[evolution-data-server] Update German translation



commit e3270368dc81c19d8986f5978d2af918033174d4
Author: Mario Blättermann <mario blaettermann gmail com>
Date:   Tue Nov 15 10:05:04 2016 +0000

    Update German translation

 po/de.po | 3102 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1585 insertions(+), 1517 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index 340ea53..0895e6f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -18,340 +18,342 @@ msgstr ""
 "Project-Id-Version: evolution-data-server master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-13 09:36+0000\n"
-"PO-Revision-Date: 2016-10-16 19:44+0200\n"
-"Last-Translator: Benjamin Steinwender <b stbe at>\n"
+"POT-Creation-Date: 2016-11-10 13:20+0000\n"
+"PO-Revision-Date: 2016-11-15 11:04+0100\n"
+"Last-Translator: Mario Blättermann <mario blaettermann gmail com>\n"
 "Language-Team: Deutsch <gnome-de gnome org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Project-Style: gnome\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:120
+#: ../src/addressbook/backends/file/e-book-backend-file.c:120
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "Datei »%s« konnte nicht entfernt werden: %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 "Ordner %s konnte nicht angelegt werden: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:419
+#: ../src/addressbook/backends/file/e-book-backend-file.c:419
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "Harte Verknüpfung für Ressource »%s« konnte nicht gelesen werden: %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 "Keine UID im Kontakt"
 
-#: ../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 "In hinzugefügten Kontakten wurden UID-Konflikte entdeckt"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:990
+#: ../src/addressbook/backends/file/e-book-backend-file.c:990
 msgid "Loading..."
 msgstr "Ladevorgang …"
 
-#: ../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:4355
 msgid "Searching..."
 msgstr "Suchvorgang …"
 
-#: ../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"
 msgstr "Kontakt »%s« sollte geändert werden, aber Revision ist ungleich"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1475
-#: ../addressbook/backends/file/e-book-backend-file.c:1560
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
-#: ../addressbook/libedata-book/e-book-sqlite.c:7342
-#: ../addressbook/libedata-book/e-book-sqlite.c:7411
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1475
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1560
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7342
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7411
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "Kontakt »%s« wurde nicht gefunden"
 
-#: ../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"
 msgstr "Abfrage »%s« wird nicht unterstützt"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1629
-#: ../addressbook/backends/file/e-book-backend-file.c:1710
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1629
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1710
 #, c-format
 msgid "Invalid Query '%s'"
 msgstr "Ungültige Abfrage »%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 "Anfrage, einen nicht verwandten Zeiger zu löschen"
 
-#: ../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"
 msgstr "Umbenennen der alten Datenbank von »%s« in »%s« schlug fehl: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1166
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:384
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:867
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:51
-#: ../addressbook/libebook-contacts/e-phone-number.c:56
-#: ../addressbook/libebook/e-book.c:1078
-#: ../addressbook/libebook/e-book-client.c:2131
-#: ../addressbook/libebook/e-book-client.c:2303
-#: ../addressbook/libebook/e-book-client.c:2516
-#: ../addressbook/libebook/e-book-client.c:2647
-#: ../addressbook/libebook/e-book-client.c:2806
-#: ../addressbook/libebook/e-book-client.c:2940
-#: ../addressbook/libebook/e-book-client.c:3071
-#: ../addressbook/libebook/e-book-client.c:3229
-#: ../addressbook/libebook/e-book-client.c:3424
-#: ../addressbook/libebook/e-book-client.c:3642
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:680
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:728
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:745
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:274
-#: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279
-#: ../calendar/libecal/e-cal-client.c:3520
-#: ../calendar/libecal/e-cal-client.c:3693
-#: ../calendar/libecal/e-cal-client.c:3957
-#: ../calendar/libecal/e-cal-client.c:4198
-#: ../calendar/libecal/e-cal-client.c:4388
-#: ../calendar/libecal/e-cal-client.c:4581
-#: ../calendar/libecal/e-cal-client.c:4790
-#: ../calendar/libecal/e-cal-client.c:4959
-#: ../calendar/libecal/e-cal-client.c:5162
-#: ../calendar/libecal/e-cal-client.c:5312
-#: ../calendar/libecal/e-cal-client.c:5506
-#: ../calendar/libecal/e-cal-client.c:5659
-#: ../calendar/libecal/e-cal-client.c:5876
-#: ../calendar/libecal/e-cal-client.c:6030
-#: ../calendar/libecal/e-cal-client.c:6256
-#: ../calendar/libecal/e-cal-client.c:6452
-#: ../calendar/libecal/e-cal-client.c:6815
-#: ../calendar/libecal/e-cal-client.c:7037
-#: ../camel/providers/imapx/camel-imapx-server.c:3041
-#: ../camel/providers/imapx/camel-imapx-server.c:3051
-#: ../camel/providers/imapx/camel-imapx-server.c:3063
-#: ../camel/providers/nntp/camel-nntp-store.c:424
-#: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
+#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1164
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4245
+#: ../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:3520
+#: ../src/calendar/libecal/e-cal-client.c:3693
+#: ../src/calendar/libecal/e-cal-client.c:3957
+#: ../src/calendar/libecal/e-cal-client.c:4198
+#: ../src/calendar/libecal/e-cal-client.c:4388
+#: ../src/calendar/libecal/e-cal-client.c:4581
+#: ../src/calendar/libecal/e-cal-client.c:4790
+#: ../src/calendar/libecal/e-cal-client.c:4959
+#: ../src/calendar/libecal/e-cal-client.c:5162
+#: ../src/calendar/libecal/e-cal-client.c:5312
+#: ../src/calendar/libecal/e-cal-client.c:5506
+#: ../src/calendar/libecal/e-cal-client.c:5659
+#: ../src/calendar/libecal/e-cal-client.c:5876
+#: ../src/calendar/libecal/e-cal-client.c:6030
+#: ../src/calendar/libecal/e-cal-client.c:6256
+#: ../src/calendar/libecal/e-cal-client.c:6452
+#: ../src/calendar/libecal/e-cal-client.c:6815
+#: ../src/calendar/libecal/e-cal-client.c:7037
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3041
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3051
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3063
+#: ../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 "Unbekannter Fehler"
 
 #. 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 "Aktualisierte Kontakte werden abgefragt …"
 
 #. 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 "Aktualisierte Gruppen werden abgefragt …"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1748
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1749
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4997
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1504
 msgid "The backend does not support bulk additions"
 msgstr "Das Backend unterstützt keine Massenhinzufügungen"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1905
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1626
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1906
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5133
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1626
 msgid "The backend does not support bulk modifications"
 msgstr "Das Backend unterstützt keine Massenänderungen"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2114
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1726
+#: ../src/addressbook/backends/google/e-book-backend-google.c:2115
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1726
 msgid "The backend does not support bulk removals"
 msgstr "Das Backend unterstützt keine Massenentfernungen"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2236
+#: ../src/addressbook/backends/google/e-book-backend-google.c:2237
 msgid "Loading…"
 msgstr "Ladevorgang …"
 
 #. 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:1654
+#: ../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 "Persönlich"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1655
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1656
 msgid "Friends"
 msgstr "Freunde"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1657
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1658
 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:1660
 msgid "Coworkers"
 msgstr "Mitarbeiter"
 
 #. Translators: An error message shown to a user when trying to do an
 #. * operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:114
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:112
 msgid "Not connected"
 msgstr "Nicht verbunden"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:892
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:890
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "Bindung sowohl mit v3- als auch mit v2-Bindungen gescheitert"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1016
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1014
 msgid "Reconnecting to LDAP server..."
 msgstr "Verbindung mit LDAP-Server wird erneut hergestellt …"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1145
 msgid "Invalid DN syntax"
 msgstr "Ungültige DN-Syntax"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1163
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4246
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1161
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4244
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP-Fehler 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:1773
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2096
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: Von ldap_first_entry wurde NULL zurückgegeben"
 
-#: ../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:2026
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2154
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: Unbehandelter Ergebnistyp %d wurde zurückgegeben"
 
-#: ../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:2287
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2414
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s: Unbehandelter Suchergebnistyp %d wurde zurückgegeben"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4195
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4193
 msgid "Receiving LDAP search results..."
 msgstr "LDAP-Suchergebnisse werden empfangen …"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4379
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4377
 msgid "Error performing search"
 msgstr "Fehler beim Ausführen der Suche"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4512
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4510
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "Kontakte werden heruntergeladen (%d) …"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5082
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5080
 msgid "Adding contact to LDAP server..."
 msgstr "Kontakt wird zu LDAP-Server hinzugefügt …"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5157
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5155
 msgid "Modifying contact from LDAP server..."
 msgstr "Kontakt auf LDAP-Server wird verändert …"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5223
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5221
 msgid "Removing contact from LDAP server..."
 msgstr "Kontakt wird von LDAP-Server entfernt …"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5618
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5616
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "DN für Benutzer »%s« konnte nicht erhalten werden"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
-#: ../calendar/backends/http/e-cal-backend-http.c:513
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:588
+#: ../src/calendar/backends/http/e-cal-backend-http.c:514
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "Fehlerhaft formatierte 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 "Zusammenfassung des Adressbuchs wird geladen …"
 
-#: ../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 ""
 "WebDAV-Anweisung PROPFIND scheiterte mit folgendem 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 ""
 "Kein Response-Textkörper im Ergebnis der WebDAV-Anweisung PROPFIND gefunden"
 
-#: ../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 "Kontakte werden geladen (%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 "SoupURI kann nicht in eine Zeichenkette umgewandelt werden"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1555
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1555
 #, c-format
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "Erzeugen der Ressource »%s« scheiterte mit HTTP-Status %d (%s)"
 
 # Die Formulierung können wir wohl nicht so stehen lassen
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1657
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1657
 msgid "Contact on server changed -> not modifying"
 msgstr "Kontakt wurde auf dem Server geändert > wird nicht geändert"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1665
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1665
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "Ändern des Kontakts scheiterte mit HTTP-Status %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1758
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1774
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1758
+#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1774
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE scheiterte mit 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 "Kein solches Buch"
 
-#: ../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 "Kontakt nicht gefunden"
 
-#: ../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 "Kontaktkennung existiert bereits"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:44
 msgid "No such source"
 msgstr "Keine solche Quelle"
 
-#: ../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 "Kein Platz"
 
 #. 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 "Eindeutige Kennung"
 
@@ -359,12 +361,12 @@ msgstr "Eindeutige Kennung"
 #. * 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 "Einordnen unter"
 
 #. 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 "Buch-UID"
 
@@ -372,435 +374,435 @@ msgstr "Buch-UID"
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook-contacts/e-contact.c:143
+#: ../src/addressbook/libebook-contacts/e-contact.c:141
 msgid "Full Name"
 msgstr "Voller Name"
 
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../src/addressbook/libebook-contacts/e-contact.c:142
 msgid "Given Name"
 msgstr "Vorname"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../src/addressbook/libebook-contacts/e-contact.c:143
 msgid "Family Name"
 msgstr "Familienname"
 
-#: ../addressbook/libebook-contacts/e-contact.c:146
+#: ../src/addressbook/libebook-contacts/e-contact.c:144
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:149
+#: ../src/addressbook/libebook-contacts/e-contact.c:147
 msgid "Email 1"
 msgstr "E-Mail 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../src/addressbook/libebook-contacts/e-contact.c:148
 msgid "Email 2"
 msgstr "E-Mail 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../src/addressbook/libebook-contacts/e-contact.c:149
 msgid "Email 3"
 msgstr "E-Mail 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../src/addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 4"
 msgstr "E-Mail 4"
 
-#: ../addressbook/libebook-contacts/e-contact.c:154
+#: ../src/addressbook/libebook-contacts/e-contact.c:152
 msgid "Mailer"
 msgstr "Mailer"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:157
+#: ../src/addressbook/libebook-contacts/e-contact.c:155
 msgid "Home Address Label"
 msgstr "Privatadresse"
 
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../src/addressbook/libebook-contacts/e-contact.c:156
 msgid "Work Address Label"
 msgstr "Geschäftsadresse"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../src/addressbook/libebook-contacts/e-contact.c:157
 msgid "Other Address Label"
 msgstr "Weitere Adresse"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:162
+#: ../src/addressbook/libebook-contacts/e-contact.c:160
 msgid "Assistant Phone"
 msgstr "Telefon des Assistenten"
 
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../src/addressbook/libebook-contacts/e-contact.c:161
 msgid "Business Phone"
 msgstr "Telefon, geschäftlich"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../src/addressbook/libebook-contacts/e-contact.c:162
 msgid "Business Phone 2"
 msgstr "Telefon 2, geschäftlich"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../src/addressbook/libebook-contacts/e-contact.c:163
 msgid "Business Fax"
 msgstr "Fax, geschäftlich"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../src/addressbook/libebook-contacts/e-contact.c:164
 msgid "Callback Phone"
 msgstr "Rückruf-Telefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../src/addressbook/libebook-contacts/e-contact.c:165
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../src/addressbook/libebook-contacts/e-contact.c:166
 msgid "Company Phone"
 msgstr "Firmentelefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../src/addressbook/libebook-contacts/e-contact.c:167
 msgid "Home Phone"
 msgstr "Telefon, privat"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../src/addressbook/libebook-contacts/e-contact.c:168
 msgid "Home Phone 2"
 msgstr "Telefon 2, privat"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../src/addressbook/libebook-contacts/e-contact.c:169
 msgid "Home Fax"
 msgstr "Fax, privat"
 
-#: ../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 "Weiteres Telefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:175
+#: ../src/addressbook/libebook-contacts/e-contact.c:173
 msgid "Other Fax"
 msgstr "Weiteres Fax"
 
-#: ../addressbook/libebook-contacts/e-contact.c:176
+#: ../src/addressbook/libebook-contacts/e-contact.c:174
 msgid "Pager"
 msgstr "Pager"
 
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../src/addressbook/libebook-contacts/e-contact.c:175
 msgid "Primary Phone"
 msgstr "Telefon, primär"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../src/addressbook/libebook-contacts/e-contact.c:176
 msgid "Radio"
 msgstr "Funk"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../src/addressbook/libebook-contacts/e-contact.c:177
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:181
+#: ../src/addressbook/libebook-contacts/e-contact.c:179
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:184
+#: ../src/addressbook/libebook-contacts/e-contact.c:182
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../addressbook/libebook-contacts/e-contact.c:185
+#: ../src/addressbook/libebook-contacts/e-contact.c:183
 msgid "Organizational Unit"
 msgstr "Organisationseinheit"
 
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../src/addressbook/libebook-contacts/e-contact.c:184
 msgid "Office"
 msgstr "Büro"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../src/addressbook/libebook-contacts/e-contact.c:185
 msgid "Title"
 msgstr "Anrede"
 
-#: ../addressbook/libebook-contacts/e-contact.c:188
+#: ../src/addressbook/libebook-contacts/e-contact.c:186
 msgid "Role"
 msgstr "Position"
 
-#: ../addressbook/libebook-contacts/e-contact.c:189
+#: ../src/addressbook/libebook-contacts/e-contact.c:187
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: ../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 "Homepage-URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../src/addressbook/libebook-contacts/e-contact.c:192
 msgid "Weblog URL"
 msgstr "Weblog-URL"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:197
+#: ../src/addressbook/libebook-contacts/e-contact.c:195
 msgid "Categories"
 msgstr "Kategorien"
 
 #. 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 "Verfügbarkeits-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 "Videokonferenz-URL"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:206
+#: ../src/addressbook/libebook-contacts/e-contact.c:204
 msgid "Spouse's Name"
 msgstr "Ehepartner"
 
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../src/addressbook/libebook-contacts/e-contact.c:205
 msgid "Note"
 msgstr "Notiz"
 
 #. 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 "Angezeigter AIM-Privatname 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../src/addressbook/libebook-contacts/e-contact.c:209
 msgid "AIM Home Screen Name 2"
 msgstr "Angezeigter AIM-Privatname 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../src/addressbook/libebook-contacts/e-contact.c:210
 msgid "AIM Home Screen Name 3"
 msgstr "Angezeigter AIM-Privatname 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../src/addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Work Screen Name 1"
 msgstr "Angezeigter AIM-Geschäftsname 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../src/addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Work Screen Name 2"
 msgstr "Angezeigter AIM-Geschäftsname 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../src/addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Work Screen Name 3"
 msgstr "Angezeigter AIM-Geschäftsname 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../src/addressbook/libebook-contacts/e-contact.c:214
 msgid "GroupWise Home Screen Name 1"
 msgstr "Angezeigter GroupWise-Privatname 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../src/addressbook/libebook-contacts/e-contact.c:215
 msgid "GroupWise Home Screen Name 2"
 msgstr "Angezeigter GroupWise-Privatname 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../src/addressbook/libebook-contacts/e-contact.c:216
 msgid "GroupWise Home Screen Name 3"
 msgstr "Angezeigter GroupWise-Privatname 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../src/addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Work Screen Name 1"
 msgstr "Angezeigter GroupWise-Geschäftsname 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../src/addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Work Screen Name 2"
 msgstr "Angezeigter GroupWise-Geschäftsname 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../src/addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Work Screen Name 3"
 msgstr "Angezeigter GroupWise-Geschäftsname 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../src/addressbook/libebook-contacts/e-contact.c:220
 msgid "Jabber Home ID 1"
 msgstr "Jabber-Privatkennung 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../src/addressbook/libebook-contacts/e-contact.c:221
 msgid "Jabber Home ID 2"
 msgstr "Jabber-Privatkennung 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../src/addressbook/libebook-contacts/e-contact.c:222
 msgid "Jabber Home ID 3"
 msgstr "Jabber-Privatkennung 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../src/addressbook/libebook-contacts/e-contact.c:223
 msgid "Jabber Work ID 1"
 msgstr "Jabber-Geschäftskennung 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../src/addressbook/libebook-contacts/e-contact.c:224
 msgid "Jabber Work ID 2"
 msgstr "Jabber-Geschäftskennung 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../src/addressbook/libebook-contacts/e-contact.c:225
 msgid "Jabber Work ID 3"
 msgstr "Jabber-Geschäftskennung 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../src/addressbook/libebook-contacts/e-contact.c:226
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Angezeigter Yahoo!-Privatname 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../src/addressbook/libebook-contacts/e-contact.c:227
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Angezeigter Yahoo!-Privatname 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../src/addressbook/libebook-contacts/e-contact.c:228
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Angezeigter Yahoo!-Privatname 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../src/addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Angezeigter Yahoo!-Geschäftsname 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../src/addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Angezeigter Yahoo!-Geschäftsname 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../src/addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Angezeigter Yahoo!-Geschäftsname 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../src/addressbook/libebook-contacts/e-contact.c:232
 msgid "MSN Home Screen Name 1"
 msgstr "Angezeigter MSN-Privatname 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../src/addressbook/libebook-contacts/e-contact.c:233
 msgid "MSN Home Screen Name 2"
 msgstr "Angezeigter MSN-Privatname 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../src/addressbook/libebook-contacts/e-contact.c:234
 msgid "MSN Home Screen Name 3"
 msgstr "Angezeigter MSN-Privatname 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../src/addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Work Screen Name 1"
 msgstr "Angezeigter MSN-Geschäftsname 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../src/addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Work Screen Name 2"
 msgstr "Angezeigter MSN-Geschäftsname 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:239
+#: ../src/addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Work Screen Name 3"
 msgstr "Angezeigter MSN-Geschäftsname 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:240
+#: ../src/addressbook/libebook-contacts/e-contact.c:238
 msgid "ICQ Home ID 1"
 msgstr "ICQ-Privatkennung 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../src/addressbook/libebook-contacts/e-contact.c:239
 msgid "ICQ Home ID 2"
 msgstr "ICQ-Privatkennung 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:242
+#: ../src/addressbook/libebook-contacts/e-contact.c:240
 msgid "ICQ Home ID 3"
 msgstr "ICQ-Privatkennung 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:243
+#: ../src/addressbook/libebook-contacts/e-contact.c:241
 msgid "ICQ Work ID 1"
 msgstr "ICQ-Geschäftskennung 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:244
+#: ../src/addressbook/libebook-contacts/e-contact.c:242
 msgid "ICQ Work ID 2"
 msgstr "ICQ-Geschäftskennung 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../src/addressbook/libebook-contacts/e-contact.c:243
 msgid "ICQ Work ID 3"
 msgstr "ICQ-Geschäftskennung 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:248
+#: ../src/addressbook/libebook-contacts/e-contact.c:246
 msgid "Last Revision"
 msgstr "Letzte Überarbeitung"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * virtual field, which returns either name of the contact or the organization
 #. * name, recognized by multiple other fields, where the first filled is used.
-#: ../addressbook/libebook-contacts/e-contact.c:252
+#: ../src/addressbook/libebook-contacts/e-contact.c:250
 msgid "Name or Org"
 msgstr "Name oder Org."
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:255
+#: ../src/addressbook/libebook-contacts/e-contact.c:253
 msgid "Address List"
 msgstr "Adressliste"
 
-#: ../addressbook/libebook-contacts/e-contact.c:256
+#: ../src/addressbook/libebook-contacts/e-contact.c:254
 msgid "Home Address"
 msgstr "Privatadresse"
 
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../src/addressbook/libebook-contacts/e-contact.c:255
 msgid "Work Address"
 msgstr "Geschäftsadresse"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../src/addressbook/libebook-contacts/e-contact.c:256
 msgid "Other Address"
 msgstr "Weitere Adresse"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:261
+#: ../src/addressbook/libebook-contacts/e-contact.c:259
 msgid "Category List"
 msgstr "Kategorieliste"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:264
+#: ../src/addressbook/libebook-contacts/e-contact.c:262
 msgid "Photo"
 msgstr "Foto"
 
