[evolution-data-server] Updated Norwegian bokmÃ¥l translation.

From: Kjartan Maraas <kmaraas src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Norwegian bokmÃ¥l translation.
Date: Sun, 12 Feb 2017 12:37:18 +0000 (UTC)
commit f8a8f47a1a40fc79c189e5e3771c30b29b779591
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sun Feb 12 13:37:03 2017 +0100

    Updated Norwegian bokmÃ¥l translation.

 po/nb.po | 3872 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 2150 insertions(+), 1722 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index fa3e461..935829e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,15 +1,15 @@
 # Norwegian bokmÃ¥l translation of evolution-data-server.
 # Copyright (C) 1998-2004, 2005 Free Software Foundation, Inc.
 #
-# Kjartan Maraas <kmaraas gnome org>, 1998-2016.
+# Kjartan Maraas <kmaraas gnome org>, 1998-2017.
 # Terance Edward Sola <terance lyse net>, 2005.
 # Torstein Adolf Winterseth <kvikende fsfe org>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server 3.19.x\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-10 20:19+0100\n"
-"PO-Revision-Date: 2016-01-10 20:22+0100\n"
+"Project-Id-Version: evolution-data-server 3.23.x\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: 2017-02-11 14:22+0000\n"
+"PO-Revision-Date: 2017-02-12 13:37+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmÃ¥l <i18n-nb lister ping uio no>\n"
 "Language: nb\n"
@@ -18,324 +18,327 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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"
+msgid "Failed to remove file â€œ%sâ€: %s"
 msgstr "Klarte ikke Ã¥ fjerne fil Â«%sÂ»: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:148
+#: ../src/addressbook/backends/file/e-book-backend-file.c:148
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "Klarte ikke Ã¥ opprette katalog %s: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:419
+#: ../src/addressbook/backends/file/e-book-backend-file.c:419
 #, c-format
-msgid "Failed to create hardlink for resource '%s': %s"
+msgid "Failed to create hardlink for resource â€œ%sâ€: %s"
 msgstr "Klarte ikke Ã¥ opprette hard lenke for ressurs Â«%sÂ»: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:524
-#: ../addressbook/backends/file/e-book-backend-file.c:1256
+#: ../src/addressbook/backends/file/e-book-backend-file.c:524
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1256
 msgid "No UID in the contact"
 msgstr "Ingen UID i kontakten"
 
-#: ../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 "UID'er som er i konflikt ble funnet i tillagte kontakter"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:990
+#: ../src/addressbook/backends/file/e-book-backend-file.c:990
 msgid "Loading..."
 msgstr "Laster â€¦"
 
-#: ../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 "SÃ¸ker â€¦"
 
-#: ../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 "PrÃ¸vde Ã¥ endre kontakt Â«%sÂ» med revisjon som ikke er synkronisert"
 
-#: ../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:7332
-#: ../addressbook/libedata-book/e-book-sqlite.c:7401
+#: ../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"
+msgid "Contact â€œ%sâ€ not found"
 msgstr "Kontakt Â«%sÂ» ble ikke funnet"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1620
-#: ../addressbook/backends/file/e-book-backend-file.c:1701
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1620
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1701
 #, c-format
-msgid "Query '%s' not supported"
+msgid "Query â€œ%sâ€ not supported"
 msgstr "SpÃ¸rring Â«%sÂ» er ikke stÃ¸ttet"
 
-#: ../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'"
+msgid "Invalid Query â€œ%sâ€"
 msgstr "Ugyldig spÃ¸rring Â«%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 "ForespÃ¸rsel om Ã¥ slette en ikke-relatert markÃ¸r"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2046
+#: ../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 "Kunne ikke endre navn pÃ¥ gammel database fra Â«%sÂ» til Â«%sÂ»: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1166
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:384
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:867
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:51
-#: ../addressbook/libebook-contacts/e-phone-number.c:56
-#: ../addressbook/libebook/e-book.c:1078
-#: ../addressbook/libebook/e-book-client.c:2131
-#: ../addressbook/libebook/e-book-client.c:2303
-#: ../addressbook/libebook/e-book-client.c:2516
-#: ../addressbook/libebook/e-book-client.c:2647
-#: ../addressbook/libebook/e-book-client.c:2806
-#: ../addressbook/libebook/e-book-client.c:2940
-#: ../addressbook/libebook/e-book-client.c:3071
-#: ../addressbook/libebook/e-book-client.c:3229
-#: ../addressbook/libebook/e-book-client.c:3424
-#: ../addressbook/libebook/e-book-client.c:3642
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:670
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:701
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:718
-#: ../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:3492
-#: ../calendar/libecal/e-cal-client.c:3665
-#: ../calendar/libecal/e-cal-client.c:3929
-#: ../calendar/libecal/e-cal-client.c:4170
-#: ../calendar/libecal/e-cal-client.c:4360
-#: ../calendar/libecal/e-cal-client.c:4553
-#: ../calendar/libecal/e-cal-client.c:4762
-#: ../calendar/libecal/e-cal-client.c:4931
-#: ../calendar/libecal/e-cal-client.c:5134
-#: ../calendar/libecal/e-cal-client.c:5284
-#: ../calendar/libecal/e-cal-client.c:5478
-#: ../calendar/libecal/e-cal-client.c:5631
-#: ../calendar/libecal/e-cal-client.c:5848
-#: ../calendar/libecal/e-cal-client.c:6002
-#: ../calendar/libecal/e-cal-client.c:6228
-#: ../calendar/libecal/e-cal-client.c:6424
-#: ../calendar/libecal/e-cal-client.c:6787
-#: ../calendar/libecal/e-cal-client.c:7009
-#: ../camel/providers/imapx/camel-imapx-server.c:2958
-#: ../camel/providers/imapx/camel-imapx-server.c:2968
-#: ../camel/providers/imapx/camel-imapx-server.c:2980
-#: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
+#: ../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 "Ukjent feil"
 
 #. 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 "SpÃ¸r etter oppdaterte kontakter â€¦"
 
 #. 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 "SpÃ¸r etter oppdaterte grupper â€¦"
 
-#: ../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:1482
+#: ../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 "Motor stÃ¸tter ikke Ã¥ legge til flere oppfÃ¸ringer samtidig"
 
-#: ../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:1604
+#: ../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 "Motor stÃ¸tter ikke Ã¥ legge til flere oppfÃ¸ringer samtidig"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2114
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1704
+#: ../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 "Kalender stÃ¸tter ikke fjerning av mange oppfÃ¸ringer"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2236
+#: ../src/addressbook/backends/google/e-book-backend-google.c:2237
 msgid "Loadingâ€¦"
 msgstr "Laster â€¦"
 
 #. 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 "Personlig"
 
 #. 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 "Venner"
 
 #. 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 "Familie"
 
 #. 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 "Kolleger"
 
 #. 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 "Ikke tilkoblet"
 
-#: ../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 "Klarte ikke Ã¥ koble til med hverken v3 eller v2 binding"
 
-#: ../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 "Kobler til LDAP-tjener pÃ¥ nytt â€¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1143
 msgid "Invalid DN syntax"
 msgstr "Ugyldig DN-syntaks"
 
-#: ../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-feil 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: NULL returnert fra ldap_first_entry"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2028
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2156
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2024
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2152
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: UhÃ¥ndtert resultat type %d returnert"
 
-#: ../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 "%s: Ikke hÃ¥ndtert sÃ¸keresultat av type %d ble returnert"
 
-#: ../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 "Mottar sÃ¸keresultater fra LDAP-tjener â€¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4379
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4375
 msgid "Error performing search"
 msgstr "Feil ved utfÃ¸ring av sÃ¸k"
 
-#: ../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 "Laster ned kontakter (%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 "Legger til kontakt pÃ¥ LDAP-tjener â€¦"
 
-#: ../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 "Endrer kontakt fra LDAP-tjener â€¦"
 
-#: ../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 "Fjerner kontakt fra LDAP-tjener â€¦"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5618
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5614
 #, c-format
-msgid "Failed to get the DN for user '%s'"
+msgid "Failed to get the DN for user â€œ%sâ€"
 msgstr "Klarte ikke Ã¥ hente DN for bruker Â«%sÂ»"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
-#: ../calendar/backends/http/e-cal-backend-http.c:512
+#: ../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 "Feilutformet 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 "Laster sammendrag for adressebok â€¦"
 
-#: ../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 pÃ¥ webdav feilet med HTTP-status: %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 "Ingen svarkropp i resultat av WebDAV PROPFIND kommando"
 
-#: ../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 "Laster kontakter (%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 "Kan ikke transformere SoupURI til streng"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1533
+#: ../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 "Oppretting av ressurs Â«%sÂ» feilet med HTTP-status %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1635
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1657
 msgid "Contact on server changed -> not modifying"
 msgstr "Kontakt pÃ¥ tjener endret -> endrer ikke"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1643
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1665
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "Endring av kontakt feilet med HTTP-status %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1736
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1752
+#: ../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 feilet med HTTP-status: %d"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:40
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:38
 msgid "No such book"
 msgstr "Boken eksisterer ikke"
 
-#: ../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 "Kontakten ble ikke funnet"
 
-#: ../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 "Kontakt-ID eksisterer allerede"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:44
 msgid "No such source"
 msgstr "Kilden eksisterer ikke"
 
-#: ../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 "Ingen plass"
 
 #. 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 "Unik ID"
 
@@ -343,12 +346,12 @@ msgstr "Unik ID"
 #. * so we can generate its value if necessary in the getter
 #. Translators: This is an EContact field description, in this case it's a
 #. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../addressbook/libebook-contacts/e-contact.c:135
+#: ../src/addressbook/libebook-contacts/e-contact.c:133
 msgid "File Under"
 msgstr "Arkiver under"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:137
+#: ../src/addressbook/libebook-contacts/e-contact.c:135
 msgid "Book UID"
 msgstr "UID for bok"
 
@@ -356,435 +359,435 @@ msgstr "UID for bok"
 #. 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 "Fullt navn"
 
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../src/addressbook/libebook-contacts/e-contact.c:142
 msgid "Given Name"
 msgstr "Gitt navn"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../src/addressbook/libebook-contacts/e-contact.c:143
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: ../addressbook/libebook-contacts/e-contact.c:146
+#: ../src/addressbook/libebook-contacts/e-contact.c:144
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:149
+#: ../src/addressbook/libebook-contacts/e-contact.c:147
 msgid "Email 1"
 msgstr "E-post 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../src/addressbook/libebook-contacts/e-contact.c:148
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../src/addressbook/libebook-contacts/e-contact.c:149
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../src/addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 4"
 msgstr "E-post 4"
 
-#: ../addressbook/libebook-contacts/e-contact.c:154
+#: ../src/addressbook/libebook-contacts/e-contact.c:152
 msgid "Mailer"
 msgstr "Postprogram"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:157
+#: ../src/addressbook/libebook-contacts/e-contact.c:155
 msgid "Home Address Label"
 msgstr "Etikett for hjemmeadresse"
 
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../src/addressbook/libebook-contacts/e-contact.c:156
 msgid "Work Address Label"
 msgstr "Etikett for jobbadresse"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../src/addressbook/libebook-contacts/e-contact.c:157
 msgid "Other Address Label"
 msgstr "Etikett for annen adresse"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:162
+#: ../src/addressbook/libebook-contacts/e-contact.c:160
 msgid "Assistant Phone"
 msgstr "Assistents telefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../src/addressbook/libebook-contacts/e-contact.c:161
 msgid "Business Phone"
 msgstr "Arbeidstelefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../src/addressbook/libebook-contacts/e-contact.c:162
 msgid "Business Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../src/addressbook/libebook-contacts/e-contact.c:163
 msgid "Business Fax"
 msgstr "Faks pÃ¥ arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../src/addressbook/libebook-contacts/e-contact.c:164
 msgid "Callback Phone"
 msgstr "Telefon for tilbakeringing"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../src/addressbook/libebook-contacts/e-contact.c:165
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../src/addressbook/libebook-contacts/e-contact.c:166
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../src/addressbook/libebook-contacts/e-contact.c:167
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../src/addressbook/libebook-contacts/e-contact.c:168
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../src/addressbook/libebook-contacts/e-contact.c:169
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: ../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 "Mobiltelefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../src/addressbook/libebook-contacts/e-contact.c:172
 msgid "Other Phone"
 msgstr "Annen telefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:175
+#: ../src/addressbook/libebook-contacts/e-contact.c:173
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: ../addressbook/libebook-contacts/e-contact.c:176
+#: ../src/addressbook/libebook-contacts/e-contact.c:174
 msgid "Pager"
 msgstr "PersonsÃ¸ker"
 
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../src/addressbook/libebook-contacts/e-contact.c:175
 msgid "Primary Phone"
 msgstr "PrimÃ¦r telefon"
 
-#: ../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 "Teleks"
 
 #. 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 "Organisasjon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:185
+#: ../src/addressbook/libebook-contacts/e-contact.c:183
 msgid "Organizational Unit"
 msgstr "Organisasjonsenhet"
 
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../src/addressbook/libebook-contacts/e-contact.c:184
 msgid "Office"
 msgstr "Kontor"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../src/addressbook/libebook-contacts/e-contact.c:185
 msgid "Title"
 msgstr "Tittel"
 
-#: ../addressbook/libebook-contacts/e-contact.c:188
+#: ../src/addressbook/libebook-contacts/e-contact.c:186
 msgid "Role"
 msgstr "Rolle"
 
-#: ../addressbook/libebook-contacts/e-contact.c:189
+#: ../src/addressbook/libebook-contacts/e-contact.c:187
 msgid "Manager"
 msgstr "Leder"
 
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../src/addressbook/libebook-contacts/e-contact.c:188
 msgid "Assistant"
 msgstr "Assistent"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:193
+#: ../src/addressbook/libebook-contacts/e-contact.c:191
 msgid "Homepage URL"
 msgstr "URL til hjemmeside"
 
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../src/addressbook/libebook-contacts/e-contact.c:192
 msgid "Weblog URL"
 msgstr "URL til weblog"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:197
+#: ../src/addressbook/libebook-contacts/e-contact.c:195
 msgid "Categories"
 msgstr "Kategorier"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:200
+#: ../src/addressbook/libebook-contacts/e-contact.c:198
 msgid "Calendar URI"
 msgstr "Kalender URI"
 
-#: ../addressbook/libebook-contacts/e-contact.c:201
+#: ../src/addressbook/libebook-contacts/e-contact.c:199
 msgid "Free/Busy URL"
 msgstr "Ledig/opptatt URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:202
+#: ../src/addressbook/libebook-contacts/e-contact.c:200
 msgid "ICS Calendar"
 msgstr "ICS-kalender"
 
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../src/addressbook/libebook-contacts/e-contact.c:201
 msgid "Video Conferencing URL"
 msgstr "Videokonferanse-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"
 msgstr "Ektefelles navn"
 
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../src/addressbook/libebook-contacts/e-contact.c:205
 msgid "Note"
 msgstr "Kommentar"
 
 #. 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-skjermnavn 1 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../src/addressbook/libebook-contacts/e-contact.c:209
 msgid "AIM Home Screen Name 2"
 msgstr "AIM-skjermnavn 2 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../src/addressbook/libebook-contacts/e-contact.c:210
 msgid "AIM Home Screen Name 3"
 msgstr "AIM-skjermnavn 3 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../src/addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Work Screen Name 1"
 msgstr "AIM-skjermnavn 1 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../src/addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Work Screen Name 2"
 msgstr "AIM-skjermnavn 2 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../src/addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Work Screen Name 3"
 msgstr "AIM-skjermnavn 3 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../src/addressbook/libebook-contacts/e-contact.c:214
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise skjermnavn 1 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../src/addressbook/libebook-contacts/e-contact.c:215
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise skjermnavn 2 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../src/addressbook/libebook-contacts/e-contact.c:216
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise skjermnavn 3 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../src/addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise-skjermnavn 1 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../src/addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise-skjermnavn 2 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../src/addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise-skjermnavn 3 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../src/addressbook/libebook-contacts/e-contact.c:220
 msgid "Jabber Home ID 1"
 msgstr "Jabber-ID 1 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../src/addressbook/libebook-contacts/e-contact.c:221
 msgid "Jabber Home ID 2"
 msgstr "Jabber-ID 2 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../src/addressbook/libebook-contacts/e-contact.c:222
 msgid "Jabber Home ID 3"
 msgstr "Jabber-ID 3 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../src/addressbook/libebook-contacts/e-contact.c:223
 msgid "Jabber Work ID 1"
 msgstr "Jabber-ID 1 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../src/addressbook/libebook-contacts/e-contact.c:224
 msgid "Jabber Work ID 2"
 msgstr "Jabber-ID 2 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../src/addressbook/libebook-contacts/e-contact.c:225
 msgid "Jabber Work ID 3"
 msgstr "Jabber-ID 3 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../src/addressbook/libebook-contacts/e-contact.c:226
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Skjermnavn 1 for Yahoo!, hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../src/addressbook/libebook-contacts/e-contact.c:227
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Skjermnavn 2 for Yahoo!, hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../src/addressbook/libebook-contacts/e-contact.c:228
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Skjermnavn 3 for Yahoo!, hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../src/addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Skjermnavn 1 for Yahoo!, arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../src/addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Skjermnavn 2 for Yahoo!, arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../src/addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Skjermnavn 3 for Yahoo!, arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../src/addressbook/libebook-contacts/e-contact.c:232
 msgid "MSN Home Screen Name 1"
 msgstr "Skjermnavn 1 for MSN, hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../src/addressbook/libebook-contacts/e-contact.c:233
 msgid "MSN Home Screen Name 2"
 msgstr "Skjermnavn 2 for MSN, hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../src/addressbook/libebook-contacts/e-contact.c:234
 msgid "MSN Home Screen Name 3"
 msgstr "Skjermnavn 3 for MSN, hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../src/addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Work Screen Name 1"
 msgstr "Skjermnavn 1 for MSN, arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../src/addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Work Screen Name 2"
 msgstr "Skjermnavn 2 for MSN, arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:239
+#: ../src/addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Work Screen Name 3"
 msgstr "Skjermnavn 3 for MSN, arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:240
+#: ../src/addressbook/libebook-contacts/e-contact.c:238
 msgid "ICQ Home ID 1"
 msgstr "ICQ-ID 1 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../src/addressbook/libebook-contacts/e-contact.c:239
 msgid "ICQ Home ID 2"
 msgstr "ICQ-ID 2 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:242
+#: ../src/addressbook/libebook-contacts/e-contact.c:240
 msgid "ICQ Home ID 3"
 msgstr "ICQ-ID 3 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:243
+#: ../src/addressbook/libebook-contacts/e-contact.c:241
 msgid "ICQ Work ID 1"
 msgstr "ICQ-ID 1 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:244
+#: ../src/addressbook/libebook-contacts/e-contact.c:242
 msgid "ICQ Work ID 2"
 msgstr "ICQ-ID 2 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../src/addressbook/libebook-contacts/e-contact.c:243
 msgid "ICQ Work ID 3"
 msgstr "ICQ-ID 3 arbeid"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:248
+#: ../src/addressbook/libebook-contacts/e-contact.c:246
 msgid "Last Revision"
 msgstr "Siste versjon"
 
 #. 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 "Navn eller organisasjon"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:255
+#: ../src/addressbook/libebook-contacts/e-contact.c:253
 msgid "Address List"
 msgstr "Adresseliste"
 
-#: ../addressbook/libebook-contacts/e-contact.c:256
+#: ../src/addressbook/libebook-contacts/e-contact.c:254
 msgid "Home Address"
 msgstr "Hjemmeadresse"
 
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../src/addressbook/libebook-contacts/e-contact.c:255
 msgid "Work Address"
 msgstr "Jobbadresse"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../src/addressbook/libebook-contacts/e-contact.c:256
 msgid "Other Address"
 msgstr "Annen adresse"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:261
+#: ../src/addressbook/libebook-contacts/e-contact.c:259
 msgid "Category List"
 msgstr "Kategoriliste"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:264
+#: ../src/addressbook/libebook-contacts/e-contact.c:262
 msgid "Photo"
 msgstr "Fotografi"
 
-#: ../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 "Navn"
 
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../src/addressbook/libebook-contacts/e-contact.c:268
 msgid "Email List"
 msgstr "E-postliste"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:273
+#: ../src/addressbook/libebook-contacts/e-contact.c:271
 msgid "AIM Screen Name List"
 msgstr "Liste over skjermnavn for AIM"
 
-#: ../addressbook/libebook-contacts/e-contact.c:274
+#: ../src/addressbook/libebook-contacts/e-contact.c:272
 msgid "GroupWise ID List"
 msgstr "GroupWise ID-liste"
 
-#: ../addressbook/libebook-contacts/e-contact.c:275
+#: ../src/addressbook/libebook-contacts/e-contact.c:273
 msgid "Jabber ID List"
 msgstr "Liste med Jabber-IDer"
 
-#: ../addressbook/libebook-contacts/e-contact.c:276
+#: ../src/addressbook/libebook-contacts/e-contact.c:274
 msgid "Yahoo! Screen Name List"
 msgstr "Liste med skjermnavn for Yahoo!"
 
-#: ../addressbook/libebook-contacts/e-contact.c:277
+#: ../src/addressbook/libebook-contacts/e-contact.c:275
 msgid "MSN Screen Name List"
 msgstr "Liste med skjermnavn for MSN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:278
+#: ../src/addressbook/libebook-contacts/e-contact.c:276
 msgid "ICQ ID List"
 msgstr "Liste med ICQ-IDer"
 
-#: ../addressbook/libebook-contacts/e-contact.c:280
+#: ../src/addressbook/libebook-contacts/e-contact.c:278
 msgid "Wants HTML Mail"
 msgstr "Vil ha meldinger som HTML"
 
 #. 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 "Liste"
 
@@ -792,241 +795,242 @@ msgstr "Liste"
 #. * used to determine whether when sending to Contact lists the addresses should be
 #. * shown or not to other recipients - basically whether to use BCC field or CC
 #. * message header when sending messages to this Contact list.
