Merge new-ui-branch to the trunk.

svn path=/trunk/; revision=22964
author: Ettore Perazzoli <ettore@src.gnome.org> 2003-10-22 02:28:34 +0800
committer: Ettore Perazzoli <ettore@src.gnome.org> 2003-10-22 02:28:34 +0800
commit: 0fb08f3ff81575a4749d851404233f34252dd2f2 (patch)
tree: 7e03befedc3a76fd104921dbbc616810d87333be /po/de.po
parent: 0e19f2c16de592607a341eb9974d31e4e47e02b5 (diff)
download: gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.gz
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.bz2
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.lz
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.xz
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.zst
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.zip
1 files changed, 3039 insertions, 3240 deletions
diff --git a/po/de.po b/po/de.po
index 3782663948..3bfa3ae60a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,193 +14,56 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.5\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-22 20:27+0200\n"
 "PO-Revision-Date: 2003-07-22 20:27+0200\n"
 "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Evolution-LDIF-Importeur"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP-Data-Interchange-Format (.ldif)"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Evolution-VCard-Importeur"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Evolution-VCard-Importeur"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Einsortieren unter"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Voller Name"
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Name"
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Adresse"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Adress-Beschriftung"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-Mail"
 
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Geburtsdatum"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Organisationseinheit"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Büro"
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Titel"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Position"
-
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Vorgesetzter"
-
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Ehepartner"
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr "Jahrestag"
-
-#: addressbook/backend/ebook/e-card.c:1436
-msgid "Mailer"
-msgstr "Mailer"
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "Kalender-URI"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Verfügbarkeits-URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "ICS-Kalender"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Notiz"
-
-# CHECK
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Verwandte Kontakte"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorien"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Liste der Kategorien"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr "Will HTML"
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr "Will HTML gesetzt"
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-msgid "List"
-msgstr "Liste"
-
-# CHECK
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr "Liste der Anzeigeadressen"
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Beliebig"
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "Kennung"
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Zuletzt verwendet"
-
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr "Bewertung verwenden"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
 #: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Primary"
@@ -210,6 +73,14 @@ msgstr "Primär"
 msgid "Prim"
 msgstr "Prim"
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Assistent"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -244,6 +115,12 @@ msgid "Home"
 msgstr "Zu Hause"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
@@ -362,9 +239,21 @@ msgid "Dep"
 msgstr "Abt"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Büro"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Büro"
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Titel"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -375,6 +264,12 @@ msgid "Prof"
 msgstr "Beruf"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Vorgesetzter"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Chef"
 
@@ -383,9 +278,32 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Spitzname"
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Ehepartner"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Notiz"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr "Kalender-URI"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "KalURI"
@@ -409,6 +327,11 @@ msgid "icsCalendar"
 msgstr "icsCalendar"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr "Jahrestag"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "JTag"
 
@@ -416,6 +339,12 @@ msgstr "JTag"
 msgid "Birth Date"
 msgstr "Geburtsdatum"
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorien"
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Familienname"
@@ -430,29 +359,107 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Namenlose Liste"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Evolution-LDIF-Importeur"
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Voller Name"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP-Data-Interchange-Format (.ldif)"
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Adresse"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Evolution-VCard-Importeur"
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
+msgstr "Adress-Beschriftung"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Evolution-VCard-Importeur"
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr "Telefon"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1354
+msgid "Birth date"
+msgstr "Geburtsdatum"
+
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1374
+msgid "Organizational Unit"
+msgstr "Organisationseinheit"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Position"
+
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:962
+msgid "Mailer"
+msgstr "Mailer"
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr "Verfügbarkeits-URL"
+
+#: addressbook/backend/ebook/e-card.c:1457
+msgid "ICS Calendar"
+msgstr "ICS-Kalender"
+
+# CHECK
+#: addressbook/backend/ebook/e-card.c:1471
+msgid "Related Contacts"
+msgstr "Verwandte Kontakte"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr "Liste der Kategorien"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr "Will HTML"
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr "Will HTML gesetzt"
+
+#: addressbook/backend/ebook/e-card.c:1506
+msgid "List"
+msgstr "Liste"
+
+# CHECK
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr "Liste der Anzeigeadressen"
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
+msgstr "Beliebig"
+
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr "Kennung"
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr "Zuletzt verwendet"
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr "Bewertung verwenden"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "Bonobo konnte nicht initialisiert werden"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -509,14 +516,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
@@ -525,6 +532,137 @@ msgstr "Wombat konnte nicht gestartet werden"
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr "Hier können Sie den Zugriff auf LDAP-Verzeichnis-Server konfigurieren"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr "Verzeichnis-Server"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Evolution Addressbook"
+msgstr "Evolution-Adressbuch"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Bedienelement zur LDAP-Konfiguration des Evolution-Adressbuchs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution-Adressbuch-Adress-Popup-Fenster"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-Adressbuch-Adressbetrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook component"
+msgstr "Evolution-Adressbuch-Komponente"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution-Adressbuch-Ordnerbetrachter"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:625
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Ordner mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP-Server:"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "LDAP-Server mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Öffentliche Kontakte"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Öffentlicher Ordner mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "New Contact"
+msgstr "Neuer Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:580
+msgid "Create a new contact"
+msgstr "Einen neuen Kontakt anlegen"
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "New Contact List"
+msgstr "Neu Kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:583
+msgid "Contact _List"
+msgstr "Kontakt_liste"
+
+#: addressbook/gui/component/addressbook-component.c:584
+msgid "Create a new contact list"
+msgstr "Eine neue Kontaktliste anlegen"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Legitimation beim IMAP-Server ist fehlgeschlagen"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "Der Server antwortete mit nicht unterstützen Suchbasen"
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Dieser Server unterstützt keine LDAPv3 Schema-Information"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr "Fehler beim Abrufen der Schema-Informationen"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr "Server antwortetet nicht mit einer gültigen Schema-Information"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Kontoname"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Servername"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Andere Kontakte"
+
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -657,101 +795,6 @@ msgstr "Beliebige Kategorie"
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Ordner mit Kontaktinformationen"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP-Server:"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "LDAP-Server mit Kontaktinformationen"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Öffentliche Kontakte"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Öffentlicher Ordner mit Kontaktinformationen"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr "Neuer Kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr "_Kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Create a new contact"
-msgstr "Einen neuen Kontakt anlegen"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr "Neu Kontaktliste"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "Contact _List"
-msgstr "Kontakt_liste"
-
-#: addressbook/gui/component/addressbook-component.c:587
-msgid "Create a new contact list"
-msgstr "Eine neue Kontaktliste anlegen"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Legitimation beim IMAP-Server ist fehlgeschlagen"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "Der Server antwortete mit nicht unterstützen Suchbasen"
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Dieser Server unterstützt keine LDAPv3 Schema-Information"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr "Fehler beim Abrufen der Schema-Informationen"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr "Server antwortetet nicht mit einer gültigen Schema-Information"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Kontoname"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Servername"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andere Kontakte"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -785,12 +828,12 @@ msgid "Querying Addressbook..."
 msgstr "Anfrage beim Adressbuch..."
 
 #: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Kontaktinfo bearbeiten"
 
 #: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Zu Kontakten hinzufügen"
@@ -799,50 +842,14 @@ msgstr "Zu Kontakten hinzufügen"
 msgid "Merge E-Mail Address"
 msgstr "E-Mail-Adresse einfließen lassen"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Abfragen deaktivieren"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Abfragen aktivieren (gefährlich!)"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr "Hier können Sie den Zugriff auf LDAP-Verzeichnis-Server konfigurieren"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr "Verzeichnis-Server"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Evolution-Adressbuch"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Bedienelement zur LDAP-Konfiguration des Evolution-Adressbuchs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution-Adressbuch-Adress-Popup-Fenster"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution-Adressbuch-Adressbetrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Evolution-Adressbuch-Komponente"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution-Adressbuch-Ordnerbetrachter"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -996,9 +1003,10 @@ msgstr "One"
 msgid "S_earch scope: "
 msgstr "Suchb_ereich: "
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1672
+#: calendar/gui/e-week-view.c:1306
 msgid "Searching"
 msgstr "Suchen"
 
@@ -1244,10 +1252,10 @@ msgstr "_Downloadbegrenzung:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:33 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "_Bearbeiten"
@@ -1288,24 +1296,20 @@ msgstr "general-tab"
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Kontakte aus Adressbuch wählen"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Oberfläche zur Auswahl eines Namens für Evolution-Adressbücher"
 
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Kontakt finden in"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "Alle Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:694
 #: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:448
 msgid "Remove"
 msgstr "Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr "Alle Entfernen"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 msgid "View Contact List"
 msgstr "Kontaktliste anzeigen"
@@ -1328,9 +1332,13 @@ msgstr "Namenloser Kontakt"
 msgid "Source"
 msgstr "Quelle"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Oberfläche zur Auswahl eines Namens für Evolution-Adressbücher"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Kontakte aus Adressbuch wählen"
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
+msgstr "Kontakt finden in"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1403,7 +1411,7 @@ msgid "D_epartment:"
 msgstr "_Abteilung:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:199
 msgid "Details"
 msgstr "Details"
 
@@ -1470,12 +1478,11 @@ msgid "_Categories..."
 msgstr "Ka_tegorien..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
+#: calendar/gui/dialogs/meeting-page.c:717
+#: calendar/gui/e-calendar-table.c:1000 calendar/gui/e-day-view.c:3718
+#: calendar/gui/e-week-view.c:3687 mail/folder-browser.c:1830
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:32
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-tasks.xml.h:18
 #: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Löschen"
@@ -1517,15 +1524,15 @@ msgid "_Web page address:"
 msgstr "Adresse der _Website:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:402
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
 msgid "Editable"
 msgstr "Editierbar"
 
@@ -2554,17 +2561,17 @@ msgstr "Simbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:388
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
 msgid "Book"
 msgstr "Buch"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 msgid "Card"
 msgstr "Karte"
 
@@ -2787,7 +2794,7 @@ msgstr "Ist neue Liste"
 msgid "Contact List Editor"
 msgstr "Kontaktlisten-Editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Liste als VCard speichern"
 
@@ -2834,7 +2841,7 @@ msgstr ""
 "trotzdem hinzufügen?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
@@ -2853,10 +2860,10 @@ msgid "%d cards"
 msgstr "%d Karten"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:395
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
 msgid "Query"
 msgstr "Abfrage"
 
@@ -2864,22 +2871,22 @@ msgstr "Abfrage"
 msgid "Error getting book view"
 msgstr "Fehler beim Abrufen der Buchansicht"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:409
 msgid "Model"
 msgstr "Modell"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:36
 #: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr "Erfolg"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
@@ -2888,90 +2895,90 @@ msgstr "Erfolg"
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
 #: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Karte nicht gefunden"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kartenkennung existiert bereits"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstützt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2307 camel/camel-service.c:733
+#: camel/camel-service.c:770 camel/camel-service.c:854
+#: camel/camel-service.c:893 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Storniert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Legitimation fehlgeschlagen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Legitimation erforderlich"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS nicht verfügbar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Adressbuch existiert nicht"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Anderer Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr "Wollen Sie die Änderungen speichern?"
 
 # CHECK
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr "_Verwerfen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen der Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Fehler beim Hinzufügen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2981,33 +2988,34 @@ msgstr ""
 "%d zusätzliche Fenster auf ihrem Bildschirm angezeigt werden.\n"
 "Wollen Sie wirklich alle Karten anzeigen lassen?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Karte verschieben nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Karte kopieren nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Karten verschieben nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Karten kopieren nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard für %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Typ"
@@ -3062,9 +3070,9 @@ msgstr "Kontakt weiterleiten"
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2439
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:68
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drucken"
@@ -3097,15 +3105,15 @@ msgstr "Kopieren"
 msgid "Paste"
 msgstr "Einfügen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Delete"
 msgstr "Löschen"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: calendar/gui/e-day-view.c:3678 calendar/gui/e-week-view.c:3652
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
 
@@ -3197,29 +3205,6 @@ msgstr "Anderes Telefon"
 msgid "Primary Phone"
 msgstr "Primäres Telefon"
 
-#: addressbook/gui/widgets/e-minicard.c:146
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Breite"
-
-#: addressbook/gui/widgets/e-minicard.c:153
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Höhe"
-
-#: addressbook/gui/widgets/e-minicard.c:161
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Hat den Fokus"
-
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Gewählt"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Hat Cursor"
-
 #: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
@@ -3233,6 +3218,21 @@ msgstr "und eine andere Karte."
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
 
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr "Breite"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr "Höhe"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr "Hat den Fokus"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Feld"
@@ -3249,6 +3249,10 @@ msgstr "Textmodell"
 msgid "Max field name length"
 msgstr "Maximale Länge des Feldnamens"
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr "Spaltenbreite"
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3277,9 +3281,13 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr "Spaltenbreite"
+#: addressbook/gui/widgets/e-minicard.c:169
+msgid "Selected"
+msgstr "Gewählt"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
+msgstr "Hat Cursor"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3289,20 +3297,20 @@ msgstr "Kartenansicht"
 msgid "GTK Tree View"
 msgstr "GTK-Baumansicht"
 
-#: addressbook/printing/e-contact-print.c:1158
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Umschlag drucken"
+
+#: addressbook/printing/e-contact-print.c:1139
 msgid "Print cards"
 msgstr "Karten drucken"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
 msgid "Print card"
 msgstr "Karte drucken"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Umschlag drucken"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 Punkt Tahoma"
@@ -3472,63 +3480,6 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift..."
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
-msgid "List local addressbook folders"
-msgstr "mit allen lokalen Ordnern und aktiven Ordnern im Netz"
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
-msgid "[vcard|csv]"
-msgstr "Karten"
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
-msgid "Impossible internal error."
-msgstr "Interner Fehler"
-
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Unbenannter Termin"
@@ -3659,29 +3610,30 @@ msgstr "31."
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:401 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:753
 msgid "High"
 msgstr "Hoch"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1709
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:273
+#: mail/message-list.c:752
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:751
 msgid "Low"
 msgstr "Niedrig"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:404
 msgid "Undefined"
 msgstr "Undefiniert"
 
@@ -3689,13 +3641,13 @@ msgstr "Undefiniert"
 msgid "Split Multi-Day Events:"
 msgstr "Mehrtätige Ereignisse aufteilen:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -3703,32 +3655,77 @@ msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 msgid "Default Priority:"
 msgstr "Vorgabepriorität:"
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
+"konfigurieren"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution-Komponente für Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution-Kalender-Terminplan-Nachrichtenbetrachter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution-Kalenderbetrachter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution-Kalender/Aufgaben-Editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution-Aufgabenbetrachter"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Beginnt:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Endent:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+#: calendar/gui/e-tasks.c:151
+msgid "invalid time"
+msgstr "ungültige Zeit"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 msgid "Evolution Alarm"
 msgstr "Evolution-Alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm am %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
 msgid "C_lose"
 msgstr "S_chließen"
 
@@ -3744,25 +3741,16 @@ msgstr "Weiterschlaf-Zeit (Minuten)"
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Warnung"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3775,7 +3763,7 @@ msgstr ""
 "wird statt dessen eine normales Erinnerungsdialogfenster\n"
 "anzeigen."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3792,27 +3780,36 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:887
 msgid "Do not ask me about this program again."
 msgstr "Mich über dieses Programm nicht mehr fragen."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo konnte nicht initialisiert werden"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service factory"
 msgstr "Fabrik für Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/calendar-commands.c:376
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Zusammenfassung enthält"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Beschreibung enthält"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentar enthält"
+
+# CHECK
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "Nicht einsortiert"
+
+#: calendar/gui/calendar-commands.c:358
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -3823,53 +3820,52 @@ msgstr ""
 "nicht wiederherstellen."
 
 # CHECK
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:364
 msgid "Purge events older than"
 msgstr "Ereignisse säubern nach"
 