-#: ../addressbook/libebook-contacts/e-contact.c:265
+#: ../src/addressbook/libebook-contacts/e-contact.c:263
 msgid "Logo"
 msgstr "Logo"
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook-contacts/e-contact.c:269
-#: ../libedataserverui/e-webdav-discover-widget.c:153
+#: ../src/addressbook/libebook-contacts/e-contact.c:267
+#: ../src/libedataserverui/e-webdav-discover-widget.c:151
 msgid "Name"
 msgstr "Name"
 
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../src/addressbook/libebook-contacts/e-contact.c:268
 msgid "Email List"
 msgstr "E-Mail-Liste"
 
 #. 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 angezeigter AIM-Namen"
 
-#: ../addressbook/libebook-contacts/e-contact.c:274
+#: ../src/addressbook/libebook-contacts/e-contact.c:272
 msgid "GroupWise ID List"
 msgstr "GroupWise-Kennungsliste"
 
-#: ../addressbook/libebook-contacts/e-contact.c:275
+#: ../src/addressbook/libebook-contacts/e-contact.c:273
 msgid "Jabber ID List"
 msgstr "Jabber-Kennungsliste"
 
-#: ../addressbook/libebook-contacts/e-contact.c:276
+#: ../src/addressbook/libebook-contacts/e-contact.c:274
 msgid "Yahoo! Screen Name List"
 msgstr "Liste angezeigter Yahoo!-Namen"
 
-#: ../addressbook/libebook-contacts/e-contact.c:277
+#: ../src/addressbook/libebook-contacts/e-contact.c:275
 msgid "MSN Screen Name List"
 msgstr "Liste angezeigter MSN-Namen"
 
-#: ../addressbook/libebook-contacts/e-contact.c:278
+#: ../src/addressbook/libebook-contacts/e-contact.c:276
 msgid "ICQ ID List"
 msgstr "ICQ-Kennungsliste"
 
-#: ../addressbook/libebook-contacts/e-contact.c:280
+#: ../src/addressbook/libebook-contacts/e-contact.c:278
 msgid "Wants HTML Mail"
 msgstr "Wünscht HTML-E-Mails"
 
 #. 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"
 
@@ -808,214 +810,215 @@ 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 "Listenanzeige der Adressen"
 
-#: ../addressbook/libebook-contacts/e-contact.c:292
+#: ../src/addressbook/libebook-contacts/e-contact.c:290
 msgid "Birth Date"
 msgstr "Geburtsdatum"
 
-#: ../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 "Jahrestag"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:296
+#: ../src/addressbook/libebook-contacts/e-contact.c:294
 msgid "X.509 Certificate"
 msgstr "X.509-Zertifikat"
 
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../src/addressbook/libebook-contacts/e-contact.c:295
 msgid "PGP Certificate"
 msgstr "PGP-Zertifikat"
 
-#: ../addressbook/libebook-contacts/e-contact.c:299
+#: ../src/addressbook/libebook-contacts/e-contact.c:297
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu-Privatkennung 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../src/addressbook/libebook-contacts/e-contact.c:298
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu-Privatkennung 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:301
+#: ../src/addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu-Privatkennung 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../src/addressbook/libebook-contacts/e-contact.c:300
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu-Geschäftskennung 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:303
+#: ../src/addressbook/libebook-contacts/e-contact.c:301
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu-Geschäftskennung 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../src/addressbook/libebook-contacts/e-contact.c:302
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu-Geschäftskennung 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../src/addressbook/libebook-contacts/e-contact.c:303
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu-Kennungsliste"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:308
+#: ../src/addressbook/libebook-contacts/e-contact.c:306
 msgid "Geographic Information"
 msgstr "Geografische Information"
 
-#: ../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 "Angezeigter Skype-Privatname 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:313
+#: ../src/addressbook/libebook-contacts/e-contact.c:311
 msgid "Skype Home Name 2"
 msgstr "Angezeigter Skype-Privatname 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../src/addressbook/libebook-contacts/e-contact.c:312
 msgid "Skype Home Name 3"
 msgstr "Angezeigter Skype-Privatname 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../src/addressbook/libebook-contacts/e-contact.c:313
 msgid "Skype Work Name 1"
 msgstr "Angezeigter Skype-Geschäftsname 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../src/addressbook/libebook-contacts/e-contact.c:314
 msgid "Skype Work Name 2"
 msgstr "Angezeigter Skype-Geschäftsname 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../src/addressbook/libebook-contacts/e-contact.c:315
 msgid "Skype Work Name 3"
 msgstr "Angezeigter Skype-Geschäftsname 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:318
+#: ../src/addressbook/libebook-contacts/e-contact.c:316
 msgid "Skype Name List"
 msgstr "Liste angezeigter Skype-Namen"
 
-#: ../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 "Googletalk-Privatname 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:323
+#: ../src/addressbook/libebook-contacts/e-contact.c:321
 msgid "Google Talk Home Name 2"
 msgstr "Googletalk-Privatname 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:324
+#: ../src/addressbook/libebook-contacts/e-contact.c:322
 msgid "Google Talk Home Name 3"
 msgstr "Googletalk-Privatname 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:325
+#: ../src/addressbook/libebook-contacts/e-contact.c:323
 msgid "Google Talk Work Name 1"
 msgstr "Googletalk-Geschäftsname 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:326
+#: ../src/addressbook/libebook-contacts/e-contact.c:324
 msgid "Google Talk Work Name 2"
 msgstr "Googletalk-Geschäftsname 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:327
+#: ../src/addressbook/libebook-contacts/e-contact.c:325
 msgid "Google Talk Work Name 3"
 msgstr "Googletalk-Geschäftsname 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:328
+#: ../src/addressbook/libebook-contacts/e-contact.c:326
 msgid "Google Talk Name List"
 msgstr "Liste angezeigter Googletalk-Namen"
 
-#: ../addressbook/libebook-contacts/e-contact.c:330
+#: ../src/addressbook/libebook-contacts/e-contact.c:328
 msgid "Twitter Name List"
 msgstr "Twitter-Namensliste"
 
-#: ../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 "Namenlose Liste"
 
-#: ../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 "Die Bibliothek wurde ohne Unterstützung für Telefonnummern erstellt."
 
-#: ../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 ""
 "Der Analysator der Telefonnummer meldete einen noch unbekannten Fehlercode."
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:45
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:43
 msgid "Not a phone number"
 msgstr "Keine Telefonnummer"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:47
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:45
 msgid "Invalid country calling code"
 msgstr "Ungültige Landesvorwahl"
 
-#: ../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 "Zahlenreihe nach der Landesvorwahl ist zu kurz für eine Telefonnummer"
 
 # »Text« wäre hier irreführend
-#: ../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 "Zahlenreihe ist zu kurz für eine 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 "Zahlenreihe ist zu kurz für eine Telefonnummer"
 
-#: ../addressbook/libebook/e-book-client.c:931
+#: ../src/addressbook/libebook/e-book-client.c:929
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "Unbekannte Bucheigenschaft »%s«"
 
-#: ../addressbook/libebook/e-book-client.c:946
+#: ../src/addressbook/libebook/e-book-client.c:944
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "Wert der Bucheigenschaft »%s« kann nicht geändert werden"
 
-#: ../addressbook/libebook/e-book-client.c:1390
-#: ../addressbook/libebook/e-book-client.c:1621
-#: ../addressbook/libebook/e-book-client.c:1898
-#: ../calendar/libecal/e-cal-client.c:1717
-#: ../calendar/libecal/e-cal-client.c:1955
+#: ../src/addressbook/libebook/e-book-client.c:1388
+#: ../src/addressbook/libebook/e-book-client.c:1619
+#: ../src/addressbook/libebook/e-book-client.c:1896
+#: ../src/calendar/libecal/e-cal-client.c:1715
+#: ../src/calendar/libecal/e-cal-client.c:1953
 #, c-format
 msgid "Unable to connect to '%s': "
 msgstr "Verbindung mit »%s« ist gescheitert:"
 
-#: ../addressbook/libebook/e-book-client-view.c:870
-#: ../calendar/libecal/e-cal-client-view.c:681
+#: ../src/addressbook/libebook/e-book-client-view.c:868
+#: ../src/calendar/libecal/e-cal-client-view.c:679
 #, c-format
 msgid "Client disappeared"
 msgstr "Client ist verschwunden"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
-#: ../addressbook/libedata-book/e-book-sqlite.c:2254
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:905
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:2254
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
 msgstr "Fehler beim Inspizieren des unbekannten Zusammenfassungsfeldes »%s«"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
-#: ../addressbook/libedata-book/e-book-sqlite.c:1393
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1393
 msgid "Error parsing regular expression"
 msgstr "Fehler beim Auswerten des regulären Ausdrucks"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
-#: ../addressbook/libedata-book/e-book-sqlite.c:1877 ../camel/camel-db.c:751
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1877
+#: ../src/camel/camel-db.c:801
 #, c-format
 msgid "Insufficient memory"
 msgstr "Nicht ausreichender Speicher"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
 #, c-format
 msgid "Invalid contact field '%d' specified in summary"
 msgstr "Ungültiges Kontaktfeld »%d« in der Zusammenfassung "
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
-#: ../addressbook/libedata-book/e-book-sqlite.c:604
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:604
 #, c-format
 msgid ""
 "Contact field '%s' of type '%s' specified in summary, but only boolean, "
@@ -1024,8 +1027,8 @@ msgstr ""
 "Kontaktfeld »%s« vom Typ »%s« in der Zusammenfassung angegeben, aber nur "
 "boolesch, Feldtypen Zeichenkette und Zeichenkettenlisten werden unterstützt"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4176
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4176
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
@@ -1033,19 +1036,19 @@ msgstr ""
 "Volle search_contacts werden nicht zwischengespeichert. vcards können nicht "
 "zurückgegeben werden."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4307
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4400
-#: ../addressbook/libedata-book/e-book-sqlite.c:5817
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4307
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4400
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5817
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "Abfrage enthielt nicht unterstützte Elemente"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4311
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4311
 #, c-format
 msgid "Invalid Query"
 msgstr "Ungültige Abfrage"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4335
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4335
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
@@ -1054,16 +1057,17 @@ msgstr ""
 "Volle search_contacts werden nicht zwischengespeichert. Daher wird nur die "
 "Abfrage der Zusammenfassung unterstützt."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4404
-#: ../addressbook/libedata-book/e-data-book.c:396
-#: ../addressbook/libedata-book/e-data-book.c:1146
-#: ../calendar/libedata-cal/e-data-cal.c:428
-#: ../calendar/libedata-cal/e-data-cal.c:1427 ../libedataserver/e-client.c:177
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4404
+#: ../src/addressbook/libedata-book/e-data-book.c:394
+#: ../src/addressbook/libedata-book/e-data-book.c:1144
+#: ../src/calendar/libedata-cal/e-data-cal.c:429
+#: ../src/calendar/libedata-cal/e-data-cal.c:1436
+#: ../src/libedataserver/e-client.c:175
 #, c-format
 msgid "Invalid query"
 msgstr "Ungültige Abfrage"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4447
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4447
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
@@ -1071,40 +1075,40 @@ msgstr ""
 "Volle vcards werden nicht zwischengespeichert. Daher wird nur die Abfrage "
 "der Zusammenfassung unterstützt."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5270
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:5270
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "Datenbankdatei konnte nicht entfernt werden: Fehlernummer %d"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6457
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6457
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr "Es werden von EbSdbCursor nur zusammengefasste Anfragen unterstützt"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6064
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6064
 #, c-format
 msgid "At least one sort field must be specified to use an EbSdbCursor"
 msgstr ""
 "Es muss zumindest ein Sortierfeld bei der Verwendung von EbSdbCursor "
 "angegeben werden"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
 #, c-format
 msgid "Cannot sort by a field that is not in the summary"
 msgstr ""
 "Es kann nicht nach einem Feld sortiert werden, das nicht in der "
 "Zusammenfassung steht"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6085
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6085
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr ""
 "Es kann nicht nach einem Feld sortiert werden, das mehrfache Werte enthalten "
 "kann"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6218
-#: ../addressbook/libedata-book/e-book-sqlite.c:8116
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6218
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8116
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
@@ -1113,8 +1117,8 @@ msgstr ""
 "Versuch eines Rückwärtsschritts eines Zeiger, aber der Zeiger ist bereits am "
 "Anfang der Kontaktliste"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6226
-#: ../addressbook/libedata-book/e-book-sqlite.c:8124
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6226
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8124
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
@@ -1123,12 +1127,12 @@ msgstr ""
 "Versuch eines Vorwärtsschritts eines Zeiger, aber der Zeiger ist bereits am "
 "Ende der Kontaktliste"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:570
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:570
 #, c-format
 msgid "Unsupported contact field '%d' specified in summary"
 msgstr "Nicht unterstütztes Kontaktfeld »%d« in der Zusammenfassung angegeben"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:1950
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1950
 msgid ""
 "Cannot upgrade contacts database from a legacy database with more than one "
 "addressbook. Delete one of the entries in the 'folders' table first."
@@ -1137,251 +1141,264 @@ msgstr ""
 "einem Adressbuch aufgerüstet werden. Löschen Sie zuerst einen Eintrag in der "
 "Tabelle »Ordner«."
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5810
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5810
 #, c-format
 msgid "Invalid query: %s"
 msgstr "Ungültige Abfrage: %s"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5985
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5985
 msgid "Invalid query for EbSqlCursor"
 msgstr "Ungültige Abfrage nach EbSqlCursor"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7938
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7938
 msgid "At least one sort field must be specified to use an EbSqlCursor"
 msgstr ""
 "Es muss zumindest ein Sortierfeld bei der Verwendung von EbSqlCursor "
 "angegeben werden"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7956
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7956
 msgid "Cannot sort by a field that is not a string type"
 msgstr ""
 "Es kann nicht nach einem Feld sortiert werden, das nicht vom Typ "
 "Zeichenkette ist"
 
-#: ../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 "Erfolg"
 
-#: ../addressbook/libedata-book/e-data-book.c:381
-#: ../calendar/libecal/e-cal.c:2304 ../calendar/libedata-cal/e-data-cal.c:410
-#: ../libedataserver/e-client.c:144
+#: ../src/addressbook/libedata-book/e-data-book.c:379
+#: ../src/calendar/libecal/e-cal.c:2302
+#: ../src/calendar/libedata-cal/e-data-cal.c:411
+#: ../src/libedataserver/e-client.c:142
 msgid "Backend is busy"
 msgstr "Backend belegt"
 
-#: ../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 "Datenbestand ist offline"
 
-#: ../addressbook/libedata-book/e-data-book.c:383
-#: ../calendar/libecal/e-cal.c:2318 ../calendar/libedata-cal/e-data-cal.c:412
-#: ../libedataserver/e-client.c:161
+#: ../src/addressbook/libedata-book/e-data-book.c:381
+#: ../src/calendar/libecal/e-cal.c:2316
+#: ../src/calendar/libedata-cal/e-data-cal.c:413
+#: ../src/libedataserver/e-client.c:159
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: ../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 "Legitimierung gescheitert"
 
-#: ../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 "Legitimierung erforderlich"
 
-#: ../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 "Nicht unterstütztes Feld"
 
-#: ../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 "Nicht unterstützte Legitimierungsmethode"
 
-#: ../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 nicht verfügbar"
 
-#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../src/addressbook/libedata-book/e-data-book.c:389
 msgid "Address book does not exist"
 msgstr "Adressbuch ist nicht vorhanden"
 
-#: ../addressbook/libedata-book/e-data-book.c:392
+#: ../src/addressbook/libedata-book/e-data-book.c:390
 msgid "Book removed"
 msgstr "Buch wurde entfernt"
 
-#: ../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 "Im Offline-Modus nicht verfügbar"
 
-#: ../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 "Suchgröße überschritten"
 
-#: ../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 "Suchzeit überschritten"
 
-#: ../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 "Abfrage verweigert"
 
-#: ../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 "Abbrechen gescheitert"
 
 #. { 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 "Ungültige Server-Version"
 
-#: ../addressbook/libedata-book/e-data-book.c:402
-#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:433
-#: ../libedataserver/e-client.c:142
+#: ../src/addressbook/libedata-book/e-data-book.c:400
+#: ../src/calendar/libecal/e-cal.c:2300
+#: ../src/calendar/libedata-cal/e-data-cal.c:434
+#: ../src/libedataserver/e-client.c:140
 msgid "Invalid argument"
 msgstr "Argument ungültig"
 
 #. 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 "Nicht unterstützt"
 
-#: ../addressbook/libedata-book/e-data-book.c:405
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:185
+#: ../src/addressbook/libedata-book/e-data-book.c:403
+#: ../src/calendar/libedata-cal/e-data-cal.c:437
+#: ../src/libedataserver/e-client.c:183
 msgid "Backend is not opened yet"
 msgstr "Backend wurde noch nicht geöffnet"
 
 # CHECK
-#: ../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 "Objekt ist nicht abgeglichen"
 
-#: ../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 "Anderer Fehler"
 
-#: ../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 "Ungültige Abfrage:"
 
 #. 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 "Buch kann nicht geöffnet werden:"
 
 #. 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 "Adressbuch kann nicht aufgefrischt werden:"
 
 #. 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 "Der Kontakt kann nicht eingelesen werden:"
 
 #. 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 "Kontaktliste kann nicht abgerufen werden:"
 
 #. 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 "Kontaktlisten-UIDs kann nicht abgerufen werden:"
 
 #. 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 "Kontakt kann nicht hinzugefügt werden:"
 
 #. 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 "Kontakte können nicht bearbeitet werden:"
 
 #. 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 "Kontakte können nicht entfernt werden:"
 
-#: ../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 "Zeiger unterstützt nicht das Festlegen des Suchausdrucks"
 
-#: ../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 "Zeiger unterstützt keinen Schritt"
 
-#: ../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 "Zeiger unterstützt keine alphabetischen Indizes"
 
-#: ../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 "Unbekannter Zeigerursprung"
 
-#: ../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 "Nicht abgeglichene Revision beim Bewegen des Zeigers"
 