-#: ../addressbook/libebook-contacts/e-contact.c:290
+#: ../src/addressbook/libebook-contacts/e-contact.c:288
 msgid "List Shows Addresses"
 msgstr "Listen viser adresser"
 
-#: ../addressbook/libebook-contacts/e-contact.c:292
+#: ../src/addressbook/libebook-contacts/e-contact.c:290
 msgid "Birth Date"
 msgstr "FÃ¸dselsdato"
 
-#: ../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 "Jubileum"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:296
+#: ../src/addressbook/libebook-contacts/e-contact.c:294
 msgid "X.509 Certificate"
 msgstr "X.509-sertifikat"
 
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../src/addressbook/libebook-contacts/e-contact.c:295
 msgid "PGP Certificate"
 msgstr "PGP-sertifikat"
 
-#: ../addressbook/libebook-contacts/e-contact.c:299
+#: ../src/addressbook/libebook-contacts/e-contact.c:297
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu-ID 1 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../src/addressbook/libebook-contacts/e-contact.c:298
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu-ID 2 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:301
+#: ../src/addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu-ID 3 hjemme"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../src/addressbook/libebook-contacts/e-contact.c:300
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu-ID 1 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:303
+#: ../src/addressbook/libebook-contacts/e-contact.c:301
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu-ID 2 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../src/addressbook/libebook-contacts/e-contact.c:302
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu-ID 3 arbeid"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../src/addressbook/libebook-contacts/e-contact.c:303
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID-liste"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:308
+#: ../src/addressbook/libebook-contacts/e-contact.c:306
 msgid "Geographic Information"
 msgstr "Geografisk informasjon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:310
+#: ../src/addressbook/libebook-contacts/e-contact.c:308
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../src/addressbook/libebook-contacts/e-contact.c:310
 msgid "Skype Home Name 1"
 msgstr "Skype-navn hjemme 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:313
+#: ../src/addressbook/libebook-contacts/e-contact.c:311
 msgid "Skype Home Name 2"
 msgstr "Skype-navn hjemme 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../src/addressbook/libebook-contacts/e-contact.c:312
 msgid "Skype Home Name 3"
 msgstr "Skype-navn hjemme 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../src/addressbook/libebook-contacts/e-contact.c:313
 msgid "Skype Work Name 1"
 msgstr "Skype-navn arbeid 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../src/addressbook/libebook-contacts/e-contact.c:314
 msgid "Skype Work Name 2"
 msgstr "Skype-navn arbeid 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../src/addressbook/libebook-contacts/e-contact.c:315
 msgid "Skype Work Name 3"
 msgstr "Skype-navn arbeid 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:318
+#: ../src/addressbook/libebook-contacts/e-contact.c:316
 msgid "Skype Name List"
 msgstr "Liste med Skype-navn"
 
-#: ../addressbook/libebook-contacts/e-contact.c:320
+#: ../src/addressbook/libebook-contacts/e-contact.c:318
 msgid "SIP address"
 msgstr "SIP-adresse"
 
-#: ../addressbook/libebook-contacts/e-contact.c:322
+#: ../src/addressbook/libebook-contacts/e-contact.c:320
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk hjemme 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 hjemme 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 hjemme 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 arbeid 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 arbeid 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 arbeid 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:328
+#: ../src/addressbook/libebook-contacts/e-contact.c:326
 msgid "Google Talk Name List"
 msgstr "Liste med Google Talk navn"
 
-#: ../addressbook/libebook-contacts/e-contact.c:330
+#: ../src/addressbook/libebook-contacts/e-contact.c:328
 msgid "Twitter Name List"
 msgstr "Liste med Twitter-navn"
 
-#: ../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 "Liste uten navn"
 
-#: ../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 "Biblioteket ble bygget uten stÃ¸tte for telefonnumre."
 
-#: ../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 "Telefonnummertolkeren rapporterte en feilkode som ikke er kjent ennÃ¥."
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:45
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:43
 msgid "Not a phone number"
 msgstr "Ikke et telefonnummer"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:47
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:45
 msgid "Invalid country calling code"
 msgstr "Ugyldig landskode"
 
-#: ../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 ""
 "GjenvÃ¦rende tekst etter landskode er for kort til Ã¥ vÃ¦re et telefonnummer"
 
-#: ../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 "Teksten er for kort til Ã¥ vÃ¦re et telefonnummer"
 
-#: ../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 "Teksten er for lang til Ã¥ vÃ¦re et telefonnummer"
 
-#: ../addressbook/libebook/e-book-client.c:931
+#: ../src/addressbook/libebook/e-book-client.c:929
 #, c-format
-msgid "Unknown book property '%s'"
+msgid "Unknown book property â€œ%sâ€"
 msgstr "Ukjent egenskap Â«%sÂ» for bok"
 
-#: ../addressbook/libebook/e-book-client.c:946
+#: ../src/addressbook/libebook/e-book-client.c:944
 #, c-format
-msgid "Cannot change value of book property '%s'"
+msgid "Cannot change value of book property â€œ%sâ€"
 msgstr "Kan ikke endre verdi for bokegenskap Â«%sÂ»"
 
-#: ../addressbook/libebook/e-book-client.c:1390
-#: ../addressbook/libebook/e-book-client.c:1621
-#: ../addressbook/libebook/e-book-client.c:1898
-#: ../calendar/libecal/e-cal-client.c:1717
-#: ../calendar/libecal/e-cal-client.c:1955
+#: ../src/addressbook/libebook/e-book-client.c:1388
+#: ../src/addressbook/libebook/e-book-client.c:1619
+#: ../src/addressbook/libebook/e-book-client.c:1896
+#: ../src/calendar/libecal/e-cal-client.c:1715
+#: ../src/calendar/libecal/e-cal-client.c:1953
 #, c-format
-msgid "Unable to connect to '%s': "
+msgid "Unable to connect to â€œ%sâ€: "
 msgstr "Kunne ikke koble til Â«%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 "Klienten forsvant"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
-#: ../addressbook/libedata-book/e-book-sqlite.c:2229
+#: ../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 "Feil ved inspeksjon av ukjent sammendragsfelt Â«%sÂ»"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
-#: ../addressbook/libedata-book/e-book-sqlite.c:1368
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1393
 msgid "Error parsing regular expression"
 msgstr "Feil ved tolking av regulÃ¦rt uttrykk"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
-#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../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 "Ikke nok minne"
 
-#: ../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 "Ugyldig kontaktfelt Â«%dÂ» oppgitt i sammendraget"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
-#: ../addressbook/libedata-book/e-book-sqlite.c:579
+#: ../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 ""
 "Kontaktfelt Â«%sÂ» av type Â«%sÂ» oppgitt i sammendrag, men stÃ¸tter kun "
 "felttypene bolsk streng og strengliste"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4169
+#: ../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 "Hele search_contacts lagres ikke i buffer. vcard kan ikke returneres."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4300
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4393
-#: ../addressbook/libedata-book/e-book-sqlite.c:5807
+#: ../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 "SpÃ¸rringen innehold elementer som ikke stÃ¸ttes"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4304
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4311
 #, c-format
 msgid "Invalid Query"
 msgstr "Ugyldig spÃ¸rring"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4328
+#: ../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 "
@@ -1035,309 +1039,328 @@ msgstr ""
 "Hele search_contacts er ikke lagret i buffer. StÃ¸tter kun spÃ¸rring pÃ¥ "
 "sammendrag."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4397
-#: ../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 "Ugyldig spÃ¸rring"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4440
+#: ../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 "Hele vcard lagres ikke i buffer. StÃ¸tter kun spÃ¸rring pÃ¥ sammendrag."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5263
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:5270
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "Klarte ikke Ã¥ fjerne databasefil: errno %d"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6050
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6450
+#: ../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 "EbSdbCursor stÃ¸tter kun spÃ¸rringer pÃ¥ sammendrag"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
+#: ../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 "Minst ett sorteringsfelt mÃ¥ spesifiseres for Ã¥ bruke en EbSdbCursor"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6071
+#: ../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 "Kan ikke sortere pÃ¥ et felt som ikke er i sammendraget"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6085
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr "Kan ikke sortere pÃ¥ et felt som kan ha flere verdier"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
-#: ../addressbook/libedata-book/e-book-sqlite.c:8106
+#: ../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:6219
-#: ../addressbook/libedata-book/e-book-sqlite.c:8114
+#: ../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:545
+#: ../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 "Ikke stÃ¸ttet kontaktfelt Â«%dÂ» oppgitt i sammendraget"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:1925
+#: ../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 ""
 "Kan ikke oppgradere kontaktdatabasen fra en gammel database med mer enn en "
 "adressebok. Slett en av oppfÃ¸ringene i Â«foldersÂ» tabellen fÃ¸rst."
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5800
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5810
 #, c-format
 msgid "Invalid query: %s"
 msgstr "Ugyldig spÃ¸rring: %s"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5975
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5985
 msgid "Invalid query for EbSqlCursor"
 msgstr "Ugyldig spÃ¸rring for EbSqlCursor"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7928
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7938
 msgid "At least one sort field must be specified to use an EbSqlCursor"
 msgstr "Minst ett sorteringsfelt mÃ¥ oppgis for Ã¥ bruke en EbSqlCursor"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7946
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7956
 msgid "Cannot sort by a field that is not a string type"
 msgstr "Kan ikke sortere pÃ¥ et felt som ikke er av type streng"
 
-#: ../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 "Suksess"
 
-#: ../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 "Motoren er opptatt"
 
-#: ../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 "Lageret er frakoblet"
 
-#: ../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 "Tilgang nektet"
 
-#: ../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 "Autentisering feilet"
 
-#: ../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 "Autentisering kreves"
 
-#: ../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 "Ikke stÃ¸ttet felt"
 
-#: ../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 "Ikke stÃ¸ttet autentiseringsmetode"
 
-#: ../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 er ikke tilgjengelig"
 
-#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../src/addressbook/libedata-book/e-data-book.c:389
 msgid "Address book does not exist"
 msgstr "Adresseboken eksisterer ikke"
 
-#: ../addressbook/libedata-book/e-data-book.c:392
+#: ../src/addressbook/libedata-book/e-data-book.c:390
 msgid "Book removed"
 msgstr "Bok fjernet"
 
-#: ../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 "Ikke tilgjengelig i frakoblet modus"
 
-#: ../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 "SÃ¸kets stÃ¸rrelsesgrense oversteget"
 
-#: ../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 "Tidsbegrensning for sÃ¸k oversteget"
 
-#: ../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 "SpÃ¸rring nektet"
 
-#: ../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 "Kunne ikke avbryte"
 
 #. { 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 "Ugyldig versjon for tjener"
 
-#: ../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 "Ugyldig argument"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:404
-#: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
-#: ../calendar/libecal/e-cal.c:1909 ../calendar/libecal/e-cal.c:2341
-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:167
+#: ../src/addressbook/libedata-book/e-data-book.c:402
+#: ../src/calendar/libecal/e-cal.c:1057 ../src/calendar/libecal/e-cal.c:1425
+#: ../src/calendar/libecal/e-cal.c:1907 ../src/calendar/libecal/e-cal.c:2339
+#: ../src/calendar/libedata-cal/e-data-cal.c:436
+#: ../src/libedataserver/e-client.c:165
 #, c-format
 msgid "Not supported"
 msgstr "Ikke stÃ¸ttet"
 
-#: ../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 "Motoren er ikke Ã¥pnet ennÃ¥"
 
-#: ../addressbook/libedata-book/e-data-book.c:406
-#: ../libedataserver/e-client.c:187
+#: ../src/addressbook/libedata-book/e-data-book.c:404
+#: ../src/libedataserver/e-client.c:185
 msgid "Object is out of sync"
 msgstr "Objektet er ute av synk"
 
-#: ../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 "Annen feil"
 
-#: ../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 "Ugyldig spÃ¸rring: "
 
 #. 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 "Kan ikke Ã¥pne bok: "
 
 #. 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 "Kan ikke oppdatere adressebok: "
 
 #. 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 "Kan ikke hente kontakt: "
 
 #. 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 "Kan ikke hente kontaktliste: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1602
+#: ../src/addressbook/libedata-book/e-data-book.c:1602
 msgid "Cannot get contact list uids: "
 msgstr "Kan ikke hente UIDer for kontaktliste: "
 
 #. 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 "Kan ikke legge til kontakt: "
 
 #. 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 "Kan ikke endre kontakter: "
 
 #. 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 "Kan ikke fjerne kontakter: "
 
-#: ../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 "MarkÃ¸r stÃ¸tter ikke Ã¥ sette sÃ¸keuttrykket"
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:859
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:857
 msgid "Cursor does not support step"
 msgstr "MarkÃ¸r stÃ¸tter ikke steg"
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:942
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:940
 msgid "Cursor does not support alphabetic indexes"
 msgstr "MarkÃ¸r stÃ¸tter ikke alfabetiske indekser"
 
-#: ../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 "Ukjent opprinnelse for markÃ¸r"
 