-#: calendar/gui/calendar-commands.c:387
+#: calendar/gui/calendar-commands.c:369
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "Tage"
 
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:468
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:471 calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1409 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:478
+#: calendar/gui/calendar-commands.c:480
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:498
+#: calendar/gui/calendar-commands.c:504 calendar/gui/calendar-commands.c:506
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:496
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-commands.c:918
+#: calendar/gui/calendar-commands.c:884
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Die Kalenderansicht konnte nicht erstellt werden. Bitte überprüfen Sie Ihre "
 "ORBit- und OAF-Einstellungen. "
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1557
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3889,10 +3885,10 @@ msgid "Public folder containing appointments and events"
 msgstr "Öffentlicher Ordner mit Kontaktinformationen"
 
 #: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Aufgaben"
@@ -3957,6 +3953,110 @@ msgstr "_Ganztags-Termin"
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
+#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:380
+msgid "Private"
+msgstr "Privat"
+
+#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:381
+msgid "Confidential"
+msgstr "Vertraulich"
+
+#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
+msgid "Public"
+msgstr "Öffentlich"
+
+#: calendar/gui/calendar-model.c:523
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/calendar-model.c:525
+msgid "E"
+msgstr "O"
+
+#: calendar/gui/calendar-model.c:525
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:453
+msgid "Free"
+msgstr "Frei"
+
+#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1207
+msgid "Busy"
+msgstr "Beschäftigt"
+
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:474 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2298
+msgid "Not Started"
+msgstr "Nicht begonnen"
+
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:247
+#: calendar/gui/print.c:2301
+msgid "In Progress"
+msgstr "In Bearbeitung"
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2304
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#: calendar/gui/calendar-model.c:1036
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Die geographische Position muss in diesem Format eingegeben werden: \n"
+"\n"
+"45.436845,125.862501"
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2079
+#: mail/folder-browser.c:1792 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-dateedit.c:1469 widgets/misc/e-dateedit.c:1584
+msgid "None"
+msgstr "Keine"
+
+#: calendar/gui/calendar-model.c:1711
+msgid "Recurring"
+msgstr "Wiederkehrend"
+
+#: calendar/gui/calendar-model.c:1713
+msgid "Assigned"
+msgstr "Zugewiesen"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr "Ja"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+msgid "No"
+msgstr "Nein"
+
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Tagesansicht"
@@ -3973,50 +4073,28 @@ msgstr "Wochenansicht"
 msgid "Month View"
 msgstr "Monatsansicht"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Benutzerdefinierte Ansicht"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Zusammenfassung enthält"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Beschreibung enthält"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Kommentar enthält"
-
-# CHECK
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
-msgid "Unmatched"
-msgstr "Nicht einsortiert"
-
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:456
 msgid "Error while opening the calendar"
 msgstr "Fehler beim Öffnen des Kalenders"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr "Methode beim Öffnen des Kalenders nicht unterstützt"
 
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Permission denied to open the calendar"
 msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Der Ordner in »%s« konnte nicht geöffnet werden"
 
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
 msgid "The type of view to show"
 msgstr "Typ der anzuzeigenden Ansicht"
 
@@ -4084,8 +4162,7 @@ msgstr "weitere Male alle"
 msgid "hours"
 msgstr "Stunden"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "Minuten"
 
@@ -4099,11 +4176,11 @@ msgstr "Grundlegend"
 msgid "Date/Time:"
 msgstr "Datum/Zeit:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
 msgid "Display a message"
 msgstr "Eine Nachricht anzeigen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
@@ -4111,7 +4188,7 @@ msgstr "Einen Klang abspielen"
 msgid "Reminders"
 msgstr "Erinnerungen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "Ein Programm ausführen"
 
@@ -4121,7 +4198,7 @@ msgstr "Eine E-Mail verschicken"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Zusammenfassung:"
@@ -4205,7 +4282,7 @@ msgstr "Tage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
 msgid "Friday"
 msgstr "Freitag"
 
@@ -4219,7 +4296,7 @@ msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
 msgid "Monday"
 msgstr "Montag"
 
@@ -4229,7 +4306,7 @@ msgstr "_So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -4243,7 +4320,7 @@ msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -4261,7 +4338,7 @@ msgstr "Aufgabenliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -4279,7 +4356,7 @@ msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -4289,12 +4366,12 @@ msgstr "W_oche beginnt:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
 msgid "Wednesday"
 msgstr "Mittwoch"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:29
 msgid "Work Week"
 msgstr "Werkwoche"
 
@@ -4458,6 +4535,31 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validierungsfehler: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+msgid " to "
+msgstr " bis "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+msgid " (Completed "
+msgstr " (Abgeschlossen "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+msgid "Completed "
+msgstr "Abgeschlossen "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+msgid " (Due "
+msgstr " (Fällig am "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+msgid "Due "
+msgstr "Fällig am "
+
 #: calendar/gui/dialogs/comp-editor.c:334
 msgid "Could not update invalid object"
 msgstr "Ungültiges Objekt konnte nicht aktualisiert werden"
@@ -4503,49 +4605,23 @@ msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1103 calendar/gui/e-day-view.c:3960
+#: calendar/gui/e-week-view.c:3898 composer/e-msg-composer.c:1184
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1383
+#: calendar/gui/dialogs/comp-editor.c:1407
+#: calendar/gui/dialogs/comp-editor.c:1433
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1460
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version konnte nicht ermittelt werden!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validierungsfehler: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr " bis "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-msgid " (Completed "
-msgstr " (Abgeschlossen "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-msgid "Completed "
-msgstr "Abgeschlossen "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr " (Fällig am "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-msgid "Due "
-msgstr "Fällig am "
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4656,31 +4732,31 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
 msgid "Scheduling"
 msgstr "Planung"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
@@ -4716,9 +4792,9 @@ msgid "Classification"
 msgstr "Einstufung"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Vertraulich"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "_Vertraulich"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4744,6 +4820,7 @@ msgid "Pu_blic"
 msgstr "Ö_ffentlich"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Zeit einstufen als"
 
@@ -4760,34 +4837,74 @@ msgstr "_Endzeit:"
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
-msgid "None"
-msgstr "Keine"
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr "Dem gewählten Organizer ist kein Konto mehr zugeordnet."
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr "Diese Person nimmt bereits an der Besprechung teil!"
+
+#: calendar/gui/dialogs/meeting-page.c:713
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Anwesender"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Klicken Sie hier, um einen Teilnehmer hinzuzufügen"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Gemeinsamer Name"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegiert durch"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegiert an"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Sprache"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Mitglied"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "UAwg"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Status"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4798,7 +4915,7 @@ msgid "_Change Organizer"
 msgstr "Organisator _ändern"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr "Andere einladen..."
 
@@ -4958,7 +5075,7 @@ msgstr ""
 "Möchten Sie Ihre Änderungen speichern?"
 
 # CHECK
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1580
 msgid "_Discard Changes"
 msgstr "Änderungen _verwerfen"
 
@@ -4996,27 +5113,6 @@ msgstr "Das Fertiggestellt-Datum ist falsch"
 msgid "% _Complete"
 msgstr "% _abgeschlossen"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-msgid "Completed"
-msgstr "Abgeschlossen"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
-#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
-msgstr "In Bearbeitung"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
-msgstr "Nicht begonnen"
-
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Fortschritt"
@@ -5037,29 +5133,21 @@ msgstr "Status:"
 msgid "_Web Page:"
 msgstr "_Website:"
 
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:192
 msgid "Basic"
 msgstr "Grundlegend"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:269
+#: calendar/gui/dialogs/task-editor.c:406
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
 msgid "Due date is wrong"
 msgstr "Das Fälligkeitsdatum ist falsch"
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Vertraulich"
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -5073,243 +5161,217 @@ msgstr "Anfangsdatum:"
 msgid "_Due Date:"
 msgstr "Fällig am:"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
 msgid "1 day"
 msgstr "1 Tag"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
 msgid "1 week"
 msgstr "1 Woche"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
 msgid "1 hour"
 msgstr "1 Stunde"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
 msgid "1 minute"
 msgstr "1 Minute"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
 msgid "1 second"
 msgstr "1 Sekunde"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
 msgid "Unknown action to be performed"
 msgstr "Unbekannte auszuführende Aktion"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s vor Terminbeginn"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nach Terminbeginn"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s zum Terminbeginn"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s vor Terminende"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nach Terminende"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s zum Terminende"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
 #, c-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr "Öffentlich"
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr "Vertraulich"
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:423
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:424
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:425
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:426
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Frei"
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Beschäftigt"
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2827
+#: calendar/gui/e-week-view.c:1983
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-week-view.c:3669 mail/folder-browser.c:1803
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: calendar/gui/e-calendar-table.c:989
+#: calendar/gui/e-calendar-table.c:981
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
-msgid "_Save As..."
-msgstr "Speichern _unter..."
+#: calendar/gui/e-calendar-table.c:982
+msgid "_Save as..."
+msgstr "_Speichern unter..."
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-calendar-table.c:983 calendar/gui/e-day-view.c:3702
+#: calendar/gui/e-week-view.c:3644 calendar/gui/e-week-view.c:3671
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3676 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-day-view.c:3708
+#: calendar/gui/e-week-view.c:3677 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3673
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3648
+#: calendar/gui/e-week-view.c:3678 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "Einfügen"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:993
 msgid "_Assign Task"
 msgstr "_Aufgabe zuweisen"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:994
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:995
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:996
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Delete Selected Tasks"
 msgstr "Gewählte Aufgaben _löschen"
 
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1300 calendar/gui/e-day-view.c:7983
+#: calendar/gui/e-week-view.c:4400
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1383
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
@@ -5323,8 +5385,8 @@ msgstr "% abgeschlossen"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -5333,14 +5395,13 @@ msgid "Completion Date"
 msgstr "Abschlussdatum"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Beschreibung:"
-
-#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Due Date"
 msgstr "Fällig am"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "End Date"
+msgstr "Enddatum"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geographische Lage"
@@ -5349,301 +5410,244 @@ msgstr "Geographische Lage"
 msgid "Priority"
 msgstr "Priorität"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Aufgabensorte"
 
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-msgid "color"
-msgstr "Farbe"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-#, fuzzy
-msgid "component"
-msgstr "Termin"
-
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: calendar/gui/e-cal-model.c:828
-msgid "Recurring"
-msgstr "Wiederkehrend"
-
-#: calendar/gui/e-cal-model.c:830
-msgid "Assigned"
-msgstr "Zugewiesen"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a, %d. %m %Y %H:%M:%S"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
-msgstr "Ja"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "No"
-msgstr "Nein"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Das Datum muss in diesem Format eingegeben werden: \n"
+"\n"
+"%s"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i Minuten-Unterteilungen"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
-msgstr "S"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1392
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+msgid "%A %d %B"
+msgstr "%A, %d. %B"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
-msgstr "O"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1425
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%d. %b"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
-msgstr "W"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:337
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "AM"
 
-#: calendar/gui/e-cal-model-tasks.c:550
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Die geographische Position muss in diesem Format eingegeben werden: \n"
-"\n"
-"45.436845,125.862501"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:340
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "PM"
 
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
-msgid "New _Appointment..."
-msgstr "Neuer _Termin..."
+#: calendar/gui/e-day-view.c:3657
+msgid "New _Appointment"
+msgstr "Neuer _Termin"
 
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3659 calendar/gui/e-week-view.c:3638
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3661 calendar/gui/e-week-view.c:3639
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3663 calendar/gui/e-week-view.c:3640
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3668 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Drucken..."
+
+#: calendar/gui/e-day-view.c:3680 calendar/gui/e-week-view.c:3654
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3682 calendar/gui/e-week-view.c:3655
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3659
+#: ui/evolution-calendar.xml.h:36
 msgid "_Publish Free/Busy Information"
 msgstr "Ver_fügbarkeitsinformationen veröffentlichen"
 
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3663
 #: ui/evolution.xml.h:60
 msgid "_Settings..."
 msgstr "_Einstellungen..."
 
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3701 calendar/gui/e-week-view.c:3670
+#: mail/folder-browser.c:1805 ui/evolution-mail-message.xml.h:114
+msgid "_Save As..."
+msgstr "Speichern _unter..."
+
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3682
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen..."
 
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3683
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten..."
 
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3688
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3689
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten löschen"
 
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3690
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten löschen"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a, %d. %m %Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Das Datum muss in diesem Format eingegeben werden: \n"
-"\n"
-"%s"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "AM"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "PM"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-msgid "%A %d %B"
-msgstr "%A, %d. %B"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d. %b"
-
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i Minuten-Unterteilungen"
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (Komplexe Wiederholung)."
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
 msgid "Every day"
 msgstr "Täglich"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
 #, c-format
 msgid "Every %d days"
 msgstr "Alle %d Tage"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
 msgid "Every week"
 msgstr "Wöchentlich"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
 #, c-format
 msgid "Every %d weeks"
 msgstr "Alle %d Wochen"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
 msgid "Every week on "
 msgstr "Wöchentlich am "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Alle %d Wochen am "
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
 msgid " and "
 msgstr " und "
 
 # CHECK - muss mit erste(r), zweite(r) usw. übereinstimmen
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
 #, c-format
 msgid "The %s day of "
 msgstr "%s Tag des "
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s des "
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
 msgid "every month"
 msgstr "monatlich"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "every %d months"
 msgstr "alle %d Monate"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
 msgid "Every year"
 msgstr "Jährlich"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every %d years"
 msgstr "Alle %d Jahre"
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
 #, c-format
 msgid " a total of %d times"
 msgstr " insgesamt %d Mal"
 
 # CHECK
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
 msgid ", ending on "
 msgstr ", endet am "
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Starts:</b> "
 msgstr "<b>Beginnt:</b> "
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Ends:</b> "
 msgstr "<b>Endet:</b>"
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
 msgid "<b>Completed:</b> "
 msgstr "<b>Abgeschlossen:</b>"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
 msgid "<b>Due:</b> "
 msgstr "<b>Fällig:</b>"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
 msgid "iCalendar Information"
 msgstr "iCalendar-Informationen"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
 msgid "iCalendar Error"
 msgstr "iCalendar-Fehler"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:1035
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5651,336 +5655,343 @@ msgstr ""
 "<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
 "wählen Sie dann eine Aktion aus dem Menü unten aus."
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1050
 msgid "<i>None</i>"
 msgstr "<i>Keine</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
 msgid "Location:"
 msgstr "Standort: "
 
 #. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075 calendar/gui/e-tasks.c:243
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:347
+#: mail/mail-display.c:928 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
 msgid "Choose an action:"
 msgstr "Eine Aktion wählen:"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
 msgid "Accept"
 msgstr "Annehmen"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
 msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "UAwg"
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
 msgid "Send Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
 msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1185 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1323
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> wünscht die Anwesenheit von %s bei einer Besprechung"
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> wünscht Ihre Anwesenheit bei einer Besprechung"
 
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1331
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wünscht zu einer vorhandenen Besprechung hinzuzufügen"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1336
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wünscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1341
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1349
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung widerrufen."
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1357
 msgid "Meeting Cancellation"
 msgstr "Besprechungswiderruf"
 
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverständliche Nachricht verschickt."
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1365
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1390
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> fordert %s auf, eine Aufgabe auszuführen."
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> fordert Sie auf eine Aufgabe auszuführen."
 
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzuzufügen."
 
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wünscht letzte Aufgabeninformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> hat eine Aufgabe widerrufen."
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Aufgabenwiderruf"
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> hat Verfügbarkeitsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1430
+#: calendar/gui/e-itip-control.c:1452
 msgid "Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> fordert Ihre Verfügbarkeitsinformationen an."
 
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1457
 msgid "Free/Busy Request"
 msgstr "Verfügbarkeitsanfrage"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1440
+#: calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Reply"
 msgstr "Verfügbarkeitsantwort"
 
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verfügbarkeitsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthält ausschließlich nicht unterstützte Anfragen."
 
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Die Anlage enthält keine gültige Kalendernachricht"
 
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalenderinformationen"
 
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt ist ungültig und konnte nicht aktualisiert werden\n"
 
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "There was an error on the CORBA system\n"
 msgstr "Es trat ein Fehler im CORBA-System auf\n"
 
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
 msgid "Object could not be found\n"
 msgstr "Objekt konnte nicht gefunden werden\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 "Sie haben nicht die nötige Berechtigung, um den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Anwesenheitsstatus konnte nicht aktualisiert werden, da der Eintrag nicht "
 "mehr existiert"
 