-#: ../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 "Der alphabetische Index wurde auf eine falsche Sprachumgebung gesetzt"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:678
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:705
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Server ist nicht erreichbar (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:704
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:731
 #, c-format
 msgid "Failed to login to the server: %s"
 msgstr "Anmeldung am Server fehlgeschlagen: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:726
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:753
 #, c-format
 msgid "Failed to connect to a server using SSL/TLS: %s"
 msgstr "SSL/TLS-Verbindung zu einem Server konnte nicht hergestellt werden: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:742
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:769
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
 msgstr ""
 "Ein unerwarteter HTTP-Statuscode %1d wurde für die Adresse: »%3s« "
 "zurückgegeben (%2s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:763
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:790
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV-Backend wurde noch nicht geladen"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1205
-#: ../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 "Ungültige Umleitungsadresse"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2919
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:2946
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Lokaler Ordner »%s« zum Zwischenspeichern kann nicht angelegt werden"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3005
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:3032
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1391,455 +1408,462 @@ msgstr ""
 "Modus geöffnet.\n"
 "Fehlermeldung: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4110
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4137
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV unterstützt keine Massenhinzufügungen"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4213
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4240
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV unterstützt keine Massenänderungen"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4494
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4521
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV unterstützt keine Massenentfernungen"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5241
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5268
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Kalender unterstützt keine Verfügbarkeitsinformationen"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5250
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5277
 msgid "Schedule outbox url not found"
 msgstr "Adresse des Terminplanausgangs nicht gefunden"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5347
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5374
 msgid "Unexpected result in schedule-response"
 msgstr "Unerwartetes Ergebnis in schedule-response"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:950
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:948
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: ../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 "Geburtstag: %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 "Jahrestag: %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 ""
 "Kalenderdaten konnten nicht gespeichert werden: Adresse ist fehlerhaft "
 "formatiert."
 
-#: ../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 "Kalenderdaten konnten nicht gespeichert werden"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:582
+#: ../src/calendar/backends/http/e-cal-backend-http.c:583
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Auf ungültige URI weitergeleitet"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:641
+#: ../src/calendar/backends/http/e-cal-backend-http.c:642
 #, c-format
 msgid "Bad file format."
 msgstr "Dateiformat fehlerhaft."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:651
+#: ../src/calendar/backends/http/e-cal-backend-http.c:652
 #, c-format
 msgid "Not a calendar."
 msgstr "Kein Kalender."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:955
-#: ../calendar/backends/weather/e-cal-backend-weather.c:709
+#: ../src/calendar/backends/http/e-cal-backend-http.c:956
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:710
 msgid "Could not create cache file"
 msgstr "Datei zum Zwischenspeichern konnte nicht angelegt werden"
 
-#: ../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 "Wetterdaten konnten nicht abgerufen werden"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:378
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:379
 msgid "Weather: Fog"
 msgstr "Wetter: Nebel"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:379
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:380
 msgid "Weather: Cloudy Night"
 msgstr "Wetter: Wolkige Nacht"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:380
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:381
 msgid "Weather: Cloudy"
 msgstr "Wetter: Wolkig"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:381
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:382
 msgid "Weather: Overcast"
 msgstr "Wetter: Bedeckt"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:382
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:383
 msgid "Weather: Showers"
 msgstr "Wetter: Schauer"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:383
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:384
 msgid "Weather: Snow"
 msgstr "Wetter: Schnee"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:384
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:385
 msgid "Weather: Clear Night"
 msgstr "Wetter: Klare Nacht"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:385
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:386
 msgid "Weather: Sunny"
 msgstr "Wetter: Sonnig"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:386
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:387
 msgid "Weather: Thunderstorms"
 msgstr "Wetter: Gewitter"
 
 #. 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 "Vorhersage"
 
-#: ../calendar/libecal/e-cal.c:2306
+#: ../src/calendar/libecal/e-cal.c:2304
 msgid "Repository is offline"
 msgstr "Repository offline"
 
 # CHECK
-#: ../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 "Kein derartiger 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 "Objekt nicht gefunden"
 
-#: ../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 "Objekt ungültig"
 
-#: ../calendar/libecal/e-cal.c:2314
+#: ../src/calendar/libecal/e-cal.c:2312
 msgid "URI not loaded"
 msgstr "URI nicht geladen"
 
-#: ../calendar/libecal/e-cal.c:2316
+#: ../src/calendar/libecal/e-cal.c:2314
 msgid "URI already loaded"
 msgstr "URI bereits geladen"
 
-#: ../calendar/libecal/e-cal.c:2320
+#: ../src/calendar/libecal/e-cal.c:2318
 msgid "Unknown User"
 msgstr "Unbekannter Benutzer"
 
-#: ../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 "Objektkennung existiert bereits"
 
-#: ../calendar/libecal/e-cal.c:2324
+#: ../src/calendar/libecal/e-cal.c:2322
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstützt"
 
-#: ../calendar/libecal/e-cal.c:2326
+#: ../src/calendar/libecal/e-cal.c:2324
 msgid "Operation has been cancelled"
 msgstr "Vorgang wurde abgebrochen"
 
-#: ../calendar/libecal/e-cal.c:2328
+#: ../src/calendar/libecal/e-cal.c:2326
 msgid "Could not cancel operation"
 msgstr "Aktion konnte nicht abgebrochen werden"
 
-#: ../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 "Legitimierung gescheitert"
 
-#: ../calendar/libecal/e-cal.c:2332
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#: ../libedataserver/e-client.c:152
+#: ../src/calendar/libecal/e-cal.c:2330
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1126
+#: ../src/libedataserver/e-client.c:150
 msgid "Authentication required"
 msgstr "Legitimierung erforderlich"
 
-#: ../calendar/libecal/e-cal.c:2334
+#: ../src/calendar/libecal/e-cal.c:2332
 msgid "A D-Bus exception has occurred"
 msgstr "Es ist eine D-Bus-Ausnahme aufgetreten"
 
-#: ../calendar/libecal/e-cal.c:2338
+#: ../src/calendar/libecal/e-cal.c:2336
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: ../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 "Unbekannter Benutzer"
 
-#: ../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 "Ungültiger Bereich"
 
-#: ../calendar/libecal/e-cal-client.c:1065
+#: ../src/calendar/libecal/e-cal-client.c:1063
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "Unbekannte Kalendereigenschaft »%s«"
 
-#: ../calendar/libecal/e-cal-client.c:1080
+#: ../src/calendar/libecal/e-cal-client.c:1078
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "Wert der Kalendereigenschaft »%s« kann nicht geändert werden"
 
-#: ../calendar/libecal/e-cal-component.c:1357
+#: ../src/calendar/libecal/e-cal-component.c:1358
 msgid "Untitled appointment"
 msgstr "Namenloser Termin"
 
-#: ../calendar/libecal/e-cal-recur.c:4744
+#: ../src/calendar/libecal/e-cal-recur.c:4742
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:4745
+#: ../src/calendar/libecal/e-cal-recur.c:4743
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:4746
+#: ../src/calendar/libecal/e-cal-recur.c:4744
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:4747
+#: ../src/calendar/libecal/e-cal-recur.c:4745
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:4748
+#: ../src/calendar/libecal/e-cal-recur.c:4746
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:4749
+#: ../src/calendar/libecal/e-cal-recur.c:4747
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:4750
+#: ../src/calendar/libecal/e-cal-recur.c:4748
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:4751
+#: ../src/calendar/libecal/e-cal-recur.c:4749
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:4752
+#: ../src/calendar/libecal/e-cal-recur.c:4750
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:4753
+#: ../src/calendar/libecal/e-cal-recur.c:4751
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:4754
+#: ../src/calendar/libecal/e-cal-recur.c:4752
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:4755
+#: ../src/calendar/libecal/e-cal-recur.c:4753
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:4756
+#: ../src/calendar/libecal/e-cal-recur.c:4754
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:4757
+#: ../src/calendar/libecal/e-cal-recur.c:4755
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:4758
+#: ../src/calendar/libecal/e-cal-recur.c:4756
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:4759
+#: ../src/calendar/libecal/e-cal-recur.c:4757
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:4760
+#: ../src/calendar/libecal/e-cal-recur.c:4758
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:4761
+#: ../src/calendar/libecal/e-cal-recur.c:4759
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:4762
+#: ../src/calendar/libecal/e-cal-recur.c:4760
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4763
+#: ../src/calendar/libecal/e-cal-recur.c:4761
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4764
+#: ../src/calendar/libecal/e-cal-recur.c:4762
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4765
+#: ../src/calendar/libecal/e-cal-recur.c:4763
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4766
+#: ../src/calendar/libecal/e-cal-recur.c:4764
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4767
+#: ../src/calendar/libecal/e-cal-recur.c:4765
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4768
+#: ../src/calendar/libecal/e-cal-recur.c:4766
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4769
+#: ../src/calendar/libecal/e-cal-recur.c:4767
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4770
+#: ../src/calendar/libecal/e-cal-recur.c:4768
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4771
+#: ../src/calendar/libecal/e-cal-recur.c:4769
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4772
+#: ../src/calendar/libecal/e-cal-recur.c:4770
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4773
+#: ../src/calendar/libecal/e-cal-recur.c:4771
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4774
+#: ../src/calendar/libecal/e-cal-recur.c:4772
 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 "Hoch"
 
-#: ../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 "Niedrig"
 
 #. 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 "Nicht festgelegt"
 
-#: ../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"
 msgstr "»%s« erwartet ein 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"
 msgstr "»%s« erwartet als erstes Argument eine Zeichenkette"
 
-#: ../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"
 msgstr "»%s« erwartet zwei oder drei Argumente"
 
-#: ../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"
 msgstr "»%s« erwartet als erstes Argument einen time_t-Wert"
 
-#: ../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"
 msgstr "»%s« erwartet als zweites Argument einen time_t-Wert"
 
-#: ../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"
 msgstr "»%s« erwartet als drittes Argument eine Zeichenkette"
 
-#: ../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"
 msgstr "»%s« erwartet keines oder zwei Argumente"
 
-#: ../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"
 msgstr "»%s« erwartet zwei Argumente"
 
-#: ../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"
 msgstr "»%s« erwartet keine Argumente"
 
-#: ../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"
 msgstr "»%s« erwartet als zweites Argument eine Zeichenkette"
 
-#: ../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 "
@@ -1849,12 +1873,12 @@ msgstr ""
 "»%s« erwartet als erstes Argument entweder »any«, »summary«, »description«, "
 "»location«, »attendee«, »organizer« oder »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"
 msgstr "»%s« erwartet mindestens ein 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 "
@@ -1863,278 +1887,286 @@ msgstr ""
 "»%s« erwartet als Argumente Zeichenketten, oder aber ein einziges Argument "
 "mit dem Wahrheitswert »falsch« (#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"
 msgstr ""
 "»%s« erwartet als erstes Argument eine Datum-/Zeit-Zeichenkette nach ISO 8601"
 
-#: ../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"
 msgstr "»%s« erwartet als zweites Argument eine Ganzzahl"
 
-#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../src/calendar/libedata-cal/e-data-cal.c:421
 msgid "Unsupported method"
 msgstr "Nicht unterstützte Methode"
 
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../src/calendar/libedata-cal/e-data-cal.c:424
 msgid "Calendar does not exist"
 msgstr "Kalender existiert nicht"
 
 #. 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 "Kalender kann nicht geöffnet werden:"
 
 #. 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 "Kalender kann nicht aufgefrischt werden:"
 
 #. 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 "Objektpfad des Kalenders kann nicht abgerufen werden:"
 
 #. 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 "Liste der Kalenderobjekte kann nicht abgerufen werden:"
 
 #. 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 "Verfügbarkeitsliste des Kalenders kann nicht abgerufen werden:"
 
 #. 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 "Kalenderobjekt kann nicht angelegt werden:"
 
 #. 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 "Kalenderobjekt kann nicht verändert werden:"
 
 #. 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 "Kalenderobjekt kann nicht entfernt werden:"
 
 #. 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 "Kalenderobjekte können nicht empfangen werden:"
 
 #. 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 "Kalenderobjekte können nicht gesendet werden:"
 
 #. 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 "Liste der Anhänge kann nicht abgerufen werden:"
 
 #. 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 "Erinnerung kann nicht verworfen werden:"
 
 #. 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 "Zeitzone des Kalenders konnte nicht abgefragt werden:"
 
 #. 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 "Zeitzone des Kalenders konnte nicht hinzugefügt werden:"
 
-#: ../camel/camel-cipher-context.c:204
+#: ../src/camel/camel-cipher-context.c:202
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Signieren wird von dieser Verschlüsselung nicht unterstützt"
 
-#: ../camel/camel-cipher-context.c:217
+#: ../src/camel/camel-cipher-context.c:215
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Prüfen wird von dieser Verschlüsselung nicht unterstützt"
 
-#: ../camel/camel-cipher-context.c:233
+#: ../src/camel/camel-cipher-context.c:231
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Verschlüsseln wird von dieser Verschlüsselung nicht unterstützt"
 
-#: ../camel/camel-cipher-context.c:247
+#: ../src/camel/camel-cipher-context.c:245
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Entziffern wird von dieser Verschlüsselung nicht unterstützt"
 
-#: ../camel/camel-cipher-context.c:363
+#: ../src/camel/camel-cipher-context.c:361
 msgid "Signing message"
 msgstr "Nachricht wird signiert"
 
-#: ../camel/camel-cipher-context.c:653
+#: ../src/camel/camel-cipher-context.c:651
 msgid "Encrypting message"
 msgstr "Nachricht wird verschlüsselt"
 
-#: ../camel/camel-cipher-context.c:825
+#: ../src/camel/camel-cipher-context.c:823
 msgid "Decrypting message"
 msgstr "Nachricht wird entschlüsselt"
 
-#: ../camel/camel-data-cache.c:179
+#: ../src/camel/camel-data-cache.c:177
 #, c-format
 msgid "Unable to create cache path"
 msgstr "Cache-Pfad konnte nicht angelegt werden"
 
-#: ../camel/camel-data-cache.c:457
+#: ../src/camel/camel-data-cache.c:455
 msgid "Empty cache file"
 msgstr "Zwischenspeicherdatei ist leer"
 
-#: ../camel/camel-data-cache.c:534
+#: ../src/camel/camel-data-cache.c:532
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Cache-Eintrag konnte nicht entfernt werden: %s: %s"
 
-#: ../camel/camel-db.c:810 ../camel/providers/local/camel-mbox-store.c:906
+#: ../src/camel/camel-db.c:854
+#: ../src/camel/providers/local/camel-mbox-store.c:904
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "%s konnte nicht in %s umbenannt werden: %s"
 
-#: ../camel/camel-filter-driver.c:935 ../camel/camel-filter-search.c:773
+#: ../src/camel/camel-filter-driver.c:990
+#: ../src/camel/camel-filter-search.c:779
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Kindprozess »%s« konnte nicht erstellt werden: %s"
 
-#: ../camel/camel-filter-driver.c:983
+#: ../src/camel/camel-filter-driver.c:1038
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ungültiger Nachrichten-Datenstrom von %s erhalten: %s"
 
-#: ../camel/camel-filter-driver.c:1190 ../camel/camel-filter-driver.c:1199
+#: ../src/camel/camel-filter-driver.c:1245
+#: ../src/camel/camel-filter-driver.c:1254
 msgid "Syncing folders"
 msgstr "Ordner werden abgeglichen"
 
-#: ../camel/camel-filter-driver.c:1297
+#: ../src/camel/camel-filter-driver.c:1352
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Analysieren der Filtersyntax: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1308
+#: ../src/camel/camel-filter-driver.c:1363
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausführen des Filters: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1404
+#: ../src/camel/camel-filter-driver.c:1460
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner konnte nicht geöffnet werden"
 
-#: ../camel/camel-filter-driver.c:1416
+#: ../src/camel/camel-filter-driver.c:1472
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner konnte nicht verarbeitet werden"
 
-#: ../camel/camel-filter-driver.c:1439
+#: ../src/camel/camel-filter-driver.c:1496
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1448 ../camel/camel-filter-driver.c:1470
+#: ../src/camel/camel-filter-driver.c:1505
+#: ../src/camel/camel-filter-driver.c:1528
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: ../camel/camel-filter-driver.c:1489 ../camel/camel-filter-driver.c:1603
+#: ../src/camel/camel-filter-driver.c:1547
+#: ../src/camel/camel-filter-driver.c:1661
 msgid "Syncing folder"
 msgstr "Ordner wird abgeglichen"
 
-#: ../camel/camel-filter-driver.c:1494 ../camel/camel-filter-driver.c:1611
+#: ../src/camel/camel-filter-driver.c:1552
+#: ../src/camel/camel-filter-driver.c:1669
 msgid "Complete"
 msgstr "Abgeschlossen"
 
-#: ../camel/camel-filter-driver.c:1557
+#: ../src/camel/camel-filter-driver.c:1615
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: ../camel/camel-filter-driver.c:1575
+#: ../src/camel/camel-filter-driver.c:1633
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: ../camel/camel-filter-driver.c:1770 ../camel/camel-filter-driver.c:1797
+#: ../src/camel/camel-filter-driver.c:1828
+#: ../src/camel/camel-filter-driver.c:1855
 #, c-format
 msgid "Execution of filter '%s' failed: "
 msgstr "Ausführen des Filters »%s« ist gescheitert:"
 
-#: ../camel/camel-filter-driver.c:1787
+#: ../src/camel/camel-filter-driver.c:1845
 #, c-format
 msgid "Error parsing filter '%s': %s: %s"
 msgstr "Fehler beim Analysieren des Filters »%s«: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1806
+#: ../src/camel/camel-filter-driver.c:1864
 #, c-format
 msgid "Error executing filter '%s': %s: %s"
 msgstr "Fehler beim Ausführen des Filters »%s«: %s: %s"
 
-#: ../camel/camel-filter-search.c:139
+#: ../src/camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: ../camel/camel-filter-search.c:513
+#: ../src/camel/camel-filter-search.c:519
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ungültige Argumente bei (system-flag)"
 
-#: ../camel/camel-filter-search.c:531
+#: ../src/camel/camel-filter-search.c:537
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ungültige Argumente bei (user-tag)"
 
-#: ../camel/camel-filter-search.c:1043
+#: ../src/camel/camel-filter-search.c:1066
 msgid "Invalid arguments to (message-location)"
 msgstr "Ungültige Argumente bei (message-location)"
 
-#: ../camel/camel-filter-search.c:1124 ../camel/camel-filter-search.c:1135
+#: ../src/camel/camel-filter-search.c:1147
+#: ../src/camel/camel-filter-search.c:1158
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
 
-#: ../camel/camel-folder.c:327
+#: ../src/camel/camel-folder.c:328
 #, c-format
 msgid "Learning new spam message in '%s : %s'"
 msgid_plural "Learning new spam messages in '%s : %s'"
 msgstr[0] "Neue unerwünschte Nachricht wird in »%s : %s« gesucht"
 msgstr[1] "Neue unerwünschte Nachrichten werden in »%s : %s« gesucht"
 
-#: ../camel/camel-folder.c:370
+#: ../src/camel/camel-folder.c:371
 #, c-format
 msgid "Learning new ham message in '%s : %s'"
 msgid_plural "Learning new ham messages in '%s : %s'"
 msgstr[0] "Neue erwünschte Nachricht wird in »%s : %s« gesucht"
 msgstr[1] "Neue erwünschte Nachrichten werden in »%s : %s« gesucht"
 
-#: ../camel/camel-folder.c:421
+#: ../src/camel/camel-folder.c:422
 #, c-format
 msgid "Filtering new message in '%s : %s'"
 msgid_plural "Filtering new messages in '%s : %s'"
 msgstr[0] "Neue Nachricht in »%s : %s« wird gefiltert"
 msgstr[1] "Neue Nachrichten in »%s : %s« werden gefiltert"
 
-#: ../camel/camel-folder.c:1029
-#: ../camel/providers/local/camel-maildir-folder.c:330
+#: ../src/camel/camel-folder.c:1033
+#: ../src/camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "Nachrichten werden verschoben"
 
-#: ../camel/camel-folder.c:1032
+#: ../src/camel/camel-folder.c:1036
 msgid "Copying messages"
 msgstr "Nachrichten werden kopiert"
 
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder.c:1077
+#: ../src/camel/camel-folder.c:1081
 #, c-format
 msgid "Quota information not supported for folder '%s : %s'"
 msgstr "Kontingent-Informationen werden für Ordner »%s : %s« nicht unterstützt"
@@ -2142,7 +2174,7 @@ msgstr "Kontingent-Informationen werden für Ordner »%s : %s« nicht unterstüt
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder.c:1176
+#: ../src/camel/camel-folder.c:1180
 #, c-format
 msgid "Filtering folder '%s : %s'"
 msgstr "Ordner »%s : %s« wird gefiltert"
@@ -2150,7 +2182,7 @@ msgstr "Ordner »%s : %s« wird gefiltert"
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder.c:2916
+#: ../src/camel/camel-folder.c:2974
 #, c-format
 msgid "Expunging folder '%s : %s'"
 msgstr "Ordner »%s : %s« wird gesäubert"
@@ -2158,7 +2190,7 @@ msgstr "Ordner »%s : %s« wird gesäubert"
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder.c:3050
+#: ../src/camel/camel-folder.c:3108
 #, c-format
 msgid "Retrieving message '%s' in '%s : %s'"
 msgstr "Nachricht »%s« in %s : %s wird abgerufen"
@@ -2166,7 +2198,7 @@ msgstr "Nachricht »%s« in %s : %s wird abgerufen"
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder.c:3243
+#: ../src/camel/camel-folder.c:3301
 #, c-format
 msgid "Retrieving quota information for '%s : %s'"
 msgstr "Kontingent-Informationen für »%s : %s« werden abgerufen"
@@ -2174,42 +2206,45 @@ msgstr "Kontingent-Informationen für »%s : %s« werden abgerufen"
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder.c:3541
+#: ../src/camel/camel-folder.c:3599
 #, c-format
 msgid "Refreshing folder '%s : %s'"
 msgstr "Ordner »%s : %s« wird aktualisiert"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:865 ../camel/camel-folder-search.c:907
+#: ../src/camel/camel-folder-search.c:879
+#: ../src/camel/camel-folder-search.c:921
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) erfordert einen einzelnen Boole'schen Wert als Ergebnis"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:942
+#: ../src/camel/camel-folder-search.c:956
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) nicht erlaubt innerhalb von %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:949 ../camel/camel-folder-search.c:957
+#: ../src/camel/camel-folder-search.c:963
+#: ../src/camel/camel-folder-search.c:971
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) erfordert den Treffertyp Zeichenkette"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:985
+#: ../src/camel/camel-folder-search.c:999
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) erwartet ein Array-Ergebnis"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:995
+#: ../src/camel/camel-folder-search.c:1009
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) erfordert, dass der Ordner festgelegt ist"
 
-#: ../camel/camel-folder-search.c:1918 ../camel/camel-folder-search.c:2090
+#: ../src/camel/camel-folder-search.c:2049
+#: ../src/camel/camel-folder-search.c:2221
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2218,7 +2253,8 @@ msgstr ""
 "Syntax des Suchausdrucks konnte nicht analysiert werden: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1930 ../camel/camel-folder-search.c:2102
+#: ../src/camel/camel-folder-search.c:2061
+#: ../src/camel/camel-folder-search.c:2233
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2230,31 +2266,23 @@ msgstr ""
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2196
+#: ../src/camel/camel-folder-summary.c:1597
 #, c-format
 msgid "Release unused memory for folder '%s : %s'"
 msgstr "Ungenutzten Speicher für Ordner »%s : %s« freigeben"
 
-#. Translators: The first '%s' is replaced with an account name and the second '%s'
-#. is replaced with a full path name. The spaces around ':' are intentional, as
-#. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-folder-summary.c:2420
-#, c-format
-msgid "Update preview data for folder '%s : %s'"
-msgstr "Voransicht für Ordner »%s : %s« wird aktualisiert"
-
-#: ../camel/camel-gpg-context.c:819 ../camel/camel-gpg-context.c:824
-#: ../camel/camel-gpg-context.c:1514
+#: ../src/camel/camel-gpg-context.c:817 ../src/camel/camel-gpg-context.c:822
+#: ../src/camel/camel-gpg-context.c:1512
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg konnte nicht ausgeführt werden: %s"
 
-#: ../camel/camel-gpg-context.c:824
-#: ../camel/providers/smtp/camel-smtp-transport.c:1131
+#: ../src/camel/camel-gpg-context.c:822
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../camel/camel-gpg-context.c:936
+#: ../src/camel/camel-gpg-context.c:934
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2265,20 +2293,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:972
+#: ../src/camel/camel-gpg-context.c:970
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 "Die Syntax des gpg-Wink auf die Benutzerkennung konnte nicht analysiert "
 "werden."
 
-#: ../camel/camel-gpg-context.c:997 ../camel/camel-gpg-context.c:1012
+#: ../src/camel/camel-gpg-context.c:995 ../src/camel/camel-gpg-context.c:1010
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 "Die Syntax des gpg-Winks auf das Passwort konnte nicht analysiert werden."
 
-#: ../camel/camel-gpg-context.c:1033
+#: ../src/camel/camel-gpg-context.c:1031
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2287,7 +2315,7 @@ msgstr ""
 "Für das Entsperren Ihrer SmartCard\n"
 "»%s« ist ein Passwort erforderlich"
 