-#: ../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 "Alfabetisk indeks ble satt for ugyldig locale"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:668
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:705
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Tjener kan ikke nÃ¥s (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:699
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:731
 #, c-format
-msgid "Failed to connect to a server using SSL: %s"
-msgstr "Klarte ikke Ã¥ koble til en tjener med SSL: %s"
+msgid "Failed to login to the server: %s"
+msgstr "Klarte ikke Ã¥ logge pÃ¥ tjener: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:715
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:753
+#, c-format
+msgid "Failed to connect to a server using SSL/TLS: %s"
+msgstr "Klarte ikke Ã¥ koble til en tjener med SSL/TLS: %s"
+
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:769
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
 msgstr "Uventet HTTP-statuskode %d mottatt (%s) for URI: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:736
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:790
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV-motor er ikke lastet ennÃ¥"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1173
-#: ../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 "Ugyldig objekt for omdirigering"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3030
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:2946
 #, c-format
-msgid "Cannot create local cache folder '%s'"
+msgid "Cannot create local cache folder â€œ%sâ€"
 msgstr "Kan ikke opprette lokal buffermappe Â«%sÂ»"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3113
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:3032
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1346,804 +1369,849 @@ msgstr ""
 "Tjeneren kan ikke nÃ¥s. Kalender Ã¥pnes i skrivebeskyttet modus.\n"
 "Feilmelding: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4208
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4137
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV stÃ¸tter ikke Ã¥ legge til flere oppfÃ¸ringer samtidig"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4311
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4240
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV stÃ¸tter ikke Ã¥ endre flere oppfÃ¸ringer samtidig"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4592
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4521
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV stÃ¸tter ikke fjerning av flere oppfÃ¸ringer samtidig"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5274
-msgid "Calendar doesn't support Free/Busy"
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5268
+msgid "Calendar doesnâ€™t support Free/Busy"
 msgstr "Kalender stÃ¸tter ikke ledig/opptatt"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5283
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5277
 msgid "Schedule outbox url not found"
 msgstr "URL for kalenderutboks"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5380
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5374
 msgid "Unexpected result in schedule-response"
 msgstr "Uventet resultat i schedule-response"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:950
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:948
 msgid "Birthday"
 msgstr "FÃ¸dselsdag"
 
-#: ../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 "FÃ¸dselsdag: %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 "Jubileum: %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 "Kan ikke lagre kalenderdata: Feil i 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 "Kan ikke lagre kalenderdata"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:581
+#: ../src/calendar/backends/http/e-cal-backend-http.c:583
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Omdirigert til ugyldig URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:640
+#: ../src/calendar/backends/http/e-cal-backend-http.c:642
 #, c-format
 msgid "Bad file format."
 msgstr "Ugyldig filformat."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:650
+#: ../src/calendar/backends/http/e-cal-backend-http.c:652
 #, c-format
 msgid "Not a calendar."
 msgstr "Ikke en kalender."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:954
-#: ../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 "Kunne ikke opprette bufferfil"
 
-#: ../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 "Kunne ikke hente vÃ¦rdata"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:378
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:379
 msgid "Weather: Fog"
 msgstr "VÃ¦r: TÃ¥ke"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:379
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:380
 msgid "Weather: Cloudy Night"
 msgstr "VÃ¦r: Overskyet natt"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:380
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:381
 msgid "Weather: Cloudy"
 msgstr "VÃ¦r: Overskyet"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:381
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:382
 msgid "Weather: Overcast"
 msgstr "VÃ¦r: Overskyet"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:382
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:383
 msgid "Weather: Showers"
 msgstr "VÃ¦r: Regnbyger"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:383
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:384
 msgid "Weather: Snow"
 msgstr "VÃ¦r: SnÃ¸"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:384
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:385
 msgid "Weather: Clear Night"
 msgstr "VÃ¦r: Klar natt"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:385
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:386
 msgid "Weather: Sunny"
 msgstr "VÃ¦r: Solskinn"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:386
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:387
 msgid "Weather: Thunderstorms"
 msgstr "VÃ¦r: TordenvÃ¦r"
 
 #. 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 "VÃ¦rmelding"
 
-#: ../calendar/libecal/e-cal.c:2306
+#: ../src/calendar/libecal/e-cal.c:2304
 msgid "Repository is offline"
 msgstr "Lageret er frakoblet"
 
-#: ../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 "Ingen slik kalender"
 
-#: ../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 "Objektet ble ikke funnet"
 
-#: ../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 "Ugyldig objekt"
 
-#: ../calendar/libecal/e-cal.c:2314
+#: ../src/calendar/libecal/e-cal.c:2312
 msgid "URI not loaded"
 msgstr "URI ble ikke lastet"
 
-#: ../calendar/libecal/e-cal.c:2316
+#: ../src/calendar/libecal/e-cal.c:2314
 msgid "URI already loaded"
 msgstr "URI allerede lastet"
 
-#: ../calendar/libecal/e-cal.c:2320
+#: ../src/calendar/libecal/e-cal.c:2318
 msgid "Unknown User"
 msgstr "Ukjent bruker"
 
-#: ../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 "Objekt-ID eksisterer allerede"
 
-#: ../calendar/libecal/e-cal.c:2324
+#: ../src/calendar/libecal/e-cal.c:2322
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke stÃ¸ttet"
 
-#: ../calendar/libecal/e-cal.c:2326
-msgid "Operation has been canceled"
+#: ../src/calendar/libecal/e-cal.c:2324
+msgid "Operation has been cancelled"
 msgstr "Operasjonen ble avbrutt"
 
-#: ../calendar/libecal/e-cal.c:2328
+#: ../src/calendar/libecal/e-cal.c:2326
 msgid "Could not cancel operation"
 msgstr "Kunne ikke avbryte operasjon"
 
-#: ../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 "Autentisering feilet"
 
-#: ../calendar/libecal/e-cal.c:2332
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#: ../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 "Autentisering kreves"
 
-#: ../calendar/libecal/e-cal.c:2334
+#: ../src/calendar/libecal/e-cal.c:2332
 msgid "A D-Bus exception has occurred"
 msgstr "Et D-Bus-unntak har oppstÃ¥tt"
 
-#: ../calendar/libecal/e-cal.c:2338
+#: ../src/calendar/libecal/e-cal.c:2336
 msgid "No error"
 msgstr "Ingen feil"
 
-#: ../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 "Ukjent bruker"
 
-#: ../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 "Ugyldig omrÃ¥de"
 
-#: ../calendar/libecal/e-cal-client.c:1065
+#: ../src/calendar/libecal/e-cal-client.c:1063
 #, c-format
-msgid "Unknown calendar property '%s'"
+msgid "Unknown calendar property â€œ%sâ€"
 msgstr "Ukjent kalenderegenskap Â«%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'"
+msgid "Cannot change value of calendar property â€œ%sâ€"
 msgstr "Kan ikke lage endre verdi for kalenderegenskap Â«%sÂ»"
 
-#: ../calendar/libecal/e-cal-component.c:1349
+#: ../src/calendar/libecal/e-cal-component.c:1358
 msgid "Untitled appointment"
 msgstr "Avtale uten navn"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../src/calendar/libecal/e-cal-recur.c:4739
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../src/calendar/libecal/e-cal-recur.c:4740
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../src/calendar/libecal/e-cal-recur.c:4741
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../src/calendar/libecal/e-cal-recur.c:4742
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../src/calendar/libecal/e-cal-recur.c:4743
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../src/calendar/libecal/e-cal-recur.c:4744
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../src/calendar/libecal/e-cal-recur.c:4745
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../src/calendar/libecal/e-cal-recur.c:4746
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../src/calendar/libecal/e-cal-recur.c:4747
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../src/calendar/libecal/e-cal-recur.c:4748
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../src/calendar/libecal/e-cal-recur.c:4749
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../src/calendar/libecal/e-cal-recur.c:4750
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../src/calendar/libecal/e-cal-recur.c:4751
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../src/calendar/libecal/e-cal-recur.c:4752
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../src/calendar/libecal/e-cal-recur.c:4753
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../src/calendar/libecal/e-cal-recur.c:4754
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../src/calendar/libecal/e-cal-recur.c:4755
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../src/calendar/libecal/e-cal-recur.c:4756
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../src/calendar/libecal/e-cal-recur.c:4757
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../src/calendar/libecal/e-cal-recur.c:4758
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../src/calendar/libecal/e-cal-recur.c:4759
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../src/calendar/libecal/e-cal-recur.c:4760
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../src/calendar/libecal/e-cal-recur.c:4761
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../src/calendar/libecal/e-cal-recur.c:4762
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../src/calendar/libecal/e-cal-recur.c:4763
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../src/calendar/libecal/e-cal-recur.c:4764
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/libecal/e-cal-recur.c:4072
+#: ../src/calendar/libecal/e-cal-recur.c:4765
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/libecal/e-cal-recur.c:4073
+#: ../src/calendar/libecal/e-cal-recur.c:4766
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/libecal/e-cal-recur.c:4074
+#: ../src/calendar/libecal/e-cal-recur.c:4767
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/libecal/e-cal-recur.c:4075
+#: ../src/calendar/libecal/e-cal-recur.c:4768
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/libecal/e-cal-recur.c:4076
+#: ../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 "HÃ¸y"
 
-#: ../calendar/libecal/e-cal-util.c:708 ../calendar/libecal/e-cal-util.c:735
+#: ../src/calendar/libecal/e-cal-util.c:709
+#: ../src/calendar/libecal/e-cal-util.c:736
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../calendar/libecal/e-cal-util.c:710 ../calendar/libecal/e-cal-util.c:737
+#: ../src/calendar/libecal/e-cal-util.c:711
+#: ../src/calendar/libecal/e-cal-util.c:738
 msgctxt "Priority"
 msgid "Low"
 msgstr "Lav"
 
 #. 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 "Udefinert"
 
-#: ../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
+#: ../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
 #, c-format
-msgid "\"%s\" expects one argument"
+msgid "â€œ%sâ€ expects one argument"
 msgstr "Â«%sÂ» forventer ett argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:92
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1394
+#: ../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
 #, c-format
-msgid "\"%s\" expects the first argument to be a string"
+msgid "â€œ%sâ€ expects the first argument to be a string"
 msgstr "Â«%sÂ» forventer at fÃ¸rste argument er en streng"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:165
 #, c-format
-msgid "\"%s\" expects two or three arguments"
+msgid "â€œ%sâ€ expects two or three arguments"
 msgstr "Â«%sÂ» forventer to eller tre argumenter"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:263
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:325
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:824
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1070
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1455
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1513
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1562
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c: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
 #, 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Â» forventer at fÃ¸rste argument er av type 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
+#: ../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
 #, 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Â» forventer at andre argument er av type time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:193
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:191
 #, c-format
-msgid "\"%s\" expects the third argument to be a string"
+msgid "â€œ%sâ€ expects the third argument to be a string"
 msgstr "Â«%sÂ» forventer at tredje argument er en streng"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:255
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:253
 #, c-format
-msgid "\"%s\" expects none or two arguments"
+msgid "â€œ%sâ€ expects none or two arguments"
 msgstr "Â«%sÂ» forventer ingen eller to argumenter"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1448
+#: ../src/calendar/libedata-cal/e-cal-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
 #, c-format
-msgid "\"%s\" expects two arguments"
+msgid "â€œ%sâ€ expects two arguments"
 msgstr "Â«%sÂ» forventer to argumenter"
 
-#: ../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
+#: ../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
 #, c-format
-msgid "\"%s\" expects no arguments"
+msgid "â€œ%sâ€ expects no arguments"
 msgstr "Â«%sÂ» forventer ingen argumenter"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:683
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:681
 #, c-format
-msgid "\"%s\" expects the second argument to be a string"
+msgid "â€œ%sâ€ expects the second argument to be a string"
 msgstr "Â«%sÂ» forventer at andre argument er en streng"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:712
 #, c-format
 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Â» forventer at fÃ¸rste argument er en av Â«anyÂ», Â«summaryÂ», Â«descriptionÂ», "
 "Â«locationÂ», Â«attendeeÂ», Â«organizerÂ» eller Â«classificationÂ»"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:885
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:883
 #, c-format
-msgid "\"%s\" expects at least one argument"
+msgid "â€œ%sâ€ expects at least one argument"
 msgstr "Â«%sÂ» forventer minst ett argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:900
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:898
 #, c-format
 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Â» forventer at alle argumenter er strenger eller ett, og kun ett, "
 "argument er den bolske verdien falsk (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1403
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1401
 #, 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Â» forventer at fÃ¸rste argument er en dato/tid-streng i ISO 8601 format"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1464
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1462
 #, c-format
-msgid "\"%s\" expects the second argument to be an integer"
+msgid "â€œ%sâ€ expects the second argument to be an integer"
 msgstr "Â«%sÂ» forventer at andre argument er et heltall"
 
-#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../src/calendar/libedata-cal/e-data-cal.c:421
 msgid "Unsupported method"
 msgstr "Ikke stÃ¸ttet metode"
 
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../src/calendar/libedata-cal/e-data-cal.c:424
 msgid "Calendar does not exist"
 msgstr "Kalender eksisterer ikke."
 
 #. 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 "Kan ikke Ã¥pne kalender: "
 
 #. 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 "Kan ikke oppdatere kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1723
+#: ../src/calendar/libedata-cal/e-data-cal.c:1735
 msgid "Cannot retrieve calendar object path: "
 msgstr "Kan ikke hente objektsti for kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1775
+#: ../src/calendar/libedata-cal/e-data-cal.c:1788
 msgid "Cannot retrieve calendar object list: "
 msgstr "Kan ikke hente objektliste for kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1832
+#: ../src/calendar/libedata-cal/e-data-cal.c:1846
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Kan ikke ledig/opptattliste for kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1882
+#: ../src/calendar/libedata-cal/e-data-cal.c:1897
 msgid "Cannot create calendar object: "
 msgstr "Kan ikke lage kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1950
+#: ../src/calendar/libedata-cal/e-data-cal.c:1966
 msgid "Cannot modify calendar object: "
 msgstr "Kan ikke endre kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2028
+#: ../src/calendar/libedata-cal/e-data-cal.c:2045
 msgid "Cannot remove calendar object: "
 msgstr "Kan ikke fjerne kalenderobjekt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2114
+#: ../src/calendar/libedata-cal/e-data-cal.c:2132
 msgid "Cannot receive calendar objects: "
 msgstr "Kan ikke motta kalenderobjekter: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2157
+#: ../src/calendar/libedata-cal/e-data-cal.c:2176
 msgid "Cannot send calendar objects: "
 msgstr "Kan ikke sende kalenderobjekter: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2209
+#: ../src/calendar/libedata-cal/e-data-cal.c:2229
 msgid "Could not retrieve attachment uris: "
 msgstr "Kunne ikke hente vedleggslenker: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2254
+#: ../src/calendar/libedata-cal/e-data-cal.c:2275
 msgid "Could not discard reminder: "
 msgstr "Kan ikke forkaste pÃ¥minnelse: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2295
+#: ../src/calendar/libedata-cal/e-data-cal.c:2317
 msgid "Could not retrieve calendar time zone: "
 msgstr "Kunne ikke hente tidssone for kalender: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2335
+#: ../src/calendar/libedata-cal/e-data-cal.c:2358
 msgid "Could not add calendar time zone: "
 msgstr "Kunne ikke legge til tidssone for kalender: "
 
-#: ../camel/camel-cipher-context.c:199
+#: ../src/camel/camel-cipher-context.c:202
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke stÃ¸ttet av dette cipheret"
 
-#: ../camel/camel-cipher-context.c:212
+#: ../src/camel/camel-cipher-context.c:215
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifisering er ikke stÃ¸ttet av dette cipheret"
 
-#: ../camel/camel-cipher-context.c:228
+#: ../src/camel/camel-cipher-context.c:231
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering er ikke stÃ¸ttet av dette cipheret"
 
-#: ../camel/camel-cipher-context.c:242
+#: ../src/camel/camel-cipher-context.c:245
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke stÃ¸ttet av dette cipheret"
 
-#: ../camel/camel-cipher-context.c:358
+#: ../src/camel/camel-cipher-context.c:361
 msgid "Signing message"
 msgstr "Signerer melding"
 
-#: ../camel/camel-cipher-context.c:648
+#: ../src/camel/camel-cipher-context.c:651
 msgid "Encrypting message"
 msgstr "Krypterer melding"
 
-#: ../camel/camel-cipher-context.c:820
+#: ../src/camel/camel-cipher-context.c:823
 msgid "Decrypting message"
 msgstr "Dekrypterer melding"
 
-#: ../camel/camel-data-cache.c:179
+#: ../src/camel/camel-data-cache.c:203
 #, c-format
 msgid "Unable to create cache path"
 msgstr "Kunne ikke opprette sti til buffer"
 
-#: ../camel/camel-data-cache.c:449
+#: ../src/camel/camel-data-cache.c:534
 msgid "Empty cache file"
 msgstr "Tom bufferfil"
 
-#: ../camel/camel-data-cache.c:522
+#: ../src/camel/camel-data-cache.c:611
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kunne ikke fjerne cache-oppfÃ¸ring: %s: %s"
 
-#: ../camel/camel-db.c:810 ../camel/providers/local/camel-mbox-store.c:906
+#: ../src/camel/camel-db.c:855
+#: ../src/camel/providers/local/camel-mbox-store.c:904
 #, c-format
-msgid "Could not rename '%s' to %s: %s"
+msgid "Could not rename â€œ%sâ€ to %s: %s"
 msgstr "Kunne ikke endre navn pÃ¥ Â«%sÂ» til %s: %s"
 
-#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:798
+#: ../src/camel/camel-filter-driver.c:990
+#: ../src/camel/camel-filter-search.c:779
 #, c-format
-msgid "Failed to create child process '%s': %s"
+msgid "Failed to create child process â€œ%sâ€: %s"
 msgstr "Kunne ikke opprette underprosess Â«%sÂ»: %s"
 
-#: ../camel/camel-filter-driver.c:962
+#: ../src/camel/camel-filter-driver.c:1038
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ugyldig meldingsstrÃ¸m mottatt fra %s: %s"
 
-#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
+#: ../src/camel/camel-filter-driver.c:1245
+#: ../src/camel/camel-filter-driver.c:1254
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: ../camel/camel-filter-driver.c:1276
+#: ../src/camel/camel-filter-driver.c:1352
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1287
+#: ../src/camel/camel-filter-driver.c:1363
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kjÃ¸ring av filter: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1383
+#: ../src/camel/camel-filter-driver.c:1460
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke Ã¥pne spool-mappen"
 
-#: ../camel/camel-filter-driver.c:1395
+#: ../src/camel/camel-filter-driver.c:1472
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Kan ikke prosessere spool-mappen"
 
-#: ../camel/camel-filter-driver.c:1418
+#: ../src/camel/camel-filter-driver.c:1496
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter melding %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1449
+#: ../src/camel/camel-filter-driver.c:1505
+#: ../src/camel/camel-filter-driver.c:1528
 #, c-format
 msgid "Failed on message %d"
 msgstr "Feilet pÃ¥ melding %d"
 
-#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1582
+#: ../src/camel/camel-filter-driver.c:1547
+#: ../src/camel/camel-filter-driver.c:1661
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: ../camel/camel-filter-driver.c:1473 ../camel/camel-filter-driver.c:1590
+#: ../src/camel/camel-filter-driver.c:1552
+#: ../src/camel/camel-filter-driver.c:1669
 msgid "Complete"
 msgstr "FullfÃ¸rt"
 
-#: ../camel/camel-filter-driver.c:1536
+#: ../src/camel/camel-filter-driver.c:1615
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter melding %d av %d"
 
-#: ../camel/camel-filter-driver.c:1554
+#: ../src/camel/camel-filter-driver.c:1633
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feilet pÃ¥ melding %d av %d"
 
-#: ../camel/camel-filter-driver.c:1749 ../camel/camel-filter-driver.c:1776
+#: ../src/camel/camel-filter-driver.c:1828
+#: ../src/camel/camel-filter-driver.c:1855
 #, c-format
-msgid "Execution of filter '%s' failed: "
+msgid "Execution of filter â€œ%sâ€ failed: "
 msgstr "KjÃ¸ring av filter: Â«%sÂ» feilet: "
 
-#: ../camel/camel-filter-driver.c:1766
+#: ../src/camel/camel-filter-driver.c:1845
 #, c-format
-msgid "Error parsing filter '%s': %s: %s"
-msgstr "Feil ved lesing av filter: Â«%sÂ»: %s: %s"
+msgid "Error parsing filter â€œ%sâ€: %s: %s"
+msgstr "Feil ved tolking av filter: Â«%sÂ»: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1785
+#: ../src/camel/camel-filter-driver.c:1864
 #, c-format
-msgid "Error executing filter '%s': %s: %s"
+msgid "Error executing filter â€œ%sâ€: %s: %s"
 msgstr "Feil ved kjÃ¸ring av filter Â«%sÂ»: %s: %s"
 
-#: ../camel/camel-filter-search.c:139
+#: ../src/camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "Feil under henting av melding"
 
-#: ../camel/camel-filter-search.c:538
+#: ../src/camel/camel-filter-search.c:519
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldige argumenter til (system-flag)"
 
-#: ../camel/camel-filter-search.c:556
+#: ../src/camel/camel-filter-search.c:537
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldige argumenter til (user-tag)"
 
-#: ../camel/camel-filter-search.c:1068
+#: ../src/camel/camel-filter-search.c:1066
 msgid "Invalid arguments to (message-location)"
 msgstr "Ugyldige argumenter til (melding-lokasjon)"
 
-#: ../camel/camel-filter-search.c:1149 ../camel/camel-filter-search.c:1160
+#: ../src/camel/camel-filter-search.c:1147
+#: ../src/camel/camel-filter-search.c:1158
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under lagring av filtersÃ¸k: %s: %s"
 
-#: ../camel/camel-folder.c:321
-#, c-format
-msgid "Learning new spam message in '%s'"
-msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "LÃ¦rer ny uÃ¸nsket melding i Â«%sÂ»"
-msgstr[1] "LÃ¦rer nye uÃ¸nskede meldinger i Â«%sÂ»"
-
-#: ../camel/camel-folder.c:361
-#, c-format
-msgid "Learning new ham message in '%s'"
-msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "LÃ¦rer ny Ã¸nsket melding i Â«%sÂ»"
-msgstr[1] "LÃ¦rer nye Ã¸nskede meldinger i Â«%sÂ»"
-
-#: ../camel/camel-folder.c:409
-#, c-format
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "Filtrerer ny melding i Â«%sÂ»"
-msgstr[1] "Filtrerer nye meldinger i Â«%sÂ»"
-
-#: ../camel/camel-folder.c:1015
-#: ../camel/providers/local/camel-maildir-folder.c:330
+#. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
+#. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
+#. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:311
+#, c-format
+msgid "Learning new spam message in â€œ%s : %sâ€"
+msgid_plural "Learning new spam messages in â€œ%s : %sâ€"
+msgstr[0] "LÃ¦rer ny uÃ¸nsket melding i Â«%s : %sÂ»"
+msgstr[1] "LÃ¦rer nye uÃ¸nskede meldinger i Â«%s : %sÂ»"
+
+#. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
+#. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
+#. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:354
+#, c-format
+msgid "Learning new ham message in â€œ%s : %sâ€"
+msgid_plural "Learning new ham messages in â€œ%s : %sâ€"
+msgstr[0] "LÃ¦rer ny Ã¸nsket melding i Â«%s : %sÂ»"
+msgstr[1] "LÃ¦rer nye Ã¸nskede meldinger i Â«%s : %sÂ»"
+
+#. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
+#. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
+#. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
+#: ../src/camel/camel-folder.c:405
+#, c-format
+msgid "Filtering new message in â€œ%s : %sâ€"
+msgid_plural "Filtering new messages in â€œ%s : %sâ€"
+msgstr[0] "Filtrerer ny melding i Â«%s : %sÂ»"
+msgstr[1] "Filtrerer nye meldinger i Â«%s : %sÂ»"
+
+#: ../src/camel/camel-folder.c:1016
+#: ../src/camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "Flytter meldinger"
 
-#: ../camel/camel-folder.c:1018
+#: ../src/camel/camel-folder.c:1019
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
-#: ../camel/camel-folder.c:1060
+#. 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
 #, c-format
-msgid "Quota information not supported for folder '%s'"
-msgstr "Kvoteinformasjon er ikke stÃ¸ttet for mappe Â«%sÂ»"
+msgid "Quota information not supported for folder â€œ%s : %sâ€"
+msgstr "Kvoteinformasjon er ikke stÃ¸ttet for mappe Â«%s : %sÂ»"
 
-#: ../camel/camel-folder.c:1155
+#. 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 "Filtering folder '%s'"
-msgstr "Filtrerer mappe Â«%sÂ»"
+msgid "Filtering folder â€œ%s : %sâ€"
+msgstr "Filtrerer mappe Â«%s : %sÂ»"
 
-#: ../camel/camel-folder.c:2887
+#. 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
 #, c-format
-msgid "Expunging folder '%s'"
-msgstr "TÃ¸mmer mappe Â«%sÂ»"
+msgid "Expunging folder â€œ%s : %sâ€"
+msgstr "TÃ¸mmer mappe Â«%s : %sÂ»"
 
-#: ../camel/camel-folder.c:3018
+#. 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
 #, c-format
-msgid "Retrieving message '%s' in %s"
-msgstr "Henter melding Â«%sÂ» i %s"
+msgid "Retrieving message â€œ%sâ€ in â€œ%s : %sâ€"
+msgstr "Henter melding Â«%sÂ» i Â«%s : %sÂ»"
 
-#: ../camel/camel-folder.c:3209
+#. 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
 #, c-format
-msgid "Retrieving quota information for '%s'"
-msgstr "Henter kvoteinformasjon for Â«%sÂ»"
+msgid "Retrieving quota information for â€œ%s : %sâ€"
+msgstr "Henter kvoteinformasjon for Â«%s : %sÂ»"
 
-#: ../camel/camel-folder.c:3506
+#. 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
 #, c-format
-msgid "Refreshing folder '%s'"
-msgstr "Oppdaterer mappe Â«%sÂ»"
+msgid "Refreshing folder â€œ%s : %sâ€"
+msgstr "Oppdaterer mappe Â«%s : %sÂ»"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:915 ../camel/camel-folder-search.c:957
+#: ../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) krever et enkelt bolsk resultat"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:992
+#: ../src/camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) tillates ikke inne i %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:999 ../camel/camel-folder-search.c:1007
+#: ../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) krever en streng for trefftype"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1035
+#: ../src/camel/camel-folder-search.c:1018
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) forventer resultat pÃ¥ tabellform"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1045
+#: ../src/camel/camel-folder-search.c:1028
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) krever et mappesett"
 
-#: ../camel/camel-folder-search.c:1962 ../camel/camel-folder-search.c:2131
+#: ../src/camel/camel-folder-search.c:2106
+#: ../src/camel/camel-folder-search.c:2280
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2152,7 +2220,8 @@ msgstr ""
 "Kan ikke tolke uttrykket: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1974 ../camel/camel-folder-search.c:2143
+#: ../src/camel/camel-folder-search.c:2118
+#: ../src/camel/camel-folder-search.c:2292
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2161,28 +2230,32 @@ msgstr ""
 "Feil under kjÃ¸ring av sÃ¸keuttrykket %s:\n"
 "%s"
 
-#: ../camel/camel-folder-summary.c:2147
+#. 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
 #, c-format
-msgid "Release unused memory for folder '%s'"
-msgstr "Slipp fri ubrukt minne for mappe Â«%sÂ»"
+msgid "Release unused memory for folder â€œ%s : %sâ€"
+msgstr "Slipp fri ubrukt minne for mappe Â«%s : %sÂ»"
 
-#: ../camel/camel-folder-summary.c:2359
+#. Translators: The '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
+#: ../src/camel/camel-gpg-context.c:417
 #, c-format
-msgid "Update preview data for folder '%s'"
-msgstr "Oppdaterer forhÃ¥ndsvisningsdata for mappe Â«%sÂ»"
+msgid "Output from %s:"
+msgstr "Utdata fra %s:"
 
-#: ../camel/camel-gpg-context.c:743 ../camel/camel-gpg-context.c:748
-#: ../camel/camel-gpg-context.c:1415
+#: ../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 "Feil ved kjÃ¸ring av gpg: %s"
 
-#: ../camel/camel-gpg-context.c:748
-#: ../camel/providers/smtp/camel-smtp-transport.c:1130
+#: ../src/camel/camel-gpg-context.c:839
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../camel/camel-gpg-context.c:813
+#: ../src/camel/camel-gpg-context.c:951
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2193,317 +2266,340 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:849
+#: ../src/camel/camel-gpg-context.c:987
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Feil under tolking av hint for gpg brukerid."
 
-#: ../camel/camel-gpg-context.c:874 ../camel/camel-gpg-context.c:889
+#: ../src/camel/camel-gpg-context.c:1012 ../src/camel/camel-gpg-context.c:1027
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Kunne ikke tolke forespÃ¸rsel pÃ¥ gpg-passordfrase."
 
-#: ../camel/camel-gpg-context.c:910
+#: ../src/camel/camel-gpg-context.c:1048
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
-"SmartCard: \"%s\""
+"SmartCard: â€œ%sâ€"
 msgstr ""
 "Du trenger en PIN for Ã¥ lÃ¥se opp nÃ¸kkelen for\n"
 "ditt SmartCard: Â«%sÂ»"
 
-#: ../camel/camel-gpg-context.c:914
+#: ../src/camel/camel-gpg-context.c:1052
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
-"user: \"%s\""
+"user: â€œ%sâ€"
 msgstr ""
 "Du trenger et passord for Ã¥ lÃ¥se opp nÃ¸kkelen for\n"
 "bruker Â«%sÂ»"
 
-#: ../camel/camel-gpg-context.c:920
+#: ../src/camel/camel-gpg-context.c:1058
 #, c-format
-msgid "Unexpected request from GnuPG for '%s'"
+msgid "Unexpected request from GnuPG for â€œ%sâ€"
 msgstr "Uventet forespÃ¸rsel fra GnuPG for Â«%sÂ»"
 
-#: ../camel/camel-gpg-context.c:932
+#: ../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 ""
-"Merk at kryptert innhold ikke inneholder informasjon om en mottaker. Du vil "
-"ikke bli spurt om passord for hver enkelt lagret privat nÃ¸kkel."
+msgstr "Merk at kryptert innhold ikke inneholder informasjon om en mottaker. Du vil bli spurt om passord for 
hver enkelt lagret privat nÃ¸kkel."
 
-#: ../camel/camel-gpg-context.c:963 ../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 "Avbrutt"
 
-#: ../camel/camel-gpg-context.c:984
+#: ../src/camel/camel-gpg-context.c:1122
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Feil ved Ã¥pning av hemmelig nÃ¸kkel: 3 ugyldige passord oppgitt."
 
-#: ../camel/camel-gpg-context.c:997
+#: ../src/camel/camel-gpg-context.c:1135
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventet svar fra GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1135
+#: ../src/camel/camel-gpg-context.c:1249
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere: Ingen gyldige mottakere spesifisert."
 