-#: calendar/gui/e-itip-control.c:1958
+#: calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Diese Antwort ist von keinem Teilnehmer.  Als Teilnehmer hinzufügen?"
 
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Anwesenheitsstatus konnte auf Grund eines ungültigen Status nicht "
 "aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "Sie haben nicht die nötige Berechtigung, um den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status updated\n"
 msgstr "Anwesenheitsstatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
 msgid "Attendee status could not be updated!\n"
 msgstr "Teilnehmerstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
 msgid "Select Calendar Folder"
 msgstr "Ordner für Kalender wählen"
 
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
 msgid "Select Tasks Folder"
 msgstr "Ordner für Aufgaben wählen"
 
@@ -6021,124 +6032,163 @@ msgstr "datum-ende"
 msgid "date-start"
 msgstr "datum-anfang"
 
-#: calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
+msgstr "Vorsitzende"
+
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+msgid "Required Participants"
+msgstr "Benötigte Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:81
+msgid "Optional Participants"
+msgstr "Optionale Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:82
+msgid "Resources"
+msgstr "Ressourcen"
+
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+msgid "Individual"
+msgstr "Individuell"
+
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+msgid "Group"
+msgstr "Gruppe"
+
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+msgid "Resource"
+msgstr "Ressource"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
+msgstr "Raum"
+
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+msgid "Chair"
+msgstr "Vorsitzender"
+
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+msgid "Required Participant"
+msgstr "Benötigter Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
+msgstr "Optionaler Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
+msgstr "Nicht-Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+msgid "Needs Action"
+msgstr "Erfordert Maßnahme"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+msgid "Delegated"
+msgstr "Delegiert"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+msgid "In Process"
+msgstr "In Bearbeitung"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:458
+#: calendar/gui/e-meeting-time-sel.c:2098
+msgid "%A, %B %d, %Y"
+msgstr "%a, %d. %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:462
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+msgid "%a %m/%d/%Y"
+msgstr "%a, %d.%m.%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1593
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Außer Haus"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:408
 msgid "No Information"
 msgstr "Keine Information"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "Optionen"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Nur Arbeitszeit anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "Show _Zoomed Out"
 msgstr "Weggezoomt anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_Update Free/Busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:504
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid "_Autopick"
 msgstr "AutoWahl"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:537
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:554
 msgid "_All People and Resources"
 msgstr "Alle Leute und Ressourcen"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:563
 msgid "All _People and One Resource"
 msgstr "Alle Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:572
 msgid "_Required People"
 msgstr "Benötigte Leute"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "Required People and _One Resource"
 msgstr "Benötigte Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Meeting _start time:"
 msgstr "Anfang der Besprechung:"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:620
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%a, %d. %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2087
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a, %d.%m.%Y"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Anwesender"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Klicken Sie hier, um einen Teilnehmer hinzuzufügen"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Gemeinsamer Name"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegiert durch"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegiert an"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Sprache"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Mitglied"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
-msgstr "ungültige Zeit"
-
 #: calendar/gui/e-tasks.c:221
 msgid "Start Date:"
 msgstr "Anfangsdatum:"
@@ -6157,7 +6207,8 @@ msgstr "Priorität:"
 msgid "Web Page:"
 msgstr "Website:"
 
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-tasks.c:702 calendar/gui/gnome-cal.c:2210
+#: calendar/gui/gnome-cal.c:2221
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben bei %s werden geöffnet"
@@ -6172,12 +6223,12 @@ msgstr "Die Aufgaben in »%s« konnten nicht geladen werden"
 msgid "The method required to load `%s' is not supported"
 msgstr "Die zum Laden von »%s« erfoderliche Methode wird nicht unterstützt"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1713
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Sie haben keine Berechtigung den Ordner in »%s« zu öffnen"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1932
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6198,101 +6249,67 @@ msgstr "Gewählte Objekte werden gelöscht..."
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3637
+msgid "New _Appointment..."
+msgstr "Neuer _Termin..."
+
+#: calendar/gui/gnome-cal.c:1685
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Der Ordner in »%s« konnte nicht geöffnet werden"
 
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1699
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Die zum Öffnen von »%s« erforderliche Methode wird nicht unterstützt"
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1760
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarme für %s werden hinzugefügt"
 
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Die Aufgaben-Hintegrundkomponente für\n"
+"Die Kalender-Hintegrundkomponente für\n"
 "%s\n"
 "ist abgestürzt. Sie müssen Evolution neu starten, um sie wieder verwenden zu "
 "können"
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1961
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
-"Die Kalender-Hintegrundkomponente für\n"
+"Die Aufgaben-Hintegrundkomponente für\n"
 "%s\n"
 "ist abgestürzt. Sie müssen Evolution neu starten, um sie wieder verwenden zu "
 "können"
 
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:2192
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender bei %s wird geöffnet"
 
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2232
 msgid "Opening default tasks folder"
 msgstr "Vorgabe-Aufgabenordner wird geöffnet"
 
-#: calendar/gui/gnome-cal.c:3094
+#: calendar/gui/gnome-cal.c:3156
 #, c-format
 msgid "Purging event %s"
 msgstr "Ereignis %s wird entfernt"
 
-#: calendar/gui/gnome-cal.c:3178
+#: calendar/gui/gnome-cal.c:3237
 msgid "Purging"
 msgstr "Entfernen"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