-#: ../camel/camel-gpg-context.c:1037
+#: ../src/camel/camel-gpg-context.c:1035
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2296,12 +2324,12 @@ msgstr ""
 "Für das Entsperren des Schlüssels für den\n"
 "Benutzer %s ist ein Passwort erforderlich."
 
-#: ../camel/camel-gpg-context.c:1043
+#: ../src/camel/camel-gpg-context.c:1041
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Unerwartete Anfrage von GnuPG für »%s«"
 
-#: ../camel/camel-gpg-context.c:1055
+#: ../src/camel/camel-gpg-context.c:1053
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
@@ -2310,216 +2338,220 @@ msgstr ""
 "Empfänger enthält, daher erscheint ein Dialog zur Passworteingabe für jeden "
 "gespeicherten geheimen Schlüssel."
 
-#: ../camel/camel-gpg-context.c:1086 ../camel/camel-net-utils.c:524
-#: ../camel/providers/nntp/camel-nntp-summary.c:401
-#: ../libedataserver/e-client.c:163
+#: ../src/camel/camel-gpg-context.c:1084 ../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 "Abgebrochen"
 
-#: ../camel/camel-gpg-context.c:1107
+#: ../src/camel/camel-gpg-context.c:1105
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Geheimschlüssel konnte nicht entsperrt werden: 3 falsche Passwörter "
 "eingegeben."
 
-#: ../camel/camel-gpg-context.c:1120
+#: ../src/camel/camel-gpg-context.c:1118
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unerwartete GnuPG-Antwort: %s"
 
-#: ../camel/camel-gpg-context.c:1234
+#: ../src/camel/camel-gpg-context.c:1232
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Nachricht konnte nicht verschlüsselt werden: keine gültigen Empfänger "
 "angegeben."
 
-#: ../camel/camel-gpg-context.c:1943 ../camel/camel-smime-context.c:843
+#: ../src/camel/camel-gpg-context.c:1941 ../src/camel/camel-smime-context.c:841
 msgid "Could not generate signing data: "
 msgstr "Signaturdaten konnten nicht erzeugt werden:"
 
-#: ../camel/camel-gpg-context.c:1994 ../camel/camel-gpg-context.c:2230
-#: ../camel/camel-gpg-context.c:2346 ../camel/camel-gpg-context.c:2522
+#: ../src/camel/camel-gpg-context.c:1992 ../src/camel/camel-gpg-context.c:2228
+#: ../src/camel/camel-gpg-context.c:2344 ../src/camel/camel-gpg-context.c:2520
 msgid "Failed to execute gpg."
 msgstr "gpg konnte nicht ausgeführt werden."
 
-#: ../camel/camel-gpg-context.c:2100 ../camel/camel-gpg-context.c:2108
-#: ../camel/camel-gpg-context.c:2116 ../camel/camel-gpg-context.c:2136
-#: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
-#: ../camel/camel-smime-context.c:995
+#: ../src/camel/camel-gpg-context.c:2098 ../src/camel/camel-gpg-context.c:2106
+#: ../src/camel/camel-gpg-context.c:2114 ../src/camel/camel-gpg-context.c:2134
+#: ../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 ""
 "Nachrichtensignatur konnte nicht verifiziert werden: Nachrichtenformat "
 "fehlerhaft"
 
-#: ../camel/camel-gpg-context.c:2182
+#: ../src/camel/camel-gpg-context.c:2180
 msgid "Cannot verify message signature: "
 msgstr "Nachrichtensignatur konnte nicht verifiziert werden:"
 
-#: ../camel/camel-gpg-context.c:2311
+#: ../src/camel/camel-gpg-context.c:2309
 msgid "Could not generate encrypting data: "
 msgstr "Verschlüsselungsdaten konnten nicht erzeugt werden:"
 
-#: ../camel/camel-gpg-context.c:2386
+#: ../src/camel/camel-gpg-context.c:2384
 msgid "This is a digitally encrypted message part"
 msgstr "Dies ist ein digital verschlüsselter Nachrichtenteil"
 
-#: ../camel/camel-gpg-context.c:2445 ../camel/camel-gpg-context.c:2454
-#: ../camel/camel-gpg-context.c:2477
+#: ../src/camel/camel-gpg-context.c:2443 ../src/camel/camel-gpg-context.c:2452
+#: ../src/camel/camel-gpg-context.c:2475
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr ""
 "Nachricht konnte nicht entschlüsselt werden: Nachrichtenformat fehlerhaft"
 
-#: ../camel/camel-gpg-context.c:2465
+#: ../src/camel/camel-gpg-context.c:2463
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME-Teil konnte nicht entschlüsselt werden: Protokollfehler"
 
-#: ../camel/camel-gpg-context.c:2532
+#: ../src/camel/camel-gpg-context.c:2530
 #, c-format
 msgid "Failed to decrypt MIME part: Secret key not found"
 msgstr "MIME-Teil konnte nicht entschlüsselt werden: Schlüssel nicht gefunden"
 
-#: ../camel/camel-gpg-context.c:2568 ../camel/camel-smime-context.c:1288
+#: ../src/camel/camel-gpg-context.c:2566
+#: ../src/camel/camel-smime-context.c:1286
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
-#: ../camel/camel-junk-filter.c:167
+#: ../src/camel/camel-junk-filter.c:167
 msgid "Synchronizing junk database"
 msgstr "Unerwünscht-Datenbank wird abgeglichen"
 
-#: ../camel/camel-lock.c:110
+#: ../src/camel/camel-lock.c:108
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Sperrdatei für %s konnte nicht angelegt werden: %s"
 
-#: ../camel/camel-lock.c:153
+#: ../src/camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr ""
 "Zeitüberschreitung beim Versuch, eine Sperrdatei auf %s zu erhalten. "
 "Versuchen Sie es später noch einmal."
 
-#: ../camel/camel-lock.c:215
+#: ../src/camel/camel-lock.c:213
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: ../camel/camel-lock.c:282
+#: ../src/camel/camel-lock.c:280
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: ../camel/camel-lock-client.c:107
+#: ../src/camel/camel-lock-client.c:105
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Weiterleitung an Sperrhilfsprogramm konnte nicht angelegt werden: %s"
 
-#: ../camel/camel-lock-client.c:131
+#: ../src/camel/camel-lock-client.c:129
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s"
 
-#: ../camel/camel-lock-client.c:218 ../camel/camel-lock-client.c:246
+#: ../src/camel/camel-lock-client.c:216 ../src/camel/camel-lock-client.c:244
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "»%s« konnte nicht gesperrt werden: Protokollfehler mit lock-helper"
 
-#: ../camel/camel-lock-client.c:234
+#: ../src/camel/camel-lock-client.c:232
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "»%s« konnte nicht gesperrt werden"
 
-#: ../camel/camel-movemail.c:101
+#: ../src/camel/camel-movemail.c:99
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "E-Mail-Datei %s konnte nicht geöffnet werden: %s"
 
-#: ../camel/camel-movemail.c:121
+#: ../src/camel/camel-movemail.c:119
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "E-Mail-Datei %s konnte nicht überprüft werden: %s"
 
-#: ../camel/camel-movemail.c:136
+#: ../src/camel/camel-movemail.c:134
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Temporäre E-Mail-Datei %s konnte nicht geöffnet werden: %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 "E-Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
 
-#: ../camel/camel-movemail.c:200
+#: ../src/camel/camel-movemail.c:198
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Weiterleitung konnte nicht angelegt werden: %s"
 
-#: ../camel/camel-movemail.c:214
+#: ../src/camel/camel-movemail.c:212
 #, c-format
 msgid "Could not fork: %s"
 msgstr "forK() konnte nicht durchgeführt werden: %s"
 
-#: ../camel/camel-movemail.c:252
+#: ../src/camel/camel-movemail.c:250
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-Programm gescheitert: %s"
 
-#: ../camel/camel-movemail.c:253
+#: ../src/camel/camel-movemail.c:251
 msgid "(Unknown error)"
 msgstr "(Unbekannter Fehler)"
 
-#: ../camel/camel-movemail.c:280
+#: ../src/camel/camel-movemail.c:278
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fehler beim Lesen der E-Mail-Datei: %s"
 
-#: ../camel/camel-movemail.c:293
+#: ../src/camel/camel-movemail.c:291
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fehler beim Schreiben der temporären E-Mail-Datei: %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 "Fehler beim Kopieren der temporären E-Mail-Datei: %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 "Kein Inhalt verfügbar"
 
-#: ../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 "Keine Signatur verfügbar"
 
-#: ../camel/camel-multipart-signed.c:806
+#: ../src/camel/camel-multipart-signed.c:804
 #, c-format
 msgid "parse error"
 msgstr "Fehler bei der Syntaxanalyse"
 
-#: ../camel/camel-net-utils.c:708
+#: ../src/camel/camel-net-utils.c:706
 #, c-format
 msgid "Resolving: %s"
 msgstr "%s wird aufgelöst"
 
-#: ../camel/camel-net-utils.c:733
+#: ../src/camel/camel-net-utils.c:731
 msgid "Host lookup failed"
 msgstr "Finden eines Rechners gescheitert"
 
-#: ../camel/camel-net-utils.c:739
+#: ../src/camel/camel-net-utils.c:737
 #, c-format
 msgid "Host lookup '%s' failed. Check your host name for spelling errors."
 msgstr ""
 "Finden des Rechners »%s« ist fehlgeschlagen. Überprüfen Sie den Rechnernamen "
 "auf Rechtschreibfehler."
 
-#: ../camel/camel-net-utils.c:743
+#: ../src/camel/camel-net-utils.c:741
 #, c-format
 msgid "Host lookup '%s' failed: %s"
 msgstr "Finden des Rechners »%s« fehlgeschlagen: %s"
@@ -2527,7 +2559,7 @@ msgstr "Finden des Rechners »%s« fehlgeschlagen: %s"
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-offline-folder.c:96
+#: ../src/camel/camel-offline-folder.c:94
 #, c-format
 msgid "Downloading new messages for offline mode in '%s : %s'"
 msgstr "Neue Nachrichten werden für Offline-Modus in »%s : %s« abgerufen"
@@ -2535,7 +2567,7 @@ msgstr "Neue Nachrichten werden für Offline-Modus in »%s : %s« abgerufen"
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-offline-folder.c:167
+#: ../src/camel/camel-offline-folder.c:165
 #, c-format
 msgid "Storing changes in folder '%s : %s'"
 msgstr "Änderungen werden im Ordner »%s : %s« gespeichert"
@@ -2543,7 +2575,7 @@ msgstr "Änderungen werden im Ordner »%s : %s« gespeichert"
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-offline-folder.c:257
+#: ../src/camel/camel-offline-folder.c:255
 #, c-format
 msgid "Checking download of new messages for offline in '%s : %s'"
 msgstr ""
@@ -2553,62 +2585,62 @@ msgstr ""
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/camel-offline-folder.c:373
+#: ../src/camel/camel-offline-folder.c:371
 #, c-format
 msgid "Syncing messages in folder '%s : %s' to disk"
 msgstr "Nachrichten im Ordner »%s : %s« werden auf Festplatte abgeglichen"
 
-#: ../camel/camel-offline-folder.c:436
+#: ../src/camel/camel-offline-folder.c:434
 msgid "Copy folder content locally for _offline operation"
 msgstr "Den Ordnerinhalt lokal zum Arbeiten im _Offline-Modus kopieren"
 
-#: ../camel/camel-provider.c:55
+#: ../src/camel/camel-provider.c:89
 msgid "Virtual folder email provider"
 msgstr "E-Mail-Treiber: Virtueller Ordner"
 
-#: ../camel/camel-provider.c:57
+#: ../src/camel/camel-provider.c:91
 msgid "For reading mail as a query of another set of folders"
 msgstr "Zum Lesen von E-Mails in Form einer Abfrage über andere Ordner"
 
-#: ../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 ""
 "%s konnte nicht geladen werden: Laden von Modulen wird von diesem System "
 "nicht unterstützt."
 
-#: ../camel/camel-provider.c:269
+#: ../src/camel/camel-provider.c:303
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s konnte nicht geladen werden: %s"
 
-#: ../camel/camel-provider.c:278
+#: ../src/camel/camel-provider.c:312
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul."
 
-#: ../camel/camel-provider.c:424 ../camel/camel-session.c:436
+#: ../src/camel/camel-provider.c:458 ../src/camel/camel-session.c:434
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Kein Treiber für Protokoll »%s« verfügbar"
 
-#: ../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 ""
 "Dies stellt unter Verwendung einer anonymen Anmeldekennung eine Verbindung "
 "mit dem Server her"
 
-#: ../camel/camel-sasl-anonymous.c:67
+#: ../src/camel/camel-sasl-anonymous.c:70
 #, c-format
 msgid "Authentication failed."
 msgstr "Legitimierung gescheitert."
 
-#: ../camel/camel-sasl-anonymous.c:78
+#: ../src/camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2617,7 +2649,7 @@ msgstr ""
 "Ungültige E-Mail-Adressverfolgungsinformationen:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:92
+#: ../src/camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2626,7 +2658,7 @@ msgstr ""
 "Ungültige opake Verfolgungsinformationen:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:106
+#: ../src/camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2635,11 +2667,11 @@ msgstr ""
 "Ungültige Verfolgungsinformationen:\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."
@@ -2647,11 +2679,11 @@ msgstr ""
 "Dies stellt eine Verbindung mit dem SMTP-Server her und verwendet dazu ein "
 "sicheres CRAM-MD5-Passwort, falls der Server dies unterstützt."
 
-#: ../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."
@@ -2659,54 +2691,54 @@ msgstr ""
 "Dies stellt eine Verbindung mit dem SMTP-Server her und verwendet dazu ein "
 "sicheres DIGEST-MD5-Passwort, falls der Server dies unterstützt."
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../src/camel/camel-sasl-digest-md5.c:852
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Server-Herausforderung zu lang (>2048 Oktette)"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../src/camel/camel-sasl-digest-md5.c:863
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Server-Herausforderung ungültig\n"
 
-#: ../camel/camel-sasl-digest-md5.c:873
+#: ../src/camel/camel-sasl-digest-md5.c:871
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 "Server-Herausforderung enthielt ungültiges »Quality-of-Protection«-Token"
 
-#: ../camel/camel-sasl-digest-md5.c:906
+#: ../src/camel/camel-sasl-digest-md5.c:904
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Serverantwort enthielt keine Legitimierungsdaten"
 
-#: ../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 "Serverantwort enthielt unvollständige Legitimierungsdaten"
 
-#: ../camel/camel-sasl-digest-md5.c:940
+#: ../src/camel/camel-sasl-digest-md5.c:938
 #, c-format
 msgid "Server response does not match"
 msgstr "Antwort des Servers passt nicht"
 
 # CHECK
-#: ../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 ""
 "Dies stellt eine Verbindung mit dem Server her und verwendet zur "
 "Legitimierung Kerberos 5"
 
-#: ../camel/camel-sasl-gssapi.c:148
+#: ../src/camel/camel-sasl-gssapi.c:146
 #, c-format
 msgid "(Unknown GSSAPI mechanism code: %x)"
 msgstr "(Unbekannter GSSAPI-Mechanismuscode: %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."
@@ -2714,13 +2746,13 @@ msgstr ""
 "Der angegebene Mechanismus wird vom übergebenen Berechtigungsnachweis nicht "
 "unterstützt oder wird von der Implementierung nicht erkannt."
 
-#: ../camel/camel-sasl-gssapi.c:186
+#: ../src/camel/camel-sasl-gssapi.c:184
 msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 "Der übergebene Parameter »target_name« liegt in fehlerhafter Formatierung "
 "vor."
 
-#: ../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."
@@ -2728,7 +2760,7 @@ msgstr ""
 "Der übergebene Parameter »target_name« enthält einen ungültigen oder nicht "
 "unterstützten Namenstyp "
 
-#: ../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."
@@ -2736,7 +2768,7 @@ msgstr ""
 "Das Eingabe-Token »input_token« enthält andere Kanalbindungen als die vom "
 "Parameter »input_chan_bindings« angegebenen."
 
-#: ../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."
@@ -2745,7 +2777,7 @@ msgstr ""
 "verifizierbare Signatur."
 
 # CHECK
-#: ../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."
@@ -2754,60 +2786,60 @@ msgstr ""
 "Kontextes gültig oder der Berechtigungsnachweis-Handle hat auf keine "
 "Berechtigungsnachweise Bezug genommen."
 
-#: ../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 "Der übergebene Kontext-Handle führte zu keinem gültigen Kontext."
 
-#: ../camel/camel-sasl-gssapi.c:210
+#: ../src/camel/camel-sasl-gssapi.c:208
 msgid "The consistency checks performed on the input_token failed."
 msgstr ""
 "Die für das Eingabe-Token »input_token« durchgeführten Konsistenzprüfungen "
 "schlugen fehl."
 
-#: ../camel/camel-sasl-gssapi.c:213
+#: ../src/camel/camel-sasl-gssapi.c:211
 msgid "The consistency checks performed on the credential failed."
 msgstr ""
 "Die für den Berechtigungsnachweis durchgeführten Konsistenzüberprüfungen "
 "schlugen fehl."
 
-#: ../camel/camel-sasl-gssapi.c:216
+#: ../src/camel/camel-sasl-gssapi.c:214
 msgid "The referenced credentials have expired."
 msgstr ""
 "Die Berechtigungsnachweise, auf die Bezug genommen wurde, sind nicht mehr "
 "gültig."
 
-#: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
-#: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
-#: ../camel/providers/smtp/camel-smtp-transport.c:799
+#: ../src/camel/camel-sasl-gssapi.c:220 ../src/camel/camel-sasl-gssapi.c:402
+#: ../src/camel/camel-sasl-gssapi.c:451 ../src/camel/camel-sasl-gssapi.c:468
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:797
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Fehlerhafte Legitimierungsantwort vom Server."
 
-#: ../camel/camel-sasl-gssapi.c:482
+#: ../src/camel/camel-sasl-gssapi.c:480
 #, c-format
 msgid "Unsupported security layer."
 msgstr "Nicht unterstützte Sicherheitsebene."
 
-#: ../camel/camel-sasl-login.c:37
+#: ../src/camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../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 ""
 "Dies stellt unter Verwendung eines einfachen Passworts eine Verbindung mit "
 "dem Server her."
 
-#: ../camel/camel-sasl-login.c:107
+#: ../src/camel/camel-sasl-login.c:105
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Unbekannter Legitimierungszustand."
 
-#: ../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."
@@ -2815,350 +2847,359 @@ msgstr ""
 "Mit dieser Option werden Sie mit einem Windows-basierten Server, der "
 "NTLM/»Secure Password Authentication« verwendet, verbunden."
 
-#: ../camel/camel-sasl-plain.c:41
+#: ../src/camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "KLARTEXT"
 
-#: ../camel/camel-sasl-popb4smtp.c:43
+#: ../src/camel/camel-sasl-popb4smtp.c:41
 msgid "POP before SMTP"
 msgstr "POP vor 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 "Dies autorisiert eine POP-Verbindung, bevor SMTP versucht wird"
 
-#: ../camel/camel-sasl-popb4smtp.c:83
+#: ../src/camel/camel-sasl-popb4smtp.c:81
 msgid "POP Source UID"
 msgstr "POP-Quell-UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:97
+#: ../src/camel/camel-sasl-popb4smtp.c:95
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP-vor-SMTP-Legitimierung mit einem unbekannten Übertragungsverfahren"
 
-#: ../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-vor-SMTP-Legitimierung wurde mit einem %s-Dienst versucht"
 
-#: ../camel/camel-search-private.c:113
+#: ../src/camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fehler beim Kompilieren eines regulären Ausdrucks: %s: %s"
 
-#: ../camel/camel-session.c:445
+#: ../src/camel/camel-session.c:443
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "Ungültiger GType registriert für Protokoll »%s«"
 
-#: ../camel/camel-session.c:514
-#: ../camel/providers/imapx/camel-imapx-server.c:2990
-#: ../camel/providers/pop3/camel-pop3-store.c:308
-#: ../camel/providers/pop3/camel-pop3-store.c:790
-#: ../camel/providers/smtp/camel-smtp-transport.c:672
+#: ../src/camel/camel-session.c:512
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2990
+#: ../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 "Keine Unterstützung für Legitimierungstyp %s"
 
-#: ../camel/camel-session.c:529
+#: ../src/camel/camel-session.c:527
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s-Legitimierung gescheitert"
 
-#: ../camel/camel-session.c:598
+#: ../src/camel/camel-session.c:596
 msgid "Forwarding messages is not supported"
 msgstr "Weiterleitung von Nachrichten wird nicht unterstützt"
 
-#: ../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 "Es konnte kein Zertifikat für »%s« gefunden werden"
 
-#: ../camel/camel-smime-context.c:376
+#: ../src/camel/camel-smime-context.c:374
 msgid "Cannot create CMS message"
 msgstr "CMS-Nachricht konnte nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:381
+#: ../src/camel/camel-smime-context.c:379
 msgid "Cannot create CMS signed data"
 msgstr "CMS-signierte Daten konnten nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:387
+#: ../src/camel/camel-smime-context.c:385
 msgid "Cannot attach CMS signed data"
 msgstr "CMS-signierte Daten konnten nicht beigelegt werden"
 
-#: ../camel/camel-smime-context.c:394
+#: ../src/camel/camel-smime-context.c:392
 msgid "Cannot attach CMS data"
 msgstr "CMS-Daten konnten nicht beigelegt werden"
 
-#: ../camel/camel-smime-context.c:400
+#: ../src/camel/camel-smime-context.c:398
 msgid "Cannot create CMS Signer information"
 msgstr "CMS-Unterzeichnerinformationen konnten nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:406
+#: ../src/camel/camel-smime-context.c:404
 msgid "Cannot find certificate chain"
 msgstr "Zertifikatkette konnte nicht gefunden werden"
 