-#: ../camel/camel-gpg-context.c:1734 ../camel/camel-smime-context.c:843
+#. Translators: The first '%s' is replaced with the e-mail address, like '<user example com>';
+#. the second '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
+#: ../src/camel/camel-gpg-context.c:1262
+#, c-format
+msgid ""
+"Failed to encrypt: Invalid recipient %s specified. A common issue is that "
+"the %s doesnâ€™t have imported public key for this recipient."
+msgstr ""
+
+#: ../src/camel/camel-gpg-context.c:1972 ../src/camel/camel-smime-context.c:841
 msgid "Could not generate signing data: "
 msgstr "Kan ikke generere signeringsdata: "
 
-#: ../camel/camel-gpg-context.c:1785 ../camel/camel-gpg-context.c:2020
-#: ../camel/camel-gpg-context.c:2136 ../camel/camel-gpg-context.c:2311
+#: ../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 "Feil ved kjÃ¸ring av gpg."
 
-#: ../camel/camel-gpg-context.c:1891 ../camel/camel-gpg-context.c:1899
-#: ../camel/camel-gpg-context.c:1907 ../camel/camel-gpg-context.c:1927
-#: ../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 "Kunne ikke verifisere meldingens signatur: Ugyldig meldingsformat"
 
-#: ../camel/camel-gpg-context.c:1973
+#: ../src/camel/camel-gpg-context.c:2211
 msgid "Cannot verify message signature: "
 msgstr "Kunne ikke verifisere meldingens signatur: "
 
-#: ../camel/camel-gpg-context.c:2101
+#: ../src/camel/camel-gpg-context.c:2340
 msgid "Could not generate encrypting data: "
 msgstr "Kunne ikke generere krypteringsdata: "
 
-#: ../camel/camel-gpg-context.c:2176
+#: ../src/camel/camel-gpg-context.c:2415
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt kryptert meldingsdel"
 
-#: ../camel/camel-gpg-context.c:2235 ../camel/camel-gpg-context.c:2244
-#: ../camel/camel-gpg-context.c:2267
+#: ../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 "Kan ikke dekryptere e-post: Ikke korrekt e-postformat"
 
-#: ../camel/camel-gpg-context.c:2255
+#: ../src/camel/camel-gpg-context.c:2494
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Feil under dekryptering av MIME-del: protokollfeil"
 
-#: ../camel/camel-gpg-context.c:2321
+#: ../src/camel/camel-gpg-context.c:2561
 #, c-format
 msgid "Failed to decrypt MIME part: Secret key not found"
 msgstr "Feil under dekryptering av MIME-del: Hemmelig nÃ¸kkel ikke funnet"
 
-#: ../camel/camel-gpg-context.c:2357 ../camel/camel-smime-context.c:1288
+#: ../src/camel/camel-gpg-context.c:2597
+#: ../src/camel/camel-smime-context.c:1286
 msgid "Encrypted content"
 msgstr "Kryptert innhold"
 
-#: ../camel/camel-junk-filter.c:167
+#: ../src/camel/camel-junk-filter.c:167
 msgid "Synchronizing junk database"
 msgstr "Synkroniserer database for sÃ¸ppelpost"
 
-#: ../camel/camel-lock.c:110
+#: ../src/camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunne ikke opprette lÃ¥sfil for %s: %s"
 
-#: ../camel/camel-lock.c:153
+#: ../src/camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "Tidsavbrudd under venting pÃ¥ lÃ¥sfil for %s. PrÃ¸v igjen senere."
 
-#: ../camel/camel-lock.c:215
+#: ../src/camel/camel-lock.c:221
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Feil under lÃ¥sing ved bruk av fcntl(2): %s"
 
-#: ../camel/camel-lock.c:282
+#: ../src/camel/camel-lock.c:293
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Feil under lÃ¥sing ved bruk av flock(2): %s"
 
-#: ../camel/camel-lock-client.c:107
+#: ../src/camel/camel-lock-client.c:105
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Kunne ikke rÃ¸r for lÃ¥shjelper: %s"
 
-#: ../camel/camel-lock-client.c:131
+#: ../src/camel/camel-lock-client.c:129
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Kan ikke kjÃ¸re fork for lÃ¥shjelper: %s"
 
-#: ../camel/camel-lock-client.c:218 ../camel/camel-lock-client.c:246
+#: ../src/camel/camel-lock-client.c:216 ../src/camel/camel-lock-client.c:244
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Could not lock â€œ%sâ€: protocol error with lock-helper"
 msgstr "Kunne ikke lÃ¥se Â«%sÂ»: protokollfeil med lÃ¥shjelper"
 
-#: ../camel/camel-lock-client.c:234
+#: ../src/camel/camel-lock-client.c:232
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Could not lock â€œ%sâ€"
 msgstr "Kunne ikke lÃ¥se Â«%sÂ»"
 
-#: ../camel/camel-movemail.c:101
+#: ../src/camel/camel-movemail.c:99
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunne ikke Ã¥pne postfil %s: %s"
 
-#: ../camel/camel-movemail.c:121
+#: ../src/camel/camel-movemail.c:119
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunne ikke sjekke e-post fil %s: %s"
 
-#: ../camel/camel-movemail.c:136
+#: ../src/camel/camel-movemail.c:134
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunne ikke Ã¥pne midlertidig postfil %s: %s"
 
-#: ../camel/camel-movemail.c:166
+#: ../src/camel/camel-movemail.c:164
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Kunne ikke lagre post i midlertidig fil %s: %s"
 
-#: ../camel/camel-movemail.c:200
+#: ../src/camel/camel-movemail.c:198
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunne ikke opprette rÃ¸r: %s"
 
-#: ../camel/camel-movemail.c:214
+#: ../src/camel/camel-movemail.c:212
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunne ikke kjÃ¸re fork: %s"
 
-#: ../camel/camel-movemail.c:252
+#: ../src/camel/camel-movemail.c:250
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-programmet feilet: %s"
 
-#: ../camel/camel-movemail.c:253
+#: ../src/camel/camel-movemail.c:251
 msgid "(Unknown error)"
 msgstr "(Ukjent feil)"
 
-#: ../camel/camel-movemail.c:280
+#: ../src/camel/camel-movemail.c:278
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Feil under lesing av postfil: %s"
 
-#: ../camel/camel-movemail.c:293
+#: ../src/camel/camel-movemail.c:291
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Feil under skriving av midlertidig fil: %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 "Feil under kopiering midlertidig meldingsfil: %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 "Ikke noe innhold tilgjengelig"
 
-#: ../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 "Ingen signatur tilgjengelig"
 
-#: ../camel/camel-multipart-signed.c:806
+#: ../src/camel/camel-multipart-signed.c:804
 #, c-format
 msgid "parse error"
 msgstr "lesefeil"
 
-#: ../camel/camel-net-utils.c:706
+#: ../src/camel/camel-net-utils.c:714
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finner: Â«%sÂ»"
 
-#: ../camel/camel-net-utils.c:731
+#: ../src/camel/camel-net-utils.c:739
 msgid "Host lookup failed"
 msgstr "Vertsoppslag feilet"
 
-#: ../camel/camel-net-utils.c:737
+#: ../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 "Navneoppslag Â«%sÂ» feilet. Sjekk vertsnavnet for stavefeil."
 
-#: ../camel/camel-net-utils.c:741
+#: ../src/camel/camel-net-utils.c:749
 #, c-format
-msgid "Host lookup '%s' failed: %s"
+msgid "Host lookup â€œ%sâ€ failed: %s"
 msgstr "Navneoppslag Â«%sÂ» feilet: %s"
 
-#: ../camel/camel-offline-folder.c:93
+#. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
+#. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
+#. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:125
 #, c-format
-msgid "Downloading new messages for offline mode in '%s'"
-msgstr "Laster ned nye meldinger for frakoblet modus i Â«%sÂ»"
+msgid "Downloading new messages for offline mode in â€œ%s : %sâ€"
+msgstr "Laster ned nye meldinger for frakoblet modus i Â«%s : %sÂ»"
 
-#: ../camel/camel-offline-folder.c:160
+#. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
+#. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
+#. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:221
 #, c-format
-msgid "Storing changes in folder '%s'"
-msgstr "Lagrer endringer i mappe Â«%sÂ»"
+msgid "Storing changes in folder â€œ%s : %sâ€"
+msgstr "Lagrer endringer i mappe Â«%s : %sÂ»"
 
-#: ../camel/camel-offline-folder.c:262
+#. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
+#. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
+#. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:311
 #, c-format
-msgid "Checking download of new messages for offline in '%s'"
-msgstr "Sjekker nedlasting av nye meldinger for frakoblet modus i Â«%sÂ»"
+msgid "Checking download of new messages for offline in â€œ%s : %sâ€"
+msgstr "Sjekker nedlasting av nye meldinger for frakoblet modus i Â«%s : %sÂ»"
 
-#: ../camel/camel-offline-folder.c:375
+#. Translators: The first â€œ%sâ€ is replaced with an account name and the second â€œ%sâ€
+#. is replaced with a full path name. The spaces around â€œ:â€ are intentional, as
+#. the whole â€œ%s : %sâ€ is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:428
 #, c-format
-msgid "Syncing messages in folder '%s' to disk"
-msgstr "Synkroniserer meldinger i mappe Â«%sÂ» til disk"
+msgid "Syncing messages in folder â€œ%s : %sâ€ to disk"
+msgstr "Synkroniserer meldinger i mappe Â«%s : %sÂ» til disk"
 
-#: ../camel/camel-offline-folder.c:438
+#: ../src/camel/camel-offline-folder.c:513
 msgid "Copy folder content locally for _offline operation"
 msgstr "Kopier mappeinnhold lokalt for Ã¥ jobbe frak_oblet"
 
-#: ../camel/camel-provider.c:55
+#: ../src/camel/camel-provider.c:89
 msgid "Virtual folder email provider"
 msgstr "E-post-tilbyder for virtuelle mapper"
 
-#: ../camel/camel-provider.c:57
+#: ../src/camel/camel-provider.c:91
 msgid "For reading mail as a query of another set of folders"
 msgstr "For lesing av e-post som en spÃ¸rring pÃ¥ et annet sett med mapper"
 
-#: ../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 "Kunne ikke laste %s: Modullasting er ikke stÃ¸ttet pÃ¥ dette systemet."
 
-#: ../camel/camel-provider.c:269
+#: ../src/camel/camel-provider.c:303
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke laste %s: %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 "Kunne ikke laste %s: Ingen initieringskode i modulen."
 
-#: ../camel/camel-provider.c:424 ../camel/camel-session.c:421
+#: ../src/camel/camel-provider.c:458 ../src/camel/camel-session.c:434
 #, c-format
-msgid "No provider available for protocol '%s'"
+msgid "No provider available for protocol â€œ%sâ€"
 msgstr "Ingen tilbyder tilgjengelig for protokoll Â«%sÂ»"
 
-#: ../camel/camel-sasl-anonymous.c:32
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../src/camel/camel-sasl-anonymous.c:35
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:82
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../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 "Dette valget vil koble til tjeneren med anonym pÃ¥logging."
 
-#: ../camel/camel-sasl-anonymous.c:67
+#: ../src/camel/camel-sasl-anonymous.c:70
 #, c-format
 msgid "Authentication failed."
 msgstr "Autentisering feilet."
 
-#: ../camel/camel-sasl-anonymous.c:78
+#: ../src/camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2512,7 +2608,7 @@ msgstr ""
 "Ugyldig informasjon i sporing av e-postadresse:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:92
+#: ../src/camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2521,7 +2617,7 @@ msgstr ""
 "Ugyldig ugjennomsiktig sporingsinformasjon:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:106
+#: ../src/camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2530,11 +2626,11 @@ msgstr ""
 "Ugyldig sporingsinformasjon:\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."
@@ -2542,11 +2638,11 @@ msgstr ""
 "Dette alternativet kobler til tjeneren med bruk av CRAM-MD5-passord, hvis "
 "tjeneren stÃ¸tter det."
 
-#: ../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."
@@ -2554,51 +2650,51 @@ msgstr ""
 "Dette alternativet kobler til tjeneren med bruk av DIGEST-MD5-passord, hvis "
 "tjeneren stÃ¸tter det."
 
-#: ../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 "SpÃ¸rring fra tjener for lang (>2048 oktetter)"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../src/camel/camel-sasl-digest-md5.c:863
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Ugyldig spÃ¸rring fra tjener\n"
 
-#: ../camel/camel-sasl-digest-md5.c:873
+#: ../src/camel/camel-sasl-digest-md5.c:871
 #, c-format
-msgid "Server challenge contained invalid \"Quality of Protection\" token"
+msgid "Server challenge contained invalid â€œQuality of Protectionâ€ token"
 msgstr "SpÃ¸rring fra tjener inneholdt ugyldig Â«Quality of ProtectionÂ»-tegn"
 
-#: ../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 "Svar fra tjener inneholdt ikke godkjenningsdata"
 
-#: ../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 "Svar fra tjener inneholdt ufullstendige godkjenningsdata"
 
-#: ../camel/camel-sasl-digest-md5.c:940
+#: ../src/camel/camel-sasl-digest-md5.c:938
 #, c-format
 msgid "Server response does not match"
 msgstr "Svar fra tjener er ikke likt"
 
-#: ../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 ""
 "Dette alternativet kobler til tjeneren med bruk av Kerberos 5-autentisering."
 
-#: ../camel/camel-sasl-gssapi.c:148
+#: ../src/camel/camel-sasl-gssapi.c:146
 #, c-format
 msgid "(Unknown GSSAPI mechanism code: %x)"
 msgstr "(Ukjent kode for GSSAPI-mekanisme: %x)"
 
-#: ../camel/camel-sasl-gssapi.c:181
+#: ../src/camel/camel-sasl-gssapi.c:179
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2606,11 +2702,11 @@ msgstr ""
 "Spesifisert mekanisme er ikke stÃ¸ttet av oppgitte akkreditiver, eller "
 "gjenkjennes ikke av implementasjonen."
 
-#: ../camel/camel-sasl-gssapi.c:186
+#: ../src/camel/camel-sasl-gssapi.c:184
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Oppgitt parameter for target_name var ikke korrekt utformet."
 
-#: ../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."
@@ -2618,7 +2714,7 @@ msgstr ""
 "Oppgitt parameter for target_name inneholdt et navn som var ugyldig eller av "
 "en ikke stÃ¸ttet type."
 
-#: ../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."
@@ -2626,7 +2722,7 @@ msgstr ""
 "input_token inneholder andre bindinger til kanaler enn det som er oppgitt "
 "via parameteren input_chan_bindings."
 
-#: ../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."
@@ -2634,7 +2730,7 @@ msgstr ""
 "input_token inneholder en ugyldig signatur eller en signatur som ikke kunne "
 "verifiseres."
 
-#: ../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."
@@ -2642,52 +2738,52 @@ msgstr ""
 "Enten var ikke oppgitte akkreditiver gyldige for initiering av kontekst, "
 "eller sÃ¥ pekte ikke hÃ¥ndtaket til noen akkreditiver."
 
-#: ../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 "Oppgitt konteksthÃ¥ndtak refererte ikke til et gyldig kontekst."
 
-#: ../camel/camel-sasl-gssapi.c:210
+#: ../src/camel/camel-sasl-gssapi.c:208
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Konsistenssjekk utfÃ¸rt pÃ¥ input_token feilet."
 
-#: ../camel/camel-sasl-gssapi.c:213
+#: ../src/camel/camel-sasl-gssapi.c:211
 msgid "The consistency checks performed on the credential failed."
 msgstr "Konsistenssjekk utfÃ¸rt pÃ¥ akkreditivene feilet."
 
-#: ../camel/camel-sasl-gssapi.c:216
+#: ../src/camel/camel-sasl-gssapi.c:214
 msgid "The referenced credentials have expired."
 msgstr "Refererte akkreditiver har utlÃ¸pt."
 
-#: ../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:798
+#: ../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 "Ugyldig svar pÃ¥ autentisering fra tjener."
 
-#: ../camel/camel-sasl-gssapi.c:482
+#: ../src/camel/camel-sasl-gssapi.c:480
 #, c-format
 msgid "Unsupported security layer."
 msgstr "UstÃ¸ttet sikkerhetslag."
 
-#: ../camel/camel-sasl-login.c:37
+#: ../src/camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "Login"
 
-#: ../camel/camel-sasl-login.c:39 ../camel/camel-sasl-plain.c:43
+#: ../src/camel/camel-sasl-login.c:37 ../src/camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "Dette valget vil koble til tjeneren ved bruk av et passord."
 
-#: ../camel/camel-sasl-login.c:107
+#: ../src/camel/camel-sasl-login.c:105
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Ukjent autentiseringstilstand."
 
-#: ../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."
@@ -2695,832 +2791,982 @@ msgstr ""
 "Dette alternativet kobler til tjeneren ved bruk av NTLM / Secure Password "
 "Authentication."
 
-#: ../camel/camel-sasl-plain.c:41
+#: ../src/camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:43
+#: ../src/camel/camel-sasl-popb4smtp.c:41
 msgid "POP before SMTP"
 msgstr "POP fÃ¸r SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:45
+#: ../src/camel/camel-sasl-popb4smtp.c:43
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 "Dette alternativet vil autorisere en POP-forbindelse fÃ¸r forsÃ¸k pÃ¥ SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:83
+#: ../src/camel/camel-sasl-popb4smtp.c:81
 msgid "POP Source UID"
 msgstr "Kilde-UID for POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:97
+#: ../src/camel/camel-sasl-popb4smtp.c:95
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP fÃ¸r SMTP autentisering via en ukjent transport"
 
-#: ../camel/camel-sasl-popb4smtp.c:109 ../camel/camel-sasl-popb4smtp.c:118
+#: ../src/camel/camel-sasl-popb4smtp.c:107
+#: ../src/camel/camel-sasl-popb4smtp.c:116
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP fÃ¸r SMTP autentisering forsÃ¸kt med en %s-tjeneste"
 
-#: ../camel/camel-search-private.c:113
+#: ../src/camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Kompilering av regulÃ¦rt uttrykk feilet: %s: %s"
 
-#: ../camel/camel-session.c:430
+#: ../src/camel/camel-session.c:443
 #, c-format
-msgid "Invalid GType registered for protocol '%s'"
+msgid "Invalid GType registered for protocol â€œ%sâ€"
 msgstr "Ugyldig GType registrert for protokoll Â«%sÂ»"
 
-#: ../camel/camel-session.c:499
-#: ../camel/providers/imapx/camel-imapx-server.c:2907
-#: ../camel/providers/pop3/camel-pop3-store.c:308
-#: ../camel/providers/pop3/camel-pop3-store.c:786
-#: ../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 "Ingen stÃ¸tte for autentiseringstype %s"
 
-#: ../camel/camel-session.c:514
+#: ../src/camel/camel-session.c:527
 #, c-format
 msgid "%s authentication failed"
 msgstr "Autentisering med %s feilet"
 
-#: ../camel/camel-session.c:583
+#: ../src/camel/camel-session.c:596
 msgid "Forwarding messages is not supported"
 msgstr "Videresending av meldinger er ikke stÃ¸ttet"
 
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1075
+#: ../src/camel/camel-smime-context.c:346
+#: ../src/camel/camel-smime-context.c:1073
 #, c-format
-msgid "Cannot find certificate for '%s'"
-msgstr "Kan ikke finne sertifikat for Â«%sÂ»"
+msgid "Cannot find certificate for â€œ%sâ€"
+msgstr "Finner ikke sertifikat for Â«%sÂ»"
 
-#: ../camel/camel-smime-context.c:376
+#: ../src/camel/camel-smime-context.c:374
 msgid "Cannot create CMS message"
 msgstr "Kan ikke opprette CMS-melding"
 
-#: ../camel/camel-smime-context.c:381
+#: ../src/camel/camel-smime-context.c:379
 msgid "Cannot create CMS signed data"
 msgstr "Kan ikke opprette CMS-signerte data"
 
-#: ../camel/camel-smime-context.c:387
+#: ../src/camel/camel-smime-context.c:385
 msgid "Cannot attach CMS signed data"
 msgstr "Kan ikke legge ved CMS-signerte data"
 
-#: ../camel/camel-smime-context.c:394
+#: ../src/camel/camel-smime-context.c:392
 msgid "Cannot attach CMS data"
 msgstr "Kan ikke legge ved CMS-data"
 
-#: ../camel/camel-smime-context.c:400
+#: ../src/camel/camel-smime-context.c:398
 msgid "Cannot create CMS Signer information"
 msgstr "Kan ikke opprette informasjon om CMS-signerer"
 
-#: ../camel/camel-smime-context.c:406
+#: ../src/camel/camel-smime-context.c:404
 msgid "Cannot find certificate chain"
 msgstr "Kan ikke finne sertifikatkjede"
 
-#: ../camel/camel-smime-context.c:412
+#: ../src/camel/camel-smime-context.c:410
 msgid "Cannot add CMS Signing time"
 msgstr "Kan ikke legge til tid for CMS-signering"
 
-#: ../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"
+msgid "Encryption certificate for â€œ%sâ€ does not exist"
 msgstr "Krypteringssertifikat for Â«%sÂ» eksisterer ikke"
 
-#: ../camel/camel-smime-context.c:458
+#: ../src/camel/camel-smime-context.c:456
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Kan ikke legge til SMIMEEncKeyPrefs-attributt"
 
-#: ../camel/camel-smime-context.c:463
+#: ../src/camel/camel-smime-context.c:461
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Kan ikke legge til MS SMIMEEncKeyPrefs-attributt"
 
-#: ../camel/camel-smime-context.c:468
+#: ../src/camel/camel-smime-context.c:466
 msgid "Cannot add encryption certificate"
 msgstr "Kan ikke legge til sertifikat for kryptering"
 
-#: ../camel/camel-smime-context.c:474
+#: ../src/camel/camel-smime-context.c:472
 msgid "Cannot add CMS Signer information"
 msgstr "Kan ikke legge til informasjon om CMS-signerer"
 
 #. 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 "Uverifisert"
 