-"konfigurieren"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr "Evolution-Komponente für Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution-Kalender-Terminplan-Nachrichtenbetrachter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution-Kalenderbetrachter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution-Kalender/Aufgaben-Editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution-Aufgabenbetrachter"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6400,7 +6417,7 @@ msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
@@ -6433,81 +6450,82 @@ msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1875
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Gewählter Tag (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1901
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
+#: calendar/gui/print.c:1908
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1912
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Gewählte Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1920
 msgid "Selected month (%b %Y)"
 msgstr "Gewählter Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1927
 msgid "Selected year (%Y)"
 msgstr "Gewähltes Jahr (%Y)"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2255
 msgid "Task"
 msgstr "Aufgabe"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2314
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2331
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2343
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2355
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2369
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2380
 msgid "Contacts: "
 msgstr "Kontakte: "
 
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
+#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2552
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2625
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
@@ -8287,11 +8305,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Resynchronisieren mit dem Server"
 
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Ordner »%s« wird für den Offline-Modus vorbereitet"
@@ -8312,57 +8326,57 @@ msgstr "Weiterleitung zu »%s« konnte nicht erstellt werden: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Kindprozess »%s« konnte nicht erstellt werden: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ungültiger Nachrichten-Datenstrom von %s empfangen: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausführen des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner konnte nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner konnte nicht verarbeitet werden"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Nachricht konnte nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
@@ -8384,35 +8398,7 @@ msgstr "Ungültige Argumente bei (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
 
-#: camel/camel-folder.c:585
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nicht unterstützte Operation: Nachricht anhängen: für %s"
-
-#: camel/camel-folder.c:1163
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nicht unterstützte Operation: Suche nach Ausdruck: für %s"
-
-#: camel/camel-folder.c:1203
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nicht unterstützte Operation: nach UIDs suchen: für %s"
-
-#: camel/camel-folder.c:1321
-msgid "Moving messages"
-msgstr "Nachrichten werden verschoben"
-
-#: camel/camel-folder.c:1321
-msgid "Copying messages"
-msgstr "Nachrichten werden kopiert"
-
-#: camel/camel-folder.c:1571
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "%d Nachricht(en) werden/wird abgerufen"
-
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:347
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8421,7 +8407,7 @@ msgstr ""
 "Suchausdruck konnte nicht verarbeitet werden: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:357
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8430,15 +8416,38 @@ msgstr ""
 "Fehler beim Ausführen eines Suchausdrucks: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:574 camel/camel-folder-search.c:602
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:654
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
 
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nicht unterstützte Operation: Nachricht anhängen: für %s"
+
+#: camel/camel-folder.c:1161
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nicht unterstützte Operation: Suche nach Ausdruck: für %s"
+
+#: camel/camel-folder.c:1201
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nicht unterstützte Operation: nach UIDs suchen: für %s"
+
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
+msgstr "Nachrichten werden verschoben"
+
+#: camel/camel-folder.c:1319
+msgid "Copying messages"
+msgstr "Nachrichten werden kopiert"
+
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8469,7 +8478,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
 msgid "Cancelled."
 msgstr "Storniert"
 
@@ -8530,6 +8539,26 @@ msgstr ""
 "Die Nachrichtensignatur konnte nicht verifiziert werden: Temporäre Datei "
 "konnte nicht erstellt werden: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Weiterleitung zu Sperrhilfsprogramm konnte nicht angelegt werden: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, 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:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "»%s« konnte nicht gesperrt werden"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8552,26 +8581,6 @@ msgstr "fcntl(2)-Sperre konnte nicht erhalten werden: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Weiterleitung zu Sperrhilfsprogramm konnte nicht angelegt werden: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, 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:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "»%s« konnte nicht gesperrt werden"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8638,11 +8647,11 @@ msgstr "MIME-Teil konnte nicht entschlüsselt werden: Ungültige Struktur"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "MIME-Teil konnte nicht entschlüsselt werden: Fehler beim Verarbeiten"
 
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
 msgid "This is a digitally signed message part"
 msgstr "Dies ist ein digital signierter Nachrichtenteil"
 
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
 msgid "parse error"
 msgstr "Fehler beim Verarbeiten"
 
@@ -8832,7 +8841,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1053
 msgid "Bad authentication response from server."
 msgstr "Ungültige Legitimationsantwort vom Server."
 
@@ -8937,53 +8946,53 @@ msgstr "URL »%s« benötigt eine Pfadkomponente"
 msgid "Resolving: %s"
 msgstr "%s wird aufgelöst"
 
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:768 camel/camel-service.c:891
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fehler beim Auflösen eines Namens: %s"
 
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:789
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 "Finden eines Rechners fehlgeschlagen: Thread konnte nicht erstellt werden: %s"
 
-#: camel/camel-service.c:803
+#: camel/camel-service.c:802
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: Rechner nicht gefunden"
 
-#: camel/camel-service.c:806
+#: camel/camel-service.c:805
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: unbekannter Grund"
 
-#: camel/camel-service.c:860
+#: camel/camel-service.c:859
 msgid "Resolving address"
 msgstr "Adresse wird aufgelöst"
 
-#: camel/camel-service.c:929
+#: camel/camel-service.c:924
 msgid "Host lookup failed: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: Rechner nicht gefunden"
 
-#: camel/camel-service.c:932
+#: camel/camel-service.c:927
 msgid "Host lookup failed: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: unbekannter Grund"
 
-#: camel/camel-session.c:75
+#: camel/camel-session.c:74
 msgid "Virtual folder email provider"
 msgstr "E-Mail-Quelle: Virtueller Ordner"
 
-#: camel/camel-session.c:77
+#: camel/camel-session.c:76
 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-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:348 camel/camel-session.c:398
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle für Protokoll »%s« verfügbar"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:521
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9158,7 +9167,7 @@ msgstr "Schlüsselverwendung untertützt das Signieren von Zertifikaten nicht"
 msgid "Error in application verification"
 msgstr "Fehler bei der Anwendungsüberprüfung"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9171,11 +9180,11 @@ msgstr ""
 "Fingerabdruck:       %s\n"
 "Signatur:                %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "GUT"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "SCHLECHT"
 
@@ -9199,7 +9208,7 @@ msgstr ""
 "Möchten Sie es dennoch akzeptieren?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9214,7 +9223,7 @@ msgstr ""
 "\n"
 "Möchten Sie akzeptieren?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9223,7 +9232,7 @@ msgstr ""
 "Zertifikatproblem: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9232,7 +9241,7 @@ msgstr ""
 "Fehlerhafte Zertifikatdomäne: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9241,7 +9250,7 @@ msgstr ""
 "Zertifikat nicht mehr gültig: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9250,7 +9259,7 @@ msgstr ""
 "Zertifikat-Rückrufliste nicht mehr gültig: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:143
+#: camel/camel-url.c:289 mail/mail-tools.c:143
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL »%s« konnte nicht verarbeitet werden"
@@ -9293,12 +9302,12 @@ msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2645
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2648
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verbindung zum Server unerwartet getrennt: %s"
@@ -9365,7 +9374,7 @@ msgstr "Nachricht konnte nicht abgerufen werden: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:350
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9379,7 +9388,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:350
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Keine solche Nachricht"
@@ -9444,104 +9453,88 @@ msgstr "Namensraum"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Filter auf neue Nachrichten in INBOX dieses Servers anwenden"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "_Automatisch nach neuen E-Mails sehen alle"
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Zum Lesen und Speichern von E-Mails auf IMAP-Servern."
 
-#: camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Passwort"
 
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschlüsselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-Server %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-Dienst für %s auf %s"
 
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:128
 #: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:131
 #: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:686
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:681
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Verbindung mit IMAP-Server %s im sicheren Modus ist fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:651
 #: camel/providers/pop3/camel-pop3-store.c:220
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS Erweiterung nicht unterstützt."
 
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:682
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "SSL »Verhandlungen« fehlgeschlagen"
 
-#: camel/providers/imap/camel-imap-store.c:824
-#, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
-
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1076
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "IMAP-Server %s unterstützt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/imap/camel-imap-store.c:1086
 #: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterstützung für Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1109
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sBitte geben Sie das IMAP-Passwort für %s@%s ein"
 
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1123
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1152
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9552,70 +9545,42 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1499
+#: camel/providers/imap/camel-imap-store.c:1641
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1842
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Der Ordnername »%s« ist ungültig, da er das Zeichen »%c« enthält"
 
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1854
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unbekannter Eltern-Ordner %s"
 
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1890
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Nachrichtenspeicherung"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
-msgid "IMAP+"
-msgstr "IMAP"
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Verbindung mit POP-Server %s konnte nicht hergestellt werden"
-
-#: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
-msgid "Index message body data"
-msgstr "Nachricht an Kontakt schicken"
-
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:353
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:357
+#: camel/providers/local/camel-local-folder.c:360
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Postfach: %s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:364
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9675,54 +9640,50 @@ msgstr ""
 "Kann außerdem zum Einlesen eines Baums mit Elm-, Pine- oder Mutt-Ordnern "
 "verwendet werden."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Speicherungswurzel %s ist kein absoluter Pfad"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Speicherwurzel »%s« ist kein reguläres Verzeichnis."
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Lokale Speicher haben keinen Eingangsordner"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokale E-Mail-Datei %s"
 
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
 #, 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:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "»%s« konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
 #, 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-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ordner-Indexdatei »%s« konnte nicht gelöscht werden: %s"
@@ -9764,7 +9725,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9827,29 +9788,29 @@ msgstr "Suchen nach neuen Nachrichten"
 msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:158
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ordnersperre auf %s konnte nicht erzeugt werden: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:217
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Postfach konnte nicht geöffnet werden: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:277
 msgid "Mail append cancelled"
 msgstr "Anhängen der E-Mail abgebrochen"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:280
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nachricht konnte nicht an mbox-Datei angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:399
+#: camel/providers/local/camel-mbox-folder.c:407
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9858,15 +9819,15 @@ msgstr ""
 "Nachricht konnte nicht erhalten werden: %s aus Ordner %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:400
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:408
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Erstellen der Nachricht fehlgeschlagen: Fehlerhaftes Postfach?"
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9875,16 +9836,7 @@ msgstr ""
 "Datei »%s« konnte nicht geöffnet werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Verzeichnis %s konnte nicht angelegt werden:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9893,15 +9845,14 @@ msgstr ""
 "Datei »%s« konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "»%s« ist keine reguläre Datei."
 
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9910,36 +9861,11 @@ msgstr ""
 "Ordner »%s« konnte nicht gelöscht werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
 #, 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:311
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Ein Ordnersperre mit diesem Namen konnte nicht erzeugt werden"
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
-
-#: camel/providers/local/camel-mbox-store.c:427
-#, fuzzy
-msgid "The new folder name is illegal."
-msgstr "Der angegebene Ordnername ist nicht gültig: %s"
-
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -10101,67 +10027,6 @@ msgstr ""
 "Spool-Ordner %s konnte nicht synchronisiert werden: %s\n"
 "Ordner könnte beschädigt sein, Kopie in »%s« gespeichert"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, fuzzy, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "%sBitte geben Sie das SMTP-Passwort für %s@%s ein"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-#, fuzzy
-msgid "Failed to send username to server"
-msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Nachricht %s konnte nicht abgerufen werden: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Benutzer hat abgebrochen"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
-msgid "Could not get group list from server."
-msgstr "Gruppe konnte nicht ermittelt werden: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, fuzzy, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-"Ausgabedatei konnte nicht angelegt werden: %s\n"
-" %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, fuzzy, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"Ausgabedatei konnte nicht angelegt werden: %s\n"
-" %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET-News"
@@ -10194,37 +10059,37 @@ msgstr ""
 "Diese Option führt die Legitimation am NNTP-Server mit einem "
 "unverschlüsselten Passwort durch."
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, c-format
 msgid "No such folder: %s"
 msgstr "Ordner existiert nicht: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Gruppe konnte nicht ermittelt werden: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: neue Nachrichten werden abgefragt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Unbekannte Serverrückmeldung: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
 msgid "Use cancel"
 msgstr "Abbrechen verwenden"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operation fehlgeschlagen: %s"
@@ -10233,6 +10098,13 @@ msgstr "Operation fehlgeschlagen: %s"
 msgid "Retrieving POP summary"
 msgstr "POP-Zusammenfassung wird abgerufen"
 
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+msgid "User cancelled"
+msgstr "Benutzer hat abgebrochen"
+
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -10242,22 +10114,34 @@ msgstr "POP-Zusammenfassung konnte nicht abgerufen werden: %s"
 msgid "Expunging deleted messages"
 msgstr "Gelöschte Nachrichten werden ausgeräumt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "Keine Nachricht mit UID %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP-Nachricht %d wird abgerufen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Nachricht %s konnte nicht abgerufen werden: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Nachrichtenspeicherung"
+
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "E-Mail auf Server belassen"
@@ -10588,7 +10472,7 @@ 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:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
@@ -10606,57 +10490,57 @@ msgstr ""
 msgid "SMTP Greeting"
 msgstr "SMTP-Begrüßung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:926
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Zeitüberschreitung bei HELO-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:948
 msgid "HELO response error"
 msgstr "Fehler bei HELO-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1020
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1037
+#: camel/providers/smtp/camel-smtp-transport.c:1049
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zeitüberschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1058
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Ungültige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei MAIL-FROM-Anfrage: %s: E-Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1164
 msgid "MAIL FROM response error"
 msgstr "Fehler bei MAIL-FROM-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1188
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei RCPT-TO-Anfrage: %s: E-Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1210
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1249
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: E-Mail nicht verschickt."
@@ -10664,37 +10548,37 @@ msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: E-Mail nicht verschickt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 msgid "DATA response error"
 msgstr "Fehler bei DATA-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1333
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zeitüberschreitung beim Übermitteln von DATA: Nachrichtenabschluss: %s E-"
 "Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1353
 msgid "DATA termination response error"
 msgstr "Fehler bei DATA-Terminierungsantwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1376
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeitüberschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1396
 msgid "RSET response error"
 msgstr "Fehler bei RSET-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1419
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Zeitüberschreitung bei QUIT-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1439
 msgid "QUIT response error"
 msgstr "Fehler bei QUIT-Antwort"
 
@@ -10713,19 +10597,20 @@ msgstr "%.0f MB"
 msgid "%.0fG"
 msgstr "%.0f GB"
 
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:311 mail/mail-display.c:226
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:449
 msgid "Remove selected items from the attachment list"
 msgstr "Die gewählten Objekte aus der Anlagenliste entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:479
 msgid "Add attachment..."
 msgstr "Anlage hinzufügen..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:480
 msgid "Attach a file to the message"
 msgstr "Der Nachricht eine Datei beilegen"
 
@@ -10757,11 +10642,89 @@ msgstr "MIME-Typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr "Hey, Sie! Sie brauchen ein Konto, um E-Mails zu verschicken!"
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Antwort an:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Von:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "An:"
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Geben Sie die Empfänger der Nachricht ein"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Kopie an:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+"Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Blindkopie an:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Geben Sie die Adressen ein, die eine Kopie erhalten, die nicht in der "
+"Empfängerliste auftaucht."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr "Ablegen in:"
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr "Zielordner"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Datei(en) beilegen"
+
+#: composer/e-msg-composer.c:555
 msgid "Could not create a PGP signature context"
 msgstr "Es konnte kein PGP-Signaturkontext angelegt werden"
 
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:834
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10770,30 +10733,30 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1197
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, überschreiben?"
 
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1215
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1238
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1276
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1284
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1291
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10802,7 +10765,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1298
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10811,7 +10774,7 @@ msgstr ""
 "Datei konnte nicht verkürzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1307
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10820,7 +10783,7 @@ msgstr ""
 "Dateideskriptor %s konnte nicht kopiert werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1316
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10829,7 +10792,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1413
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10838,7 +10801,7 @@ msgstr ""
 "entdeckt.\n"
 "Möchten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1594
+#: composer/e-msg-composer.c:1575
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10849,28 +10812,28 @@ msgstr ""
 "\n"
 "Wollen Sie die Änderungen speichern?"
 
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1584
 msgid "Warning: Modified Message"
 msgstr "Warnung: Geänderte Nachricht"
 
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1616
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2040
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2080 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2256 composer/e-msg-composer.c:2925
+#: composer/e-msg-composer.c:2926
 msgid "Compose a message"
 msgstr "Eine Nachricht verfassen"
 
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2957
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10878,7 +10841,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "Adresswähler-Control konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2985
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10890,7 +10853,7 @@ msgstr ""
 "Bitte stellen Sie sicher, dass die korrekte gtkhtml- und\n"
 "libgtkhtml-Version installiert ist.\n"
 
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3052
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10898,7 +10861,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:4110
+#: composer/e-msg-composer.c:4078
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10906,86 +10869,6 @@ msgstr ""
 "<b>(Der Editor enthält einen nicht-Text Nachrichtenrumpf, der nicht "
 "bearbeitet werden kann.)<b>"
 
-#: composer/e-msg-composer-hdrs.c:290
-#, fuzzy
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"Sie müssen ein Konto einrichten,\n"
-"bevor Sie E-Mails verfassen können."
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Antwort an:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Von:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "An:"
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Geben Sie die Empfänger der Nachricht ein"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Kopie an:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-"Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Blindkopie an:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Geben Sie die Adressen ein, die eine Kopie erhalten, die nicht in der "
-"Empfängerliste auftaucht."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr "Ablegen in:"
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr "Zielordner"
-
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr "Datei(en) beilegen"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Die Groupware-Suite Evolution"
@@ -11156,7 +11039,7 @@ msgstr ""
 "Es existiert bereits eine Datei mit diesem Namen.\n"
 "Überschreiben?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:199
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
@@ -11178,210 +11061,90 @@ msgstr "Kategorien synchronisieren"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y / %I.%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y / %H.%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
 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.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
 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.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
 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.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H.%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
 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.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1415 widgets/misc/e-dateedit.c:1628
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1412 widgets/misc/e-dateedit.c:1625
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution-Zusammenfassungskomponente"
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Ordner konnte nicht umbenannt werden:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Fehler beim Laden von %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Eine Datei wählen"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Eine E-Mail verschicken"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Typ der anzuzeigenden Ansicht"
-
-#: executive-summary/component/e-summary-url.c:73
-#, fuzzy, c-format
-msgid "Run %s"
-msgstr "URL: %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Schließen"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Diesen Ordner an einen anderen Ort verschieben"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "/%s neu konfigurieren"
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Seite"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-msgid "Error"
-msgstr "Fehler"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Aktualisieren"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "Verfügbarkeit _aktualisieren"
-
 #: filter/filter-datespec.c:65
 msgid "1 second ago"
 msgstr "Vor 1 Sekunde"
@@ -11497,6 +11260,84 @@ msgstr "Sie müssen einen Ordner angeben"
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Fehler im regulären Ausdruck »%s«:\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+msgid "Important"
+msgstr "Wichtig"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
+msgid "Work"
+msgstr "Arbeit"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1413
+msgid "Personal"
+msgstr "Persönlich"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+msgid "To Do"
+msgstr "Zu erledigen"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1415
+msgid "Later"
+msgstr "Später"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Der Filter muss benannt werden."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Regelname: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Namenlos"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Falls"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Aktionen ausführen"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "falls alle Kriterien zutreffen"
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr "falls irgendein Kriterium zutreffen"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "Eingang"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "Ausgang"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Vergleichen mit"
@@ -11599,84 +11440,6 @@ msgstr "mit allen lokalen Ordnern"
 msgid "years"
 msgstr "Jahre"
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Fehler im regulären Ausdruck »%s«:\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr "Wichtig"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Arbeit"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Persönlich"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-msgid "To Do"
-msgstr "Zu erledigen"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-msgid "Later"
-msgstr "Später"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Der Filter muss benannt werden."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Regelname: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Namenlos"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Falls"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Aktionen ausführen"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "falls alle Kriterien zutreffen"
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "falls irgendein Kriterium zutreffen"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "Eingang"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "Ausgang"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -11700,217 +11463,217 @@ msgid "Beep"
 msgstr "Beep"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "enthält"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Verschickt-Datum"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "Existieren nicht"
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Entwurf"
+msgid "does not contain"
+msgstr "enthält nicht"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr "Existieren"
+msgid "does not end with"
+msgstr "endet nicht auf"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "Ausdruck"
+msgid "does not exist"
+msgstr "existiert nicht"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr "Folgenachricht"
+msgid "does not return"
+msgstr "liefert nicht"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "klingt nicht wie"
 
 #: filter/libfilter-i18n.h:18
-msgid "Label"
-msgstr "Etikett"
+msgid "does not start with"
+msgstr "beginnt nicht mit"
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "Mailingliste"
+msgid "Do Not Exist"
+msgstr "Existieren nicht"
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "Nachrichtenrumpf"
+msgid "Draft"
+msgstr "Entwurf"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "Nachrichtenkopf"
+msgid "ends with"
+msgstr "endet auf"
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "In Ordner verschieben"
+msgid "Exist"
+msgstr "Existieren"
 
 #: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
-msgstr "Nachricht an Befehl im Terminal weiterleiten"
+msgid "exists"
+msgstr "existiert"
 
 #: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "Klang abspielen"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Gelesen"
+msgid "Expression"
+msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Empfänger"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr "Folgenachricht"
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr "Regex-Treffer"
+msgid "is"
+msgstr "ist"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "Beantwortet"
+msgid "is after"
+msgstr "ist nach"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Bewertung"
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "ist vor"
 
 #: filter/libfilter-i18n.h:30
-msgid "Sender"
-msgstr "Absender"
+msgid "is Flagged"
+msgstr "ist markiert"
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr "Status setzen:"
+msgid "is greater than"
+msgstr "ist größer als"
 
 #: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "Terminal-Befehl"
+msgid "is less than"
+msgstr "ist kleiner als"
 
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "Größe (kB)"
+msgid "is not"
+msgstr "ist nicht"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
-msgstr "Herkunftskonto"
+msgid "is not Flagged"
+msgstr "ist nicht markiert"
 
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
-msgstr "Bestimmte Kopfzeile"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1840
+msgid "Label"
+msgstr "Etikett"
+
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
+msgstr "Mailingliste"
 
 #: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
-msgstr "Verarbeitung abbrechen"
+msgid "Message Body"
+msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Betreff"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
+msgstr "Nachrichtenkopf"
 
 #: filter/libfilter-i18n.h:39
-msgid "Unset Status"
-msgstr "Status nicht setzen"
+msgid "Move to Folder"
+msgstr "In Ordner verschieben"
 
 #: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "enthält"
+msgid "Pipe Message to Shell Command"
+msgstr "Nachricht an Befehl im Terminal weiterleiten"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "enthält nicht"
+msgid "Play Sound"
+msgstr "Klang abspielen"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "endet nicht auf"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Gelesen"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "existiert nicht"
+msgid "Recipients"
+msgstr "Empfänger"
 
 #: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "liefert nicht"
+msgid "Regex Match"
+msgstr "Regex-Treffer"
 
 #: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "klingt nicht wie"
+msgid "Replied to"
+msgstr "Beantwortet"
 
 #: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "beginnt nicht mit"
+msgid "returns"
+msgstr "liefert"
 
 #: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "endet auf"
+msgid "returns greater than"
+msgstr "liefert größer als"
 
 #: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "existiert"
+msgid "returns less than"
+msgstr "liefert kleiner als"
 
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "ist markiert"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "ist nach"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+msgid "Sender"
+msgstr "Absender"
 
 #: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "ist vor"
+msgid "Set Status"
+msgstr "Status setzen:"
 
 #: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "ist größer als"
+msgid "Shell Command"
+msgstr "Terminal-Befehl"
 
 #: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "ist kleiner als"
+msgid "Size (kB)"
+msgstr "Größe (kB)"
 
 #: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "ist nicht markiert"
+msgid "sounds like"
+msgstr "klingt wie"
 
 #: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "ist nicht"
+msgid "Source Account"
+msgstr "Herkunftskonto"
 
 #: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "ist"
+msgid "Specific header"
+msgstr "Bestimmte Kopfzeile"
 
 #: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr "liefert größer als"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "liefert kleiner als"
+msgid "starts with"
+msgstr "beginnt mit"
 
 #: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "liefert"
+msgid "Stop Processing"
+msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "klingt wie"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:933
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+msgid "Subject"
+msgstr "Betreff"
 
 #: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "beginnt mit"
+msgid "Unset Status"
+msgstr "Status nicht setzen"
 
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelname »%s« ist nicht eindeutig. Wählen Sie einen anderen."
@@ -11978,9 +11741,10 @@ msgid "Scanning %s"
 msgstr "%s wird abgetastet"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:117
+#: mail/folder-browser-ui.c:362 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "E-Mail"
 
@@ -12071,7 +11835,7 @@ msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Müll"
 
@@ -12121,39 +11885,100 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/component-factory.c:116
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Editoreinstellungen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
+"der Anzeige von Nachrichten festlegen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
+"Nachrichteneditor konfigurieren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution E-Mail"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Bedienelement zur Konfiguration von Evolution-E-Mail-Konten"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution-E-Mail-Komponente"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution-E-Mail-Editor"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Bedienelement zur Konfiguration des Evolution-E-Mail-Editors"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail configuration interface"
+msgstr "Evolution-E-Mail-Konfigurationsoberfläche"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution-E-Mail-Ordnerbetrachter"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Mail preferences control"
+msgstr "Evoltion-E-Mail-Einstellungen-Bedienelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-Mail-Konten"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
+msgstr "E-Mail-Einstellungen"
+
+#: mail/component-factory.c:117
 msgid "Folder containing mail"
 msgstr "Ordner, der E-Mails enthält"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public Mail"
 msgstr "Öffentliche E-Mail"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 msgid "Public folder containing mail"
 msgstr "Öffentlicher Ordner, der E-Mails enthält"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash"
 msgstr "Virtueller Müll"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash folder"
 msgstr "Virtueller Müllordner"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners festlegen"
 
-#: mail/component-factory.c:826
+#: mail/component-factory.c:823
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -12161,112 +11986,236 @@ msgstr ""
 "Einige Ihrer E-Mail-Einstellungen scheinen ungültig zu sein, bitte stellen "
 "Sie sicher, dass alles in Ordnung ist."
 
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1004
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Methode für den Transport von E-Mails eingestellt"
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1027
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Es sind noch nicht verschickte Nachrichten vorhanden. Wollen Sie Evolution "
 "dennoch beenden?"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1067
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1067
 msgid "_Mail Message"
 msgstr "E-_Mail-Nachricht"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1068
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1076
 msgid "New Message Post"
 msgstr "Neue Ordner-Nachricht"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1076
 msgid "_Post Message"
 msgstr "_Nachricht an Ordner"
 
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1077
 msgid "Post a new mail message"
 msgstr "Eine neue E-Mail-Nachricht an einen Ordner verfassen"
 
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1369
 msgid "Connecting..."
 msgstr "Verbindung wird hergestellt..."
 
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1380
 msgid "Cannot register storage with shell"
 msgstr "Speicher konnte nicht bei der Shell registriert werden"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Ordner-Informationen werden entnommen"
+#: mail/folder-browser-ui.c:488
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Eigenschaften von »%s«"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Editoreinstellungen"
+#: mail/folder-browser-ui.c:490
+msgid "Properties"
+msgstr "Eigenschaften"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
-"der Anzeige von Nachrichten festlegen"
+#: mail/folder-browser.c:329 mail/mail-display.c:393 mail/mail-display.c:917
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
-"Nachrichteneditor konfigurieren"
+#: mail/folder-browser.c:804
+#, c-format
+msgid "%d new"
+msgstr "%d neu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
+#: mail/folder-browser.c:807 mail/folder-browser.c:815
+#: mail/folder-browser.c:818
+msgid ", "
+msgstr ", "
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution E-Mail"
+#: mail/folder-browser.c:809
+#, c-format
+msgid "%d hidden"
+msgstr "%d verborgen"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Bedienelement zur Konfiguration von Evolution-E-Mail-Konten"
+#: mail/folder-browser.c:811
+#, c-format
+msgid "%d visible"
+msgstr "%d sichtbar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution-E-Mail-Komponente"
+#: mail/folder-browser.c:816
+#, c-format
+msgid "%d selected"
+msgstr "%d ausgewählt"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution-E-Mail-Editor"
+#: mail/folder-browser.c:821
+#, c-format
+msgid "%d unsent"
+msgstr "%d nicht verschickt"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Bedienelement zur Konfiguration des Evolution-E-Mail-Editors"
+#: mail/folder-browser.c:823
+#, c-format
+msgid "%d sent"
+msgstr "%d verschickt"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
-msgstr "Evolution-E-Mail-Konfigurationsoberfläche"
+#: mail/folder-browser.c:825
+#, c-format
+msgid "%d total"
+msgstr "%d insgesamt"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution-E-Mail-Ordnerbetrachter"
+#: mail/folder-browser.c:1204
+msgid "Create _Virtual Folder From Search..."
+msgstr "_Virtuellen Ordner aus Suche anlegen..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
-msgstr "Evoltion-E-Mail-Einstellungen-Bedienelement"
+#: mail/folder-browser.c:1776
+msgid "VFolder on _Subject"
+msgstr "VOrdner über _Betreff"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-Mail-Konten"
+#: mail/folder-browser.c:1777
+msgid "VFolder on Se_nder"
+msgstr "VOrdner über Abse_nder"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "E-Mail-Einstellungen"
+#: mail/folder-browser.c:1778
+msgid "VFolder on _Recipients"
+msgstr "VOrdner über _Empfänger"
+
+#: mail/folder-browser.c:1779
+msgid "VFolder on Mailing _List"
+msgstr "VOrdner über Mailing_liste"
+
+#: mail/folder-browser.c:1783
+msgid "Filter on Sub_ject"
+msgstr "Filter über _Betreff"
+
+#: mail/folder-browser.c:1784
+msgid "Filter on Sen_der"
+msgstr "Filter über _Absender"
+
+#: mail/folder-browser.c:1785
+msgid "Filter on Re_cipients"
+msgstr "Filter über _Empfänger"
+
+#: mail/folder-browser.c:1786 mail/folder-browser.c:2110
+msgid "Filter on _Mailing List"
+msgstr "Filter über _Mailingliste"
+
+#: mail/folder-browser.c:1804
+msgid "_Edit as New Message..."
+msgstr "Als neue Nachricht _bearbeiten..."
+
+#: mail/folder-browser.c:1806
+msgid "_Print"
+msgstr "_Drucken"
+
+#: mail/folder-browser.c:1810 ui/evolution-mail-message.xml.h:112
+msgid "_Reply to Sender"
+msgstr "Antwort an Ab_sender"
+
+#: mail/folder-browser.c:1811 ui/evolution-mail-message.xml.h:76
+msgid "Reply to _List"
+msgstr "_Liste antworten"
+
+#: mail/folder-browser.c:1812 ui/evolution-mail-message.xml.h:75
+msgid "Reply to _All"
+msgstr "_Allen antworten"
+
+#: mail/folder-browser.c:1813
+msgid "_Forward"
+msgstr "_Weiterleiten"
+
+#: mail/folder-browser.c:1817
+msgid "Follo_w Up..."
+msgstr "Follo_w Up..."
+
+#: mail/folder-browser.c:1818
+msgid "Fla_g Completed"
+msgstr "Als abgeschlossen _markieren"
+
+#: mail/folder-browser.c:1819
+msgid "Cl_ear Flag"
+msgstr "Markierung _löschen"
+
+#. separator here?
+#: mail/folder-browser.c:1823 ui/evolution-mail-message.xml.h:44
+msgid "Mar_k as Read"
+msgstr "Als gelesen mar_kieren"
+
+#: mail/folder-browser.c:1824
+msgid "Mark as _Unread"
+msgstr "Als _ungelesen markieren"
+
+#: mail/folder-browser.c:1825
+msgid "Mark as _Important"
+msgstr "Als _wichtig markieren"
+
+#: mail/folder-browser.c:1826
+msgid "_Mark as Unimportant"
+msgstr "Als unwichtig _markieren"
+
+#: mail/folder-browser.c:1831
+msgid "U_ndelete"
+msgstr "Lösche_n rückgängig"
+
+#: mail/folder-browser.c:1835
+msgid "Mo_ve to Folder..."
+msgstr "In Ordner _verschieben..."
+
+#: mail/folder-browser.c:1836 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "In Ordner kopieren..."
+
+#: mail/folder-browser.c:1844
+msgid "Add Sender to Address_book"
+msgstr "Absender zum Adress_buch hinzufügen"
+
+#: mail/folder-browser.c:1848
+msgid "Appl_y Filters"
+msgstr "Filter _anwenden"
+
+#: mail/folder-browser.c:1852
+msgid "Crea_te Rule From Message"
+msgstr "_Regel aus Nachricht anlegen"
+
+#: mail/folder-browser.c:2111
+msgid "VFolder on M_ailing List"
+msgstr "VOrdner über M_ailingliste"
+
+#: mail/folder-browser.c:2113
+#, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Filter über _Mailingliste (%s)"
+
+#: mail/folder-browser.c:2114
+#, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "VOrdner über M_ailingliste (%s)"
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Vorgabe"
+
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Ordner-Informationen werden entnommen"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
@@ -12352,7 +12301,7 @@ msgstr "_Benutzername:"
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
 msgid "You may not create two accounts with the same name."
 msgstr "Sie können keine zwei Konten mit demselben Namen anlegen."
 
@@ -12383,16 +12332,16 @@ msgstr "[Vorgabe]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
-#: mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: mail/mail-accounts.c:487
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Kontoname"
 
-#: mail/mail-accounts.c:489
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -12435,6 +12384,222 @@ msgstr ""
 "    »%s«\n"
 "Und wurden aktualisiert."
 
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Diese Meldung nicht mehr anzeigen."
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"Sie haben den E-Mail-Client nicht konfiguriert.\n"
+"Sie müssen dies tun, bevor Sie E-Mails verschicken,\n"
+"abrufen oder verfassen können.\n"
+"Möchten Sie ihn jetzt konfigurieren?"
+
+#: mail/mail-callbacks.c:212
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Sie müssen ein Konto einrichten,\n"
+"bevor Sie E-Mails verfassen können."
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"Sie müssen eine Identität einrichten,\n"
+"bevor Sie E-Mails verfassen können."
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"Sie müssen einen Mailtransport einrichten,\n"
+"bevor Sie E-Mails verfassen können."
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+"Sie verschicken eine HTML-formatierte Nachricht. Bitte stellen Sie sicher,\n"
+"dass die folgenden Empfänger HTML-Mails abrufen können und wollen:\n"
+
+#: mail/mail-callbacks.c:267
+msgid "Send anyway?"
+msgstr "Dennoch verschicken?"
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Diese Nachricht hat keinen Betreff.\n"
+"Wirklich verschicken?"
+
+#: mail/mail-callbacks.c:314
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+"Da die Kontaktliste, an die Sie diese Nachricht verschicken, konfiguriert "
+"ist, die Adressen der Liste zu verbergen, wird die Nachricht lediglich an "
+"Blindkopie-Empfängeradressen übermittlt."
+
+#: mail/mail-callbacks.c:318
+msgid "This message contains only Bcc recipients."
+msgstr "Diese Nachricht enthält ausschließlich Blindkopie-Empfänger."
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+"Es ist möglich, dass der E-Mail-Server die Empfänger kenntlich macht, indem "
+"er eine Apparently-To-Kopfzeile hinzufügt.\n"
+"Dennoch verschicken?"
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr "Sie müssen Empfänger angeben, um diese Nachricht zu verschicken."
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Der Entwürfe-Ordner für dieses Konto konnte nicht geöffnet werden.\n"
+"Möchten Sie den voreingestellten Entwürfe-Ordner verwenden?"
+
+#: mail/mail-callbacks.c:1189
+msgid "an unknown sender"
+msgstr "ein unbekannter Absender"
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "Am %a, %Y-%m-%d um %H.%M schrieb %%s:"
+
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr "Nachricht(en) verschieben in"
+
+#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr "Nachricht(en) kopieren in"
+
+#: mail/mail-callbacks.c:2344
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Sind Sie sicher, dass Sie alle %d Nachrichten bearbeiten wollen?"
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Sie können nur im Entwürfe-Ordner\n"
+"abgespeicherte Nachrichten bearbeiten."
+
+#: mail/mail-callbacks.c:2393
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Sie können nur Nachrichten im\n"
+"Verschickt-Ordner neu verschicken."
+
+#: mail/mail-callbacks.c:2403
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr ""
+"Sind Sie sicher, dass Sie alle %d Nachrichten nochmals verschicken wollen?"
+
+#: mail/mail-callbacks.c:2424
+msgid "No Message Selected"
+msgstr "Keine Nachricht markiert"
+
+#: mail/mail-callbacks.c:2465
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"In »%s« konnte nicht gespeichert werden:\n"
+"  %s"
+
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"»%s« ist bereits vorhanden.\n"
+"Soll es überschrieben werden?"
+
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
+msgstr "Nachricht speichern unter..."
+
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
+msgstr "Nachrichten speichern unter..."
+
+#: mail/mail-callbacks.c:2686
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Dieser Vorgang wird alle als gelöscht markierten Nachrichten dauerhaft "
+"entfernen. Falls Sie fortfahren, werden Sie diese Nachrichten nicht "
+"wiederherstellen können.\n"
+"\n"
+"Sollen die Nachrichten wirklich entfernt werden?"
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Fehler beim Laden von Filterinformation:\n"
+"%s"
+
+#: mail/mail-callbacks.c:2789
+msgid "Filters"
+msgstr "Filter"
+
+#: mail/mail-callbacks.c:2830
+#, c-format
+msgid "Page %d of %d"
+msgstr "Seite %d von %d"
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr "Nachricht drucken"
+
+#: mail/mail-callbacks.c:2954
+msgid "Printing of message failed"
+msgstr "Drucken der Nachricht fehlgeschlagen"
+
+#: mail/mail-callbacks.c:3147
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+"Sind Sie sicher, dass Sie alle %d Nachrichten in getrennten Fenstern öffnen "
+"wollen?"
+
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 msgid "Unnamed"
@@ -12460,19 +12625,11 @@ msgstr "Skript-Signatur hinzufügen"
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Dienst wird überprüft"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Verbindung zu Server..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identität"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12483,11 +12640,11 @@ msgstr ""
 "ausgefüllt werden, sofern Sie diese Informationen nicht in den E-Mails, die "
 "Sie verschicken, einschließen wollen."
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
 msgid "Receiving Mail"
 msgstr "Abrufen von E-Mail"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12496,15 +12653,15 @@ msgstr ""
 "an. Falls Sie nicht sich sicher sind, wenden Sie sich bitte an Ihren "
 "Systemadministrator oder Internet-Provider."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Bitte wählen Sie aus den folgenden Optionen"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
 msgid "Sending Mail"
 msgstr "Verschicken von E-Mail"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12513,11 +12670,11 @@ msgstr ""
 "verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich bitte "
 "an Ihren Systemadministrator oder Internet-Provider."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Kontenverwaltung"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12533,6 +12690,14 @@ msgstr ""
 "dieses Konto ein.\n"
 "Dieser Name wird nur zur Anzeige auf dem Bildschirm verwendet."
 
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Dienst wird überprüft"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Verbindung zu Server..."
+
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Prüfen, welche Typen unterstützt werden "
@@ -12658,10 +12823,6 @@ msgstr ""
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Vorgabe"
-
 #: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Vorgabe-Verhalten"
@@ -13113,25 +13274,218 @@ msgstr "Sichere Verbindung (_SSL) verwenden:"
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie die anderen Anwendungen _verwenden"
 
+#: mail/mail-config.glade.h:171
+msgid "color"
+msgstr "Farbe"
+
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "Beschreibung"
 
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr "S/MIME-Signaturkontext konnte nicht angelegt werden."
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr "S/MIME-certsonly-Kontext konnte nicht angelegt werden."
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr "S/MIME-Verschlüsselungskontext konnte nicht angelegt werden."
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr "S/MIME-Entschlüsselungskontext konnte nicht angelegt werden."
+
+#: mail/mail-display.c:196
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Es existiert bereits eine Datei mit Namen »%s«.\n"
+"Soll diese überschrieben werden?"
+
+#: mail/mail-display.c:335
+msgid "Save Attachment"
+msgstr "Anlage speichern"
+
+#: mail/mail-display.c:408
+#, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Die temporäre Datei »%s« konnte nicht angelegt werden: %s"
+
+#: mail/mail-display.c:476
+msgid "Save Attachment..."
+msgstr "Anlage speichern..."
+
+#: mail/mail-display.c:477
+msgid "View Inline"
+msgstr "An Ort und Stelle anzeigen"
+
+#: mail/mail-display.c:478
+#, c-format
+msgid "Open in %s..."
+msgstr "Öffnen in %s..."
+
+#: mail/mail-display.c:538
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "An Ort und Stelle anzeigen (mit %s)"
+
+#: mail/mail-display.c:542
+msgid "Hide"
+msgstr "Verbergen"
+
+#: mail/mail-display.c:562
+msgid "External Viewer"
+msgstr "Externer Betrachter"
+
+#: mail/mail-display.c:1348
+msgid "Downloading images"
+msgstr "Bilder werden heruntergeladen"
+
+#: mail/mail-display.c:1525
+msgid "Loading message content"
+msgstr "Laden des Nachrichteninhalts"
+
+#: mail/mail-display.c:1867
+msgid "Overdue:"
+msgstr "Überfallig:"
+
+#: mail/mail-display.c:1871
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "am %d. %B %Y, %H:%M"
+
+#: mail/mail-display.c:2235
+msgid "Open Link in Browser"
+msgstr "Link in Browser öffnen"
+
+#: mail/mail-display.c:2236
+msgid "Copy Link Location"
+msgstr "Linkziel kopieren"
+
+#: mail/mail-display.c:2238
+msgid "Save Link as (FIXME)"
+msgstr "Link speichern unter (FIXME)"
+
+#: mail/mail-display.c:2240
+msgid "Save Image as..."
+msgstr "Bild speichern unter..."
+
+#: mail/mail-folder-cache.c:745
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
 
+#: mail/mail-format.c:664
+#, c-format
+msgid "%s attachment"
+msgstr "%s-Anlage"
+
+#: mail/mail-format.c:706 mail/mail-format.c:1343 mail/mail-format.c:1414
+#: mail/mail-format.c:1534 mail/mail-format.c:1658 mail/mail-format.c:1683
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+"Die MIME-Nachricht konnte nicht verarbeitet werden und wird daher als "
+"Quellxt angezeigt."
+
+#: mail/mail-format.c:784 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Datum"
+
+#: mail/mail-format.c:870
+msgid "Bad Address"
+msgstr "Ungültige Adresse"
+
+#: mail/mail-format.c:911 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Von"
+
+#: mail/mail-format.c:915
+msgid "Reply-To"
+msgstr "Antwort an"
+
+#: mail/mail-format.c:920 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "An"
+
+#: mail/mail-format.c:925
+msgid "Cc"
+msgstr "Kopie"
+
+#: mail/mail-format.c:930
+msgid "Bcc"
+msgstr "Blindkopie"
+
+#: mail/mail-format.c:1457
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Diese Nachricht ist digital signiert. Klicken Sie auf das Schlosssymbol, um "
+"weitere Informationen zu erhalten."
+
+#: mail/mail-format.c:1485
+msgid "Could not create a PGP verfication context"
+msgstr "Es konnte kein PGP-Überprüfungskontext angelegt werden"
+
+#: mail/mail-format.c:1493
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
+"nachgewiesen."
+
+#: mail/mail-format.c:1500
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Diese Nachricht ist digital unterzeichnet, aber konnte nicht als authentisch "
+"nachgewiesen werden."
+
+#: mail/mail-format.c:1764
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Zeiger auf FTP-Site (%s)"
+
+#: mail/mail-format.c:1775
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
+
+#: mail/mail-format.c:1778
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Zeiger auf lokale Datei (%s)"
+
+#: mail/mail-format.c:1805
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Zeiger auf Daten im Netz (%s)"
+
+#: mail/mail-format.c:1811
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
+
+#: mail/mail-format.c:1813
+msgid "Malformed external-body part."
+msgstr "Ungültiger external-body-Teil."
+
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokale Ordner/%s"
 
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Ordner wird umkonfiguriert"
 
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13140,37 +13494,37 @@ msgstr ""
 "Metainformationen zum Ordner konnten nicht gespeichert werden; Sie\n"
 "können ihn wahrscheinlich nicht mehr öffnen: %s: %s"
 
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Metainformationen zum Ordner können nicht in %s gespeichert werden: %s"
 
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ordner-Metadaten %s können nicht gelöscht werden: %s"
 
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner »%s« in »%s«-Format um"
 
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr "Datei %s konnte nicht geladen werden"
 
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s neu konfigurieren"
 
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
 msgid "You cannot change the format of a non-local folder."
 msgstr "Sie können das Format eines nichtlokalen Ordners nicht ändern."
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13180,7 +13534,7 @@ msgstr ""
 "  %s:\n"
 "%s"
 
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13189,131 +13543,118 @@ msgstr ""
 "Fehler bei folgendem Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "In Arbeit"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Ordner wird gefiltert"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
-#: mail/mail-ops.c:557
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "E-Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
-
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-
-#: mail/mail-ops.c:587
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "E-Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
+msgstr "Dennoch wurde die Nachricht erfolgreich verschickt."
 
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "»%s« wird verschickt"
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Nachrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden abgetastet"
 
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s wird geöffnet"
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Speicher %s wird geöffnet"
 
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Ordner wird aktualisiert"
 
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d Nachricht(en) werden/wird abgerufen"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d Nachricht(en) werden/wird gespeichert"
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13322,7 +13663,7 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13331,11 +13672,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
 msgid "Saving attachment"
 msgstr "Speichern der Anlage"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13344,74 +13685,106 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird neu aufgebaut"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+msgid "(Untitled Message)"
+msgstr "(Unbenannte Nachricht)"
+
+#: mail/mail-search.c:236
+msgid "Untitled Message"
+msgstr "Unbenannte Nachricht"
+
+#: mail/mail-search.c:238
+msgid "Empty Message"
+msgstr "Leere Nachricht"
+
+#: mail/mail-search.c:287
+msgid "Find in Message"
+msgstr "In Nachricht suchen"
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr "Groß-/Kleinschreibung beachten"
+
+#: mail/mail-search.c:322
+msgid "Search Forward"
+msgstr "Vorwärts suchen"
+
+#: mail/mail-search.c:342
+msgid "Find:"
+msgstr "Suchen:"
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr "Passt auf:"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Stornieren..."
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pfad: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "E-Mails abrufen und verschicken"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "_Alles abbrechen"
 
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
 msgid "_Remember this password"
 msgstr "An dieses Passwort e_rinnern"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
 msgid "_Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort e_rinnern"
 
@@ -13460,17 +13833,21 @@ msgstr "Weitergeleitete Nachricht - %s"
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:459 mail/mail-tools.c:466
+msgid "Forwarded Message"
+msgstr "Weitergeleitete Nachricht"
+
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "VOrdner wird eingerichtet: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "VOrdner werden aktualisiert für URI: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13483,96 +13860,101 @@ msgstr ""
 "   »%s«\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vOrdner"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Es wurde versucht, einen vOrdner »%s« zu editieren, der nicht existiert."
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-list.c:900
+#: mail/message-browser.c:233
+msgid "(No subject)"
+msgstr "(Kein Betreff)"
+
+#: mail/message-browser.c:235
+#, c-format
+msgid "%s - Message"
+msgstr "%s - Nachricht"
+
+#: mail/message-list.c:741
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:742
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:743
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:744
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:745
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:749
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:750
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:754
 msgid "Higher"
 msgstr "Höher"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:755
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %H.%M"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Fällig am "
@@ -13589,10 +13971,6 @@ msgstr "Markiert"
 msgid "Follow Up Flag"
 msgstr "Folgenachricht-Markierung"
 
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Von"
-
 #: mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Ursprünglicher Speicherort"
@@ -13605,10 +13983,6 @@ msgstr "Erhalten"
 msgid "Size"
 msgstr "Größe"
 
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "An"
-
 #: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Anrufen"
@@ -13625,7 +13999,7 @@ msgstr "Follow-Up"
 msgid "For Your Information"
 msgstr "Zu Ihrer Information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:37
 msgid "Forward"
 msgstr "Weiterleiten"
 
@@ -13633,11 +14007,11 @@ msgstr "Weiterleiten"
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:73
 msgid "Reply"
 msgstr "Antworten"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:74
 msgid "Reply to All"
 msgstr "Allen antworten"
 
@@ -13671,6 +14045,39 @@ msgstr "_Fällig am:"
 msgid "_Flag:"
 msgstr "_Markierung:"
 
+#: mail/subscribe-dialog.c:230
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "Ordner unter %s auf »%s« werden abgetastet"
+
+#: mail/subscribe-dialog.c:232
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "Ordner der obersten Ebene auf »%s« werden abgetastet"
+
+#: mail/subscribe-dialog.c:329
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Ordner »%s« wird abonniert"
+
+#: mail/subscribe-dialog.c:331
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Abonnement auf Ordner »%s« wird abbestellt"
+
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Ordner"
+
+#: mail/subscribe-dialog.c:1499
+msgid "No server has been selected"
+msgstr "Es wurde kein Server gewählt"
+
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
+msgstr "Bitte wählen Sie einen Server."
+
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr "Abonnements verwalten"
@@ -13684,123 +14091,17 @@ msgid "S_erver:"
 msgstr "_Server:"
 
 #: mail/subscribe-dialog.glade.h:4
+msgid "Scanning folders ..."
+msgstr "Ordner werden abgetastet..."
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Ordner mit der Evolution-Übersicht"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %e. %B %Y"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Bitte warten..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Zusammenfassung drucken"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Drucken der Übersicht fehlgeschlagen"
-
-#: my-evolution/e-summary-calendar.c:384
-msgid "Appointments"
-msgstr "Termine"
-
-#: my-evolution/e-summary-calendar.c:392
-msgid "No appointments."
-msgstr "Keine Termine."
-
-#: my-evolution/e-summary-calendar.c:409
-msgid "%k:%M %d %B"
-msgstr "%k.%M %d. %B"
-
-#: my-evolution/e-summary-calendar.c:411
-#, fuzzy
-msgid "%l:%M%p %d %B"
-msgstr "%k.%M %d. %B"
-
-#: my-evolution/e-summary-calendar.c:429
-msgid "No description"
-msgstr "Keine Beschreibung"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "E-Mail-Zusammenfassung"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com: Wort des Tages"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Zitate des Tages"
-
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr "Neuer Nachrichtenkanal"
-
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr "_URL:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Fehler beim Herunterladen des RDF"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Nachrichtenkanal"
-
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr "Alle"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Angezeigt"
-
-#: my-evolution/e-summary-tasks.c:349
-msgid "No tasks"
-msgstr "Keine Aufgaben"
-
-#: my-evolution/e-summary-tasks.c:387
-#, fuzzy
-msgid "blue"
-msgstr "Ambler"
-
-#: my-evolution/e-summary-tasks.c:387
-msgid "(No Description)"
-msgstr "(keine Beschreibung)"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr "Mein Wetter"
-
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
-msgstr "Ein Fehler ist aufgetreten beim Herunterladen der Daten für"
-
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Wetter"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
-msgstr "KBOS"
-
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Hier können Sie das Erscheinungsbild von Evolution konfigurieren"
@@ -23606,6 +23907,110 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zürich"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Ordner mit der Evolution-Übersicht"
+
+#: my-evolution/e-summary-calendar.c:381
+msgid "Appointments"
+msgstr "Termine"
+
+#: my-evolution/e-summary-calendar.c:389
+msgid "No appointments."
+msgstr "Keine Termine."
+
+#: my-evolution/e-summary-calendar.c:406
+msgid "%k:%M %d %B"
+msgstr "%k.%M %d. %B"
+
+#: my-evolution/e-summary-calendar.c:408
+msgid "%l:%M%P %d %B"
+msgstr "%k.%M %d. %B"
+
+#: my-evolution/e-summary-calendar.c:426
+msgid "No description"
+msgstr "Keine Beschreibung"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "E-Mail-Zusammenfassung"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com: Wort des Tages"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Zitate des Tages"
+
+#: my-evolution/e-summary-preferences.c:565
+msgid "New News Feed"
+msgstr "Neuer Nachrichtenkanal"
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr "_URL:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Fehler beim Herunterladen des RDF"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Nachrichtenkanal"
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr "Alle"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr "Angezeigt"
+
+#: my-evolution/e-summary-tasks.c:330
+msgid "No tasks"
+msgstr "Keine Aufgaben"
+
+#: my-evolution/e-summary-tasks.c:364
+msgid "(No Description)"
+msgstr "(keine Beschreibung)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Mein Wetter"
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr "Ein Fehler ist aufgetreten beim Herunterladen der Daten für"
+
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Wetter"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %e. %B %Y"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Bitte warten..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Zusammenfassung drucken"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Drucken der Übersicht fehlgeschlagen"
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -24864,27 +25269,21 @@ msgstr "_Ein Tag"
 msgid "_Show full path for folders"
 msgstr "_Vollen Pfad für Ordner anzeigen"
 
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Neu"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Hier können Sie spezielle Ordner und Offline-Ordner konfigurieren"
 
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Einen neuen Ordner anlegen"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution-Shell"
 
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Die Ximian-Evolution-Shell konnte nicht initialisiert werden: %s"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Bedienelement zur Konfiguration von Evolution-Ordner"
 
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Bonobo konnte nicht initialisiert werden"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Ordnereinstellungen"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -24980,49 +25379,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Das Team:"
 
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Komponente %s konnte nicht aktiviert werden:\n"
-"Der Fehler im Aktivierungssystem lautet:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Lokaler Speicher konnte nicht eingestellt werden -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Die Evolution-Komponente, die Ordner des Typs »%s« betreut, brach\n"
-"unerwartet ab. Sie müssen Evolution beenden und neu starten, um\n"
-"wieder auf diese Daten zugreifen zu können."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Ungültige Argumente"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Registrierung bei OAF konnte nicht stattfinden"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Konfigurationsdatenbank nicht gefunden"
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Allgemeiner Fehler"
-
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Extra Ordner zur Vervollständigung"
@@ -25268,27 +25624,23 @@ msgid "Automatic"
 msgstr "Automatisch"
 
 #: shell/e-shell-importer.c:643
-#, fuzzy
-msgid "_Filename:"
+msgid "Filename:"
 msgstr "Dateiname:"
 
 #: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: shell/e-shell-importer.c:658
-#, fuzzy
-msgid "File _type:"
+#: shell/e-shell-importer.c:657
+msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:684
-#, fuzzy
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:682
+msgid "Import data and settings from older programs"
 msgstr "Daten und Einstellungen aus älteren Programmen importieren"
 
-#: shell/e-shell-importer.c:687
-#, fuzzy
-msgid "Import a _single file"
+#: shell/e-shell-importer.c:686
+msgid "Import a single file"
 msgstr "Eine einzelne Datei importieren"
 
 #: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
@@ -25316,9 +25668,8 @@ msgstr "Ordner wählen"
 msgid "Select a destination folder for importing this data"
 msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
 
-#: shell/e-shell-importer.c:1193
-#, fuzzy
-msgid "_Import"
+#: shell/e-shell-importer.c:1192 shell/importer/intelligent.c:191
+msgid "Import"
 msgstr "Importieren"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25378,19 +25729,11 @@ msgstr "Gemeinschaftsordner konnte nicht geöffnet werden: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Der angegebene Gemeinschaftsordner konnte nicht gefunden werden."
 
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:782
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Assistent"
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Neu"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25412,37 +25755,6 @@ msgstr "Ordnername darf das Raute-Zeichen »#« nicht enthalten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' und '..' sind reservierte Ordnernamen."
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Kein Ordner angezeigt)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(keine)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um "
-"offline zu arbeiten."
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution geht gerade offline."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um "
-"online zu arbeiten."
-
 #: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -25494,13 +25806,79 @@ msgstr "_Offline arbeiten"
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Fehler beim Speichern von Verknüpfungen."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Verknüpfungen"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(keine)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um "
+"offline zu arbeiten."
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution geht gerade offline."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um "
+"online zu arbeiten."
+
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Komponente %s konnte nicht aktiviert werden:\n"
+"Der Fehler im Aktivierungssystem lautet:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Lokaler Speicher konnte nicht eingestellt werden -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Die Evolution-Komponente, die Ordner des Typs »%s« betreut, brach\n"
+"unerwartet ab. Sie müssen Evolution beenden und neu starten, um\n"
+"wieder auf diese Daten zugreifen zu können."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Ungültige Argumente"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Registrierung bei OAF konnte nicht stattfinden"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Konfigurationsdatenbank nicht gefunden"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Allgemeiner Fehler"
 
 #: shell/e-shortcuts-view.c:80
 msgid "Create New Shortcut Group"