-#: ../camel/camel-smime-context.c:412
+#: ../src/camel/camel-smime-context.c:410
 msgid "Cannot add CMS Signing time"
 msgstr "CMS-Unterzeichnungszeit konnte nicht hinzugefügt werden"
 
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../src/camel/camel-smime-context.c:434
+#: ../src/camel/camel-smime-context.c:449
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Es existiert kein Verschlüsselungszertifikat für »%s«"
 
-#: ../camel/camel-smime-context.c:458
+#: ../src/camel/camel-smime-context.c:456
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs-Attribut konnte nicht hinzugefügt werden"
 
-#: ../camel/camel-smime-context.c:463
+#: ../src/camel/camel-smime-context.c:461
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs-Attribut konnte nicht hinzugefügt werden"
 
-#: ../camel/camel-smime-context.c:468
+#: ../src/camel/camel-smime-context.c:466
 msgid "Cannot add encryption certificate"
 msgstr "Verschlüsselungszertifikat konnte nicht hinzugefügt werden"
 
-#: ../camel/camel-smime-context.c:474
+#: ../src/camel/camel-smime-context.c:472
 msgid "Cannot add CMS Signer information"
 msgstr "CMS-Unterzeichnerinformation konnte nicht hinzugefügt werden"
 
 #. 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 "Nicht verifiziert"
 
-#: ../camel/camel-smime-context.c:509
+#: ../src/camel/camel-smime-context.c:507
 msgid "Good signature"
 msgstr "Signatur einwandfrei"
 
-#: ../camel/camel-smime-context.c:511
+#: ../src/camel/camel-smime-context.c:509
 msgid "Bad signature"
 msgstr "Signatur fehlerhaft"
 
-#: ../camel/camel-smime-context.c:513
+#: ../src/camel/camel-smime-context.c:511
 msgid "Content tampered with or altered in transit"
 msgstr "Inhalt bei Übertragung beschädigt oder verändert"
 
-#: ../camel/camel-smime-context.c:515
+#: ../src/camel/camel-smime-context.c:513
 msgid "Signing certificate not found"
 msgstr "Signaturzertifikat nicht gefunden"
 
-#: ../camel/camel-smime-context.c:517
+#: ../src/camel/camel-smime-context.c:515
 msgid "Signing certificate not trusted"
 msgstr "Signaturzertifikat nicht vertrauenswürdig"
 
-#: ../camel/camel-smime-context.c:519
+#: ../src/camel/camel-smime-context.c:517
 msgid "Signature algorithm unknown"
 msgstr "Signaturalgorithmus unbekannt"
 
-#: ../camel/camel-smime-context.c:521
+#: ../src/camel/camel-smime-context.c:519
 msgid "Signature algorithm unsupported"
 msgstr "Signaturalgorithmus nicht unterstützt"
 
-#: ../camel/camel-smime-context.c:523
+#: ../src/camel/camel-smime-context.c:521
 msgid "Malformed signature"
 msgstr "Signatur fehlerhaft formatiert"
 
-#: ../camel/camel-smime-context.c:525
+#: ../src/camel/camel-smime-context.c:523
 msgid "Processing error"
 msgstr "Verarbeitungsfehler"
 
-#: ../camel/camel-smime-context.c:570
+#: ../src/camel/camel-smime-context.c:568
 msgid "No signed data in signature"
 msgstr "Keine signierten Daten in Signatur"
 
-#: ../camel/camel-smime-context.c:575
+#: ../src/camel/camel-smime-context.c:573
 msgid "Digests missing from enveloped data"
 msgstr "Digest der kuvertieren Daten fehlt"
 
-#: ../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 "Digests konnten nicht berechnet werden"
 
-#: ../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 "Nachrichten-Digests konnten nicht festgelegt werden"
 
-#: ../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 "Zertifikatimport gescheitert"
 
-#: ../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 ""
 "Zertifikat ist die einzige Nachricht, Zertifikatverifizierung nicht möglich"
 
-#: ../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 ""
 "Zertifikat ist die einzige Nachricht, Zertifikate importiert und verifiziert"
 
-#: ../camel/camel-smime-context.c:642
+#: ../src/camel/camel-smime-context.c:640
 msgid "Cannot find signature digests"
 msgstr "Signatur-Digest konnte nicht gefunden werden"
 
-#: ../camel/camel-smime-context.c:659
+#: ../src/camel/camel-smime-context.c:657
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Unterzeichner: %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 "Verschlüsselungskontext konnte nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:861
+#: ../src/camel/camel-smime-context.c:859
 msgid "Failed to add data to CMS encoder"
 msgstr "Daten konnten nicht zu CMS-Kodierer hinzugefügt werden"
 
-#: ../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 "Datenverschlüsselung gescheitert"
 
-#: ../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 "Dekodiervorgang gescheitert"
 
 # CHECK
-#: ../camel/camel-smime-context.c:1083
+#: ../src/camel/camel-smime-context.c:1081
 msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 "Es konnte kein gemeinsamer Massenverschlüsselungsalgorithmus gefunden werden"
 
 # CHECK
-#: ../camel/camel-smime-context.c:1091
+#: ../src/camel/camel-smime-context.c:1089
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 "Es konnte kein Slot für den Massenverschlüsselungsschlüssel bereitgestellt "
 "werden"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../src/camel/camel-smime-context.c:1100
 msgid "Cannot create CMS Message"
 msgstr "CMS-Nachricht konnte nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:1108
+#: ../src/camel/camel-smime-context.c:1106
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS-Umschlagsdaten konnten nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:1114
+#: ../src/camel/camel-smime-context.c:1112
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS-Umschlagsdaten konnten nicht beigelegt werden"
 
-#: ../camel/camel-smime-context.c:1120
+#: ../src/camel/camel-smime-context.c:1118
 msgid "Cannot attach CMS data object"
 msgstr "CMS-Datenobjekt konnte nicht beigelegt werden"
 
-#: ../camel/camel-smime-context.c:1129
+#: ../src/camel/camel-smime-context.c:1127
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS-Empfängerinformationen konnten nicht angelegt werden"
 
-#: ../camel/camel-smime-context.c:1134
+#: ../src/camel/camel-smime-context.c:1132
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS-Empfängerinformationen konnten nicht hinzugefügt werden"
 
-#: ../camel/camel-smime-context.c:1160
+#: ../src/camel/camel-smime-context.c:1158
 msgid "Failed to add data to encoder"
 msgstr "Hinzufügen von Daten zum Kodierer gescheitert"
 
-#: ../camel/camel-smime-context.c:1270
+#: ../src/camel/camel-smime-context.c:1268
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME-Entschlüsselung: Kein entschlüsselter Inhalt gefunden"
 
-#: ../camel/camel-store.c:1284
+#: ../src/camel/camel-store.c:1369
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Ordner »%s« wird geöffnet"
 
-#: ../camel/camel-store.c:1578
+#: ../src/camel/camel-store.c:1663
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Ordner in »%s« werden eingelesen"
 
-#: ../camel/camel-store.c:1606 ../camel/camel-store.c:1651
-#: ../camel/camel-vtrash-folder.c:45
+#: ../src/camel/camel-store.c:1691 ../src/camel/camel-store.c:1736
+#: ../src/camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: ../camel/camel-store.c:1620 ../camel/camel-store.c:1668
-#: ../camel/camel-vtrash-folder.c:47
+#: ../src/camel/camel-store.c:1705 ../src/camel/camel-store.c:1753
+#: ../src/camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Unerwünscht"
 
-#: ../camel/camel-store.c:2269
+#: ../src/camel/camel-store.c:2354
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ordner konnte nicht angelegt werden: %s: Ordner existiert"
 
-#: ../camel/camel-store.c:2276
+#: ../src/camel/camel-store.c:2361
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Ordner »%s« wird angelegt"
 
-#: ../camel/camel-store.c:2453 ../camel/camel-vee-store.c:422
-#: ../camel/providers/local/camel-maildir-store.c:346
+#: ../src/camel/camel-store.c:2538 ../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 "Ordner konnte nicht gelöscht werden: %s: Ungültiger Vorgang"
 
-#: ../camel/camel-store.c:2643 ../camel/camel-vee-store.c:473
-#: ../camel/providers/local/camel-maildir-store.c:914
+#: ../src/camel/camel-store.c:2728 ../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 "Ordner konnte nicht umbenannt werden: %s: Ungültiger Vorgang"
 
-#: ../camel/camel-stream.c:168
+#: ../src/camel/camel-stream.c:170
 msgid "Cannot write with no base stream"
 msgstr "Es kann nicht ohne Datenstrom geschrieben werden"
 
-#: ../camel/camel-stream.c:288 ../camel/camel-stream.c:339
+#: ../src/camel/camel-stream.c:290 ../src/camel/camel-stream.c:341
 #, c-format
 msgid "Stream type '%s' is not seekable"
 msgstr "Datenstromtyp »%s« kann nicht durchsucht werden"
 
-#: ../camel/camel-stream-filter.c:344
+#: ../src/camel/camel-stream-filter.c:342
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr ""
 "Mit CamelStreamFilter wird nur das Zurücksetzen an den Beginn unterstützt"
 
-#: ../camel/camel-stream-null.c:74
+#: ../src/camel/camel-stream-null.c:76
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr ""
 "Mit CamelHttpStream wird nur das Zurücksetzen an den Beginn unterstützt"
 
-#: ../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 "Verbindung abgebrochen"
 
-#: ../camel/camel-stream-process.c:283
+#: ../src/camel/camel-stream-process.c:289
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Verbindung mit Befehl »%s« konnte nicht hergestellt werden: %s"
 
-#: ../camel/camel-subscribable.c:273
+#: ../src/camel/camel-subscribable.c:234
 #, c-format
 msgid "Subscribing to folder '%s'"
 msgstr "Ordner »%s« wird abonniert"
 
-#: ../camel/camel-subscribable.c:442
+#: ../src/camel/camel-subscribable.c:403
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Ordner »%s« wird abbestellt"
 
-#: ../camel/camel-url.c:327
+#: ../src/camel/camel-url.c:325
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Syntax der Adresse »%s« konnte nicht analysiert werden"
 
-#: ../camel/camel-vee-folder.c:499
+#: ../src/camel/camel-vee-folder.c:498
 #, c-format
 msgid "Updating folder '%s'"
 msgstr "Ordner »%s« wird aktualisiert"
 
-#: ../camel/camel-vee-folder.c:884 ../camel/camel-vee-folder.c:999
+#: ../src/camel/camel-vee-folder.c:894 ../src/camel/camel-vee-folder.c:1009
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
@@ -3168,114 +3209,114 @@ msgstr ""
 #. is replaced with an account name and the third '%s' is replaced with a full
 #. path name. The spaces around ':' are intentional, as the whole '%s : %s' is
 #. meant as an absolute identification of the folder.
-#: ../camel/camel-vee-folder.c:921
+#: ../src/camel/camel-vee-folder.c:931
 #, c-format
 msgid "No such message %s in '%s : %s'"
 msgstr "Nachricht %s existiert nicht in %s : %s"
 
-#: ../camel/camel-vee-folder.c:975
+#: ../src/camel/camel-vee-folder.c:985
 #, c-format
 msgid "Error storing '%s': "
 msgstr "Fehler beim Speichern von »%s«:"
 
-#: ../camel/camel-vee-folder.c:1221
+#: ../src/camel/camel-vee-folder.c:1232
 msgid "Automatically _update on change in source folders"
 msgstr "Bei jeder Änderung des _Quellordners automatisch aktualisieren"
 
 #. 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 "Ohne Übereinstimmung"
 
-#: ../camel/camel-vee-store.c:448
+#: ../src/camel/camel-vee-store.c:446
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ordner existiert nicht"
 
-#: ../camel/camel-vee-store.c:483
+#: ../src/camel/camel-vee-store.c:481
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ordner konnte umbenannt werden: %s: Ordner existiert nicht"
 
-#: ../camel/camel-vee-store.c:546
+#: ../src/camel/camel-vee-store.c:544
 msgid "Enable _Unmatched folder"
 msgstr "Ordner »_Ohne Übereinstimmung« aktivieren"
 
-#: ../camel/camel-vee-store.c:1043
+#: ../src/camel/camel-vee-store.c:1053
 msgid "Updating Unmatched search folder"
 msgstr "Suchordner »Ohne Übereinstimmung« wird aktualisiert"
 
-#: ../camel/camel-vtrash-folder.c:46
+#: ../src/camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Nachrichten können nicht in den Papierkorb-Ordner kopiert werden"
 
-#: ../camel/camel-vtrash-folder.c:48
+#: ../src/camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Nachrichten können nicht in den Unerwünscht-Ordner kopiert werden"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:973
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:971
 #, c-format
 msgid "You must be working online to complete this operation (%s)"
 msgstr "Sie müssen online arbeiten, um diesen Vorgang abzuschließen (%s)"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:981
-#: ../camel/providers/imapx/camel-imapx-server.c:3123
-#: ../camel/providers/nntp/camel-nntp-store.c:353
-#: ../camel/providers/nntp/camel-nntp-store.c:1350
-#: ../camel/providers/nntp/camel-nntp-store.c:2158
-#: ../camel/providers/nntp/camel-nntp-store.c:2302
-#: ../camel/providers/pop3/camel-pop3-folder.c:449
-#: ../camel/providers/pop3/camel-pop3-folder.c:632
-#: ../camel/providers/pop3/camel-pop3-folder.c:834
-#: ../camel/providers/pop3/camel-pop3-folder.c:1044
-#: ../camel/providers/pop3/camel-pop3-store.c:296
-#: ../camel/providers/pop3/camel-pop3-store.c:529
-#: ../camel/providers/pop3/camel-pop3-store.c:577
-#: ../camel/providers/pop3/camel-pop3-store.c:672
-#: ../camel/providers/pop3/camel-pop3-store.c:1107
-#: ../camel/providers/smtp/camel-smtp-transport.c:543
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:979
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3123
+#: ../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:2156
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2300
+#: ../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 "Sie müssen online arbeiten, um diesen Vorgang abzuschließen"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1561
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1649
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1559
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1647
 #, c-format
 msgid "No destination folder specified"
 msgstr "Kein Zielordner angegeben"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1588
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1586
 msgid "Unable to move junk messages"
 msgstr "Unerwünschte Nachrichten konnten nicht verschoben werden"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1683
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1681
 msgid "Unable to move deleted messages"
 msgstr "Gelöschte Nachrichten konnten nicht verschoben werden"
 
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/providers/imapx/camel-imapx-folder.c:705
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:705
 #, c-format
 msgid "No quota information available for folder '%s : %s'"
 msgstr "Kontingent-Informationen sind für Ordner »%s : %s« nicht verfügbar"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:968
-#: ../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 "Nachrichten_filter auf diesen Ordner anwenden"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:979
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:991
 msgid "Always check for _new mail in this folder"
 msgstr "Immer in diesem Ordner nach _neuen E-Mails schauen"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1090
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1096
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Zusammenfassung für %s konnte nicht erstellt werden"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1099
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1108
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "Zwischenspeicher konnte nicht für »%s« angelegt werden:"
@@ -3283,481 +3324,488 @@ msgstr "Zwischenspeicher konnte nicht für »%s« angelegt werden:"
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/providers/imapx/camel-imapx-folder.c:1300
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1312
 #, c-format
 msgid "No IMAP mailbox available for folder '%s : %s'"
 msgstr "Für Ordner »%s : %s« ist kein IMAP-Postfach verfügbar"
 
-#: ../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 "Quelldatenstrom gab keine Daten zurück"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:38
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:36
 msgid "Checking for New Mail"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../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 "In allen Ordnern nach neuen E-Mails se_hen"
 
-#: ../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 "In abonnierten Ordnern nach neuen E-Mails se_hen"
 
-#: ../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 "»_Schnelles Abgleichen« verwenden, falls es der Server unterstützt"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:44
 msgid "_Listen for server change notifications"
 msgstr "Nach Benachrich_tigungen des Servers lauschen"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:49
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:47
 msgid "Connection to Server"
 msgstr "Verbindung mit 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 "Anzahl der gleichzeitig zu verwendenden Verbindungen"
 
-#: ../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 "Ordner"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:54
 msgid "_Show only subscribed folders"
 msgstr "Nur abonnierte Ordner an_zeigen"
 
-#: ../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 "Über vom Server vorgegebenen Ordner-Namensraum hin_wegsetzen"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:59
 msgid "Namespace:"
 msgstr "Namensraum:"
 
-#: ../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 "Optionen"
 
-#: ../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 "_Filter auf neue Nachrichten in allen Ordnern anwenden"
 
-#: ../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 "_Filter auf neue Nachrichten im Eingang dieses Servers anwenden"
 
-#: ../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 "Neue Nachrichten auf _unerwünschten Inhalt prüfen"
 
-#: ../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 "Ausschließlich den _Eingangsordner auf unerwünschte Nachrichten prüfen"
 
-#: ../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 "Entfernte E-Mails automatisch lokal a_bgleichen"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Default IMAP port"
 msgstr "Vorgegebener IMAP-Port"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:81
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:79
 msgid "IMAP over TLS"
 msgstr "IMAP über TLS"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:86
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:88
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Zum Lesen und Speichern von E-Mails auf IMAP-Servern."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1167
+#: ../src/camel/providers/imapx/camel-imapx-server.c:1166
 msgid "Error writing to cache stream"
 msgstr "Fehler beim Schreiben in den Zwischenspeicher-Datenstrom"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2806
-#: ../camel/providers/imapx/camel-imapx-server.c:2894
-#: ../camel/providers/imapx/camel-imapx-server.c:3156
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2806
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2894
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3156
 msgid "Failed to get capabilities"
 msgstr "Ermitteln der Fähigkeiten gescheitert"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2825
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2825
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Verbindung mit IMAP-Server %s im sicheren Modus ist gescheitert: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2826
-#: ../camel/providers/smtp/camel-smtp-transport.c:281
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2826
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:279
 msgid "STARTTLS not supported"
 msgstr "STARTTLS nicht unterstützt"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2835
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2835
 msgid "Failed to issue STARTTLS"
 msgstr "Fehler bei der Ausgabe von STARTTLS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2883
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2883
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Verbindung mit IMAP-Server %s im sicheren Modus ist gescheitert:"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2977
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2977
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP-Server %s unterstützt den Legitimierungstyp %s nicht"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3008
-#: ../camel/providers/nntp/camel-nntp-store.c:459
-#: ../camel/providers/nntp/camel-nntp-store.c:601
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3008
+#: ../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 "Legitimierung ohne Benutzername ist nicht möglich"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3017
-#: ../camel/providers/nntp/camel-nntp-store.c:610
-#: ../camel/providers/pop3/camel-pop3-store.c:690
-#: ../camel/providers/pop3/camel-pop3-store.c:728
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3017
+#: ../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 "Legitimierungspasswort ist nicht verfügbar"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3025
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3025
 msgid "Failed to authenticate"
 msgstr "Legitimierung gescheitert"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3178
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3178
 msgid "Failed to issue NAMESPACE"
 msgstr "Fehler bei der Ausgabe von NAMESPACE"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3196
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3196
 msgid "Failed to enable QResync"
 msgstr "Aktivieren von QResync fehlgeschlagen"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3228
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3228
 msgid "Failed to issue NOTIFY"
 msgstr "Fehler bei der Ausgabe von NOTIFY"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3706
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3706
 msgid "Failed to select mailbox"
 msgstr "Fehler beim Auswählen des Postfachs"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3809
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3809
 msgid "Cannot issue command, no stream available"
 msgstr "Befehl kann nicht ausgegeben werden, kein Datenstrom vorhanden"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4073
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4073
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Nachricht mit Kennung %s konnte nicht abgerufen werden: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4074
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4074
 msgid "No such message available."
 msgstr "Nachricht nicht verfügbar."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4111
-#: ../camel/providers/imapx/camel-imapx-server.c:4136
-#: ../camel/providers/imapx/camel-imapx-server.c:4175
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4111
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4136
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4175
 msgid "Error fetching message"
 msgstr "Fehler beim Abrufen der Nachricht"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4153
-#: ../camel/providers/imapx/camel-imapx-server.c:4760
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4153
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4751
 msgid "Error performing NOOP"
 msgstr "Fehler beim Ausführen von NOOP"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4168
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4168
 msgid "Failed to close the tmp stream"
 msgstr "Temporärer Datenstrom konnte nicht geschlossen werden"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4199
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4199
 msgid "Failed to copy the tmp file"
 msgstr "Temporäre Datei konnte nicht kopiert werden"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4362
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4362
 msgid "Error moving messages"
 msgstr "Fehler beim Verschieben von Nachrichten"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4362
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4362
 msgid "Error copying messages"
 msgstr "Fehler beim Kopieren von Nachrichten"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4546
-#: ../camel/providers/imapx/camel-imapx-server.c:4567
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4547
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4568
 msgid "Cannot create spool file: "
 msgstr "Spool-Datei konnte nicht angelegt werden:"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4668
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4654
 msgid "Error appending message"
 msgstr "Fehler beim Anhängen der Nachricht"
 
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/providers/imapx/camel-imapx-server.c:4913
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4904
 #, c-format
 msgid "Scanning for changed messages in '%s : %s'"
 msgstr "Geänderte Nachrichten werden in »%s : %s« gesucht"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4917
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4908
 msgid "Error scanning changes"
 msgstr "Fehler beim Durchsuchen der Änderungen"
 
 #. Translators: The first '%s' is replaced with an account name and the second '%s'
 #. is replaced with a full path name. The spaces around ':' are intentional, as
 #. the whole '%s : %s' is meant as an absolute identification of the folder.