-#: ../camel/camel-smime-context.c:509
+#: ../src/camel/camel-smime-context.c:507
 msgid "Good signature"
 msgstr "Gyldig signatur"
 
-#: ../camel/camel-smime-context.c:511
+#: ../src/camel/camel-smime-context.c:509
 msgid "Bad signature"
 msgstr "Ugyldig signatur"
 
-#: ../camel/camel-smime-context.c:513
+#: ../src/camel/camel-smime-context.c:511
 msgid "Content tampered with or altered in transit"
 msgstr "Innholdet er endret under overfÃ¸ring"
 
-#: ../camel/camel-smime-context.c:515
+#: ../src/camel/camel-smime-context.c:513
 msgid "Signing certificate not found"
 msgstr "Sertifikat for signering ble ikke funnet"
 
-#: ../camel/camel-smime-context.c:517
+#: ../src/camel/camel-smime-context.c:515
 msgid "Signing certificate not trusted"
 msgstr "Stoler ikke pÃ¥ sertifikat for signering"
 
-#: ../camel/camel-smime-context.c:519
+#: ../src/camel/camel-smime-context.c:517
 msgid "Signature algorithm unknown"
 msgstr "Ukjent signeringsalgoritme"
 
-#: ../camel/camel-smime-context.c:521
+#: ../src/camel/camel-smime-context.c:519
 msgid "Signature algorithm unsupported"
 msgstr "Signaturalgoritmen er ikke stÃ¸ttet"
 
-#: ../camel/camel-smime-context.c:523
+#: ../src/camel/camel-smime-context.c:521
 msgid "Malformed signature"
 msgstr "Feilutformet signatur"
 
-#: ../camel/camel-smime-context.c:525
+#: ../src/camel/camel-smime-context.c:523
 msgid "Processing error"
 msgstr "Lesefeil"
 
-#: ../camel/camel-smime-context.c:570
+#: ../src/camel/camel-smime-context.c:568
 msgid "No signed data in signature"
 msgstr "Ingen signerte data i signatur"
 
-#: ../camel/camel-smime-context.c:575
+#: ../src/camel/camel-smime-context.c:573
 msgid "Digests missing from enveloped data"
 msgstr "Sammendrag av innpakkede data mangler"
 
-#: ../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 "Kan ikke beregne sammendrag"
 
-#: ../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 "Kan ikke sette sammendrag for melding"
 
-#: ../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 "Import av sertifikat feilet"
 
-#: ../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 ""
 "Sertifikatet er den eneste meldingen. Kan ikke verifisere sertifikatene"
 
-#: ../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 ""
 "Sertifikatet er den eneste meldingen. Sertifikater importert og verifisert"
 
-#: ../camel/camel-smime-context.c:642
+#: ../src/camel/camel-smime-context.c:640
 msgid "Cannot find signature digests"
 msgstr "Kan ikke finne signatursammendrag"
 
-#: ../camel/camel-smime-context.c:659
+#: ../src/camel/camel-smime-context.c:657
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signeringspart: %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 "Kan ikke opprette kontekst for koding"
 
-#: ../camel/camel-smime-context.c:861
+#: ../src/camel/camel-smime-context.c:859
 msgid "Failed to add data to CMS encoder"
 msgstr "Kunne ikke legge til data i CMS-koder"
 
-#: ../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 "Kunne ikke kode data"
 
-#: ../camel/camel-smime-context.c:1014 ../camel/camel-smime-context.c:1263
+#: ../src/camel/camel-smime-context.c:1012
+#: ../src/camel/camel-smime-context.c:1261
 msgid "Decoder failed"
 msgstr "Dekoder feilet"
 
-#: ../camel/camel-smime-context.c:1083
+#: ../src/camel/camel-smime-context.c:1081
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Kan ikke finne felles krypteringsalgoritme"
 
-#: ../camel/camel-smime-context.c:1091
+#: ../src/camel/camel-smime-context.c:1089
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Kan ikke allokere plass for krypteringsnÃ¸kkel"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../src/camel/camel-smime-context.c:1100
 msgid "Cannot create CMS Message"
 msgstr "Kan ikke opprette CMS-melding"
 
-#: ../camel/camel-smime-context.c:1108
+#: ../src/camel/camel-smime-context.c:1106
 msgid "Cannot create CMS Enveloped data"
 msgstr "Kan ikke opprette CMS-innpakkede data"
 
-#: ../camel/camel-smime-context.c:1114
+#: ../src/camel/camel-smime-context.c:1112
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Kan ikke legge ved CMS-innpakkede data"
 
-#: ../camel/camel-smime-context.c:1120
+#: ../src/camel/camel-smime-context.c:1118
 msgid "Cannot attach CMS data object"
 msgstr "Kan ikke legge ved dataobjekt for CMS"
 
-#: ../camel/camel-smime-context.c:1129
+#: ../src/camel/camel-smime-context.c:1127
 msgid "Cannot create CMS Recipient information"
 msgstr "Kan ikke opprette mottakerinformasjon for CMS"
 
-#: ../camel/camel-smime-context.c:1134
+#: ../src/camel/camel-smime-context.c:1132
 msgid "Cannot add CMS Recipient information"
 msgstr "Kan ikke legge til mottakerinformasjon for CMS"
 
-#: ../camel/camel-smime-context.c:1160
+#: ../src/camel/camel-smime-context.c:1158
 msgid "Failed to add data to encoder"
 msgstr "Klarte ikke Ã¥ legge til data for koder"
 
-#: ../camel/camel-smime-context.c:1270
+#: ../src/camel/camel-smime-context.c:1268
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME dekryptering: Fant ikke kryptert innhold"
 
-#: ../camel/camel-store.c:1258
+#: ../src/camel/camel-store.c:1370
 #, c-format
-msgid "Opening folder '%s'"
+msgid "Opening folder â€œ%sâ€"
 msgstr "Ã…pner mappe Â«%sÂ»"
 
-#: ../camel/camel-store.c:1549
+#: ../src/camel/camel-store.c:1665
 #, c-format
-msgid "Scanning folders in '%s'"
-msgstr "SÃ¸ker etter mapper i Â«%sÂ»"
+msgid "Scanning folders in â€œ%sâ€"
+msgstr "SÃ¸ker gjennom mapper i Â«%sÂ»"
 
-#: ../camel/camel-store.c:1577 ../camel/camel-store.c:1622
-#: ../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 "Papirkurv"
 
-#: ../camel/camel-store.c:1591 ../camel/camel-store.c:1639
-#: ../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 "SÃ¸ppel"
 
-#: ../camel/camel-store.c:2240
+#: ../src/camel/camel-store.c:2356
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kan ikke opprette mappe: Â«%sÂ»: mappen eksisterer"
 
-#: ../camel/camel-store.c:2247
+#: ../src/camel/camel-store.c:2363
 #, c-format
-msgid "Creating folder '%s'"
+msgid "Creating folder â€œ%sâ€"
 msgstr "Lager mappe Â«%sÂ»"
 
-#: ../camel/camel-store.c:2424 ../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 "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: ../camel/camel-store.c:2614 ../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 "Kan ikke endre navn pÃ¥ mappe: %s: Ugyldig operasjon"
 
-#: ../camel/camel-stream.c:168
+#: ../src/camel/camel-stream.c:170
 msgid "Cannot write with no base stream"
 msgstr "Kan ikke skrive uten en grunnleggende strÃ¸m"
 
-#: ../camel/camel-stream.c:288 ../camel/camel-stream.c:339
+#: ../src/camel/camel-stream.c:290 ../src/camel/camel-stream.c:341
 #, c-format
-msgid "Stream type '%s' is not seekable"
+msgid "Stream type â€œ%sâ€ is not seekable"
 msgstr "StrÃ¸m av type Â«%sÂ» er ikke sÃ¸kbar"
 
-#: ../camel/camel-stream-filter.c:344
+#: ../src/camel/camel-stream-filter.c:342
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "Kun nullstilling til starten er stÃ¸ttet med CamelStreamFilter"
 
-#: ../camel/camel-stream-null.c:74
+#: ../src/camel/camel-stream-null.c:76
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "Kun nullstilling til begynnelsen er stÃ¸ttet med CamelHttpStream"
 
-#: ../camel/camel-stream-process.c:278
-#: ../camel/providers/smtp/camel-smtp-transport.c:719
+#: ../src/camel/camel-stream-process.c:284
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:717
 #, c-format
 msgid "Connection cancelled"
 msgstr "Tilkobling avbrutt"
 
-#: ../camel/camel-stream-process.c:283
+#: ../src/camel/camel-stream-process.c:289
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
+msgid "Could not connect with command â€œ%sâ€: %s"
 msgstr "Kunne ikke koble til med kommando Â«%sÂ»: %s"
 
-#: ../camel/camel-subscribable.c:273
+#: ../src/camel/camel-subscribable.c:234
 #, c-format
-msgid "Subscribing to folder '%s'"
+msgid "Subscribing to folder â€œ%sâ€"
 msgstr "Abonnerer pÃ¥ mappe Â«%sÂ»"
 
-#: ../camel/camel-subscribable.c:442
+#: ../src/camel/camel-subscribable.c:403
 #, c-format
-msgid "Unsubscribing from folder '%s'"
+msgid "Unsubscribing from folder â€œ%sâ€"
 msgstr "Fjerner abonnement pÃ¥ mappe Â«%sÂ»"
 
-#: ../camel/camel-url.c:327
+#: ../src/camel/camel-url.c:325
 #, c-format
-msgid "Could not parse URL '%s'"
+msgid "Could not parse URL â€œ%sâ€"
 msgstr "Kunne ikke tolke URL Â«%sÂ»"
 
-#: ../camel/camel-vee-folder.c:491
+#: ../src/camel/camel-vee-folder.c:498
 #, c-format
-msgid "Updating folder '%s'"
+msgid "Updating folder â€œ%sâ€"
 msgstr "Oppdaterer mappe Â«%sÂ»"
 
-#: ../camel/camel-vee-folder.c:869 ../camel/camel-vee-folder.c:979
+#: ../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 "Kan ikke kopiere eller flytte meldinger inn i en virtuell mappe"
 
-#: ../camel/camel-vee-folder.c:902
+#. 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.
+#: ../src/camel/camel-vee-folder.c:935
 #, c-format
-msgid "No such message %s in %s"
-msgstr "Ingen slik melding %s i %s"
+msgid "No such message %s in â€œ%s : %sâ€"
+msgstr "Ingen slik melding %s i Â«%s : %sÂ»"
 
-#: ../camel/camel-vee-folder.c:955
+#: ../src/camel/camel-vee-folder.c:989
 #, c-format
-msgid "Error storing '%s': "
+msgid "Error storing â€œ%sâ€: "
 msgstr "Feil ved lagring av Â«%sÂ»: "
 
-#: ../camel/camel-vee-folder.c:1193
+#: ../src/camel/camel-vee-folder.c:1236
 msgid "Automatically _update on change in source folders"
 msgstr "_Oppdater automatisk ved endring i kildemapper"
 
 #. 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 "Ingen treff"
 
-#: ../camel/camel-vee-store.c:436
+#: ../src/camel/camel-vee-store.c:446
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: ../camel/camel-vee-store.c:471
+#: ../src/camel/camel-vee-store.c:481
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn pÃ¥ mappe: %s: Ingen slik mappe"
 
-#: ../camel/camel-vee-store.c:533
+#: ../src/camel/camel-vee-store.c:544
 msgid "Enable _Unmatched folder"
 msgstr "SlÃ¥ pÃ¥ _mappe uten treff"
 
-#: ../camel/camel-vee-store.c:1026
+#: ../src/camel/camel-vee-store.c:1067
 msgid "Updating Unmatched search folder"
 msgstr "Oppdaterer sÃ¸kemappe uten treff"
 
-#: ../camel/camel-vtrash-folder.c:46
+#: ../src/camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Kan ikke kopiere meldinger til papirkurvmappen"
 
-#: ../camel/camel-vtrash-folder.c:48
+#: ../src/camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Kan ikke kopiere meldinger til sÃ¸ppelmappen"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:769
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:967
 #, c-format
 msgid "You must be working online to complete this operation (%s)"
 msgstr "Du mÃ¥ arbeide tilkoblet for Ã¥ fullfÃ¸re denne operasjonen (%s)"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:777
-#: ../camel/providers/imapx/camel-imapx-server.c:3035
-#: ../camel/providers/nntp/camel-nntp-store.c:349
-#: ../camel/providers/nntp/camel-nntp-store.c:1291
-#: ../camel/providers/nntp/camel-nntp-store.c:2099
-#: ../camel/providers/nntp/camel-nntp-store.c:2243
-#: ../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:1103
-#: ../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 "Du mÃ¥ arbeide tilknyttet for Ã¥ fullfÃ¸re denne operasjonen"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1270
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1358
+#: ../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 "Ingen mÃ¥lmappe oppgitt"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1297
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1582
 msgid "Unable to move junk messages"
 msgstr "Kan ikke flytte uÃ¸nskede meldinger"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1392
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1677
 msgid "Unable to move deleted messages"
 msgstr "Kan ikke flytte slettede meldinger"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:702
+#. 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
 #, c-format
-msgid "No quota information available for folder '%s'"
-msgstr "Kvoteinformasjon er ikke tilgjengelig for mappe Â«%sÂ»"
+msgid "No quota information available for folder â€œ%s : %sâ€"
+msgstr "Kvoteinformasjon er ikke tilgjengelig for mappe Â«%s : %sÂ»"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:964
-#: ../camel/providers/nntp/camel-nntp-folder.c:765
+#: ../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 "Bruk mappe_filter pÃ¥ denne mappen"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:975
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:991
 msgid "Always check for _new mail in this folder"
 msgstr "Alltid se etter _nye meldinger i denne mappen"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1088
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1102
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Kunne ikke lage sammendrag for mappe %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1097
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1114
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "Kunne ikke lage mellomlager for %s: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1295
+#. 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
 #, c-format
-msgid "No IMAP mailbox available for folder '%s'"
-msgstr "Ingen IMAP-postboks tilgjengelig for mappe Â«%sÂ»"
+msgid "No IMAP mailbox available for folder â€œ%s : %sâ€"
+msgstr "Ingen IMAP-postboks tilgjengelig for mappe Â«%s : %sÂ»"
 
-#: ../camel/providers/imapx/camel-imapx-input-stream.c:101
+#: ../src/camel/providers/imapx/camel-imapx-input-stream.c:102
 #, c-format
 msgid "Source stream returned no data"
 msgstr "KildestrÃ¸m returnerte ingen data"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:38
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:36
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../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 "_Se etter nye meldinger i alle mapper"
 
-#: ../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 "S_e etter nye meldinger i abonnerte mapper"
 
-#: ../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 "Bruk _rask omsynkronisering hvis tjeneren stÃ¸tter det"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:44
 msgid "_Listen for server change notifications"
 msgstr "_Lytt etter endringsvarsling fra tjener"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:49
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:47
 msgid "Connection to Server"
 msgstr "Tilkobling til server"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:49
 msgid "Numbe_r of concurrent connections to use"
 msgstr "Antall samtidige tilkoblinge_r som skal brukes"
 
-#: ../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 "Mapper"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:54
 msgid "_Show only subscribed folders"
 msgstr "Vi_s kun abonnerte mapper"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:57
 msgid "O_verride server-supplied folder namespace"
 msgstr "O_verstyr tjeners navneomrÃ¥de for mapper"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:59
 msgid "Namespace:"
 msgstr "NavneomrÃ¥de:"
 
-#: ../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 "Alternativer"
 
-#: ../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 "Bruk filtre for nye meldinger i alle mapper"
 
-#: ../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 "_Bruk filtre for nye meldinger i Innboks pÃ¥ denne tjeneren"
 
-#: ../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 "Se etter sÃ¸ppelinn_hold i nye meldinger"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:70
 msgid "Only check for Junk messages in the In_box folder"
 msgstr "Se kun etter sÃ¸ppelinnhold i nye meldinger i inn_boksmappen"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:72
 msgid "Synchroni_ze remote mail locally in all folders"
 msgstr "S_ynkroniser eksterne meldinger med lokale meldinger i alle mapper"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Default IMAP port"
 msgstr "Forvalgt port for IMAP"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:81
-msgid "IMAP over SSL"
-msgstr "IMAP over SSL"
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:80
+msgid "IMAP over TLS"
+msgstr "IMAP over TLS"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:87
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:89
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post pÃ¥ IMAP-tjenere."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1116
+#: ../src/camel/providers/imapx/camel-imapx-server.c:1166
 msgid "Error writing to cache stream"
 msgstr "Feil ved skriving til mellomlagerstrÃ¸m"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2744
-#: ../camel/providers/imapx/camel-imapx-server.c:2818
-#: ../camel/providers/imapx/camel-imapx-server.c:3065
+#: ../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
 msgid "Failed to get capabilities"
 msgstr "Klarte ikke Ã¥ hente evner"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2758
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2832
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2759
-#: ../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 er ikke stÃ¸ttet"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2765
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2842
 msgid "Failed to issue STARTTLS"
 msgstr "Klarte ikke Ã¥ sende STARTTLS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2809
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2890
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Klarte ikke Ã¥ koble til IMAP-tjener %s i sikker modus: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2896
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2984
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP-tjener %s stÃ¸tter ikke autentiseringstype %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2925
-#: ../camel/providers/nntp/camel-nntp-store.c:400
-#: ../camel/providers/nntp/camel-nntp-store.c:542
+#: ../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 "Kan ikke autentisere uten brukernavn"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2934
-#: ../camel/providers/nntp/camel-nntp-store.c:551
-#: ../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
 msgid "Authentication password not available"
 msgstr "Passord for autentisering er ikke tilgjengelig"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2942
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3032
 msgid "Failed to authenticate"
 msgstr "Klarte ikke Ã¥ autentisere"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3082
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3185
 msgid "Failed to issue NAMESPACE"
 msgstr "Klarte ikke Ã¥ sende NAMESPACE"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3096
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3203
 msgid "Failed to enable QResync"
 msgstr "Klarte ikke Ã¥ slÃ¥ pÃ¥ QResync"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3124
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3235
 msgid "Failed to issue NOTIFY"
 msgstr "Klarte ikke Ã¥ sende NOTIFY"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3602
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3713
 msgid "Failed to select mailbox"
 msgstr "Klarte ikke Ã¥ velge postboks"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3700
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3816
 msgid "Cannot issue command, no stream available"
 msgstr "Kan ikke sende kommando, ingen strÃ¸m tilgjengelig"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3951
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4080
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Kan ikke hente melding med meldings-ID %s: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3952
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4081
 msgid "No such message available."
 msgstr "Ingen slik melding tilgjengelig."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3986
-#: ../camel/providers/imapx/camel-imapx-server.c:4011
-#: ../camel/providers/imapx/camel-imapx-server.c:4030
+#: ../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 "Feil ved henting av melding"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4023
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4160
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4759
+msgid "Error performing NOOP"
+msgstr "Feil ved utfÃ¸ring av NOOP"
+
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4175
 msgid "Failed to close the tmp stream"
 msgstr "Klarte ikke Ã¥ lukke midlertidig strÃ¸m"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4054
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4206
 msgid "Failed to copy the tmp file"
 msgstr "Klarte ikke Ã¥ kopiere midlertidig fil"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4213
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4369
 msgid "Error moving messages"
 msgstr "Feil ved flytting av meldinger"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4213
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4369
 msgid "Error copying messages"
 msgstr "Feil ved kopiering av meldinger"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4397
-#: ../camel/providers/imapx/camel-imapx-server.c:4418
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4554
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4575
 msgid "Cannot create spool file: "
 msgstr "Kan ikke spool-fil: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4509
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4661
 msgid "Error appending message"
 msgstr "Feil ved forsÃ¸k pÃ¥ Ã¥ legge til en melding"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4599
-msgid "Error performing NOOP"
-msgstr "Feil ved utfÃ¸ring av NOOP"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4747
+#. 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
 #, c-format
-msgid "Scanning for changed messages in '%s'"
-msgstr "SÃ¸ker etter endrede meldinger i Â«%sÂ»"
+msgid "Scanning for changed messages in â€œ%s : %sâ€"
+msgstr "SÃ¸ker etter endrede meldinger i Â«%s : %sÂ»"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4750
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4916
 msgid "Error scanning changes"
 msgstr "Feil ved sÃ¸k i endringer"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4768
+#. 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
 #, c-format
-msgid "Fetching summary information for new messages in '%s'"
-msgstr "Henter sammendragsinformasjon for nye meldinger i Â«%sÂ»"
+msgid "Fetching summary information for new messages in â€œ%s : %sâ€"
+msgstr "Henter sammendragsinformasjon for nye meldinger i Â«%s : %sÂ»"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4785
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4955
 msgid "Error fetching message info"
 msgstr "Feil ved henting av meldingsinformasjon"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4847
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5037
 msgid "Error running STATUS"
 msgstr "Feil ved kjÃ¸ring av STATUS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5330
-#: ../camel/providers/imapx/camel-imapx-server.c:5382
+#: ../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 "Feil ved synkronisering av endringer"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5493
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5747
 msgid "Error expunging message"
 msgstr "Feil ved tÃ¸mming av melding"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5563
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5819
 msgid "Error fetching folders"
 msgstr "Feil ved henting av mapper"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5574
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5830
 msgid "Error fetching subscribed folders"
 msgstr "Feil ved henting av abonnerte mapper"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5596
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5852
 msgid "Error creating folder"
 msgstr "Feil ved oppretting av mappe"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5652
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5908
 msgid "Error deleting folder"
 msgstr "Feil ved sletting av mappe"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5698
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5954
 msgid "Error renaming folder"
 msgstr "Feil ved endring av navn pÃ¥ mappe"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5730
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5986
 msgid "Error subscribing to folder"
 msgstr "Feil ved abonnering pÃ¥ mappe"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5766
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6022
 msgid "Error unsubscribing from folder"
 msgstr "Feil ved fjerning av abonnement pÃ¥ mappe"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5802
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6062
 msgid "IMAP server does not support quotas"
 msgstr "IMAP-tjener stÃ¸tter ikke kvoter"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5812
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6074
 msgid "Error retrieving quota information"
 msgstr "Feil ved henting av kvoteinformasjon"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5859
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6121
 msgid "Search failed"
 msgstr "SÃ¸k feilet"
 
 #. Blocks, until the DONE is issued or on inactivity timeout, error, ...