@@ -25616,6 +25994,18 @@ msgstr "_Entfernen"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Fehler beim Speichern von Verknüpfungen."
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Verknüpfungen"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Kontrollkästchen"
+
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Kein Fehler"
@@ -25672,14 +26062,6 @@ msgstr "Ein Ordnersperre mit diesem Namen konnte nicht erzeugt werden"
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Diese Aktion kann im Offline-Modus nicht ausgeführt werden"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kontrollkästchen"
-
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Ordner"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25694,6 +26076,43 @@ msgstr "%s (zu %d%% abgeschlossen)"
 msgid "<click here to select a folder>"
 msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Unbekannter Fehler."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Der Fehler im Komponentensystem ist:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Der Fehler vom Aktivierungssystem ist:\n"
+"%s"
+
 #: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr "CORBA-Fehler"
@@ -25754,43 +26173,6 @@ msgstr "Keine Platz mehr frei"
 msgid "Old owner has died"
 msgstr "Alter Besitzer ist gestorben"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Unbekannter Fehler."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Der Fehler im Komponentensystem ist:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Der Fehler vom Aktivierungssystem ist:\n"
-"%s"
-
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Testtyp"
@@ -25898,22 +26280,6 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu speichern."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Hier können Sie spezielle Ordner und Offline-Ordner konfigurieren"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution-Shell"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Bedienelement zur Konfiguration von Evolution-Ordner"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Ordnereinstellungen"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -25954,10 +26320,6 @@ msgstr ""
 msgid "Importers"
 msgstr "Importeure"
 
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "Importieren"
-
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Nicht importieren"
@@ -26152,7 +26514,7 @@ msgstr "Kontakt(e) in einen anderen Ordner verschieben..."
 msgid "Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Inhalt der Zwischenablage einfügen"
 