-#: ../camel/providers/imapx/camel-imapx-server.c:4938
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4929
 #, c-format
 msgid "Fetching summary information for new messages in '%s : %s'"
 msgstr ""
 "Zusammenfassende Informationen für neue Nachrichten in »%s : %s« werden "
 "abgerufen"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4956
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4947
 msgid "Error fetching message info"
 msgstr "Fehler beim Abrufen der Nachrichtinfo"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5018
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5009
 msgid "Error running STATUS"
 msgstr "Fehler beim Ausführen von STATUS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5510
-#: ../camel/providers/imapx/camel-imapx-server.c:5562
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5494
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5547
 msgid "Error syncing changes"
 msgstr "Fehler beim Abgleichen der Änderungen"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5673
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5677
 msgid "Error expunging message"
 msgstr "Fehler beim Löschen der Nachricht"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5743
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5749
 msgid "Error fetching folders"
 msgstr "Fehler beim Abrufen der Ordner"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5754
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5760
 msgid "Error fetching subscribed folders"
 msgstr "Fehler beim Abrufen der abonnierten Ordner"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5776
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5782
 msgid "Error creating folder"
 msgstr "Fehler beim Anlegen des Ordners"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5832
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5838
 msgid "Error deleting folder"
 msgstr "Fehler beim Löschen des Ordners"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5878
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5884
 msgid "Error renaming folder"
 msgstr "Fehler beim Umbenennen des Ordners"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5910
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5916
 msgid "Error subscribing to folder"
 msgstr "Fehler beim Abonnieren des Ordners"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5946
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5952
 msgid "Error unsubscribing from folder"
 msgstr "Fehler beim Kündigen des Abonnement des Ordners"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5986
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5992
 msgid "IMAP server does not support quotas"
 msgstr "IMAP-Server unterstützt keine Kontingente"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5998
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6004
 msgid "Error retrieving quota information"
 msgstr "Fehler beim Abrufen der Kontingent-Informationen"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6045
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6051
 msgid "Search failed"
 msgstr "Suche fehlgeschlagen"
 
 #. Blocks, until the DONE is issued or on inactivity timeout, error, ...
-#: ../camel/providers/imapx/camel-imapx-server.c:6163
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6169
 msgid "Error running IDLE"
 msgstr "Fehler beim Ausführen von IDLE"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imapx/camel-imapx-store.c:224
-#: ../camel/providers/local/camel-maildir-folder.c:482
-#: ../camel/providers/local/camel-maildir-store.c:347
-#: ../camel/providers/local/camel-maildir-store.c:826
-#: ../camel/providers/local/camel-maildir-store.c:832
-#: ../camel/providers/local/camel-maildir-store.c:915
-#: ../camel/providers/local/camel-spool-store.c:393
+#: ../src/camel/providers/imapx/camel-imapx-store.c: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 "Eingang"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:765
+#: ../src/camel/providers/imapx/camel-imapx-store.c:800
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-Server %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:768
+#: ../src/camel/providers/imapx/camel-imapx-store.c:803
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-Dienst für %s auf %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:836
+#: ../src/camel/providers/imapx/camel-imapx-store.c:871
 msgid "No IMAPx connection object provided"
 msgstr "Kein IMAPx-Verbindungsobjekt zur Verfügung gestellt"
 
-#: ../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:888
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:92
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:78
 msgid "Password"
 msgstr "Passwort"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:855
+#: ../src/camel/providers/imapx/camel-imapx-store.c:890
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dies stellt unter Verwendung eines unverschlüsselten Passworts eine "
 "Verbindung mit dem IMAP-Server her."
 
-#: ../camel/providers/imapx/camel-imapx-store.c:938
+#: ../src/camel/providers/imapx/camel-imapx-store.c:973
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner »%s« nicht vorhanden"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1381
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1421
 #, c-format
 msgid "No IMAP namespace for folder path '%s'"
 msgstr "Kein IMAP-Namensraum für Ordnerpfad  »%s«"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1642
-#: ../camel/providers/imapx/camel-imapx-store.c:1876
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1682
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1916
 #, c-format
 msgid "Retrieving folder list for '%s'"
 msgstr "Ordnerliste für »%s« wird abgerufen"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2093
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2133
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Der Ordnername »%s« ist ungültig, da er das Zeichen »%c« enthält"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2470
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2510
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Drafts"
 msgstr "[Gmail]/Entwürfe"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2471
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2511
 msgctxt "IMAPDefaults"
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2472
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2512
 msgctxt "IMAPDefaults"
 msgid "Draft"
 msgstr "Entwurf"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2475
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2515
 msgctxt "IMAPDefaults"
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2478
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2518
 msgctxt "IMAPDefaults"
 msgid "Archive"
 msgstr "Archiv"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2481
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2521
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Sent Mail"
 msgstr "[Gmail]/Gesendet"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2482
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2522
 msgctxt "IMAPDefaults"
 msgid "Sent"
 msgstr "Gesendet"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2483
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2523
 msgctxt "IMAPDefaults"
 msgid "Sent Items"
 msgstr "Gesendete Objekte"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2484
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2524
 msgctxt "IMAPDefaults"
 msgid "Sent Messages"
 msgstr "Verschickte Nachrichten"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2487
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2527
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Spam"
 msgstr "[Gmail]/Spam"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2488
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2528
 msgctxt "IMAPDefaults"
 msgid "Junk"
 msgstr "Unerwünscht"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2489
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2529
 msgctxt "IMAPDefaults"
 msgid "Junk E-mail"
 msgstr "Unerwünschte E-Mail"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2490
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2530
 msgctxt "IMAPDefaults"
 msgid "Junk Email"
 msgstr "Unerwünschte E-Mail"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2491
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2531
 msgctxt "IMAPDefaults"
 msgid "Spam"
 msgstr "Spam"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2492
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2532
 msgctxt "IMAPDefaults"
 msgid "Bulk Mail"
 msgstr "Massen-E-Mails"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2495
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2535
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Trash"
 msgstr "[Gmail]/Papierkorb"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2496
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2536
 msgctxt "IMAPDefaults"
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2497
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2537
 msgctxt "IMAPDefaults"
 msgid "Deleted Items"
 msgstr "Gelöschte Objekte"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2498
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2538
 msgctxt "IMAPDefaults"
 msgid "Deleted Messages"
 msgstr "Gelöschte Nachrichten"
 
-#: ../camel/providers/local/camel-local-folder.c:190
+#: ../src/camel/providers/local/camel-local-folder.c:187
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:200
-#: ../camel/providers/local/camel-local-folder.c:209
+#: ../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 "Postfach: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:218
+#: ../src/camel/providers/local/camel-local-folder.c:215
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:495
+#: ../src/camel/providers/local/camel-local-folder.c:505
 msgid "_Index message body data"
 msgstr "Rumpfdaten der Nachricht _indizieren"
 
-#: ../camel/providers/local/camel-local-folder.c:723
+#: ../src/camel/providers/local/camel-local-folder.c:737
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3766,23 +3814,27 @@ msgstr ""
 "Nachricht %s konnte nicht aus Ordner %s abgerufen werden\n"
 "%s"
 
-#: ../camel/providers/local/camel-local-provider.c:41
+#: ../src/camel/providers/local/camel-local-provider.c:43
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "Die Ordner-_Zusammenfassungsdatei ».folders« verwenden (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-Mail-Ordner im 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 "Zum Speichern lokaler E-Mails in MH-artigen E-Mail-Ordnern."
 
-#: ../camel/providers/local/camel-local-provider.c:66
+#: ../src/camel/providers/local/camel-local-provider.c:65
+msgid "Apply _filters to new messages"
+msgstr "_Filter auf neue Nachrichten anwenden"
+
+#: ../src/camel/providers/local/camel-local-provider.c:73
 msgid "Local delivery"
 msgstr "Lokale Auslieferung"
 
-#: ../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."
@@ -3790,29 +3842,29 @@ msgstr ""
 "Zum Abrufen (Verschieben) von lokalen E-Mails aus Standardspools im mbox-"
 "Format in von Evolution verwaltete Ordner."
 
-#: ../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 "Filter auf neue Nachrichten im Posteingang _anwenden"
 
-#: ../camel/providers/local/camel-local-provider.c:86
+#: ../src/camel/providers/local/camel-local-provider.c:95
 msgid "Maildir-format mail directories"
 msgstr "E-Mail-Ordner im 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 "Zum Speichern lokaler E-Mails in Maildir-Ordnern."
 
-#: ../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 "Status-_Kopfzeilen im Elm/Pine/Mutt-Format speichern"
 
-#: ../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-Datei"
 
-#: ../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."
@@ -3822,220 +3874,220 @@ msgstr ""
 "Kann außerdem zum Einlesen eines Baums mit Elm-, Pine- oder Mutt-Ordnern "
 "verwendet werden."
 
-#: ../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-Ordner"
 
-#: ../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 "Ordner %s konnte nicht in %s umbenannt werden: %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 "Lokale E-Mail-Datei %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 "Speicherwurzel %s ist kein absoluter Pfad"
 
-#: ../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 "Speicherwurzel »%s« ist kein regulärer Ordner."
 
-#: ../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 "Ordner konnte nicht abgerufen werden: %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 "Lokale Speicher haben keinen Eingangsordner"
 
-#: ../camel/providers/local/camel-local-store.c:446
-#: ../camel/providers/local/camel-mbox-store.c:739
+#: ../src/camel/providers/local/camel-local-store.c:444
+#: ../src/camel/providers/local/camel-mbox-store.c:737
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Ordner-Indexdatei »%s« konnte nicht gelöscht werden: %s"
 
-#: ../camel/providers/local/camel-local-store.c:474
-#: ../camel/providers/local/camel-mbox-store.c:769
+#: ../src/camel/providers/local/camel-local-store.c:472
+#: ../src/camel/providers/local/camel-mbox-store.c:767
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Ordner-Metadatei »%s« konnte nicht gelöscht werden: %s"
 
-#: ../camel/providers/local/camel-local-store.c:587
+#: ../src/camel/providers/local/camel-local-store.c:585
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "»%s« konnte nicht umbenannt werden: %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 "Nachricht existiert nicht"
 
-#: ../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 "Nachricht konnte nicht an Maildir-Ordner angehängt werden: %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 "Nachricht %s konnte nicht aus Ordner %s abgerufen werden:"
 
-#: ../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 "Nachricht kann nicht in den Zielordner übertragen werden: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:131
-#: ../camel/providers/local/camel-maildir-store.c:931
+#: ../src/camel/providers/local/camel-maildir-store.c:129
+#: ../src/camel/providers/local/camel-maildir-store.c:929
 #, c-format
 msgid "Cannot create folder containing '%s'"
 msgstr "Ordner, der »%s« enthält, kann nicht angelegt werden"
 
-#: ../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 "Ordner %s existiert bereits"
 
-#: ../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 "Ordner »%s« konnte nicht angelegt werden: %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 "Ordner »%s« konnte nicht abgerufen werden: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:287
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mh-store.c:532
+#: ../src/camel/providers/local/camel-maildir-store.c:285
+#: ../src/camel/providers/local/camel-mbox-store.c:375
+#: ../src/camel/providers/local/camel-mh-store.c:528
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Ordner »%s« konnte nicht abgerufen werden: Ordner existiert nicht."
 
-#: ../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 "Ordner »%s« konnte nicht abgerufen werden: kein Maildir-Ordner."
 
-#: ../camel/providers/local/camel-maildir-store.c:378
-#: ../camel/providers/local/camel-maildir-store.c:418
-#: ../camel/providers/local/camel-mh-store.c:676
+#: ../src/camel/providers/local/camel-maildir-store.c:376
+#: ../src/camel/providers/local/camel-maildir-store.c:416
+#: ../src/camel/providers/local/camel-mh-store.c:672
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Ordner »%s« konnte nicht gelöscht werden: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:380
+#: ../src/camel/providers/local/camel-maildir-store.c:378
 msgid "not a maildir directory"
 msgstr "kein Maildir-Ordner"
 
-#: ../camel/providers/local/camel-maildir-store.c:666
-#: ../camel/providers/local/camel-maildir-store.c:1146
-#: ../camel/providers/local/camel-spool-store.c:212
-#: ../camel/providers/local/camel-spool-store.c:231
+#: ../src/camel/providers/local/camel-maildir-store.c:664
+#: ../src/camel/providers/local/camel-maildir-store.c:1144
+#: ../src/camel/providers/local/camel-spool-store.c:210
+#: ../src/camel/providers/local/camel-spool-store.c:229
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Ordner »%s« konnte nicht eingelesen werden: %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:445
+#: ../src/camel/providers/local/camel-maildir-summary.c:586
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir-Ordnerpfad konnte nicht geöffnet werden: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:607
+#: ../src/camel/providers/local/camel-maildir-summary.c:577
 msgid "Checking folder consistency"
 msgstr "Konsistenz des Ordners wird überprüft"
 
-#: ../camel/providers/local/camel-maildir-summary.c:707
+#: ../src/camel/providers/local/camel-maildir-summary.c:676
 msgid "Checking for new messages"
 msgstr "Nach neuen Nachrichten sehen"
 
-#: ../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:779
+#: ../src/camel/providers/local/camel-mbox-summary.c:364
+#: ../src/camel/providers/local/camel-mbox-summary.c:582
+#: ../src/camel/providers/local/camel-mbox-summary.c:736
+#: ../src/camel/providers/local/camel-spool-summary.c:141
 msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
 
-#: ../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 "Postfach konnte nicht geöffnet werden: %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 "Nachricht konnte nicht an mbox-Datei angehängt werden: %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 "Dieser Ordner scheint irreparabel beschädigt zu sein."
 
-#: ../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 "Ordnersperre auf %s konnte nicht erzeugt werden: %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 "Es konnte kein Ordner mit diesem Namen angelegt werden."
 
-#: ../camel/providers/local/camel-mbox-store.c:433
+#: ../src/camel/providers/local/camel-mbox-store.c:431
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Ordner »%s« konnte nicht abgerufen werden: keine reguläre Datei."
 
-#: ../camel/providers/local/camel-mbox-store.c:596
+#: ../src/camel/providers/local/camel-mbox-store.c:594
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Ordner »%s« konnte nicht angelegt werden: %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 "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:610
+#: ../src/camel/providers/local/camel-mbox-store.c:608
 msgid "Folder already exists"
 msgstr "Ordner existiert bereits"
 
-#: ../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"
@@ -4044,79 +4096,79 @@ msgstr ""
 "Ordner »%s« konnte nicht gelöscht werden:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:673
+#: ../src/camel/providers/local/camel-mbox-store.c:671
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "»%s« ist keine reguläre Datei."
 
-#: ../camel/providers/local/camel-mbox-store.c:682
+#: ../src/camel/providers/local/camel-mbox-store.c:680
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Ordner »%s« ist nicht leer. Nicht gelöscht."
 
-#: ../camel/providers/local/camel-mbox-store.c:709
-#: ../camel/providers/local/camel-mbox-store.c:724
+#: ../src/camel/providers/local/camel-mbox-store.c:707
+#: ../src/camel/providers/local/camel-mbox-store.c:722
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Ordner-Zusammenfassungsdatei »%s« konnte nicht gelöscht werden: %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 "Der neue Ordnername ist nicht zulässig."
 
-#: ../camel/providers/local/camel-mbox-store.c:822
+#: ../src/camel/providers/local/camel-mbox-store.c:820
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "»%s« konnte nicht umbenannt werden: »%s«: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:476
+#: ../src/camel/providers/local/camel-mbox-summary.c:374
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ordner konnte nicht geöffnet werden: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:611
+#: ../src/camel/providers/local/camel-mbox-summary.c:506
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ordner konnte nicht geprüft werden: %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:591
+#: ../src/camel/providers/local/camel-mbox-summary.c:745
+#: ../src/camel/providers/local/camel-spool-summary.c:148
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Datei konnte nicht geöffnet werden: %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:610
+#: ../src/camel/providers/local/camel-spool-summary.c:163
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Temporäres Postfach konnte nicht angelegt werden: %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:627
+#: ../src/camel/providers/local/camel-mbox-summary.c:867
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:745
+#: ../src/camel/providers/local/camel-mbox-summary.c:640
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Temporärer Ordner konnte nicht geschlossen werden: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:764
+#: ../src/camel/providers/local/camel-mbox-summary.c:659
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %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:759
+#: ../src/camel/providers/local/camel-mbox-summary.c:1030
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Ordner konnte nicht gespeichert werden: %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:800
+#: ../src/camel/providers/local/camel-mbox-summary.c:1073
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -4125,81 +4177,81 @@ msgstr ""
 "Die MBOX-Datei ist beschädigt, bitte beheben Sie das Problem. (Es wurde eine "
 "Von:-Zeile erwartet aber nicht erhalten.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:908
-#: ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../src/camel/providers/local/camel-mbox-summary.c:810
+#: ../src/camel/providers/local/camel-mbox-summary.c:1085
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Zusammenfassung und Ordner stimmen nicht überein, sogar nach einem "
 "Datenabgleich"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1077
-#: ../camel/providers/local/camel-spool-summary.c:356
+#: ../src/camel/providers/local/camel-mbox-summary.c:977
+#: ../src/camel/providers/local/camel-spool-summary.c:358
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %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:1146
+#: ../src/camel/providers/local/camel-mbox-summary.c:1176
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Fehler beim Schreiben in temporäres Postfach: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1261
+#: ../src/camel/providers/local/camel-mbox-summary.c:1165
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Fehler beim Schreiben in temporäres Postfach %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 "Nachricht konnte nicht an mh-Ordner angehängt werden: %s:"
 
-#: ../camel/providers/local/camel-mh-store.c:542
+#: ../src/camel/providers/local/camel-mh-store.c:538
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Ordner »%s« konnte nicht angelegt werden: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:558
+#: ../src/camel/providers/local/camel-mh-store.c:554
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Ordner »%s« konnte nicht abgerufen werden: kein Ordner."
 
-#: ../camel/providers/local/camel-mh-summary.c:236
+#: ../src/camel/providers/local/camel-mh-summary.c:235
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH-Ordnerpfad konnte nicht geöffnet werden: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:95
+#: ../src/camel/providers/local/camel-spool-store.c:93
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Spool »%s« konnte nicht geöffnet werden: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:109
+#: ../src/camel/providers/local/camel-spool-store.c:107
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Spool »%s« ist weder eine reguläre Datei noch ein regulärer Ordner"
 
-#: ../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 "E-Mail-Spooldatei %s"
 
-#: ../camel/providers/local/camel-spool-store.c:429
+#: ../src/camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool-Ordnerbaum %s"
 
-#: ../camel/providers/local/camel-spool-store.c:432
+#: ../src/camel/providers/local/camel-spool-store.c:429
 msgid "Invalid spool"
 msgstr "Ungültige Warteschlange"
 
-#: ../camel/providers/local/camel-spool-store.c:481
+#: ../src/camel/providers/local/camel-spool-store.c:478
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Ordner »%s/%s« existiert nicht."
 
-#: ../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"
@@ -4208,12 +4260,12 @@ msgstr ""
 "Ordner »%s« konnte nicht geöffnet werden:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:500
+#: ../src/camel/providers/local/camel-spool-store.c:497
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Ordner »%s« existiert nicht."
 
-#: ../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"
@@ -4222,41 +4274,41 @@ msgstr ""
 "Ordner »%s« konnte nicht angelegt werden:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:521
+#: ../src/camel/providers/local/camel-spool-store.c:518
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "»%s« ist keine Postfachdatei."
 
-#: ../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 "Speicher unterstützt keinen Eingangsordner"
 
-#: ../camel/providers/local/camel-spool-store.c:604
+#: ../src/camel/providers/local/camel-spool-store.c:601
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-Ordner können nicht gelöscht werden"
 
-#: ../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-Ordner können nicht umbenannt werden"
 
-#: ../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 "Temporärer Ordner %s konnte nicht abgeglichen werden: %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 "Spool-Ordner %s konnte nicht abgeglichen werden: %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"
@@ -4265,86 +4317,86 @@ msgstr ""
 "Spool-Ordner %s konnte nicht abgeglichen werden: %s\n"
 "Ordner könnte fehlerhaft sein, Kopie in »%s« gespeichert"
 
-#: ../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 "Interner Fehler: UID-Format ungültig: %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 "Nachricht %s konnte nicht abgerufen werden: %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 "Nachricht %s konnte nicht abgerufen werden:"
 
-#: ../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 "Veröffentlichung gescheitert: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:508
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:488
 msgid "Posting failed: "
 msgstr "Veröffentlichung gescheitert:"
 
-#: ../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 "Diese Nachricht ist derzeit nicht verfügbar"
 
-#: ../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 "Nachrichten können nicht aus NNTP-Ordnern kopiert werden"
 
-#: ../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 "Ordner in _Kurznotation verwenden (also c.o.linux statt 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 "_Relative Ordnernamen im Abonnementdialog anzeigen"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:54
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:54
 msgid "Default NNTP port"
 msgstr "Vorgegebener NNTP-Port"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:55
 msgid "NNTP over TLS"
 msgstr "NNTP über 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 ""
 "Dies ist ein Treiber zum Lesen und Verfassen von Beiträgen in bzw. an USENET-"
 "Newsgroups."
 
-#: ../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 ""
 "Dies stellt eine Verbindung mit dem NNTP-Server her, ohne Legitimierung."
 
-#: ../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."
@@ -4352,37 +4404,37 @@ msgstr ""
 "Dies führt die Legitimierung am NNTP-Server mit einem unverschlüsselten "
 "Passwort durch."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:381
+#: ../src/camel/providers/nntp/camel-nntp-store.c:379
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Begrüßung von %s konnte nicht gelesen werden:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:393
+#: ../src/camel/providers/nntp/camel-nntp-store.c:391
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-Server %s antwortete mit Fehler-Code %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:412
+#: ../src/camel/providers/nntp/camel-nntp-store.c:410
 #, c-format
 msgid "Failed to issue STARTTLS for NNTP server %s: "
 msgstr "Fehler bei der Ausgabe von STARTTLS für den NNTP-Server %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:423