-#: ../camel/providers/imapx/camel-imapx-server.c:5970
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6239
 msgid "Error running IDLE"
 msgstr "Feil ved utfÃ¸ring av IDLE"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6162
-msgid "Failed to issue DONE"
-msgstr "Klarte ikke Ã¥ sende DONE"
-
 #. 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 "Innboks"
 
-#: ../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-tjener %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-tjeneste for %s pÃ¥ %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 "Ingen tilkoblingsobjekt for IMAPx oppgitt"
 
-#: ../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 "Passord"
 
-#: ../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 ""
 "Dette valget vil la deg koble til en IMAP-tjener ved Ã¥ bruke et klartekst-"
 "passord."
 
-#: ../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 "Mappen %s eksisterer ikke"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1353
+#: ../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 "Ingen IMAP-navneomrÃ¥de for mapppesti Â«%sÂ»"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1614
-#: ../camel/providers/imapx/camel-imapx-store.c:1848
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1686
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1920
 #, c-format
-msgid "Retrieving folder list for '%s'"
+msgid "Retrieving folder list for â€œ%sâ€"
 msgstr "Henter mappeliste for Â«%sÂ»"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2065
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2137
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid "The folder name â€œ%sâ€ is invalid because it contains the character â€œ%câ€"
 msgstr "Mappenavn Â«%sÂ» er ugyldig fordi det inneholder tegnet Â«%cÂ»"
 
-#: ../camel/providers/local/camel-local-folder.c:194
+#. 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 ""
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2515
+msgctxt "IMAPDefaults"
+msgid "Drafts"
+msgstr "Skisser"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2516
+msgctxt "IMAPDefaults"
+msgid "Draft"
+msgstr "Skisse"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2519
+msgctxt "IMAPDefaults"
+msgid "Templates"
+msgstr "Maler"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2522
+msgctxt "IMAPDefaults"
+msgid "Archive"
+msgstr "Arkiv"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2525
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Sent Mail"
+msgstr "[Gmail]/Sendt e-post"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2526
+msgctxt "IMAPDefaults"
+msgid "Sent"
+msgstr "Sendt"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2527
+msgctxt "IMAPDefaults"
+msgid "Sent Items"
+msgstr "Sendte elementer"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2528
+msgctxt "IMAPDefaults"
+msgid "Sent Messages"
+msgstr "Sendte meldinger"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2531
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Spam"
+msgstr "[Gmail/Spam]"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2532
+msgctxt "IMAPDefaults"
+msgid "Junk"
+msgstr "SÃ¸ppel"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2533
+msgctxt "IMAPDefaults"
+msgid "Junk E-mail"
+msgstr "UÃ¸nsket e-post"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2534
+msgctxt "IMAPDefaults"
+msgid "Junk Email"
+msgstr "UÃ¸nsket e-post"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2535
+msgctxt "IMAPDefaults"
+msgid "Spam"
+msgstr "Spam"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2536
+#, fuzzy
+msgctxt "IMAPDefaults"
+msgid "Bulk Mail"
+msgstr "E-post"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2539
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Trash"
+msgstr "[Gmail/Papirkurv]"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2540
+msgctxt "IMAPDefaults"
+msgid "Trash"
+msgstr "Papirkurv"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2541
+msgctxt "IMAPDefaults"
+msgid "Deleted Items"
+msgstr "Slettede elementer"
+
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2542
+msgctxt "IMAPDefaults"
+msgid "Deleted Messages"
+msgstr "Slettede meldinger"
+
+#. 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:204
-#: ../camel/providers/local/camel-local-folder.c:213
+#. 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 "postboks: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:222
+#. 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:499
+#: ../src/camel/providers/local/camel-local-folder.c:505
 msgid "_Index message body data"
 msgstr "_Indekser data i meldingskropp"
 
-#: ../camel/providers/local/camel-local-folder.c:727
+#. Translators: The first %s is replaced with a message ID,
+#. * the second %s is replaced with the folder path,
+#. * the third %s is replaced with a detailed error string
+#: ../src/camel/providers/local/camel-local-folder.c:737
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3529,23 +3775,27 @@ msgstr ""
 "Kan ikke hente melding %s fra mappe %s\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
+msgid "_Use the â€œ.foldersâ€ folder summary file (exmh)"
 msgstr "Br_uk Â«.foldersÂ» fil for mappesammendrag (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../src/camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "E-postkataloger i MH-format"
 
-#: ../camel/providers/local/camel-local-provider.c:49
+#: ../src/camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in MH-like mail directories."
 msgstr "For lagring av lokal e-post i MH-lignende meldingskataloger."
 
-#: ../camel/providers/local/camel-local-provider.c:66
+#: ../src/camel/providers/local/camel-local-provider.c:65
+msgid "Apply _filters to new messages"
+msgstr "Bruk _filtre pÃ¥ nye meldinger"
+
+#: ../src/camel/providers/local/camel-local-provider.c:73
 msgid "Local delivery"
 msgstr "Lokal levering"
 
-#: ../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."
@@ -3553,29 +3803,29 @@ msgstr ""
 "For henting (flytting) av lokal e-post fra standard meldingslager i mbox-"
 "format til mapper som hÃ¥ndteres av Evolution."
 
-#: ../camel/providers/local/camel-local-provider.c:79
-#: ../camel/providers/local/camel-local-provider.c:101
+#: ../src/camel/providers/local/camel-local-provider.c:86
+#: ../src/camel/providers/local/camel-local-provider.c:110
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_Bruk filtre for nye meldinger i Innboks"
 
-#: ../camel/providers/local/camel-local-provider.c:86
+#: ../src/camel/providers/local/camel-local-provider.c:95
 msgid "Maildir-format mail directories"
 msgstr "E-postkataloger i maildir-format"
 
-#: ../camel/providers/local/camel-local-provider.c:87
+#: ../src/camel/providers/local/camel-local-provider.c:96
 msgid "For storing local mail in maildir directories."
 msgstr "For lagring av lokal e-post i maildir-kataloger."
 
-#: ../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 "_Lagre statushoder i Elm/Mutt/Pine-format"
 
-#: ../camel/providers/local/camel-local-provider.c:109
+#: ../src/camel/providers/local/camel-local-provider.c:120
 msgid "Standard Unix mbox spool file"
 msgstr "Standard Unix mbox Â«spoolÂ»-fil"
 
-#: ../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."
@@ -3583,527 +3833,527 @@ msgstr ""
 "For lesing og lagring av lokal e-post i standard eksterne mbox-filer.\n"
 "Kan ogsÃ¥  brukes til Ã¥ lagre et tre av mapper i Elm, Pine eller Mutt-stil."
 
-#: ../camel/providers/local/camel-local-provider.c:123
+#: ../src/camel/providers/local/camel-local-provider.c:134
 msgid "Standard Unix mbox spool directory"
 msgstr "Standard Unix mbox Â«spoolÂ»-katalog"
 
-#: ../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 "Kunne ikke endre navn pÃ¥ mappe %s til %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 "Lokal e-post-fil %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 "Lagerrot %s er ikke en absolutt sti"
 
-#: ../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 "Lagerrot %s er ikke en vanlig katalog"
 
-#: ../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 "Finner ikke mappe: %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 "Lokalt lager har ikke en innboks"
 
-#: ../camel/providers/local/camel-local-store.c:446
-#: ../camel/providers/local/camel-mbox-store.c:739
+#: ../src/camel/providers/local/camel-local-store.c:444
+#: ../src/camel/providers/local/camel-mbox-store.c:737
 #, c-format
-msgid "Could not delete folder index file '%s': %s"
+msgid "Could not delete folder index file â€œ%sâ€: %s"
 msgstr "Kunne ikke slette indeksfil for mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:474
-#: ../camel/providers/local/camel-mbox-store.c:769
+#: ../src/camel/providers/local/camel-local-store.c:472
+#: ../src/camel/providers/local/camel-mbox-store.c:767
 #, c-format
-msgid "Could not delete folder meta file '%s': %s"
+msgid "Could not delete folder meta file â€œ%sâ€: %s"
 msgstr "Kunne ikke slette metadatafil for mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:587
+#: ../src/camel/providers/local/camel-local-store.c:585
 #, c-format
-msgid "Could not rename '%s': %s"
+msgid "Could not rename â€œ%sâ€: %s"
 msgstr "Kunne ikke endre navn pÃ¥ Â«%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 "Ingen slik melding"
 
-#: ../camel/providers/local/camel-maildir-folder.c:234
+#: ../src/camel/providers/local/camel-maildir-folder.c:232
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Kan ikke legge til melding i maildir mappe: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:282
-#: ../camel/providers/local/camel-maildir-folder.c:292
-#: ../camel/providers/local/camel-mbox-folder.c:400
-#: ../camel/providers/local/camel-mh-folder.c:169
-#: ../camel/providers/local/camel-mh-folder.c:179
+#: ../src/camel/providers/local/camel-maildir-folder.c:282
+#: ../src/camel/providers/local/camel-maildir-folder.c:292
+#: ../src/camel/providers/local/camel-mbox-folder.c:395
+#: ../src/camel/providers/local/camel-mh-folder.c:169
+#: ../src/camel/providers/local/camel-mh-folder.c:179
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "Kan ikke hente melding %s fra mappe %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:362
+#: ../src/camel/providers/local/camel-maildir-folder.c:362
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Kan ikke overfÃ¸re melding til mÃ¥lmappe: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:131
-#: ../camel/providers/local/camel-maildir-store.c:931
+#: ../src/camel/providers/local/camel-maildir-store.c:129
+#: ../src/camel/providers/local/camel-maildir-store.c:929
 #, c-format
-msgid "Cannot create folder containing '%s'"
+msgid "Cannot create folder containing â€œ%sâ€"
 msgstr "Kan ikke lage mappe som inneholder Â«%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 "Mappen %s eksisterer allerede"
 
-#: ../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 "Kan ikke opprette mappe Â«%sÂ»: %s"
+msgid "Cannot create folder â€œ%sâ€: %s"
+msgstr "Kan ikke opprette mappe: Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:281
-#: ../camel/providers/local/camel-mbox-store.c:367
-#: ../camel/providers/local/camel-mh-store.c:523
+#: ../src/camel/providers/local/camel-maildir-store.c:279
+#: ../src/camel/providers/local/camel-mbox-store.c:365
+#: ../src/camel/providers/local/camel-mh-store.c:519
 #, c-format
-msgid "Cannot get folder '%s': %s"
-msgstr "Finner ikke mappe Â«%sÂ»: %s"
+msgid "Cannot get folder â€œ%sâ€: %s"
+msgstr "Finner ikke mappe: Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:287
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mh-store.c:532
+#: ../src/camel/providers/local/camel-maildir-store.c:285
+#: ../src/camel/providers/local/camel-mbox-store.c:375
+#: ../src/camel/providers/local/camel-mh-store.c:528
 #, c-format
-msgid "Cannot get folder '%s': folder does not exist."
+msgid "Cannot get folder â€œ%sâ€: folder does not exist."
 msgstr "Finner ikke mappe Â«%sÂ»: mappen eksisterer ikke."
 
-#: ../camel/providers/local/camel-maildir-store.c:314
+#: ../src/camel/providers/local/camel-maildir-store.c:312
 #, c-format
-msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "Kan ikke hente mappe Â«%sÂ»: ikke en maildir katalog."
+msgid "Cannot get folder â€œ%sâ€: not a maildir directory."
+msgstr "Kan ikke hente mappe Â«%sÂ»: ikke en maildir-katalog."
 
-#: ../camel/providers/local/camel-maildir-store.c:378
-#: ../camel/providers/local/camel-maildir-store.c:418
-#: ../camel/providers/local/camel-mh-store.c:676
+#: ../src/camel/providers/local/camel-maildir-store.c:376
+#: ../src/camel/providers/local/camel-maildir-store.c:416
+#: ../src/camel/providers/local/camel-mh-store.c:672
 #, c-format
-msgid "Could not delete folder '%s': %s"
+msgid "Could not delete folder â€œ%sâ€: %s"
 msgstr "Kunne ikke slette mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:380
+#: ../src/camel/providers/local/camel-maildir-store.c:378
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
-#: ../camel/providers/local/camel-maildir-store.c:666
-#: ../camel/providers/local/camel-maildir-store.c:1146
-#: ../camel/providers/local/camel-spool-store.c:212
-#: ../camel/providers/local/camel-spool-store.c:231
+#: ../src/camel/providers/local/camel-maildir-store.c:664
+#: ../src/camel/providers/local/camel-maildir-store.c:1144
+#: ../src/camel/providers/local/camel-spool-store.c:210
+#: ../src/camel/providers/local/camel-spool-store.c:229
 #, c-format
-msgid "Could not scan folder '%s': %s"
+msgid "Could not scan folder â€œ%sâ€: %s"
 msgstr "Kunne ikke sÃ¸ke i mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:476
-#: ../camel/providers/local/camel-maildir-summary.c:616
+#: ../src/camel/providers/local/camel-maildir-summary.c:448
+#: ../src/camel/providers/local/camel-maildir-summary.c:589
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan ikke Ã¥pne maildir katalogsti: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:607
+#: ../src/camel/providers/local/camel-maildir-summary.c:580
 msgid "Checking folder consistency"
 msgstr "Sjekker om mappen er konsistent"
 
-#: ../camel/providers/local/camel-maildir-summary.c:707
+#: ../src/camel/providers/local/camel-maildir-summary.c:679
 msgid "Checking for new messages"
 msgstr "Ser etter nye meldinger"
 
-#: ../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 "Lagrer mappe"
 
-#: ../camel/providers/local/camel-mbox-folder.c:196
+#: ../src/camel/providers/local/camel-mbox-folder.c:194
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "Kan ikke Ã¥pne postboks: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:262
+#: ../src/camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "Kan ikke legge til melding i mbox-fil: %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 "Mappen ser ut til Ã¥ ha blitt korrupt og kan ikke repareres."
 
-#: ../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 "Kan ikke opprette mappelÃ¥s pÃ¥: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:389
-#: ../camel/providers/local/camel-mbox-store.c:580
+#: ../src/camel/providers/local/camel-mbox-store.c:387
+#: ../src/camel/providers/local/camel-mbox-store.c:578
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Kan ikke opprette en mappe med dette navnet."
 
-#: ../camel/providers/local/camel-mbox-store.c:433
+#: ../src/camel/providers/local/camel-mbox-store.c:431
 #, c-format
-msgid "Cannot get folder '%s': not a regular file."
+msgid "Cannot get folder â€œ%sâ€: not a regular file."
 msgstr "Kan ikke hente mappe Â«%sÂ»: ikke en vanlig fil."
 
-#: ../camel/providers/local/camel-mbox-store.c:596
+#: ../src/camel/providers/local/camel-mbox-store.c:594
 #, c-format
-msgid "Cannot create directory '%s': %s."
+msgid "Cannot create directory â€œ%sâ€: %s."
 msgstr "Kan ikke opprette katalog Â«%sÂ»: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:608
+#: ../src/camel/providers/local/camel-mbox-store.c:606
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan ikke opprette mappe: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:610
+#: ../src/camel/providers/local/camel-mbox-store.c:608
 msgid "Folder already exists"
 msgstr "Mappen eksisterer allerede"
 
-#: ../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"
+"Could not delete folder â€œ%sâ€:\n"
 "%s"
 msgstr ""
 "Kunne ikke slette mappen Â«%sÂ»\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:673
+#: ../src/camel/providers/local/camel-mbox-store.c:671
 #, c-format
-msgid "'%s' is not a regular file."
+msgid "â€œ%sâ€ is not a regular file."
 msgstr "Â«%sÂ» er ikke en vanlig fil."
 
-#: ../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."
+msgid "Folder â€œ%sâ€ is not empty. Not deleted."
 msgstr "Mappen Â«%sÂ» er ikke tom. Ikke slettet."
 
-#: ../camel/providers/local/camel-mbox-store.c:709
-#: ../camel/providers/local/camel-mbox-store.c:724
+#: ../src/camel/providers/local/camel-mbox-store.c:707
+#: ../src/camel/providers/local/camel-mbox-store.c:722
 #, c-format
-msgid "Could not delete folder summary file '%s': %s"
+msgid "Could not delete folder summary file â€œ%sâ€: %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:806
+#: ../src/camel/providers/local/camel-mbox-store.c:804
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "Det nye mappenavnet er ugyldig."
 
-#: ../camel/providers/local/camel-mbox-store.c:822
+#: ../src/camel/providers/local/camel-mbox-store.c:820
 #, c-format
-msgid "Could not rename '%s': '%s': %s"
+msgid "Could not rename â€œ%sâ€: â€œ%sâ€: %s"
 msgstr "Kunne ikke endre navn pÃ¥ Â«%sÂ»: Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:476
+#: ../src/camel/providers/local/camel-mbox-summary.c:377
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunne ikke Ã¥pne mappe %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 "Kan ikke sjekke mappe: %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 "Kunne ikke Ã¥pne fil %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 "Kan ikke Ã¥pne midlertidig postboks: %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 "Kunne ikke lukke kildemappe %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:745
+#: ../src/camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %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 "Kunne ikke endre navn pÃ¥ mappe: %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 "Kunne ikke lagre mappe: %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 ""
 "MBOX-filen er korrupt. Vennligst korriger den. (Forventet en From: linje, "
 "men fant den ikke.)"
 
-#: ../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 "Sammendrag og mappe stemmer ikke overens selv etter synkronisering"
 
-#: ../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 "Ukjent feil: %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 "Skriving til midlertidig postboks feilet: %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 "Skriving til midlertidig postboks feilet: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:116
+#: ../src/camel/providers/local/camel-mh-folder.c:114
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "Kan ikke legge til melding i mh-mappe: %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"
+msgid "Could not create folder â€œ%sâ€: %s"
 msgstr "Kunne ikke opprette mappe Â«%sÂ»: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:558
+#: ../src/camel/providers/local/camel-mh-store.c:554
 #, c-format
-msgid "Cannot get folder '%s': not a directory."
+msgid "Cannot get folder â€œ%sâ€: not a directory."
 msgstr "Kan ikke hente mappe Â«%sÂ»: ikke en katalog."
 
-#: ../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 "Kan ikke Ã¥pne MH-katalogsti: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:95
+#: ../src/camel/providers/local/camel-spool-store.c:93
 #, c-format
-msgid "Spool '%s' cannot be opened: %s"
+msgid "Spool â€œ%sâ€ cannot be opened: %s"
 msgstr "Spool Â«%sÂ» kan ikke Ã¥pnes: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:109
+#: ../src/camel/providers/local/camel-spool-store.c:107
 #, c-format
-msgid "Spool '%s' is not a regular file or directory"
+msgid "Spool â€œ%sâ€ is not a regular file or directory"
 msgstr "Spool Â«%sÂ» er ikke en vanlig fil eller katalog"
 
-#: ../camel/providers/local/camel-spool-store.c:425
+#: ../src/camel/providers/local/camel-spool-store.c:422
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool e-post-fil %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 "Tre av spool-mapper %s"
 
-#: ../camel/providers/local/camel-spool-store.c:432
+#: ../src/camel/providers/local/camel-spool-store.c:429
 msgid "Invalid spool"
 msgstr "Ugyldig kÃ¸"
 
-#: ../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."
+msgid "Folder â€œ%s/%sâ€ does not exist."
 msgstr "Mappen Â«%s/%sÂ» eksisterer ikke."
 
-#: ../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"
+"Could not open folder â€œ%sâ€:\n"
 "%s"
 msgstr ""
 "Kan ikke Ã¥pne mappe Â«%sÂ»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:500
+#: ../src/camel/providers/local/camel-spool-store.c:497
 #, c-format
-msgid "Folder '%s' does not exist."
+msgid "Folder â€œ%sâ€ does not exist."
 msgstr "Mappen Â«%sÂ» eksisterer ikke."
 
-#: ../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"
+"Could not create folder â€œ%sâ€:\n"
 "%s"
 msgstr ""
 "Kunne ikke opprette mappe Â«%sÂ»:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:521
+#: ../src/camel/providers/local/camel-spool-store.c:518
 #, c-format
-msgid "'%s' is not a mailbox file."
+msgid "â€œ%sâ€ is not a mailbox file."
 msgstr "Â«%sÂ» er ikke en postboks-fil."
 
-#: ../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 "Lager stÃ¸tter ikke en INNBOKS"
 
-#: ../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 "Spoolmapper kan ikke vÃ¦re slettes"
 
-#: ../camel/providers/local/camel-spool-store.c:619
+#: ../src/camel/providers/local/camel-spool-store.c:616
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mapper kan ikke vÃ¦re gis nytt navn"
 
-#: ../camel/providers/local/camel-spool-summary.c:177
-#: ../camel/providers/local/camel-spool-summary.c:189
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../src/camel/providers/local/camel-spool-summary.c:179
+#: ../src/camel/providers/local/camel-spool-summary.c:191
+#: ../src/camel/providers/local/camel-spool-summary.c:203
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "Kunne ikke synkronisere midlertidig mappe %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:219
+#: ../src/camel/providers/local/camel-spool-summary.c:221
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "Kunne ikke synkronisere spool-mappe %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:253
-#: ../camel/providers/local/camel-spool-summary.c:272
-#: ../camel/providers/local/camel-spool-summary.c:285
+#: ../src/camel/providers/local/camel-spool-summary.c:255
+#: ../src/camel/providers/local/camel-spool-summary.c:274
+#: ../src/camel/providers/local/camel-spool-summary.c:287
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in '%s'"
+"Folder may be corrupt, copy saved in â€œ%sâ€"
 msgstr ""
 "Kunne ikke synkronisere spool-mappe %s: %s\n"
 "Mappen kan vÃ¦re korrupt, kopi lagret i Â«%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 "Intern feil: UID har ugyldig format: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:297