@@ -26160,8 +26522,8 @@ msgstr "Inhalt der Zwischenablage einfügen"
 msgid "Previews the contacts to be printed"
 msgstr "Eine Vorschau auf die zu druckenden Kontakte anzeigen"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:69
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
@@ -26206,21 +26568,17 @@ msgstr "Laden abbrechen"
 msgid "View the current contact"
 msgstr "Den aktuellen Kontakt anzeigen"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:30
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "A_ktionen"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "In Ordner kopieren..."
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "Kontakt _weiterleiten..."
 
@@ -26288,59 +26646,54 @@ msgstr "Zu einem bestimmten Datum gehen"
 msgid "Go to today"
 msgstr "Zum heutigen Tag gehen"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 msgid "Month"
 msgstr "Monat"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Eine Vorschau auf den zu druckenden Kalender anzeigen"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Verfügbarkeitsinformationen für diesen Kalender veröffentlichen"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
 msgstr "_Säubern"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:23
 msgid "Purge old appointments and meetings"
 msgstr "Alte Termine und Treffen säubern"
 
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Show as list"
-msgstr "Details anzeigen"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:24
 msgid "Show one day"
 msgstr "Einen Tag anzeigen"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:25
 msgid "Show one month"
 msgstr "Einen Monat anzeigen"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one week"
 msgstr "Eine Woche anzeigen"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Die Werkwoche anzeigen"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:28
 msgid "Week"
 msgstr "Woche"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Schließen"