+#: ../src/camel/providers/nntp/camel-nntp-store.c:421
 #, c-format
 msgid "NNTP server %s doesn't support STARTTLS: %s"
 msgstr "NNTP-Server %s unterstützt STARTTLS nicht: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:443
+#: ../src/camel/providers/nntp/camel-nntp-store.c:441
 #, c-format
 msgid "Failed to connect to NNTP server %s in secure mode: "
 msgstr "Verbindung mit NNTP-Server %s im sicheren Modus ist gescheitert: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:514
+#: ../src/camel/providers/nntp/camel-nntp-store.c:512
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-News über %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1251
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1250
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4393,26 +4445,26 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1367
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1365
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Sie können in Newsgroups keine Ordner anlegen: Abonnieren Sie sie "
 "stattdessen."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1383
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1381
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Sie können in Newsgroups keine Ordner umbenennen."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1406
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1404
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Sie können in Newsgroups keine Ordner entfernen: Bestellen Sie sie "
 "stattdessen ab."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1616
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1614
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4422,7 +4474,7 @@ msgstr ""
 "Sie können diese Newsgroup nicht abonnieren, da sie nicht existiert.\n"
 "Vermutlich ist das gewählte Objekt ein Elternordner."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1683
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1681
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4430,116 +4482,116 @@ msgid ""
 "newsgroup does not exist!"
 msgstr "Sie können diese Newsgroup nicht abonnieren, da sie nicht existiert."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2109
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2107
 msgid "NNTP Command failed: "
 msgstr "NNTP-Befehl gescheitert:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2214
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2212
 #, c-format
 msgid "Not connected."
 msgstr "Nicht verbunden."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2316
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2314
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ordner existiert nicht: %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: neue Nachrichten werden eingelesen"
 
-#: ../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 "Unerwartete Server-Antwort von 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 "Unerwartete Server-Antwort von 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 "Vorgang gescheitert: %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 "Keine Nachricht mit der Kennung %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 "POP-Nachricht %d wird abgerufen"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:576
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:644
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:645
 msgid "Retrieving POP summary"
 msgstr "POP-Zusammenfassung wird abgerufen"
 
-#: ../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 "POP-Zusammenfassung konnte nicht abgerufen werden:"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:811
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:812
 msgid "Expunging old messages"
 msgstr "Alte Nachrichten werden gelöscht"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:839
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:840
 msgid "Expunging deleted messages"
 msgstr "Gelöschte Nachrichten werden ausgeräumt"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:36
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:34
 msgid "Message Storage"
 msgstr "Nachrichtenspeicher"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:38
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:36
 msgid "_Leave messages on server"
 msgstr "Nachrichten auf _Server belassen"
 
 #. 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 "_Nach %s Tag(en) löschen"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:42
 msgid "Delete _expunged from local Inbox"
 msgstr "Gelöschte Nachrichten aus lokalem Posteingang _entfernen"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:46
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:44
 msgid "Disable _support for all POP3 extensions"
 msgstr "Jegliche _Unterstützung von POP3-Erweiterungen deaktivieren"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:52
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:50
 msgid "Default POP3 port"
 msgstr "Vorgegebener POP3-Port"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:51
 msgid "POP3 over TLS"
 msgstr "POP3 über TLS"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:60
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:58
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:62
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:60
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Zum Verbinden mit und Herunterladen von E-Mails von POP-Servern."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:80
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4548,7 +4600,7 @@ msgstr ""
 "Verbindung mit dem POP-Server her. Viele POP-Server unterstützen nur diese "
 "Möglichkeit."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:92
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:90
 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 "
@@ -4560,65 +4612,65 @@ msgstr ""
 "zu unterstützen."
 
 #. 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 "Es konnte keine gültige Begrüßung durch POP-Server %s gelesen werden"
 
-#: ../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 ""
 "Verbindung mit POP-Server %s konnte im sicheren Modus nicht hergestellt "
 "werden: %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 wird vom Server nicht unterstützt"
 
 #. 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 ""
 "Verbindung mit POP-Server %s konnte im sicheren Modus nicht hergestellt "
 "werden %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 ""
 "Verbindung mit POP-Server %s konnte im sicheren Modus nicht hergestellt "
 "werden:"
 
-#: ../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 "Anmeldung an POP-Server %s gescheitert: SASL-Protokollfehler"
 
-#: ../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 "Legitimierung am POP-Server %s gescheitert:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../src/camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3-Server %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:490
+#: ../src/camel/providers/pop3/camel-pop3-store.c:488
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3-Dienst für %s auf %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:702
-#: ../camel/providers/pop3/camel-pop3-store.c:715
-#: ../camel/providers/pop3/camel-pop3-store.c:801
+#: ../src/camel/providers/pop3/camel-pop3-store.c:700
+#: ../src/camel/providers/pop3/camel-pop3-store.c:713
+#: ../src/camel/providers/pop3/camel-pop3-store.c:799
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4627,7 +4679,7 @@ msgstr ""
 "Verbindung mit POP-Server %s konnte nicht hergestellt werden.\n"
 "Fehler beim Übermitteln des Passworts:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:742
+#: ../src/camel/providers/pop3/camel-pop3-store.c:740
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4639,7 +4691,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:816
+#: ../src/camel/providers/pop3/camel-pop3-store.c:814
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4648,22 +4700,22 @@ msgstr ""
 "Verbindung mit POP-Server %s konnte nicht hergestellt werden.\n"
 "Fehler beim Übermitteln des Benutzernamens %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:900
+#: ../src/camel/providers/pop3/camel-pop3-store.c:898
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Ordner »%s« existiert nicht."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:917
+#: ../src/camel/providers/pop3/camel-pop3-store.c:915
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3-Postfächer haben keine Ordnerstruktur"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:33
-#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
+#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:31
+#: ../src/services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:35
+#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:33
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4671,306 +4723,306 @@ msgstr ""
 "Zum Zustellen von E-Mails durch Übergabe an das Programm »sendmail« auf dem "
 "lokalen System."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:46
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:44
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:46
 msgid "Mail delivery via the sendmail program"
 msgstr "E-Mail-Zustellung über das Programm sendmail"
 
-#: ../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 "Fehler beim Lesen der Von:-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 "Verschicken von Nachrichten im offline-Modus ist deaktiviert"
 
-#: ../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 "Syntax der Empfängerliste konnte nicht analysiert werden"
 
-#: ../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 "Argumente konnten nicht analysiert werden"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:230
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:215
 #, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
 msgstr ""
 "Weiterleitung an »%s« konnte nicht angelegt werden: %s: E-Mail nicht "
 "verschickt"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:255
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:246
 #, c-format
 msgid "Could not fork '%s': %s: mail not sent"
 msgstr "»%s« konnte nicht abgespalten werden: %s: E-Mail nicht verschickt"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:304
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:301
 msgid "Could not send message: "
 msgstr "Nachricht konnte nicht verschickt werden:"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:334
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:343
 #, c-format
 msgid "'%s' exited with signal %s: mail not sent."
 msgstr "»%s« brach mit Signal %s ab: E-Mail nicht verschickt."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:344
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:353
 #, c-format
 msgid "Could not execute '%s': mail not sent."
 msgstr "»%s« konnte nicht ausgeführt werden: E-Mail nicht verschickt."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:349
+#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:358
 #, c-format
 msgid "'%s' exited with status %d: mail not sent."
 msgstr "»%s« wurde mit Status %d beendet: E-Mail nicht verschickt."
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:37
 msgid "Default SMTP port"
 msgstr "Vorgegebener SMTP-Port"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:40
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:38
 msgid "SMTP over TLS"
 msgstr "SMTP über TLS"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../src/camel/providers/smtp/camel-smtp-provider.c:39
 msgid "Message submission port"
 msgstr "Port zum Senden von Nachrichten"
 
-#: ../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 ""
 "Zum Zustellen von E-Mails per SMTP über einen entfernten E-Mail-Knotenpunkt."
 
-#: ../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 "Fehler bei Welcome-Antwort:"
 
-#: ../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 "Verbindung mit SMTP-Server %s im sicheren Modus ist gescheitert: %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-Befehl gescheitert:"
 
-#: ../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 "Verbindung mit SMTP-Server %s im sicheren Modus ist gescheitert:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:439
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:437
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-Server %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:442
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-E-Mail-Auslieferung über %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:582
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:580
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP-Server %s unterstützt den Legitimierungstypen %s nicht"
 
-#: ../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 "Kein gültiger SASL-Mechanismus wurde angegeben"
 
-#: ../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-Befehl gescheitert: Nicht verbunden."
 
-#: ../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-Befehl gescheitert:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:887
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Nachricht konnte nicht verschickt werden: Dienst nicht verbunden."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:898
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:896
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht gültig."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:902
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:900
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:931
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:929
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empfänger angegeben."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:946
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:944
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Mindestens ein Empfänger ungültig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1078
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1076
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfehler, Befehl nicht erkannt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1080
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1078
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfehler in Parametern oder Argumenten"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1080
 msgid "Command not implemented"
 msgstr "Befehl nicht implementiert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1084
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1082
 msgid "Command parameter not implemented"
 msgstr "Befehlsparameter nicht implementiert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1086
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "System status, or system help reply"
 msgstr "Systemstatus- oder Systemhilfe-Antwort"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1088
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1086
 msgid "Help message"
 msgstr "Hilfemeldung"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1090
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1088
 msgid "Service ready"
 msgstr "Dienst ist bereit"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1092
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1090
 msgid "Service closing transmission channel"
 msgstr "Dienst schließt Übertragungskanal"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1092
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst nicht verfügbar, Übertragungskanal wird geschlossen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1096
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "Requested mail action okay, completed"
 msgstr "Angeforderte E-Mail-Aktion in Ordnung, abgeschlossen"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1098
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1096
 msgid "User not local; will forward to <forward-path>"
 msgstr "Benutzer nicht lokal; Weiterleitung erfolgt zu <weiterleitungspfad>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1098
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Angeforderte E-Mail-Aktion nicht ausgeführt: Postfach nicht verfügbar"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1100
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Angeforderte Aktion nicht ausgeführt: Postfach nicht verfügbar"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1104
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1102
 msgid "Requested action aborted: error in processing"
 msgstr "Angeforderte Aktion abgebrochen: Fehler bei Verarbeitung"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1106
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1104
 msgid "User not local; please try <forward-path>"
 msgstr "Benutzer nicht lokal; probieren Sie es mit <weiterleitungspfad>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1108
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1106
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Angeforderte Aktion nicht ausgeführt: unzureichender Systemspeicher"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1110
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1108
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Angeforderte Aktion abgebrochen: Speicherzuteilung überschritten"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1110
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Angeforderte Aktion nicht ausgeführt: Postfachname nicht erlaubt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1114
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "E-Mail-Eingabe beginnen; Ende mit <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1114
 msgid "Transaction failed"
 msgstr "Transaktion gescheitert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1120
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1118
 msgid "A password transition is needed"
 msgstr "Ein Passwortübergang ist notwendig"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Authentication mechanism is too weak"
 msgstr "Legitimierungsmechanismus ist zu schwach"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1124
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1122
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "Für den verlangten Legitimierungsmechanismus ist eine Verschlüsselung "
 "erforderlich."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1126
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1124
 msgid "Temporary authentication failure"
 msgstr "Legitimierung vorübergehend gescheitert"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1416
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1414
 msgid "SMTP Greeting"
 msgstr "SMTP-Begrüßung"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1425
-#: ../camel/providers/smtp/camel-smtp-transport.c:1438
-#: ../camel/providers/smtp/camel-smtp-transport.c:1445
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1423
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1436
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1443
 msgid "HELO command failed: "
 msgstr "HELO-Befehl gescheitert:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1521
-#: ../camel/providers/smtp/camel-smtp-transport.c:1535
-#: ../camel/providers/smtp/camel-smtp-transport.c:1544
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1533
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1542
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM-Befehl gescheitert:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1572
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1570
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO-Befehl gescheitert:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1588
-#: ../camel/providers/smtp/camel-smtp-transport.c:1597
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1586
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1595
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> gescheitert:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1669
-#: ../camel/providers/smtp/camel-smtp-transport.c:1680
-#: ../camel/providers/smtp/camel-smtp-transport.c:1691
-#: ../camel/providers/smtp/camel-smtp-transport.c:1753
-#: ../camel/providers/smtp/camel-smtp-transport.c:1771
-#: ../camel/providers/smtp/camel-smtp-transport.c:1784
-#: ../camel/providers/smtp/camel-smtp-transport.c:1792
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1669
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1680
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1691
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1740
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1758
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1771
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1779
 msgid "DATA command failed: "
 msgstr "DATA-Befehl gescheitert:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1818
-#: ../camel/providers/smtp/camel-smtp-transport.c:1832
-#: ../camel/providers/smtp/camel-smtp-transport.c:1840
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1805
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1819
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1827
 msgid "RSET command failed: "
 msgstr "RSET-Befehl gescheitert:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1866
-#: ../camel/providers/smtp/camel-smtp-transport.c:1878
-#: ../camel/providers/smtp/camel-smtp-transport.c:1884
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1853
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1865
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1871
 msgid "QUIT command failed: "
 msgstr "QUIT-Befehl gescheitert:"
 
@@ -5118,38 +5170,39 @@ msgstr "(Veraltet) Portnummer für SOCKS-Anfragen"
 msgid "(Deprecated) Automatic proxy configuration URL"
 msgstr "(Veraltet) Adresse zur automatischen Proxy-Konfiguration"
 
-#: ../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 unterstützt das Erstellen entfernter Ressourcen nicht"
 
-#: ../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 unterstützt das Löschen entfernter Ressourcen nicht"
 
-#: ../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."
 msgstr ""
 "Backend für Quelle »%s« und Erweiterung »%s« kann nicht gefunden werden."
 
-#: ../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 "In der Quelldatei fehlt eine [%s]-Gruppe"
 
-#: ../libebackend/e-server-side-source.c:466
+#: ../src/libebackend/e-server-side-source.c:467
 msgid "Failed to lookup credentials: "
 msgstr "Nachschlagen von Anmeldedaten gescheitert: "
 
-#: ../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:1598
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr ""
 "Die Datenquelle »%s« unterstützt das Erstellen entfernter Ressourcen nicht"
 
-#: ../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"
@@ -5157,276 +5210,278 @@ msgstr ""
 "Datenquelle »%s« hat kein Sammel-Backend zum Erstellen der entfernten "
 "Ressource"
 
-#: ../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:1711
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr ""
 "Die Datenquelle »%s« unterstützt das Löschen entfernter Ressourcen nicht"
 
-#: ../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"
 msgstr ""
 "Datenquelle »%s« hat kein Sammel-Backend zum Löschen der entfernten Ressource"
 
-#: ../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:1807
+#: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1080
 #, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
 msgstr "Datenquelle »%s« unterstützt die Legitimierung mit OAuth 2.0 nicht"
 
-#: ../libebackend/e-server-side-source.c:1856
+#: ../src/libebackend/e-server-side-source.c:1857
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "Die Datei muss die Endung ».source« haben"
 
-#: ../libebackend/e-source-registry-server.c:319
+#: ../src/libebackend/e-source-registry-server.c:320
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr "UID »%s« wird bereits verwendet"
 
-#: ../libebackend/e-subprocess-factory.c:279
+#: ../src/libebackend/e-subprocess-factory.c:277
 #, c-format
 msgid "Module '%s' for source UID '%s' cannot be loaded"
 msgstr "Modul »%s« für die Quell-UID »%s« kann nicht geladen werden"
 
-#: ../libebackend/e-subprocess-factory.c:291
+#: ../src/libebackend/e-subprocess-factory.c:289
 #, c-format
 msgid "No such source for UID '%s'"
 msgstr "Keine solche Quelle für UID »%s«"
 
-#: ../libebackend/e-subprocess-factory.c:302
+#: ../src/libebackend/e-subprocess-factory.c:300
 #, c-format
 msgid "Failed to create backend of type '%s' for source UID '%s'"
 msgstr "Backend des Typs »%s« für Quell-UID »%s« konnte nicht erzeugt werden"
 
-#: ../libebackend/e-user-prompter-server.c:305
+#: ../src/libebackend/e-user-prompter-server.c:303
 #, c-format
 msgid "Extension dialog '%s' not found."
 msgstr "Erweiterungsdialog »%s« wurde nicht gefunden."
 
-#: ../libedataserver/e-categories.c:49
+#: ../src/libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "Jahrestag"
 
-#: ../libedataserver/e-categories.c:50
+#: ../src/libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: ../libedataserver/e-categories.c:51
+#: ../src/libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: ../libedataserver/e-categories.c:52
+#: ../src/libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Wettbewerb"
 
-#: ../libedataserver/e-categories.c:53
+#: ../src/libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Favoriten"
 
-#: ../libedataserver/e-categories.c:54
+#: ../src/libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Geschenke"
 
-#: ../libedataserver/e-categories.c:55
+#: ../src/libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Ziele/Zielsetzungen"
 
-#: ../libedataserver/e-categories.c:56
+#: ../src/libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Urlaub"
 
-#: ../libedataserver/e-categories.c:57
+#: ../src/libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Urlaubskarten"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:59
+#: ../src/libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Heiße Kontakte"
 
-#: ../libedataserver/e-categories.c:60
+#: ../src/libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ideen"
 
-#: ../libedataserver/e-categories.c:61
+#: ../src/libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "International"
 msgstr "International"
 
-#: ../libedataserver/e-categories.c:62
+#: ../src/libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Schlüssel-Kunde"
 
-#: ../libedataserver/e-categories.c:63
+#: ../src/libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Allgemeines"
 
-#: ../libedataserver/e-categories.c:64
+#: ../src/libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../libedataserver/e-categories.c:65
+#: ../src/libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Anrufe"
 
 #. 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 "Strategien"
 
-#: ../libedataserver/e-categories.c:69
+#: ../src/libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Lieferanten"
 
-#: ../libedataserver/e-categories.c:70
+#: ../src/libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Zeit und Ausgaben"
 
-#: ../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 "Wartend"
 
-#: ../libedataserver/e-client.c:146
+#: ../src/libedataserver/e-client.c:144
 msgid "Source not loaded"
 msgstr "Quelle nicht geladen"
 
-#: ../libedataserver/e-client.c:148
+#: ../src/libedataserver/e-client.c:146
 msgid "Source already loaded"
 msgstr "Quelle bereits geladen"
 
 #. 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 "Abwesend, nicht verfügbar"
 
-#: ../libedataserver/e-client.c:181
+#: ../src/libedataserver/e-client.c:179
 msgid "D-Bus error"
 msgstr "D-Bus-Fehler"
 
-#: ../libedataserver/e-client.c:2023
+#: ../src/libedataserver/e-client.c:2021
 msgid "Timeout was reached"
 msgstr "Zeitüberschreitung erreicht"
 
-#: ../libedataserver/e-source.c:771
+#: ../src/libedataserver/e-source.c:774
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "In der Quelldatei fehlt eine [%s]-Gruppe"
 
-#: ../libedataserver/e-source.c:1375
+#: ../src/libedataserver/e-source.c:1378
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "Datenquelle »%s« ist nicht entfernbar"
 
-#: ../libedataserver/e-source.c:1498
+#: ../src/libedataserver/e-source.c:1501
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "Datenquelle »%s« ist schreibgeschützt"
 
-#: ../libedataserver/e-source.c:2194
+#: ../src/libedataserver/e-source.c:2197
 msgid "Unnamed"
 msgstr "Unbenannt"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:41
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:39
 msgid "Credentials lookup is not supported"
 msgstr "Nachschlagen von Anmeldedaten wird nicht unterstützt"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:54
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:52
 msgid "Credentials store is not supported"
 msgstr "Speichern von Anmeldedaten wird nicht unterstützt"
 
-#: ../libedataserver/e-source-credentials-provider-impl.c:65
+#: ../src/libedataserver/e-source-credentials-provider-impl.c:63
 msgid "Credentials delete is not supported"
 msgstr "Löschen von Anmeldedaten wird nicht unterstützt"
 
 #. Translators: The first %s is a display name of the source, the second is its UID.
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:81
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:145
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:242
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:79
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:143
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:240
 #, c-format
 msgid "Source '%s' (%s) is not a valid Google source"
 msgstr "Quelle »%s« (%s) ist keine gültige Google-Quelle"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:159
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:157
 msgid "Google secret not found"
 msgstr "Google-Secret nicht gefunden"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:190
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:212
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:235
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:525
+#: ../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:523
 msgid "Google authentication is not supported"
 msgstr "Google-Legitimierung wird nicht unterstützt"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:401
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:399
 msgid "Failed to get Google secret from credentials"
 msgstr "Erhalten von Google-Geheimnis aus den Anmeldedaten ist fehlgeschlagen"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:408
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:406
 msgid "Refresh token not found in Google secret"
 msgstr "Auffrischungs-Token wurde in Google-Geheimnis nicht gefunden"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:416
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:414
 msgid "Failed to construct refresh_token request"
 msgstr "Neue »refresh_token«-Anfrage konnte nicht konstruiert werden"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:449
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:447
 msgid "Failed to encode new access token to Google secret"
 msgstr "Neuer Zugriffs-Token für Google-Geheimnis konnte nicht erstellt werden"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:459
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:457
 msgid "Failed to get access token from refresh_token server response"
 msgstr ""
 "Zugriffs-Token konnte nicht aus der »refresh_token«-Serverantwort erhalten "
 "werden"
 