-#: ../camel/providers/nntp/camel-nntp-folder.c:302
-#: ../camel/providers/pop3/camel-pop3-folder.c:574
-#: ../camel/providers/pop3/camel-pop3-folder.c:1002
+#: ../src/camel/providers/nntp/camel-nntp-folder.c: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 "Kan ikke hente melding %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:309
-#: ../camel/providers/nntp/camel-nntp-folder.c:629
-#: ../camel/providers/pop3/camel-pop3-folder.c:478
-#: ../camel/providers/pop3/camel-pop3-folder.c:510
-#: ../camel/providers/pop3/camel-pop3-folder.c:542
-#: ../camel/providers/pop3/camel-pop3-folder.c:564
-#: ../camel/providers/pop3/camel-pop3-folder.c:583
+#: ../src/camel/providers/nntp/camel-nntp-folder.c: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
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Kan ikke hente melding %s: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:435
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:428
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:434
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Posting feilet: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:508
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:488
 msgid "Posting failed: "
 msgstr "Posting feilet: "
 
-#: ../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 "Denne meldingen er ikke tilgjengelig"
 
-#: ../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 "Du kan ikke kopiere meldinger fra en NNTP-mappe"
 
-#: ../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 ""
 "Vi_s mapper med kort navn (f.eks. c.o.linux i stedet for 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 "Vis relative mappenavn i abonnementsdialogen"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:54
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:54
 msgid "Default NNTP port"
 msgstr "Forvalgt port for NNTP"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
-msgid "NNTP over SSL"
-msgstr "NNTP over SSL"
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:55
+msgid "NNTP over TLS"
+msgstr "NNTP over TLS"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:61
 msgid "USENET news"
 msgstr "USENET news"
 
-#: ../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 ""
 "Dette er en tilbyder for lesing og posting av innlegg til USENET "
 "nyhetsgrupper."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:84
 msgid ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
 msgstr "Dette alternativet kobler til NNTP-tjener anonymt, uten autentisering."
 
-#: ../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."
@@ -4111,22 +4361,37 @@ msgstr ""
 "Dette alternativet vil autentisere mot NNTP-tjeneren ved bruk av klartekst "
 "passord."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:377
+#: ../src/camel/providers/nntp/camel-nntp-store.c:379
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Kan ikke lese hilsen fra %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:385
+#: ../src/camel/providers/nntp/camel-nntp-store.c:391
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-tjener %s returnerte feilkode %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:455
+#: ../src/camel/providers/nntp/camel-nntp-store.c:410
+#, c-format
+msgid "Failed to issue STARTTLS for NNTP server %s: "
+msgstr "Klarte ikke Ã¥ sende STARTTLS for NNTP-tjener %s: "
+
+#: ../src/camel/providers/nntp/camel-nntp-store.c:421
+#, c-format
+msgid "NNTP server %s doesnâ€™t support STARTTLS: %s"
+msgstr "NNTP-tjener %s stÃ¸tter ikke STARTTLS: %s"
+
+#: ../src/camel/providers/nntp/camel-nntp-store.c:441
+#, c-format
+msgid "Failed to connect to NNTP server %s in secure mode: "
+msgstr "Klarte ikke Ã¥ koble til NNTP-tjener %s i sikker modus: "
+
+#: ../src/camel/providers/nntp/camel-nntp-store.c:512
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1250
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4137,23 +4402,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1308
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1365
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Du kan ikke opprette mapper i et News-lager: abonner i stedet."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1324
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1381
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Du kan ikke endre navn pÃ¥ en mappe pÃ¥ en nyhetstjener."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1347
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1404
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Du kan ikke fjerne en mappe i et News-lager: slett abonnement i stedet."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1557
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1618
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4164,7 +4429,7 @@ msgstr ""
 "\n"
 "Nyhetsgruppen finnes ikke. Valgt oppfÃ¸ring er sannsynligvis en opphavsmappe."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1624
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1685
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4175,116 +4440,120 @@ msgstr ""
 "\n"
 "nyhetsgruppen eksisterer ikke!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2050
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2111
 msgid "NNTP Command failed: "
 msgstr "NNTP-kommando feilet: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2155
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2216
 #, c-format
 msgid "Not connected."
 msgstr "Ingen tilkoblet."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2257
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2318
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ingen slik mappe: %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: SÃ¸ker etter nye meldinger"
 
-#: ../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 "Uventet svar fra xover: %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 "Uventet svar fra head: %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 "Operasjonen feilet: %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 "Ingen melding med UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:457
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:458
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-melding %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:576
 msgid "Unknown reason"
 msgstr "Ukjent Ã¥rsak"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:644
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:645
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:703
-#: ../camel/providers/pop3/camel-pop3-folder.c:706
-#: ../camel/providers/pop3/camel-pop3-folder.c:719
-#: ../camel/providers/pop3/camel-pop3-folder.c:732
-#: ../camel/providers/pop3/camel-pop3-folder.c:746
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:704
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:707
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:720
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:733
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:747
 msgid "Cannot get POP summary: "
 msgstr "Kan ikke hente POP-sammendrag: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:811
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:812
 msgid "Expunging old messages"
 msgstr "Fjerner gamle meldinger"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:839
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:840
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede meldinger"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:36
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:34
 msgid "Message Storage"
 msgstr "Meldingslager"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:38
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:36
 msgid "_Leave messages on server"
 msgstr "_Behold meldinger pÃ¥ tjeneren"
 
 #. 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 "_Slett etter %s dag(er)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:42
+msgid "Hint: Use 0 days to keep messages on the server indefinitely."
+msgstr "Hint: Bruk 0 dager for Ã¥ beholde meldinger pÃ¥ tjeneren for alltid."
+
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:44
 msgid "Delete _expunged from local Inbox"
 msgstr "Slett m_eldinger merket for sletting i lokal innboks"
 
-#: ../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 "SlÃ¥ av _stÃ¸tte for alle POP3-utvidelser"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:52
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:52
 msgid "Default POP3 port"
 msgstr "Forvalgt port for POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
-msgid "POP3 over SSL"
-msgstr "POP3 over SSL"
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:53
+msgid "POP3 over TLS"
+msgstr "POP3 over TLS"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:60
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:60
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:62
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:62
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "For tilkobling til og nedhenting av e-post pÃ¥ POP-tjenere."
 
-#: ../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."
@@ -4293,7 +4562,7 @@ msgstr ""
 "klartekst. Dette er det eneste alternativet som er stÃ¸ttet av mange POP-"
 "tjenere."
 
-#: ../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 "
@@ -4304,59 +4573,59 @@ msgstr ""
 "selv pÃ¥ tjenere som hevder Ã¥ stÃ¸tte det."
 
 #. 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 "Klarte ikke Ã¥ lese en gyldig hilsen fra POP-tjener %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:177
+#: ../src/camel/providers/pop3/camel-pop3-store.c:175
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Klarte ikke Ã¥ koble til POP-tjener %s i sikker modus: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:178
+#: ../src/camel/providers/pop3/camel-pop3-store.c:176
 msgid "STLS not supported by server"
 msgstr "STLS er ikke stÃ¸ttet av tjeneren"
 
 #. 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 "Klarte ikke Ã¥ koble til POP-tjener %s i sikker modus%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:217
+#: ../src/camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Klarte ikke Ã¥ koble til POP-tjener %s i sikker modus: "
 
-#: ../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 "Kan ikke logge inn til POP-tjener %s: SASL-protokollfeil"
 
-#: ../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 "Klarte ikke Ã¥ autentisere mot POP-tjener %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../src/camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3-tjener %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:490
+#: ../src/camel/providers/pop3/camel-pop3-store.c:488
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3-tjener for %s pÃ¥ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:702
-#: ../camel/providers/pop3/camel-pop3-store.c:715
-#: ../camel/providers/pop3/camel-pop3-store.c:797
+#: ../src/camel/providers/pop3/camel-pop3-store.c:700
+#: ../src/camel/providers/pop3/camel-pop3-store.c:713
+#: ../src/camel/providers/pop3/camel-pop3-store.c:799
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4365,7 +4634,8 @@ msgstr ""
 "Kunne ikke koble til POP-tjener %s.\n"
 "Feil ved oversending av passord: "
 
-#: ../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 "
@@ -4376,7 +4646,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:812
+#: ../src/camel/providers/pop3/camel-pop3-store.c:814
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4385,322 +4655,322 @@ msgstr ""
 "Kunne ikke koble til POP-tjener %s.\n"
 "Feil ved oversending av brukernavn%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:896
+#: ../src/camel/providers/pop3/camel-pop3-store.c:898
 #, c-format
-msgid "No such folder '%s'."
-msgstr "Ingen slik mappe Â«%sÂ»."
+msgid "No such folder â€œ%sâ€."
+msgstr "Mappen %s eksisterer ikke."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:913
+#: ../src/camel/providers/pop3/camel-pop3-store.c:915
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3-lagre har ingen mappehierarki"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:33
-#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
+#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:31
+#: ../src/services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:35
+#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:33
 msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
+"For delivering mail by passing it to the â€œsendmailâ€ program on the local "
 "system."
 msgstr ""
 "For levering av e-post ved Ã¥ videresende den til Â«sendmailÂ»-programmet pÃ¥ "
 "det lokale systemet."
 
-#: ../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 "Levering av e-post via sendmail programmet"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:137
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Failed to read From address"
 msgstr "Klarte ikke Ã¥ lese Fra-adresse"
 
-#: ../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 "Sending av meldinger er slÃ¥tt av i frakoblet modus"
 
-#: ../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 "Kunne ikke tolke mottakerliste"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:199
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:199
 #, c-format
 msgid "Could not parse arguments"
 msgstr "Kunne ikke tolke argumenter"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:230
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:215
 #, c-format
-msgid "Could not create pipe to '%s': %s: mail not sent"
+msgid "Could not create pipe to â€œ%sâ€: %s: mail not sent"
 msgstr "Kunne ikke opprette rÃ¸r til Â«%sÂ»: %s: melding ikke sendt"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:255
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:246
 #, c-format
-msgid "Could not fork '%s': %s: mail not sent"
+msgid "Could not fork â€œ%sâ€: %s: mail not sent"
 msgstr "Kunne ikke kjÃ¸re fork pÃ¥ Â«%sÂ»: %s: melding ikke sendt"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:304
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:301
 msgid "Could not send message: "
 msgstr "Kunne ikke sende meldingen: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:334
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:343
 #, c-format
-msgid "'%s' exited with signal %s: mail not sent."
+msgid "â€œ%sâ€ exited with signal %s: mail not sent."
 msgstr "Â«%sÂ» avsluttet med signal %s: melding ikke sendt."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:344
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:353
 #, c-format
-msgid "Could not execute '%s': mail not sent."
+msgid "Could not execute â€œ%sâ€: mail not sent."
 msgstr "Kunne ikke kjÃ¸re Â«%sÂ»: melding ikke sendt."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:349
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:358
 #, c-format
-msgid "'%s' exited with status %d: mail not sent."
+msgid "â€œ%sâ€ exited with status %d: mail not sent."
 msgstr "Â«%sÂ» avsluttet med status %d: melding ikke sendt."
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:37
 msgid "Default SMTP port"
 msgstr "Forvalgt port for SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:40
-msgid "SMTP over SSL"
-msgstr "SMTP over SSL"
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:38
+msgid "SMTP over TLS"
+msgstr "SMTP over TLS"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:39
 msgid "Message submission port"
 msgstr "Port for sending av melding"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:47
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:45
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:49
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:47
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "For levering av e-post via en ekstern e-posttjener med SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
-#: ../camel/providers/smtp/camel-smtp-transport.c:244
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:235
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:242
 msgid "Welcome response error: "
 msgstr "Feil i velkommen-svar: "
 
-#: ../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 "Klarte ikke Ã¥ koble til SMTP-tjener %s i sikker modus: %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-kommando feilet: "
 
-#: ../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 "Klarte ikke Ã¥ koble til SMTP-tjener %s i sikker modus: "
 
-#: ../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-tjener %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 e-postlevering via %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:582
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:580
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP-tjener %s stÃ¸tter ikke autentiseringstype %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 "Ingen SASL-mekanisme oppgitt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:699
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:697
 msgid "AUTH command failed: Not connected."
 msgstr "AUTH-kommando feilet: Ikke koblet til."
 
-#: ../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-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:888
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:887
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Kan ikke sende melding: tjenesten er ikke tilkoblet."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:901
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:900
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:930
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:929
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:945
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:944
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende melding: en eller flere ugyldige mottakere"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1077
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1076
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfeil, kommando ikke gjenkjent"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1079
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1078
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfeil i parametere eller argumenter"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1081
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1080
 msgid "Command not implemented"
 msgstr "Kommando ikke implementert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1083
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1082
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1085
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar pÃ¥ systemhjelp"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1087
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1086
 msgid "Help message"
 msgstr "Hjelp-melding"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1089
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1088
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1091
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1090
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1092
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilgjengelig, lukker sendekanalen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "Requested mail action okay, completed"
 msgstr "Forespurt e-post handling er ok, fullfÃ¸rt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1097
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1096
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruker; videresender til <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1098
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Forespurt e-post handling er ikke utfÃ¸rt: postboks ikke tilgjengelig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1101
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1100
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurt handling ikke utfÃ¸rt: postboks ikke tilgjengelig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1103
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1102
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurt handling avbrutt: feil i prosessering"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1105
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1104
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruker; vennligst prÃ¸v <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1107
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1106
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurt handling ikke utfÃ¸rt: utilstrekkelig lagringsplass"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1109
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1108
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurt e-post handling avbrutt: lagringsallokering oversteget"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1111
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1110
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Forespurt handling ikke utfÃ¸rt: postboksnavn ikke tillatt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1113
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slutt med <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1115
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1114
 msgid "Transaction failed"
 msgstr "Transaksjonen feilet"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1119
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1118
 msgid "A password transition is needed"
 msgstr "PassordoverfÃ¸ring kreves"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1121
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen er for svak"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1123
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1122
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kreves for forespurt autentiseringsmekanisme."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1125
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1124
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autentiseringsfeil"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1415
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1414
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1424
-#: ../camel/providers/smtp/camel-smtp-transport.c:1437
-#: ../camel/providers/smtp/camel-smtp-transport.c:1444
+#: ../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-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1520
-#: ../camel/providers/smtp/camel-smtp-transport.c:1534
-#: ../camel/providers/smtp/camel-smtp-transport.c:1543
+#: ../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-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1571
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1570
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1587
-#: ../camel/providers/smtp/camel-smtp-transport.c:1596
+#: ../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> feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1668
-#: ../camel/providers/smtp/camel-smtp-transport.c:1679
-#: ../camel/providers/smtp/camel-smtp-transport.c:1690
-#: ../camel/providers/smtp/camel-smtp-transport.c:1752
-#: ../camel/providers/smtp/camel-smtp-transport.c:1770
-#: ../camel/providers/smtp/camel-smtp-transport.c:1783
-#: ../camel/providers/smtp/camel-smtp-transport.c:1791
+#: ../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-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1817
-#: ../camel/providers/smtp/camel-smtp-transport.c:1831
-#: ../camel/providers/smtp/camel-smtp-transport.c:1839
+#: ../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-kommando feilet: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1865
-#: ../camel/providers/smtp/camel-smtp-transport.c:1877
-#: ../camel/providers/smtp/camel-smtp-transport.c:1883
+#: ../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-kommando feilet: "
 
@@ -4730,8 +5000,7 @@ msgstr "Enheter for pÃ¥minnelse om bursdager og jubileum"
 
 #: ../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 ""
 "Enheter for pÃ¥minnelser om bursdager eller jubileum. Â«minutesÂ», Â«hoursÂ» "
 "eller Â«daysÂ»"
@@ -4740,6 +5009,61 @@ msgstr ""
 msgid "Whether the migration of old setting was already done"
 msgstr "Hvorvidt migrering av den gamle innstillingen allerede er utfÃ¸rt"
 
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:2
+msgid "An absolute path where the gpg (or gpg2) binary is"
+msgstr "En absolutt sti hvor gpg eller gpg2 binÃ¦rfilen befinner seg"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:3
+msgid ""
+"An example is â€œ/usr/bin/gpgâ€; when it is left empty, or an incorrect value "
+"is set, then it will be searched for. Change requires restart of the "
+"application."
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:4
+msgid "Whether to load photos of signers/encrypters"
+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 "
+"available in the key/certificate."
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:6
+msgid "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
+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 "
+"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
 msgid "(Deprecated) Proxy type to use"
 msgstr "(Utfaset) Type proxy som skal brukes"
@@ -4747,7 +5071,7 @@ msgstr "(Utfaset) Type proxy som skal brukes"
 #: ../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 ""
 
@@ -4799,281 +5123,324 @@ msgstr "(Utfaset) Portnummer for SOCKS-forespÃ¸rsler"
 msgid "(Deprecated) Automatic proxy configuration URL"
 msgstr "(Utfaset) URL for automatisk konfigurasjon av proxy"
 
-#: ../libebackend/e-collection-backend.c:976
+#: ../src/libebackend/e-collection-backend.c:977
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s stÃ¸tter ikke Ã¥ lage eksterne ressurser"
 
-#: ../libebackend/e-collection-backend.c:1035
+#: ../src/libebackend/e-collection-backend.c:1036
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s stÃ¸tter ikke sletting av eksterne ressurser"
 
-#: ../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 "Datakilden mangler en [%s]-gruppe"
 
-#: ../libebackend/e-server-side-source.c:466
+#: ../src/libebackend/e-server-side-source.c:467
 msgid "Failed to lookup credentials: "
 msgstr "Klarte ikke Ã¥ slÃ¥ opp pÃ¥loggingsinformasjon: "
 
-#: ../libebackend/e-server-side-source.c:1391 ../libedataserver/e-source.c:1595
+#: ../src/libebackend/e-server-side-source.c:1392
+#: ../src/libedataserver/e-source.c:1599
 #, c-format
-msgid "Data source '%s' does not support creating remote resources"
+msgid "Data source â€œ%sâ€ does not support creating remote resources"
 msgstr "Datakilde Â«%sÂ» stÃ¸tter ikke Ã¥ lage eksterne ressurser"
 
-#: ../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 "Datakilde Â«%sÂ» har ingen samlingsmotor for Ã¥ lage ekstern ressurs"
 
-#: ../libebackend/e-server-side-source.c:1433 ../libedataserver/e-source.c:1708
+#: ../src/libebackend/e-server-side-source.c:1434
+#: ../src/libedataserver/e-source.c:1712
 #, c-format
-msgid "Data source '%s' does not support deleting remote resources"
+msgid "Data source â€œ%sâ€ does not support deleting remote resources"
 msgstr "Datakilde Â«%sÂ» stÃ¸tter ikke sletting av eksterne ressurser"
 
-#: ../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 "Datakilde Â«%sÂ» har ingen samlingsmotor for Ã¥ slette ekstern ressurs"
 
-#: ../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
 #, 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 "Datakilde Â«%sÂ» stÃ¸tter ikke OAuth 2.0 autentisering"
 
-#: ../libebackend/e-server-side-source.c:1856
+#: ../src/libebackend/e-server-side-source.c:1857
 #, c-format
-msgid "File must have a '.source' extension"
+msgid "File must have a â€œ.sourceâ€ extension"
 msgstr "Filen mÃ¥ ha en Â«.sourceÂ»-filtype"
 
-#: ../libebackend/e-source-registry-server.c:319
+#: ../src/libebackend/e-source-registry-server.c:320
 #, c-format
-msgid "UID '%s' is already in use"
+msgid "UID â€œ%sâ€ is already in use"
 msgstr "UID Â«%sÂ» er allerede i bruk"
 
-#: ../libebackend/e-subprocess-factory.c:285
+#: ../src/libebackend/e-subprocess-factory.c:277
 #, c-format
-msgid "No such source for UID '%s'"
+msgid "Module â€œ%sâ€ for source UID â€œ%sâ€ cannot be loaded"
+msgstr "Modul Â«%sÂ» for kilde-UID Â«%sÂ» kan ikke lastes"
+
+#: ../src/libebackend/e-subprocess-factory.c:289
+#, c-format
+msgid "No such source for UID â€œ%sâ€"
 msgstr "Kilden eksisterer ikke for UID Â«%sÂ»"
 
-#: ../libebackend/e-user-prompter-server.c:305
+#: ../src/libebackend/e-subprocess-factory.c:300
+#, c-format
+msgid "Failed to create backend of type â€œ%sâ€ for source UID â€œ%sâ€"
+msgstr "Klarte ikke Ã¥ opprette motor av type Â«%sÂ» for kilde-UID Â«%sÂ»"
+
+#: ../src/libebackend/e-user-prompter-server.c:303
 #, c-format
-msgid "Extension dialog '%s' not found."
+msgid "Extension dialog â€œ%sâ€ not found."
 msgstr "Utvidelsesdialog Â«%sÂ» ble ikke funnet."
 
-#: ../libedataserver/e-categories.c:49
+#: ../src/libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "Jubileum"
 
-#: ../libedataserver/e-categories.c:50
+#: ../src/libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "FÃ¸dselsdag"
 
-#: ../libedataserver/e-categories.c:51
+#: ../src/libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "Arbeid"
 
-#: ../libedataserver/e-categories.c:52
+#: ../src/libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Konkurranse"
 
-#: ../libedataserver/e-categories.c:53
+#: ../src/libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Favoritter"
 
-#: ../libedataserver/e-categories.c:54
+#: ../src/libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Gaver"
 
-#: ../libedataserver/e-categories.c:55
+#: ../src/libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "MÃ¥l"
 
-#: ../libedataserver/e-categories.c:56
+#: ../src/libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Ferie"
 
-#: ../libedataserver/e-categories.c:57
+#: ../src/libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Postkort"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:59
+#: ../src/libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Viktige kontakter"
 
-#: ../libedataserver/e-categories.c:60
+#: ../src/libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "IdÃ©er"
 