@@ -26349,7 +26702,7 @@ msgstr "Schließen"
 msgid "Close this item"
 msgstr "Diesen Eintrag schließen"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Diesen Eintrag löschen"
 
@@ -26362,58 +26715,47 @@ msgstr "Hauptwerkzeugleiste"
 msgid "Preview the printed item"
 msgstr "Eine Vorschau auf das zu druckende Objekt anzeigen"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Speichern _unter..."
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "Speichern"
+
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Speichern unter..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
-msgid "Save and _Close"
-msgstr "Speichern und schließen"
-
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Den Eintrag speichern und das Dialogfenster schließen"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Diesen Eintrag auf Platte speichern"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Datei"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Speichern"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Den markierten Text in die Zwischenablage kopieren"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
@@ -26434,39 +26776,51 @@ msgstr "_Alle auswählen"
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Umschlag drucken..."
 
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Speichern _unter..."
+
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Den Kontakt speichern und das Dialogfenster schließen"
 
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr "_Nachricht an Kontakt schicken..."
 
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "_Speichern"
+
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Diese Liste löschen"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Löschen..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Die Liste speichern und das Dialogfenster schließen"
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "Liste an andere schicken..."
 
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "_Nachricht an Liste schicken..."
 
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "Löschen..."
-
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Besprechung a_bsagen"
@@ -26541,8 +26895,7 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
 #: ui/evolution-mail-global.xml.h:11
-#, fuzzy
-msgid "Post Ne_w Message"
+msgid "Post New Message"
 msgstr "Nachricht an Ordner verfassen"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26577,19 +26930,14 @@ msgstr "_Vorschaufläche"
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Die markierte(n) Nachricht(en) in die Zwischenablage kopieren"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Die markierte(n) Nachricht(en) in die Zwischenablage verschieben"
 
-#: ui/evolution-mail-list.xml.h:4
-#, fuzzy
-msgid "E_xpunge"
-msgstr "_Säubern"
-
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "_Gewählte Nachrichten verbergen"
@@ -26616,7 +26964,7 @@ msgstr "Alle als _gelesen markieren"
 msgid "Mark all visible messages as read"
 msgstr "Alle sichtbaren Nachrichten als gelesen markieren"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
 msgid "Paste message(s) from the clipboard"
 msgstr "Die in der Zwischenablage befindliche(n) Nachricht(en) einfügen"
 
@@ -26661,37 +27009,26 @@ msgstr "Die markierten Nachrichten zeitweilig verbergen"
 msgid "Threaded Message list"
 msgstr "Nachrichtenliste in Threads ordnen"
 
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26
+msgid "_Expunge"
+msgstr "_Säubern"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Ordner"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Auswahl _umkehren"
 
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "Ei_genschaften..."
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "Nachrichtenliste nach _Threads ordnen"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Dieses Fenster schließen"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "Schließen"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Ansicht"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Absender zum Adressbuch _hinzufügen"
@@ -26724,398 +27061,396 @@ msgstr "Eine Antwort an die Mailingliste der markierten Nachricht verfassen"
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Eine Antwort an den Absender der markierten Nachricht verfassen"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:10
 msgid "Copy selected messages to another folder"
 msgstr "Die markierten Nachrichten in einen anderen Ordner kopieren"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create _Virtual Folder From Message"
 msgstr "_Virtuellen Ordner aus Nachricht erzeugen"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages from this sender"
 msgstr "Eine Regel anlegen, um Nachrichten von diesem Absender zu filtern"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Empfänger zu filtern"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Mailingliste zu filtern"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages with this subject"
 msgstr "Eine Regel anlegen, um Nachrichten mit diesem Betreff zu filtern"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for these recipients"
 msgstr "Einen virtuellen Ordner für diese Empfänger anlegen"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this mailing list"
 msgstr "Einen virtuellen Ordner für diese Mailingliste anlegen"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this sender"
 msgstr "Einen virtuellen Ordner für diesen Absender anlegen"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this subject"
 msgstr "Einen virtuellen Ordner für diesen Betreff anlegen"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:20
 msgid "Decrease the text size"
 msgstr "Die Textgröße heruntersetzen"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next important message"
 msgstr "Die nächste wichtige Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next message"
 msgstr "Die nächste Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread message"
 msgstr "Die nächste ungelesene Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next unread thread"
 msgstr "Den nächsten ungelesenen Thread anzeigen"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous important message"
 msgstr "Die letzte wichtige Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous message"
 msgstr "Die vorhergehende Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the previous unread message"
 msgstr "Die letzte ungelesene Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:29
 msgid "F_orward"
 msgstr "_Weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Mailing _List..."
 msgstr "Filter über Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on Se_nder..."
 msgstr "Filter über _Absender..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Recipients..."
 msgstr "Filter über _Empfänger..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:33
 msgid "Filter on _Subject..."
 msgstr "Filter über _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:34
 msgid "Flag selected message(s) for follow-up"
 msgstr "Die markierte(n) Nachricht(en) als Follow-Up markieren"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:35
 msgid "Follow _Up..."
 msgstr "_Folgenachricht..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:36
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-Mail erzwingen"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message in the body of a new message"
 msgstr "Die markierte Nachricht im Rumpf einer neuen Nachricht weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message quoted like a reply"
 msgstr "Die markierte Nachricht als Zitat wie in einer Antwort weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone"
 msgstr "Die markierte Nachricht an jemanden weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:41
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Die markierte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:42
 msgid "Increase the text size"
 msgstr "Die Textgröße heraufsetzen"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:43
 msgid "Load _Images"
 msgstr "_Bilder laden"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Als gelesen mar_kieren"
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as I_mportant"
 msgstr "Als _wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark as Unimp_ortant"
 msgstr "Als _unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as having been read"
 msgstr "Die markierte(n) Nachricht(en) als gelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as important"
 msgstr "Die markierte(n) Nachricht(en) als wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Die markierte(n) Nachricht(en) als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Die markierte(n) Nachricht(en) als unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected messages for deletion"
 msgstr "Alle sichtbaren Nachrichten zum Löschen vorsehen"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:54
 msgid "Move selected message(s) to another folder"
 msgstr "Die markierte(n) Nachricht(en) in einen anderen Ordner verschieben"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next _Important Message"
 msgstr "Nächste _wichtige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next _Thread"
 msgstr "Nächster _Thread"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next _Unread Message"
 msgstr "Nächste _ungelesene Nachricht"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in a new window"
 msgstr "Die markierte Nachricht in einem neuen Fenster öffnen"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:60
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Die markierte Nachrichte im E-Mail-Editor öffnen, um sie nochmals zu "
 "verschicken"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:61
 msgid "Original Si_ze"
 msgstr "Original_größe"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:62
 msgid "P_revious Unread Message"
 msgstr "_Letzte ungelesene Nachricht"
 
-#: ui/evolution-mail-message.xml.h:67
-#, fuzzy
-msgid "Post a Repl_y"
+#: ui/evolution-mail-message.xml.h:63
+msgid "Post a Reply"
 msgstr "Eine Antwort verfassen"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:64
 msgid "Post a reply to a message in a Public folder"
 msgstr "Eine Antwort auf eine Nachricht in einem öffentlichen Ordner verfassen"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:65
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:66
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:67
 msgid "Previous"
 msgstr "Zurück"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:70
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:71
 msgid "Re_direct"
 msgstr "_Weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:72
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die markierte Nachricht an jemanden weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "_Allen antworten"
-
-#: ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "_Liste antworten"
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:77
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgröße zurücksetzen"
 
-#: ui/evolution-mail-message.xml.h:82
-#, fuzzy
-msgid "S_earch in Message..."
+#: ui/evolution-mail-message.xml.h:78
+msgid "S_earch Message..."
 msgstr "Nachricht durch_suchen..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:79
 msgid "S_maller"
 msgstr "_Kleiner"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:80
 msgid "Save the message as a text file"
 msgstr "Die Nachricht als Textdatei speichern"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:81
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach einem Text suchen"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:82
 msgid "Set up the page settings for your current printer"
 msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker festlegen"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Email _Source"
 msgstr "E-Mail-_Quelltext anzeigen"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show Full _Headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show message in the normal style"
 msgstr "Nachricht im normalen Stil anzeigen"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show message with all email headers"
 msgstr "Nachricht mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:89
 msgid "Text Si_ze"
 msgstr "Te_xtgröße"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:90
 msgid "Un-delete the selected messages"
 msgstr "Löschen der markierten Nachrichten rückgängig machen"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on Mailing _List..."
 msgstr "VOrdner über Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on Se_nder..."
 msgstr "VOrdner über _Absender..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:93
 msgid "VFolder on _Recipients..."
 msgstr "VOrdner über _Empfänger..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:94
 msgid "VFolder on _Subject..."
 msgstr "VOrdner über _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "_Beigelegt"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Create Filter From Message"
 msgstr "Filter aus Nachricht _erzeugen"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Forward Message"
 msgstr "Nachricht _weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Inline"
 msgstr "An _Ort und Stelle"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Larger"
 msgstr "_Größer"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Normal Display"
 msgstr "_Normal anzeigen"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Open Message"
 msgstr "Nachricht ö_ffnen"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "Antwort an Ab_sender"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Resend..."
 msgstr "E_rneut verschicken..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:115 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Werkzeuge"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Undelete"
 msgstr "Löschen rückgängig"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Dieses Fenster schließen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "Schließen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "_Ansicht"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Beilegen"
@@ -27124,7 +27459,7 @@ msgstr "Beilegen"
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Die aktuelle Datei schließen"
 
@@ -27141,7 +27476,7 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 "Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "_Format"
 
@@ -27173,11 +27508,6 @@ msgstr "Mit S/MIME verschlüsseln"
 msgid "S/MIME Sign"
 msgstr "Mit S/MIME signieren"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Speichern"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Speichern _unter"
@@ -27191,7 +27521,7 @@ msgid "Save in folder..."
 msgstr "In Ordner speichern..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Die aktuelle Datei speichern"
 
@@ -27208,7 +27538,7 @@ msgid "Send"
 msgstr "Abschicken"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Diese E-Mail im HTML-Format verschicken"
 
@@ -27273,7 +27603,7 @@ msgid "_From Field"
 msgstr "_Von-Feld"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "Einfügen"
 
@@ -27289,11 +27619,11 @@ msgstr "Antwort-an-Feld"
 msgid "_Security"
 msgstr "_Sicherheit"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "_HTML"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Save the current file and close the window"
 msgstr "Die aktuelle Datei speichern und das Fenster schließen"
 
@@ -27632,33 +27962,27 @@ msgid "_Work Week View"
 msgstr "_Werkwochenansicht"
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As _Sent Folder"
+msgid "As Sent Folder"
 msgstr "Als Verschickt-Ordner"
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By S_tatus"
-msgstr "Nach Status"
+msgid "By Follow Up Flag"
+msgstr "Nach Folgenachricht-Markierung"
 
 #: views/mail/galview.xml.h:3
-#, fuzzy
-msgid "By Se_nder"
+msgid "By Sender"
 msgstr "Nach Absender"
 
 #: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "By Su_bject"
-msgstr "Nach Betreff"
+msgid "By Status"
+msgstr "Nach Status"
 
 #: views/mail/galview.xml.h:5
-#, fuzzy
-msgid "By _Follow Up Flag"
-msgstr "Nach Folgenachricht-Markierung"
+msgid "By Subject"
+msgstr "Nach Betreff"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
-msgid "_Messages"
+msgid "Messages"
 msgstr "Nachrichten"
 
 #: views/tasks/galview.xml.h:1
@@ -27715,12 +28039,12 @@ msgstr "Ansichten definieren..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -27846,6 +28170,22 @@ msgstr "Gespeicherte Suchen _bearbeiten..."
 msgid "_Advanced..."
 msgstr "_Komplex..."
 
+#: widgets/misc/e-messagebox.c:154
+msgid "Information"
+msgstr "Information"
+
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr "Fehler"
+
+#: widgets/misc/e-messagebox.c:175
+msgid "Question"
+msgstr "Frage"
+
+#: widgets/misc/e-messagebox.c:182
+msgid "Message"
+msgstr "Meldung"
+
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Suchen"
@@ -27891,546 +28231,5 @@ msgstr "Evolution-Kalender-Backend für lokale Dateien"
 msgid "Evolution Addressbook local file backend"
 msgstr "Evolution-Adressbuch-Backend für lokale Dateien"
 