-#: ../libedataserver/e-source-credentials-provider-impl-google.c:465
+#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:463
 msgid "Failed to refresh token"
 msgstr "Token konnte nicht aktualisiert werden"
 
-#: ../libedataserver/e-source-credentials-provider-impl-password.c:81
+#: ../src/libedataserver/e-source-credentials-provider-impl-password.c:79
 msgid "Password not found"
 msgstr "Passwort nicht gefunden"
 
-#: ../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 "Das Signaturskript muss eine lokale Datei sein"
 
-#: ../libedataserver/e-source-proxy.c:1641
+#: ../src/libedataserver/e-source-proxy.c:1642
 #, c-format
 msgid "Source '%s' does not support proxy lookups"
 msgstr "Die Datenquelle »%s« unterstützt nicht das Nachschlagen von Proxys"
@@ -5435,7 +5490,8 @@ msgstr "Die Datenquelle »%s« unterstützt nicht das Nachschlagen von Proxys"
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1692 ../libedataserver/e-time-utils.c:1991
+#: ../src/libedataserver/e-time-utils.c:1691
+#: ../src/libedataserver/e-time-utils.c:1990
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -5443,7 +5499,8 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1982
+#: ../src/libedataserver/e-time-utils.c:1696
+#: ../src/libedataserver/e-time-utils.c:1981
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d. %m %Y %k:%M:%S"
 
@@ -5451,7 +5508,8 @@ msgstr "%a, %d. %m %Y %k:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1702 ../libedataserver/e-time-utils.c:1987
+#: ../src/libedataserver/e-time-utils.c:1701
+#: ../src/libedataserver/e-time-utils.c:1986
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y, %I:%M %p"
 
@@ -5459,78 +5517,83 @@ msgstr "%a, %d.%m.%Y, %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1978
+#: ../src/libedataserver/e-time-utils.c:1706
+#: ../src/libedataserver/e-time-utils.c:1977
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y, %k:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1712
+#: ../src/libedataserver/e-time-utils.c:1711
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %d.%m.%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1717
+#: ../src/libedataserver/e-time-utils.c:1716
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y %k"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1720 ../libedataserver/e-time-utils.c:1840
-#: ../libedataserver/e-time-utils.c:1973
+#: ../src/libedataserver/e-time-utils.c:1719
+#: ../src/libedataserver/e-time-utils.c:1839
+#: ../src/libedataserver/e-time-utils.c:1972
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1727
+#: ../src/libedataserver/e-time-utils.c:1726
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1731
+#: ../src/libedataserver/e-time-utils.c:1730
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %k:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1736
+#: ../src/libedataserver/e-time-utils.c:1735
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y / %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1741
+#: ../src/libedataserver/e-time-utils.c:1740
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %k:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1746
+#: ../src/libedataserver/e-time-utils.c:1745
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1751
+#: ../src/libedataserver/e-time-utils.c:1750
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %k"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1754 ../libedataserver/e-time-utils.c:1843
+#: ../src/libedataserver/e-time-utils.c:1753
+#: ../src/libedataserver/e-time-utils.c:1842
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1914 ../libedataserver/e-time-utils.c:2035
+#: ../src/libedataserver/e-time-utils.c:1913
+#: ../src/libedataserver/e-time-utils.c:2034
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1918 ../libedataserver/e-time-utils.c:2027
+#: ../src/libedataserver/e-time-utils.c:1917
+#: ../src/libedataserver/e-time-utils.c:2026
 msgid "%H:%M:%S"
 msgstr "%k:%M:%S"
 
@@ -5538,94 +5601,96 @@ msgstr "%k:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1923 ../libedataserver/e-time-utils.c:2032
+#: ../src/libedataserver/e-time-utils.c:1922
+#: ../src/libedataserver/e-time-utils.c:2031
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1927 ../libedataserver/e-time-utils.c:2024
+#: ../src/libedataserver/e-time-utils.c:1926
+#: ../src/libedataserver/e-time-utils.c:2023
 msgid "%H:%M"
 msgstr "%k:%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 "%k%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1935
+#: ../src/libedataserver/e-time-utils.c:1934
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserver/e-webdav-discover.c:484
-#: ../libedataserver/e-webdav-discover.c:493
+#: ../src/libedataserver/e-webdav-discover.c:482
+#: ../src/libedataserver/e-webdav-discover.c:491
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP-Fehler: %s"
 
-#: ../libedataserver/e-webdav-discover.c:523
+#: ../src/libedataserver/e-webdav-discover.c:521
 msgid "Could not parse response"
 msgstr "Antwort konnte nicht verarbeitet werden"
 
-#: ../libedataserver/e-webdav-discover.c:532
+#: ../src/libedataserver/e-webdav-discover.c:530
 msgid "Empty response"
 msgstr "Leere Antwort"
 
-#: ../libedataserver/e-webdav-discover.c:540
+#: ../src/libedataserver/e-webdav-discover.c:538
 msgid "Unexpected reply from server"
 msgstr "Unerwartete Antwort vom Server"
 
-#: ../libedataserverui/e-credentials-prompter.c:260
-#: ../libedataserverui/e-credentials-prompter.c:1573
-#: ../libedataserverui/e-credentials-prompter.c:1617
+#: ../src/libedataserverui/e-credentials-prompter.c:258
+#: ../src/libedataserverui/e-credentials-prompter.c:1571
+#: ../src/libedataserverui/e-credentials-prompter.c:1615
 msgid "Credentials prompt was cancelled"
 msgstr "Abfrage der Anmeldedaten wurde abgebrochen"
 
-#: ../libedataserverui/e-credentials-prompter.c:664
+#: ../src/libedataserverui/e-credentials-prompter.c:662
 #, c-format
 msgid "Source '%s' doesn't support prompt for credentials"
 msgstr "Die Quelle »%s« unterstützt das Anfragen von Anmeldedaten nicht"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:446
+#: ../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 ""
 "Zugriffs-Token von Adresse »%s« konnte nicht erlangt werden. Fehlercode %d "
 "(%s)"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:494
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:492
 msgid "Requesting access token, please wait..."
 msgstr "Zugriffs-Token wird angefordert, bitte warten …"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:596
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:594
 msgid "Google Address book authentication request"
 msgstr "Legitimierungsanfrage für Google-Adressbuch"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:599
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:597
 msgid "Google Calendar authentication request"
 msgstr "Legitimierungsanfrage für Google-Kalender"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:600
 msgid "Google Memo List authentication request"
 msgstr "Legitimierungsanfrage für Google-Notizliste"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:603
 msgid "Google Task List authentication request"
 msgstr "Legitimierungsanfrage für Google-Aufgabenliste"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:609
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:607
 msgid "Google Mail authentication request"
 msgstr "Legitimierungsanfrage für Google-Nachrichten"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:612
+#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:610
 msgid "Google account authentication request"
 msgstr "Legitimierungsanfrage für Google-Konto"
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
+#: ../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 "
@@ -5634,7 +5699,7 @@ msgstr ""
 "Melden Sie sich an Ihrem Google-Konto an und akzeptieren Sie die "
 "Bedingungen, um auf Ihr Adressbuch »%s« zuzugreifen."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
+#: ../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 "
@@ -5643,7 +5708,7 @@ msgstr ""
 "Melden Sie sich an Ihrem Google-Konto an und akzeptieren Sie die "
 "Bedingungen, um auf Ihren Kalender »%s« zuzugreifen."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
+#: ../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 "
@@ -5652,7 +5717,7 @@ msgstr ""
 "Melden Sie sich an Ihrem Google-Konto an und akzeptieren Sie die "
 "Bedingungen, um auf Ihr E-Mail-Konto »%s« zuzugreifen."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
+#: ../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 "
@@ -5661,7 +5726,7 @@ msgstr ""
 "Melden Sie sich an Ihrem Google-Konto an und akzeptieren Sie die "
 "Bedingungen, um auf Ihren E-Mail-Transport »%s« zuzugreifen."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
+#: ../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 "
@@ -5670,7 +5735,7 @@ msgstr ""
 "Melden Sie sich an Ihrem Google-Konto an und akzeptieren Sie die "
 "Bedingungen, um auf Ihre Notizliste »%s« zuzugreifen."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:643
+#: ../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 "
@@ -5679,7 +5744,7 @@ msgstr ""
 "Melden Sie sich an Ihrem Google-Konto an und akzeptieren Sie die "
 "Bedingungen, um auf Ihre Aufgabenliste »%s« zuzugreifen."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:647
+#: ../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 "
@@ -5688,128 +5753,128 @@ msgstr ""
 "Melden Sie sich an Ihrem Google-Konto an und akzeptieren Sie die "
 "Bedingungen, um auf Ihr Konto »%s« zuzugreifen."
 
-#: ../libedataserverui/e-credentials-prompter-impl-google.c:691
-#: ../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:1061
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:134
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:132
 msgid "Address book authentication request"
 msgstr "Adressbuch-Legitimierungsanfrage"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:139
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:137
 msgid "Calendar authentication request"
 msgstr "Kalender-Legitimierungsanfrage"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:143
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:141
 msgid "Mail authentication request"
 msgstr "Nachrichten-Legitimierungsanfrage"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:146
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:144
 msgid "Authentication request"
 msgstr "Legitimierungsanfrage"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:157
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:155
 #, c-format
 msgid "Please enter the password for address book \"%s\"."
 msgstr "Bitte geben Sie das Passwort für das Adressbuch »%s« ein."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:161
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:159
 #, c-format
 msgid "Please enter the password for calendar \"%s\"."
 msgstr "Bitte geben Sie das Passwort für den Kalender »%s« ein."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:165
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:163
 #, c-format
 msgid "Please enter the password for mail account \"%s\"."
 msgstr "Bitte geben Sie das Passwort für das E-Mail-Konto »%s« ein."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:169
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:167
 #, c-format
 msgid "Please enter the password for mail transport \"%s\"."
 msgstr "Bitte geben Sie das Passwort für den Nachrichtentransport »%s« ein."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:173
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:171
 #, c-format
 msgid "Please enter the password for memo list \"%s\"."
 msgstr "Bitte geben Sie das Passwort für die Notizliste »%s« ein."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:177
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:175
 #, c-format
 msgid "Please enter the password for task list \"%s\"."
 msgstr "Bitte geben Sie das Passwort für die Aufgabenliste »%s« ein."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:181
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:179
 #, c-format
 msgid "Please enter the password for account \"%s\"."
 msgstr "Bitte geben Sie das Passwort für das Konto »%s« ein."
 
-#: ../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:1062
 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 "_Benutzername:"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:355
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:353
 msgid "_Password:"
 msgstr "_Passwort:"
 
 # Erscheint in einer Benachrichtigung mit Passwortabfrage
 #. 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 "Dieses Passwort zu Ihrem Schlüsselbund _hinzufügen"
 
-#: ../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 "Vertrauen in Zertifikat …"
 
-#: ../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_blehnen"
 
-#: ../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 "Vorübergehend _akzeptieren"
 
-#: ../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 "_Dauerhaft akzeptieren"
 
-#: ../libedataserverui/e-trust-prompt.c:188
-#: ../modules/trust-prompt/trust-prompt-gtk.c:159
+#: ../src/libedataserverui/e-trust-prompt.c:186
+#: ../src/modules/trust-prompt/trust-prompt-gtk.c:157
 #, c-format
 msgid "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
 msgstr ""
 "Dem SSL/TLS-Zertifikat für »%s« wird nicht vertraut. Wollen Sie es "
 "akzeptieren?"
 
-#: ../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 "Grund:"
 
-#: ../libedataserverui/e-trust-prompt.c:213
+#: ../src/libedataserverui/e-trust-prompt.c:211
 msgid "Detailed error:"
 msgstr "Detaillierter Fehler:"
 
-#: ../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 "Die signierende Zertifizierungsstelle ist unbekannt."
 
-#: ../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."
@@ -5817,74 +5882,74 @@ msgstr ""
 "Das Zertifikat entspricht nicht der erwarteten Identität der Seite, von der "
 "es bezogen wurde."
 
-#: ../libedataserverui/e-trust-prompt.c:279
-#: ../modules/trust-prompt/module-trust-prompt.c:86
+#: ../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 "Die Aktivierungszeit des Zertifikats liegt noch in der Zukunft."
 
-#: ../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 "Das Zertifikat ist abgelaufen."
 
-#: ../libedataserverui/e-trust-prompt.c:283
-#: ../modules/trust-prompt/module-trust-prompt.c:90
+#: ../src/libedataserverui/e-trust-prompt.c:281
+#: ../src/modules/trust-prompt/module-trust-prompt.c:88
 msgid ""
 "The certificate has been revoked according to the connection's certificate "
 "revocation list."
 msgstr ""
 "Das Zertifikat wurde gemäß der Widerrufsliste der Verbindung zurückgezogen."
 
-#: ../libedataserverui/e-trust-prompt.c:285
-#: ../modules/trust-prompt/module-trust-prompt.c:92
+#: ../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 "Der Algorithmus des Zertifikats wird als unsicher angenommen."
 
-#: ../libedataserverui/e-webdav-discover-widget.c:166
+#: ../src/libedataserverui/e-webdav-discover-widget.c:164
 msgid "Supports"
 msgstr "Unterstützt"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:177
+#: ../src/libedataserverui/e-webdav-discover-widget.c:175
 msgid "_User mail:"
 msgstr "_Benutzer-E-Mail:"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:523
+#: ../src/libedataserverui/e-webdav-discover-widget.c:521
 msgctxt "WebDAVDiscover"
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:524
+#: ../src/libedataserverui/e-webdav-discover-widget.c:522
 msgctxt "WebDAVDiscover"
 msgid "Events"
 msgstr "Ereignisse"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:525
+#: ../src/libedataserverui/e-webdav-discover-widget.c:523
 msgctxt "WebDAVDiscover"
 msgid "Memos"
 msgstr "Notizen"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:526
+#: ../src/libedataserverui/e-webdav-discover-widget.c:524
 msgctxt "WebDAVDiscover"
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:825
+#: ../src/libedataserverui/e-webdav-discover-widget.c:823
 msgid "Invalid URL"
 msgstr "Ungültige Adresse"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:839
+#: ../src/libedataserverui/e-webdav-discover-widget.c:837
 msgid "User name not filled"
 msgstr "Benutzername nicht vorhanden"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:880
+#: ../src/libedataserverui/e-webdav-discover-widget.c:878
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../libedataserverui/e-webdav-discover-widget.c:883
+#: ../src/libedataserverui/e-webdav-discover-widget.c:881
 msgid "Searching server sources..."
 msgstr "Server-Quellen werden gesucht …"
 
-#: ../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 "
@@ -5893,48 +5958,48 @@ msgstr ""
 "Ein »%s« zugehöriges Konto, aus welchem ein Passwort bezogen werden könnte, "
 "konnte im Dienst org.gnome.OnlineAccounts nicht gefunden werden"
 
-#: ../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 "Fehler beim Ermitteln des Passworts von GOA: "
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:219
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:220
 #, c-format
 msgid "Code: %u - Unexpected response from server"
 msgstr "Code: %u - Unerwartete Antwort von Server"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:240
+#: ../src/modules/gnome-online-accounts/goaewsclient.c:241
 #, c-format
 msgid "Failed to parse autodiscover response XML"
 msgstr "XML-Code der Autodiscover-Anwort konnte nicht verarbeitet werden"
 
 #. 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 "Autodiscover-Element konnte nicht gefunden werden"
 
 #. 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 "Response-Element konnte nicht gefunden werden"
 
 #. 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 "Account-Element konnte nicht gefunden werden"
 
 #. 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 ""
 "In der Autodiscover-Anwort konnten weder ASUrl noch OABUrl gefunden werden"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1235
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1236
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
@@ -5943,68 +6008,68 @@ msgstr ""
 "Ein »%s« zugehöriges Konto, aus welchem ein Zugriffs-Token bezogen werden "
 "könnte, konnte im Dienst org.gnome.OnlineAccounts nicht gefunden werden"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1266
 #, c-format
 msgid "Failed to obtain an access token for '%s': "
 msgstr "Zugriffs-Token für »%s« konnte nicht erlangt werden:"
 
-#: ../modules/google-backend/module-google-backend.c:602
-#: ../modules/yahoo-backend/module-yahoo-backend.c:226
+#: ../src/modules/google-backend/module-google-backend.c:603
+#: ../src/modules/yahoo-backend/module-yahoo-backend.c:227
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: ../modules/google-backend/module-google-backend.c:659
-#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
-#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
+#: ../src/modules/google-backend/module-google-backend.c:660
+#: ../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 "Kontakte"
 
-#: ../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 "Ihre Kalender integrieren"
 
-#: ../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 "Ihre Kontakte integrieren"
 
-#: ../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 "Anmeldedienst gab kein Chiffre zurück"
 
-#: ../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 "Notwendig, damit EDS in UOA (Online-Konten) erscheint"
 
-#: ../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-Kontakte"
 
-#: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
 msgid "GMail"
 msgstr "GMail"
 
-#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
 msgid "Mail"
 msgstr "Mail"
 
-#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
+#: ../src/modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
 msgid "Integrate your mailboxes"
 msgstr "Ihre Postfächer integrieren"
 
-#: ../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 "
@@ -6013,8 +6078,8 @@ msgstr ""
 "Es kann kein zugehöriger Kontodienst in der Kontodatenbank gefunden werden, "
 "aus welchem ein Zugangs-Token für »%s« bezogen werden könnte."
 
-#: ../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)"
@@ -6022,132 +6087,135 @@ msgstr ""
 "Status 200 wurde bei der Abfrage Ihrer Identität erwartet, stattdessen wurde "
 "Status %d erhalten (%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 "Fehler beim Analysieren der Antwort als JSON:"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:119
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:120
 msgid "Didn't find 'email' in JSON data"
 msgstr "»E-Mail« wurde nicht in den JSON-Daten gefunden"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:316
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:317
 msgid "Didn't find 'id' in JSON data"
 msgstr "»id« wurde nicht in den JSON-Daten gefunden"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:321
+#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:322
 msgid "Didn't find 'emails.account' in JSON data"
 msgstr "»emails.account« wurde nicht in den JSON-Daten gefunden"
 
-#: ../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-Mail"
 
-#: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
+#: ../src/modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
 msgid "Yahoo! Calendar"
 msgstr "Yahoo!-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! Mail"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:36
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:38
-#: ../services/evolution-user-prompter/evolution-user-prompter.c:32
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c: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 "Nicht beenden, wenn der letzte Client geschlossen ist"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:39
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:41
 msgid "Wait running until at least one client is connected"
 msgstr "Warten, bis mindestens ein Client verbunden ist"
 
-#: ../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 "Geburts- & Jahrestage"
 
-#: ../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 "Auf LDAP-Servern"
 
-#: ../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 "Auf diesem Rechner"
 
-#: ../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 "Suchordner"
 
-#: ../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 "Wetter"
 
-#: ../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 "Im Web"
 
-#: ../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
+#: ../src/services/evolution-source-registry/evolution-source-registry.c:40
 msgid "Don't migrate user data from previous versions of Evolution"
 msgstr "Benutzerdaten nicht aus früheren Versionen von Evolution übernehmen"
 
-#: ../services/evolution-user-prompter/prompt-user-gtk.c:121
+#: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
 msgid "_Dismiss"
 msgstr "_Verwerfen"
 
-#: ../tools/addressbook-export/addressbook-export.c:70
-#: ../tools/addressbook-export/addressbook-export.c:784
+#: ../src/tools/addressbook-export/addressbook-export.c:68
+#: ../src/tools/addressbook-export/addressbook-export.c:782
 msgid "Can not open file"
 msgstr "Datei kann nicht geöffnet werden"
 
-#: ../tools/addressbook-export/addressbook-export.c:100
+#: ../src/tools/addressbook-export/addressbook-export.c:98
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "Client »%s« konnte nicht geöffnet werden: %s"
 
-#: ../tools/addressbook-export/addressbook-export.c:894
+#: ../src/tools/addressbook-export/addressbook-export.c:892
 msgid "Unhandled error"
 msgstr "Unbehandelter Fehler"
 
-#: ../tools/addressbook-export/addressbook-export.c:927
+#: ../src/tools/addressbook-export/addressbook-export.c:925
 msgid "Specify the output file instead of standard output"
 msgstr "Ausgabedatei anstelle der Standardausgabe angeben"
 
-#: ../tools/addressbook-export/addressbook-export.c:928
+#: ../src/tools/addressbook-export/addressbook-export.c:926
 msgid "OUTPUTFILE"
 msgstr "AUSGABEDATEI"
 
-#: ../tools/addressbook-export/addressbook-export.c:931
+#: ../src/tools/addressbook-export/addressbook-export.c:929
 msgid "List local address book folders"
 msgstr "Ordner des lokalen Adressbuchs auflisten"
 
-#: ../tools/addressbook-export/addressbook-export.c:934
+#: ../src/tools/addressbook-export/addressbook-export.c:932
 msgid "Show cards as vcard or csv file"
 msgstr "Karten als vCard- oder CSV-Datei anzeigen"
 
-#: ../tools/addressbook-export/addressbook-export.c:935
+#: ../src/tools/addressbook-export/addressbook-export.c:933
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../tools/addressbook-export/addressbook-export.c:983
+#: ../src/tools/addressbook-export/addressbook-export.c:981
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Fehler in Befhelszeilenargumenten, bitte verwenden Sie die Option --help, um "
 "die verfügbaren Optionen anzeigen zu lassen"
 
-#: ../tools/addressbook-export/addressbook-export.c:997
+#: ../src/tools/addressbook-export/addressbook-export.c:995
 msgid "Only support csv or vcard format."
 msgstr "Nur das CSV- oder vCard-Format unterstützen."
+
+#~ msgid "Update preview data for folder '%s : %s'"
+#~ msgstr "Voransicht für Ordner »%s : %s« wird aktualisiert"


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