-#: ../libedataserver/e-categories.c:61
+#: ../src/libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "International"
 msgstr "Internasjonal"
 
-#: ../libedataserver/e-categories.c:62
+#: ../src/libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "NÃ¸kkelkunde"
 
-#: ../libedataserver/e-categories.c:63
+#: ../src/libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
-#: ../libedataserver/e-categories.c:64
+#: ../src/libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../libedataserver/e-categories.c:65
+#: ../src/libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Telefonsamtaler"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:67
+#: ../src/libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "Status"
 
-#: ../libedataserver/e-categories.c:68
+#: ../src/libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Strategier"
 
-#: ../libedataserver/e-categories.c:69
+#: ../src/libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "LeverandÃ¸rer"
 
-#: ../libedataserver/e-categories.c:70
+#: ../src/libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Tid og utgifter"
 
-#: ../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 "Venter"
 
-#: ../libedataserver/e-client.c:146
+#: ../src/libedataserver/e-client.c:144
 msgid "Source not loaded"
 msgstr "Kilde ble ikke lastet"
 
-#: ../libedataserver/e-client.c:148
+#: ../src/libedataserver/e-client.c:146
 msgid "Source already loaded"
 msgstr "Kilden er allerede lastet"
 
 #. 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 "Frakoblet modus er ikke tilgjengelig"
 
-#: ../libedataserver/e-client.c:181
+#: ../src/libedataserver/e-client.c:179
 msgid "D-Bus error"
 msgstr "D-Bus-feil"
 
-#: ../libedataserver/e-client.c:2023
+#: ../src/libedataserver/e-client.c:2021
 msgid "Timeout was reached"
 msgstr "Tidsavbrudd"
 
-#: ../libedataserver/e-source.c:771
+#: ../src/libedataserver/e-source.c:775
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "Kildefilen mangler en [%s]-gruppe"
 
-#: ../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 "Datakilde Â«%sÂ» kan ikke fjernes"
 
-#: ../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 "Datakilde Â«%sÂ» er ikke skrivbar"
 
-#: ../libedataserver/e-source.c:2194
+#: ../src/libedataserver/e-source.c:2198
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:41
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:39
 msgid "Credentials lookup is not supported"
 msgstr "Oppslag av pÃ¥loggingsinformasjon er ikke stÃ¸ttet"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:54
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:52
 msgid "Credentials store is not supported"
 msgstr "Lagring av pÃ¥loggingsinformasjon er ikke stÃ¸ttet"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:65
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:63
 msgid "Credentials delete is not supported"
 msgstr "Sletting av pÃ¥loggingsinformasjon er ikke stÃ¸ttet"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
-msgid "Google authentication is not supported"
-msgstr "Google-autentisering er ikke stÃ¸ttet"
-
 #. 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"
+msgid "Source â€œ%sâ€ (%s) is not a valid Google source"
 msgstr "Kilde Â«%sÂ» (%s) er ikke en gyldig Google-kilde"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:157
 msgid "Google secret not found"
 msgstr "Google-hemmelighet ble ikke funnet"
 
-#: ../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 "Google authentication is not supported"
+msgstr "Google-autentisering er ikke stÃ¸ttet"
+
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:400
+msgid "Failed to get Google secret from credentials"
+msgstr "Klarte ikke Ã¥ finne hemmelighet for Google i pÃ¥loggingsinformasjonen"
+
+#: ../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 encode new access token to Google secret"
+msgstr "Klarte ikke Ã¥ hente et adgangstegn for Â«%sÂ»: "
+
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:464
+#, fuzzy
+msgid "Failed to get access token from refresh_token server response"
+msgstr "Klarte ikke Ã¥ hente et adgangstegn for Â«%sÂ»: "
+
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:470
+#, fuzzy
+#| msgid "Failed to retrieve message"
+msgid "Failed to refresh token"
+msgstr "Feil under henting av melding"
+
+#: ../src/libedataserver/e-source-credentials-provider-impl-password.c:79
 msgid "Password not found"
 msgstr "Passordet ble ikke funnet"
 
-#: ../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 "Signaturskriptet mÃ¥ vÃ¦re en lokal fil"
 
-#: ../libedataserver/e-source-proxy.c:1641
+#: ../src/libedataserver/e-source-proxy.c:1642
 #, c-format
-msgid "Source '%s' does not support proxy lookups"
+msgid "Source â€œ%sâ€ does not support proxy lookups"
 msgstr "Kilde Â«%sÂ» stÃ¸tter ikke oppslag via proxy"
 
 #. 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 %H.%M.%S"
 
@@ -5081,7 +5448,8 @@ msgstr "%a %d.%m.%Y %H.%M.%S"
 #. * 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"
 
@@ -5089,7 +5457,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 %H.%M"
 
@@ -5097,78 +5466,83 @@ msgstr "%a %d.%m.%Y %H.%M"
 #. * 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 %H"
 
 #. 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 %H.%M.%S"
 
 #. 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 %H.%S"
 
 #. 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 %H"
 
 #. 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 "%H.%M.%s"
 
 #. 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"
 
@@ -5176,259 +5550,274 @@ 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 "%H.%M"
 
 #. 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 "%H"
 
-#: ../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-feil: %s"
 
-#: ../libedataserver/e-webdav-discover.c:523
+#: ../src/libedataserver/e-webdav-discover.c:525
 msgid "Could not parse response"
 msgstr "Kunne ikke tolke svaret"
 
-#: ../libedataserver/e-webdav-discover.c:532
+#: ../src/libedataserver/e-webdav-discover.c:534
 msgid "Empty response"
 msgstr "Tomt svar"
 
-#: ../libedataserver/e-webdav-discover.c:540
+#: ../src/libedataserver/e-webdav-discover.c:542
 msgid "Unexpected reply from server"
 msgstr "Uventet svar fra tjener"
 
-#: ../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
 msgid "Credentials prompt was cancelled"
 msgstr "SpÃ¸rsmÃ¥l om pÃ¥loggingsinformasjon ble avbrutt"
 
-#: ../libedataserverui/e-credentials-prompter.c:664
+#: ../src/libedataserverui/e-credentials-prompter.c:662
 #, c-format
-msgid "Source '%s' doesn't support prompt for credentials"
+msgid "Source â€œ%sâ€ doesnâ€™t support prompt for credentials"
 msgstr "Kilde Â«%sÂ» stÃ¸tter ikke oppslag av pÃ¥loggingsinformasjon"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:436
-#, fuzzy, c-format
-msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
-msgstr "Klarte ikke Ã¥ hente et adgangstegn for Â«%sÂ»: "
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:444
+#, c-format
+msgid "Failed to obtain access token from address â€œ%sâ€. Error code %d (%s)"
+msgstr "Klarte ikke Ã¥ hente et adgangstegn for Â«%sÂ»: Feilkode %d (%s)"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:482
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:492
 msgid "Requesting access token, please wait..."
 msgstr ""
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:584
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:594
 msgid "Google Address book authentication request"
 msgstr "AutentiseringsforespÃ¸rsel for Google-adressebok"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:587
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:597
 msgid "Google Calendar authentication request"
 msgstr "AutentiseringsforespÃ¸rsel for Google-kalender"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:590
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:600
 msgid "Google Memo List authentication request"
 msgstr "AutentiseringsforespÃ¸rsel for Google notatliste"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:593
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:603
 msgid "Google Task List authentication request"
 msgstr "AutentiseringsforespÃ¸rsel for Google oppgaveliste"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:597
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:607
 msgid "Google Mail authentication request"
 msgstr "AutentiseringsforespÃ¸rsel for Google e-post"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:600
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:610
 msgid "Google account authentication request"
 msgstr "AutentiseringsforespÃ¸rsel for Google-konto"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:611
+#: ../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\"."
-msgstr "Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din adressebok Â«%sÂ»."
+"address book â€œ%sâ€."
+msgstr ""
+"Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din "
+"adressebok Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:615
+#: ../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\"."
-msgstr "Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din kalenger Â«%sÂ»."
+"calendar â€œ%sâ€."
+msgstr "Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din kalender Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:619
+#: ../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\"."
-msgstr "Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din e-postkonto Â«%sÂ»."
+"mail account â€œ%sâ€."
+msgstr ""
+"Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din e-"
+"postkonto Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
+#: ../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\"."
-msgstr "Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din e-posttransport Â«%sÂ»."
+"mail transport â€œ%sâ€."
+msgstr ""
+"Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din e-"
+"posttransport Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
+#: ../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\"."
-msgstr "Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din notatliste Â«%sÂ»."
+"memo list â€œ%sâ€."
+msgstr ""
+"Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din "
+"notatliste Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
+#: ../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\"."
-msgstr "Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din oppgaveliste Â«%sÂ»."
+"task list â€œ%sâ€."
+msgstr ""
+"Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din "
+"oppgaveliste Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
+#: ../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\"."
-msgstr "Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din konto Â«%sÂ»."
+"account â€œ%sâ€."
+msgstr ""
+"Logg inn til din Google-konto og godta betingelsene for Ã¥ aksessere din "
+"konto Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:679
-#: ../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 "A_vbryt"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:134
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:132
 msgid "Address book authentication request"
 msgstr "AutentiseringsforespÃ¸rsel for adressebok"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:139
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:137
 msgid "Calendar authentication request"
 msgstr "AutentiseringsforespÃ¸rsel for kalender"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:143
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:141
 msgid "Mail authentication request"
 msgstr "AutentiseringsforespÃ¸rsel for e-post"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:146
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:144
 msgid "Authentication request"
 msgstr "AutentiseringsforespÃ¸rsel"
 
-#: ../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\"."
+msgid "Please enter the password for address book â€œ%sâ€."
 msgstr "Vennligst oppgi passordet for adressebok Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:161
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:159
 #, c-format
-msgid "Please enter the password for calendar \"%s\"."
+msgid "Please enter the password for calendar â€œ%sâ€."
 msgstr "Vennligst oppgi passordet for kalender Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:165
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:163
 #, c-format
-msgid "Please enter the password for mail account \"%s\"."
+msgid "Please enter the password for mail account â€œ%sâ€."
 msgstr "Vennligst oppgi passordet for e-postkonto Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:169
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:167
 #, c-format
-msgid "Please enter the password for mail transport \"%s\"."
+msgid "Please enter the password for mail transport â€œ%sâ€."
 msgstr "Vennligst oppgi passordet for e-posttransport Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:173
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:171
 #, c-format
-msgid "Please enter the password for memo list \"%s\"."
+msgid "Please enter the password for memo list â€œ%sâ€."
 msgstr "Vennligst oppgi passordet for notatliste Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:177
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:175
 #, c-format
-msgid "Please enter the password for task list \"%s\"."
+msgid "Please enter the password for task list â€œ%sâ€."
 msgstr "Vennligst oppgi passordet for oppgaveliste Â«%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\"."
+msgid "Please enter the password for account â€œ%sâ€."
 msgstr "Vennligst oppgi passordet for konto Â«%sÂ»."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:233
-#: ../libedataserverui/e-webdav-discover-widget.c:1064
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:231
+#: ../src/libedataserverui/e-webdav-discover-widget.c: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 "Br_ukernavn:"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:355
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:353
 msgid "_Password:"
 msgstr "_Passord:"
 
 #. 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 "Legg til dette p_assordet i nÃ¸kkelringen"
 
-#: ../libedataserverui/e-trust-prompt.c:113
-#: ../modules/trust-prompt/trust-prompt-gtk.c:119
+#: ../src/libedataserverui/e-trust-prompt.c:111
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:117
 msgid "Certificate trust..."
 msgstr "Tillit til sertifikat â€¦"
 
-#: ../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 "A_vvis"
 
-#: ../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 "Godta midler_tidig"
 
-#: ../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 "Godt_a permanent"
 
-#: ../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 certificate for '%s' is not trusted. Do you wish to accept it?"
-msgstr "Stoler ikke pÃ¥ SSL-sertifikat for Â«%sÂ». Vil du akseptere det?"
+msgid "SSL/TLS certificate for â€œ%sâ€ is not trusted. Do you wish to accept it?"
+msgstr "Stoler ikke pÃ¥ SSL/TLS-sertifikat for Â«%sÂ». Vil du akseptere det?"
 
-#: ../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 "Ã…rsak:"
 
-#: ../libedataserverui/e-trust-prompt.c:213
+#: ../src/libedataserverui/e-trust-prompt.c:211
 msgid "Detailed error:"
 msgstr "Detaljert feil:"
 
-#: ../libedataserverui/e-trust-prompt.c:275
-#: ../modules/trust-prompt/module-trust-prompt.c:82
+#: ../src/libedataserverui/e-trust-prompt.c:273
+#: ../src/modules/trust-prompt/module-trust-prompt.c:80
 msgid "The signing certificate authority is not known."
 msgstr "Signerende sertifikatautoritet er ikke kjent."
 
-#: ../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."
@@ -5436,204 +5825,200 @@ msgstr ""
 "Sertifikatet er ikke likt forventet identitet for nettstedet det ble hentet "
 "fra."
 
-#: ../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
+msgid "The certificateâ€™s activation time is still in the future."
 msgstr "Sertifikatets aktiveringstidspunkt er fremdeles i fremtiden."
 
-#: ../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 "Sertifikatet har utlÃ¸pt."
 
-#: ../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 ""
 "Sertifikatet er tilbaketrukket i fÃ¸lge tilkoblingens tilbaketrekkingsliste "
 "for sertifikater."
 
-#: ../libedataserverui/e-trust-prompt.c:285
-#: ../modules/trust-prompt/module-trust-prompt.c:92
-msgid "The certificate's algorithm is considered insecure."
-msgstr "Sertifikatets algoritme ses pÃ¥ som usikker."
+#: ../src/libedataserverui/e-trust-prompt.c:283
+#: ../src/modules/trust-prompt/module-trust-prompt.c:90
+msgid "The certificateâ€™s algorithm is considered insecure."
+msgstr "Sertifikatets algoritme anses som usikker."
 
-#: ../libedataserverui/e-webdav-discover-widget.c:166
+#: ../src/libedataserverui/e-webdav-discover-widget.c:164
 msgid "Supports"
 msgstr "StÃ¸tter"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:177
+#: ../src/libedataserverui/e-webdav-discover-widget.c:175
 msgid "_User mail:"
 msgstr "Br_ukers e-post:"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:523
+#: ../src/libedataserverui/e-webdav-discover-widget.c:521
 msgctxt "WebDAVDiscover"
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:524
+#: ../src/libedataserverui/e-webdav-discover-widget.c:522
 msgctxt "WebDAVDiscover"
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:525
+#: ../src/libedataserverui/e-webdav-discover-widget.c:523
 msgctxt "WebDAVDiscover"
 msgid "Memos"
 msgstr "Notater"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:526
+#: ../src/libedataserverui/e-webdav-discover-widget.c:524
 msgctxt "WebDAVDiscover"
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:825
+#: ../src/libedataserverui/e-webdav-discover-widget.c:826
 msgid "Invalid URL"
 msgstr "Ugyldig URL"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:839
+#: ../src/libedataserverui/e-webdav-discover-widget.c:840
 msgid "User name not filled"
 msgstr "Brukernavn ikke oppgitt"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:880
+#: ../src/libedataserverui/e-webdav-discover-widget.c:881
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:883
+#: ../src/libedataserverui/e-webdav-discover-widget.c:884
 msgid "Searching server sources..."
 msgstr "SÃ¸ker etter kilder pÃ¥ tjener â€¦"
 
-#: ../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 ""
 "Kan ikke finne samsvarende konto for Ã¥ hente passord for Â«%sÂ» i org.gnome."
 "OnlineAccounts-tjenesten"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:273
+#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:271
 msgid "Failed to get password from GOA: "
 msgstr "Klarte ikke Ã¥ hente passord fra GOA: "
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:219
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:220
 #, c-format
-msgid "Code: %u - Unexpected response from server"
-msgstr "Kode: %u - Uventet svar fra tjener"
+msgid "Code: %u â€” Unexpected response from server"
+msgstr "Kode: %u â€“ Uventet svar fra tjener"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:240
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:241
 #, c-format
 msgid "Failed to parse autodiscover response XML"
-msgstr "Klarte ikke Ã¥ svar-XML fra automatisk gjenkjenning"
+msgstr "Klarte ikke Ã¥ tolke svar-XML fra automatisk gjenkjenning"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:249
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:250
 #, c-format
 msgid "Failed to find Autodiscover element"
 msgstr "Klarte ikke Ã¥ finne element for automatisk gjenkjenning"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:261
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:262
 #, c-format
 msgid "Failed to find Response element"
 msgstr "Klarte ikke Ã¥ finne svarelement"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:273
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:274
 #, c-format
 msgid "Failed to find Account element"
 msgstr "Klarte ikke Ã¥ finne kontoelement"
 
 #. 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 "Klarte ikke Ã¥ finne ASUrl og OABUrl i svar fra automatisk gjenkjenning"
 
-#: ../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'"
-msgstr ""
-"Kan ikke finne samsvarende konto Ã¥ finne tilgangstegn for Â«%sÂ» i org.gnome."
-"OnlineAccounts-tjenesten"
+"from which to obtain an access token for â€œ%sâ€"
+msgstr "Kan ikke finne samsvarende konto Ã¥ finne adgangstegn for Â«%sÂ» i org.gnome.OnlineAccounts-tjenesten"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1370
 #, c-format
-msgid "Failed to obtain an access token for '%s': "
+msgid "Failed to obtain an access token for â€œ%sâ€: "
 msgstr "Klarte ikke Ã¥ hente et adgangstegn for Â«%sÂ»: "
 
-#: ../modules/google-backend/module-google-backend.c:568
-#: ../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 "Oppgaver"
 
-#: ../modules/google-backend/module-google-backend.c:625
-#: ../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 "Kontakter"
 
-#: ../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 "Kalender"
 
-#: ../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 "Integrer dine kalendere"
 
-#: ../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 "Integrer dine kontakter"
 
-#: ../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 "PÃ¥loggingstjenesten returnerte ikke en hemmelighet"
 
-#: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:1
 msgid "Evolution Data Server"
 msgstr "Evolution Data Server"
 
-#: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:2
+#: ../src/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:2
 msgid "Required to have EDS appear in UOA"
 msgstr "Kreves for Ã¥ vise EDS i UOA"
 
-#: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
 msgid "Google Calendar"
 msgstr "Google kalender"
 
-#: ../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 kontakter"
 
-#: ../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 "E-post"
 
-#: ../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 "Integrer dine postbokser"
 
-#: ../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'"
-msgstr ""
-"Finner ingen samsvarende kontotjeneste i kontodatabasen hvor det er mulig Ã¥ "
-"fÃ¥ et aksesstegn for Â«%sÂ»"
+"which to obtain an access token for â€œ%sâ€"
+msgstr "Finner ingen samsvarende kontotjeneste i kontodatabasen hvor det er mulig Ã¥ fÃ¥ et adgangstegn for 
Â«%sÂ»"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:84
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:281
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:85
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:282
 #, c-format
 msgid ""
 "Expected status 200 when requesting your identity, instead got status %d (%s)"
@@ -5641,87 +6026,130 @@ msgstr ""
 "Forventet status 200 ved forespÃ¸rsel om din identitet. Fikk i stedet status "
 "%d (%s)"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:101
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:298
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:102
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:299
 msgid "Error parsing response as JSON: "
 msgstr "Feil under lesing av svar som JSON: "
 
-#: ../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
+msgid "Didnâ€™t find â€œemailâ€ in JSON data"
 msgstr "Fant ikke Â«emailÂ» i JSON-data"
 
-#: ../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
+msgid "Didnâ€™t find â€œidâ€ in JSON data"
 msgstr "Fant ikke Â«idÂ» i JSON-data"
 
-#: ../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
+msgid "Didnâ€™t find â€œemails.accountâ€ in JSON data"
 msgstr "Fant ikke Â«emails.accountÂ» i JSON-data"
 
-#: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
 msgid "Windows Live Mail"
 msgstr "Windows Live e-post"
 
-#: ../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! kalender"
 
-#: ../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! e-post"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:36
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
-#: ../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 "Fortsett Ã¥ kjÃ¸re etter at klienten er lukket"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:42
+#: ../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 "Utsett kjÃ¸ring til minst en klient er tilkoblet"
 
-#: ../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 "FÃ¸dselsdager og jubileer"
 
-#: ../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 "PÃ¥ LDAP-tjenere"
 
-#: ../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 "PÃ¥ denne datamaskinen"
 
-#: ../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 "SÃ¸kemapper"
 
-#: ../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 "VÃ¦r"
 
-#: ../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 "PÃ¥ nettet"
 
-#: ../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"
+#: ../src/services/evolution-source-registry/evolution-source-registry.c:40
+msgid "Donâ€™t migrate user data from previous versions of Evolution"
 msgstr "Ikke migrer brukerdata fra tidligere versjoner av Evolution"
 
-#: ../services/evolution-user-prompter/prompt-user-gtk.c:121
+#: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
 msgid "_Dismiss"
 msgstr "_Forkast"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:68
+#: ../src/tools/addressbook-export/addressbook-export.c:782
+msgid "Can not open file"
+msgstr "Kan ikke Ã¥pne fil"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:98
+#, c-format
+msgid "Failed to open client â€œ%sâ€: %s"
+msgstr "Klarte ikke Ã¥ Ã¥pne klient Â«%sÂ»: %s"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:892
+msgid "Unhandled error"
+msgstr "UhÃ¥ndtert feil"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:925
+msgid "Specify the output file instead of standard output"
+msgstr "Oppgi utdatafil i stedet for standard utdata"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:926
+msgid "OUTPUTFILE"
+msgstr "UTDATAFIL"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:929
+msgid "List local address book folders"
+msgstr "Vis lokale adressebokmapper"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:932
+msgid "Show cards as vcard or csv file"
+msgstr "Vis kort som vcard eller csv-fil"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:933
+msgid "[vcard|csv]"
+msgstr "[vcard|csv]"
+
+#: ../src/tools/addressbook-export/addressbook-export.c:981
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: ../src/tools/addressbook-export/addressbook-export.c:995
+msgid "Only support csv or vcard format."
+msgstr ""
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]