-#~ msgid "That person is already attending the meeting!"
-#~ msgstr "Diese Person nimmt bereits an der Besprechung teil!"
-
-#~ msgid "_Save as..."
-#~ msgstr "_Speichern unter..."
-
-#~ msgid "End Date"
-#~ msgstr "Enddatum"
-
-#~ msgid "New _Appointment"
-#~ msgstr "Neuer _Termin"
-
-#~ msgid "Print..."
-#~ msgstr "Drucken..."
-
-#~ msgid "Chair Persons"
-#~ msgstr "Vorsitzende"
-
-#~ msgid "Required Participants"
-#~ msgstr "Benötigte Teilnehmer"
-
-#~ msgid "Optional Participants"
-#~ msgstr "Optionale Teilnehmer"
-
-#~ msgid "Resources"
-#~ msgstr "Ressourcen"
-
-#~ msgid "Individual"
-#~ msgstr "Individuell"
-
-#~ msgid "Group"
-#~ msgstr "Gruppe"
-
-#~ msgid "Resource"
-#~ msgstr "Ressource"
-
-#~ msgid "Room"
-#~ msgstr "Raum"
-
-#~ msgid "Chair"
-#~ msgstr "Vorsitzender"
-
-#~ msgid "Required Participant"
-#~ msgstr "Benötigter Teilnehmer"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Optionaler Teilnehmer"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Nicht-Teilnehmer"
-
-#~ msgid "Needs Action"
-#~ msgstr "Erfordert Maßnahme"
-
-#~ msgid "Delegated"
-#~ msgstr "Delegiert"
-
-#~ msgid "In Process"
-#~ msgstr "In Bearbeitung"
-
-#~ msgid "Hey you, dunce. You need an account to send mail doncha know."
-#~ msgstr "Hey, Sie! Sie brauchen ein Konto, um E-Mails zu verschicken!"
-
-#~ msgid "Properties for \"%s\""
-#~ msgstr "Eigenschaften von »%s«"
-
-#~ msgid "Properties"
-#~ msgstr "Eigenschaften"
-
-#~ msgid "Could not create temporary directory: %s"
-#~ msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
-
-#~ msgid "%d new"
-#~ msgstr "%d neu"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%d hidden"
-#~ msgstr "%d verborgen"
-
-#~ msgid "%d visible"
-#~ msgstr "%d sichtbar"
-
-#~ msgid "%d selected"
-#~ msgstr "%d ausgewählt"
-
-#~ msgid "%d unsent"
-#~ msgstr "%d nicht verschickt"
-
-#~ msgid "%d sent"
-#~ msgstr "%d verschickt"
-
-#~ msgid "%d total"
-#~ msgstr "%d insgesamt"
-
-#~ msgid "Create _Virtual Folder From Search..."
-#~ msgstr "_Virtuellen Ordner aus Suche anlegen..."
-
-#~ msgid "VFolder on _Subject"
-#~ msgstr "VOrdner über _Betreff"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "VOrdner über Abse_nder"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "VOrdner über _Empfänger"
-
-#~ msgid "VFolder on Mailing _List"
-#~ msgstr "VOrdner über Mailing_liste"
-
-#~ msgid "Filter on Sub_ject"
-#~ msgstr "Filter über _Betreff"
-
-#~ msgid "Filter on Sen_der"
-#~ msgstr "Filter über _Absender"
-
-#~ msgid "Filter on Re_cipients"
-#~ msgstr "Filter über _Empfänger"
-
-#~ msgid "Filter on _Mailing List"
-#~ msgstr "Filter über _Mailingliste"
-
-#~ msgid "_Edit as New Message..."
-#~ msgstr "Als neue Nachricht _bearbeiten..."
-
-#~ msgid "_Print"
-#~ msgstr "_Drucken"
-
-#~ msgid "_Forward"
-#~ msgstr "_Weiterleiten"
-
-#~ msgid "Follo_w Up..."
-#~ msgstr "Follo_w Up..."
-
-#~ msgid "Fla_g Completed"
-#~ msgstr "Als abgeschlossen _markieren"
-
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Markierung _löschen"
-
-#~ msgid "Mark as _Unread"
-#~ msgstr "Als _ungelesen markieren"
-
-#~ msgid "Mark as _Important"
-#~ msgstr "Als _wichtig markieren"
-
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "Als unwichtig _markieren"
-
-#~ msgid "U_ndelete"
-#~ msgstr "Lösche_n rückgängig"
-
-#~ msgid "Mo_ve to Folder..."
-#~ msgstr "In Ordner _verschieben..."
-
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Absender zum Adress_buch hinzufügen"
-
-#~ msgid "Appl_y Filters"
-#~ msgstr "Filter _anwenden"
-
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "_Regel aus Nachricht anlegen"
-
-#~ msgid "VFolder on M_ailing List"
-#~ msgstr "VOrdner über M_ailingliste"
-
-#~ msgid "Filter on _Mailing List (%s)"
-#~ msgstr "Filter über _Mailingliste (%s)"
-
-#~ msgid "VFolder on M_ailing List (%s)"
-#~ msgstr "VOrdner über M_ailingliste (%s)"
-
-#~ msgid "Don't show this message again."
-#~ msgstr "Diese Meldung nicht mehr anzeigen."
-
-#~ msgid ""
-#~ "You have not configured the mail client.\n"
-#~ "You need to do this before you can send,\n"
-#~ "receive or compose mail.\n"
-#~ "Would you like to configure it now?"
-#~ msgstr ""
-#~ "Sie haben den E-Mail-Client nicht konfiguriert.\n"
-#~ "Sie müssen dies tun, bevor Sie E-Mails verschicken,\n"
-#~ "abrufen oder verfassen können.\n"
-#~ "Möchten Sie ihn jetzt konfigurieren?"
-
-#~ msgid ""
-#~ "You need to configure an identity\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Sie müssen eine Identität einrichten,\n"
-#~ "bevor Sie E-Mails verfassen können."
-
-#~ msgid ""
-#~ "You need to configure a mail transport\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Sie müssen einen Mailtransport einrichten,\n"
-#~ "bevor Sie E-Mails verfassen können."
-
-#~ msgid ""
-#~ "You are sending an HTML-formatted message. Please make sure that\n"
-#~ "the following recipients are willing and able to receive HTML mail:\n"
-#~ msgstr ""
-#~ "Sie verschicken eine HTML-formatierte Nachricht. Bitte stellen Sie "
-#~ "sicher,\n"
-#~ "dass die folgenden Empfänger HTML-Mails abrufen können und wollen:\n"
-
-#~ msgid "Send anyway?"
-#~ msgstr "Dennoch verschicken?"
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "Diese Nachricht hat keinen Betreff.\n"
-#~ "Wirklich verschicken?"
-
-#~ msgid ""
-#~ "Since the contact list you are sending to is configured to hide the "
-#~ "list's addresses, this message will contain only Bcc recipients."
-#~ msgstr ""
-#~ "Da die Kontaktliste, an die Sie diese Nachricht verschicken, konfiguriert "
-#~ "ist, die Adressen der Liste zu verbergen, wird die Nachricht lediglich an "
-#~ "Blindkopie-Empfängeradressen übermittlt."
-
-#~ msgid "This message contains only Bcc recipients."
-#~ msgstr "Diese Nachricht enthält ausschließlich Blindkopie-Empfänger."
-
-#~ msgid ""
-#~ "It is possible that the mail server may reveal the recipients by adding "
-#~ "an Apparently-To header.\n"
-#~ "Send anyway?"
-#~ msgstr ""
-#~ "Es ist möglich, dass der E-Mail-Server die Empfänger kenntlich macht, "
-#~ "indem er eine Apparently-To-Kopfzeile hinzufügt.\n"
-#~ "Dennoch verschicken?"
-
-#~ msgid "You must specify recipients in order to send this message."
-#~ msgstr "Sie müssen Empfänger angeben, um diese Nachricht zu verschicken."
-
-#~ msgid ""
-#~ "Unable to open the drafts folder for this account.\n"
-#~ "Would you like to use the default drafts folder?"
-#~ msgstr ""
-#~ "Der Entwürfe-Ordner für dieses Konto konnte nicht geöffnet werden.\n"
-#~ "Möchten Sie den voreingestellten Entwürfe-Ordner verwenden?"
-
-#~ msgid "an unknown sender"
-#~ msgstr "ein unbekannter Absender"
-
-#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-#~ msgstr "Am %a, %Y-%m-%d um %H.%M schrieb %%s:"
-
-#~ msgid "Move message(s) to"
-#~ msgstr "Nachricht(en) verschieben in"
-
-#~ msgid "Copy message(s) to"
-#~ msgstr "Nachricht(en) kopieren in"
-
-#~ msgid "Are you sure you want to edit all %d messages?"
-#~ msgstr "Sind Sie sicher, dass Sie alle %d Nachrichten bearbeiten wollen?"
-
-#~ msgid ""
-#~ "You may only edit messages saved\n"
-#~ "in the Drafts folder."
-#~ msgstr ""
-#~ "Sie können nur im Entwürfe-Ordner\n"
-#~ "abgespeicherte Nachrichten bearbeiten."
-
-#~ msgid ""
-#~ "You may only resend messages\n"
-#~ "in the Sent folder."
-#~ msgstr ""
-#~ "Sie können nur Nachrichten im\n"
-#~ "Verschickt-Ordner neu verschicken."
-
-#~ msgid "Are you sure you want to resend all %d messages?"
-#~ msgstr ""
-#~ "Sind Sie sicher, dass Sie alle %d Nachrichten nochmals verschicken wollen?"
-
-#~ msgid "No Message Selected"
-#~ msgstr "Keine Nachricht markiert"
-
-#~ msgid ""
-#~ "Cannot save to `%s'\n"
-#~ " %s"
-#~ msgstr ""
-#~ "In »%s« konnte nicht gespeichert werden:\n"
-#~ "  %s"
-
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "»%s« ist bereits vorhanden.\n"
-#~ "Soll es überschrieben werden?"
-
-#~ msgid "Save Message As..."
-#~ msgstr "Nachricht speichern unter..."
-
-#~ msgid "Save Messages As..."
-#~ msgstr "Nachrichten speichern unter..."
-
-#~ msgid ""
-#~ "This operation will permanently erase all messages marked as\n"
-#~ "deleted. If you continue, you will not be able to recover these "
-#~ "messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-#~ msgstr ""
-#~ "Dieser Vorgang wird alle als gelöscht markierten Nachrichten dauerhaft "
-#~ "entfernen. Falls Sie fortfahren, werden Sie diese Nachrichten nicht "
-#~ "wiederherstellen können.\n"
-#~ "\n"
-#~ "Sollen die Nachrichten wirklich entfernt werden?"
-
-#~ msgid ""
-#~ "Error loading filter information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fehler beim Laden von Filterinformation:\n"
-#~ "%s"
-
-#~ msgid "Filters"
-#~ msgstr "Filter"
-
-#~ msgid "Page %d of %d"
-#~ msgstr "Seite %d von %d"
-
-#~ msgid "Print Message"
-#~ msgstr "Nachricht drucken"
-
-#~ msgid "Printing of message failed"
-#~ msgstr "Drucken der Nachricht fehlgeschlagen"
-
-#~ msgid "Are you sure you want to open all %d messages in separate windows?"
-#~ msgstr ""
-#~ "Sind Sie sicher, dass Sie alle %d Nachrichten in getrennten Fenstern "
-#~ "öffnen wollen?"
-
-#~ msgid "Could not create a S/MIME signature context."
-#~ msgstr "S/MIME-Signaturkontext konnte nicht angelegt werden."
-
-#~ msgid "Could not create a S/MIME certsonly context."
-#~ msgstr "S/MIME-certsonly-Kontext konnte nicht angelegt werden."
-
-#~ msgid "Could not create a S/MIME encryption context."
-#~ msgstr "S/MIME-Verschlüsselungskontext konnte nicht angelegt werden."
-
-#~ msgid "Could not create a S/MIME envelope context."
-#~ msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
-
-#~ msgid "Could not create a S/MIME decode context."
-#~ msgstr "S/MIME-Entschlüsselungskontext konnte nicht angelegt werden."
-
-#~ msgid ""
-#~ "File `%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Es existiert bereits eine Datei mit Namen »%s«.\n"
-#~ "Soll diese überschrieben werden?"
-
-#~ msgid "Save Attachment"
-#~ msgstr "Anlage speichern"
-
-#~ msgid "Could not create temporary file '%s': %s"
-#~ msgstr "Die temporäre Datei »%s« konnte nicht angelegt werden: %s"
-
-#~ msgid "Save Attachment..."
-#~ msgstr "Anlage speichern..."
-
-#~ msgid "View Inline"
-#~ msgstr "An Ort und Stelle anzeigen"
-
-#~ msgid "Open in %s..."
-#~ msgstr "Öffnen in %s..."
-
-#~ msgid "View Inline (via %s)"
-#~ msgstr "An Ort und Stelle anzeigen (mit %s)"
-
-#~ msgid "Hide"
-#~ msgstr "Verbergen"
-
-#~ msgid "External Viewer"
-#~ msgstr "Externer Betrachter"
-
-#~ msgid "Downloading images"
-#~ msgstr "Bilder werden heruntergeladen"
-
-#~ msgid "Loading message content"
-#~ msgstr "Laden des Nachrichteninhalts"
-
-#~ msgid "Overdue:"
-#~ msgstr "Überfallig:"
-
-#~ msgid "by %B %d, %Y, %l:%M %P"
-#~ msgstr "am %d. %B %Y, %H:%M"
-
-#~ msgid "Open Link in Browser"
-#~ msgstr "Link in Browser öffnen"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "Linkziel kopieren"
-
-#~ msgid "Save Link as (FIXME)"
-#~ msgstr "Link speichern unter (FIXME)"
-
-#~ msgid "Save Image as..."
-#~ msgstr "Bild speichern unter..."
-
-#~ msgid "%s attachment"
-#~ msgstr "%s-Anlage"
-
-#~ msgid "Could not parse MIME message. Displaying as source."
-#~ msgstr ""
-#~ "Die MIME-Nachricht konnte nicht verarbeitet werden und wird daher als "
-#~ "Quellxt angezeigt."
-
-#~ msgid "Bad Address"
-#~ msgstr "Ungültige Adresse"
-
-#~ msgid "Reply-To"
-#~ msgstr "Antwort an"
-
-#~ msgid "Cc"
-#~ msgstr "Kopie"
-
-#~ msgid "Bcc"
-#~ msgstr "Blindkopie"
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more "
-#~ "information."
-#~ msgstr ""
-#~ "Diese Nachricht ist digital signiert. Klicken Sie auf das Schlosssymbol, "
-#~ "um weitere Informationen zu erhalten."
-
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "Es konnte kein PGP-Überprüfungskontext angelegt werden"
-
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr ""
-#~ "Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
-#~ "nachgewiesen."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Diese Nachricht ist digital unterzeichnet, aber konnte nicht als "
-#~ "authentisch nachgewiesen werden."
-
-#~ msgid "Pointer to FTP site (%s)"
-#~ msgstr "Zeiger auf FTP-Site (%s)"
-
-#~ msgid "Pointer to local file (%s) valid at site \"%s\""
-#~ msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
-
-#~ msgid "Pointer to local file (%s)"
-#~ msgstr "Zeiger auf lokale Datei (%s)"
-
-#~ msgid "Pointer to remote data (%s)"
-#~ msgstr "Zeiger auf Daten im Netz (%s)"
-
-#~ msgid "Pointer to unknown external data (\"%s\" type)"
-#~ msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
-
-#~ msgid "Malformed external-body part."
-#~ msgstr "Ungültiger external-body-Teil."
-
-#~ msgid "However, the message was successfully sent."
-#~ msgstr "Dennoch wurde die Nachricht erfolgreich verschickt."
-
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Unbenannte Nachricht)"
-
-#~ msgid "Untitled Message"
-#~ msgstr "Unbenannte Nachricht"
-
-#~ msgid "Empty Message"
-#~ msgstr "Leere Nachricht"
-
-#~ msgid "Find in Message"
-#~ msgstr "In Nachricht suchen"
-
-#~ msgid "Case Sensitive"
-#~ msgstr "Groß-/Kleinschreibung beachten"
-
-#~ msgid "Search Forward"
-#~ msgstr "Vorwärts suchen"
-
-#~ msgid "Find:"
-#~ msgstr "Suchen:"
-
-#~ msgid "Matches:"
-#~ msgstr "Passt auf:"
-
-#~ msgid "Forwarded Message"
-#~ msgstr "Weitergeleitete Nachricht"
-
-#~ msgid "(No subject)"
-#~ msgstr "(Kein Betreff)"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - Nachricht"
-
-#~ msgid "Scanning folders under %s on \"%s\""
-#~ msgstr "Ordner unter %s auf »%s« werden abgetastet"
-
-#~ msgid "Scanning root-level folders on \"%s\""
-#~ msgstr "Ordner der obersten Ebene auf »%s« werden abgetastet"
-
-#~ msgid "Subscribing to folder \"%s\""
-#~ msgstr "Ordner »%s« wird abonniert"
-
-#~ msgid "Unsubscribing to folder \"%s\""
-#~ msgstr "Abonnement auf Ordner »%s« wird abbestellt"
-
-#~ msgid "No server has been selected"
-#~ msgstr "Es wurde kein Server gewählt"
-
-#~ msgid "Please select a server."
-#~ msgstr "Bitte wählen Sie einen Server."
-
-#~ msgid "Scanning folders ..."
-#~ msgstr "Ordner werden abgetastet..."
-
-#~ msgid "Save As..."
-#~ msgstr "Speichern unter..."
-
-#~ msgid "Information"
-#~ msgstr "Information"
-
-#~ msgid "Question"
-#~ msgstr "Frage"
-
-#~ msgid "Message"
-#~ msgstr "Meldung"
-
 #~ msgid "URL:"
 #~ msgstr "URL:"
author	Ettore Perazzoli <ettore@src.gnome.org>	2003-10-22 02:28:34 +0800
committer	Ettore Perazzoli <ettore@src.gnome.org>	2003-10-22 02:28:34 +0800
commit	0fb08f3ff81575a4749d851404233f34252dd2f2 (patch)
tree	7e03befedc3a76fd104921dbbc616810d87333be /po/de.po
parent	0e19f2c16de592607a341eb9974d31e4e47e02b5 (diff)
download	gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.gz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.bz2 gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.lz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.xz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.zst gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.zip