Updated German translation

svn path=/trunk/; revision=11477

2 files changed, 3276 insertions, 3070 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 223728938d..c59c69edec 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-30  Matthias Warkus  <mawarkus@gnome.org>
+
+	* de.po: Updated German translation.
+
 2001-07-30  Andras Timar <timar@gnome.hu>
 
         * hu.po: Updated Hungarian translation.
diff --git a/po/de.po b/po/de.po
index d9fba5e78f..ac4a001290 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,19 +10,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.8cvs\n"
-"POT-Creation-Date: 2001-07-08 23:15+0200\n"
-"PO-Revision-Date: 2001-07-08 23:39+02:00\n"
+"POT-Creation-Date: 2001-07-30 18:20+0200\n"
+"PO-Revision-Date: 2001-07-30 18:29+02:00\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3606
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Factory, um VCard-Dateien in Evolution zu importieren."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Importiert VCard-Dateien in Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Karte: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -30,7 +38,7 @@ msgstr ""
 "\n"
 "Name: "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -38,7 +46,7 @@ msgstr ""
 "\n"
 "  Präfix:     "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -46,7 +54,7 @@ msgstr ""
 "\n"
 "  Vorname:     "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -54,7 +62,7 @@ msgstr ""
 "\n"
 "  Zusätzlich: "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -62,7 +70,7 @@ msgstr ""
 "\n"
 "  Familienname:     "
 
-#: addressbook/backend/ebook/e-card.c:3613
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -70,7 +78,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -78,7 +86,7 @@ msgstr ""
 "\n"
 "Geburtsdatum: "
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -86,7 +94,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -94,7 +102,7 @@ msgstr ""
 "\n"
 "  Postfach:  "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -102,7 +110,7 @@ msgstr ""
 "\n"
 "  Suffix:        "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -110,7 +118,7 @@ msgstr ""
 "\n"
 "  Straße:     "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -118,7 +126,7 @@ msgstr ""
 "\n"
 "  Ort:     "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -126,7 +134,7 @@ msgstr ""
 "\n"
 "  Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -134,7 +142,7 @@ msgstr ""
 "\n"
 "  Postleitzahl: "
 
-#: addressbook/backend/ebook/e-card.c:3646
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -142,7 +150,7 @@ msgstr ""
 "\n"
 "  Land:     "
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -150,7 +158,7 @@ msgstr ""
 "\n"
 "Postvermerk: "
 
-#: addressbook/backend/ebook/e-card.c:3671
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -158,7 +166,7 @@ msgstr ""
 "\n"
 "Telefone:\n"
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -166,7 +174,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3698
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -174,7 +182,7 @@ msgstr ""
 "\n"
 "E-Mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3701
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -182,7 +190,7 @@ msgstr ""
 "\n"
 "E-Mail:"
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -190,7 +198,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3726
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -198,7 +206,7 @@ msgstr ""
 "\n"
 "Zeitzone: "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -206,7 +214,7 @@ msgstr ""
 "\n"
 "Geographischer Ort: "
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -214,7 +222,7 @@ msgstr ""
 "\n"
 "Berufsbezeichnung: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -222,7 +230,7 @@ msgstr ""
 "\n"
 "Firma: "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -230,7 +238,7 @@ msgstr ""
 "\n"
 "  Name:  "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -238,7 +246,7 @@ msgstr ""
 "\n"
 "  Einheit:  "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -246,7 +254,7 @@ msgstr ""
 "\n"
 "  Einheit2: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -254,7 +262,7 @@ msgstr ""
 "\n"
 "  Einheit3: "
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -262,7 +270,7 @@ msgstr ""
 "\n"
 "  Einheit4: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -270,7 +278,7 @@ msgstr ""
 "\n"
 "Kategorien: "
 
-#: addressbook/backend/ebook/e-card.c:3760
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -288,7 +296,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -296,7 +304,7 @@ msgstr ""
 "\n"
 "Eindeutige Zeichenkette: "
 
-#: addressbook/backend/ebook/e-card.c:3776
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -304,31 +312,23 @@ msgstr ""
 "\n"
 "Öffentlicher Schlüssel: "
 
-#: addressbook/backend/ebook/e-card.c:4038
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/backend/ebook/e-card.c:4046
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard für %s"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Factory, um VCard-Dateien in Evolution zu importieren."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importiert VCard-Dateien in Evolution."
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1202
+#: calendar/conduits/todo/todo-conduit.c:1017
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
@@ -342,14 +342,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:776
+#: calendar/conduits/todo/todo-conduit.c:591
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:777
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
@@ -358,267 +358,645 @@ 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.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Eine Bonobo-Control für ein Adress-Popup."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Eine Bonobo-Control, um eine Adresse anzuzeigen."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Eine beispielhafte Bonobo-Komponente, die ein Adressbuch anzeigt."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Control, die eine Evolution-Adressbuch-Minikarte anzeigt."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Evolution-Komponente für Kontaktverwaltung."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Factory für die Adressbuch-Minikarten-Control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Factory für den Adressanzeiger des Adressbuchs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Factory für das Adress-Popup des Adressbuchs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Factory für die Evolution-Adressbuch-Komponente."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Factory für die beispielhafte Adressbuch-Kontrolle"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP-Server"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Datei"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Unbekannter Adressbuch-Typ"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Kein (Anonymer Modus)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Passwort"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Unbekannter Legitimationstyp"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Basis"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Ein"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Unterbaum"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Unbekannter Bereichstyp"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "DN binden:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "FIXME DN-Bindungs-Hilfetext hier"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:436
+msgid "Remember this password"
+msgstr "Dieses Passwort speichern"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Host-Rechner:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME Host-Rechner-Hilfetext hier."
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Root-DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Root-DN-Hilfetext hier."
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME Port-Hilfetext hier."
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Suche-Bereich:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Legitimation:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "Komplexe LDAP-Optionen"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Pfad:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME Pfad-Hilfetext hier"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Pfad erstellen wenn er noch nicht existiert."
+
+#: addressbook/gui/component/addressbook-config.c:662
+msgid "Edit Addressbook"
+msgstr "Adressbuch bearbeiten"
+
+#: addressbook/gui/component/addressbook-config.c:664
+msgid "Add Addressbook"
+msgstr "Adressbuch hinzufügen"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Wählen Sie den Typ ihres Adressbuches und geben Sie die relevanten "
+"Informationen ein."
+
+#: addressbook/gui/component/addressbook-config.c:688
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:894
+msgid "Name:"
+msgstr "Name:"
+
+#: addressbook/gui/component/addressbook-config.c:689
+msgid "FIXME Name help text here"
+msgstr "FIXME Hilfetext zum Namen hier"
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Beschreibung:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Description help text here"
+msgstr "FIXME Hilfetext zur Beschreibung hier"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
+msgid "Addressbook Sources"
+msgstr "Adressbuch-Quellen"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "De_lete"
+msgstr "_Löschen"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Name"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
 msgstr "Hinzufügen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Bearbeiten"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Andere Kontakte"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Bitte geben Sie das Passwort für %s ein"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Das Adressbuch kann nicht geöffnet werden"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"Es war nicht möglich, dieses Adressbuch zu öffnen. Dies\n"
+"bedeutet entweder, dass Sie einen ungültigen URI eingegeben\n"
+"haben oder dass der LDAP-Server unerreichbar ist."
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Diese Version von Evolution hat keine eincompilierte LDAP-\n"
+"Unterstützung. Wenn Sie LDAP in Evolution verwenden wollen,\n"
+"müssen Sie das Programm aus dem CVS-Quellcode compilieren,\n"
+"nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
+"haben.\n"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"Dieses Adressbuch konnte nicht geöffnet werden. Bitte prüfen Sie\n"
+"nach, ob der Pfad existiert und ob Sie darauf zugreifen dürfen."
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Irgend ein Feld enthält"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Name enthält"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "E-Mail enthält"
+
+#: addressbook/gui/component/addressbook.c:557
+msgid "Category contains"
+msgstr "Kategorie enthält"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "Die URI, die der Suchdienst anzeigen wird"
+
+#.
+#. * 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
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(keine)"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Primäre E-Mail"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "E-Mail 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "E-Mail 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
+msgstr "Eine Aktion wählen"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Einen neuen Kontakt \"%s\" anlegen"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Adresse zu bestehendem Kontakt \"%s\" hinzufügen"
+
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
+msgstr "Anfrage beim Adressbuch..."
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Kontaktinfo bearbeiten"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Zu Kontakten hinzufügen"
+
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
+msgstr "E-Mail-Adresse einfließen lassen"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Abfragen deaktivieren"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Abfragen aktivieren (gefährlich!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution Namenauswahlschnittstelle für das Adressbuch."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Factory für die Namenauswahl-Schnittstelle des Adressbuchs"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1181
+#: my-evolution/e-summary-preferences.c:1235
+#: my-evolution/e-summary-preferences.c:1296 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:475
+msgid "Remove"
+msgstr "Entfernen"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Alle Entfernen"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "HTML-Mail verschicken?"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+msgid "Unnamed Contact"
+msgstr "Namenloser Kontakt"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr "Lokaler Speicher kann nicht erreicht werden. Dies sollte nie passieren."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Nachrichtenempfänger"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Namen wählen"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select name from _folder:"
+msgstr "Name aus _Ordner wählen:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "_Category:"
+msgstr "_Kategorie:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Suchen"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Jahrestag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "Geschäftlich"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Geschäftliches Fax"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "Kontakte..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Kategorien..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
 #: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Details"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Einsortieren unter:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Allgemein"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Neuer Telefon-Typ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "Notizen:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid "Organi_zation:"
+msgstr "_Organisation:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefon-Typen"
 
-#: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1476
-#, fuzzy
-msgid "Primary Email"
-msgstr "Teils Hagel"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr "Will HTML-Mail erhalten"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Adresse der Webseite:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: mail/mail-config.glade.h:101
-msgid "_Add"
-msgstr "Hinzufügen"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Address..."
 msgstr "Adresse..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Name des Assistenten:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "Geburtstag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "Geschäftlich"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "Firma:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "Kontakte..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1293 mail/mail-config.glade.h:102
-#: ui/evolution-mail-message.xml.h:78 ui/evolution-tasks.xml.h:15
-#: ui/evolution.xml.h:45
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1450
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:79
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Löschen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "Abteilung:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "Voller Name..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "Zu Hause"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "Stellenbezeichnung:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Name des Vorgesetzten:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Spitzname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "Büro:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "Beruf:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "Partner:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "Dies ist die Postadresse"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:663
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Kontakt löschen?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt gehört in folgende Kategorien:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1435
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1436
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Geschäftlich 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1437
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Geschäftliches Fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1438
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Rückruf"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1439
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1440
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1441
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Zu Hause"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1443
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1444
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1446
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: mail/mail-config.glade.h:59
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Andere"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1448
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1449
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Primär"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1450
-#: addressbook/gui/widgets/e-addressbook-view.c:723
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
-msgstr "Regen"
+msgstr "Funk"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1451
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1452
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:727
-msgid "Email 2"
-msgstr "E-Mail 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1478
-#: addressbook/gui/widgets/e-addressbook-view.c:728
-msgid "Email 3"
-msgstr "E-Mail 3"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Kontakt löschen?"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufügen"
@@ -628,23 +1006,21 @@ msgid "Edit Full"
 msgstr "Voll bearbeiten"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Voller Name"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:294
-#, fuzzy
 msgid "E-mail"
-msgstr "Hagel"
+msgstr "E-Mail"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
-#, fuzzy
 msgid "Canada"
-msgstr "Sand"
+msgstr "Kanada"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
@@ -711,9 +1087,8 @@ msgid "Jr."
 msgstr "Jr."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:8
-#, fuzzy
 msgid "Miss"
-msgstr "Nebel"
+msgstr "Fräulein"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
@@ -777,386 +1152,17 @@ msgstr "_Entfernen"
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "Bitte geben Sie das Passwort für %s ein"
-
-#: addressbook/gui/component/addressbook.c:373
-msgid "Unable to open addressbook"
-msgstr "Das Adressbuch kann nicht geöffnet werden"
-
-#: addressbook/gui/component/addressbook.c:380
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
-msgstr ""
-"Es war nicht möglich, dieses Adressbuch zu öffnen. Dies\n"
-"bedeutet entweder, dass Sie einen ungültigen URI eingegeben\n"
-"haben oder dass der LDAP-Server unerreichbar ist."
-
-#: addressbook/gui/component/addressbook.c:385
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"Diese Version von Evolution hat keine eincompilierte LDAP-\n"
-"Unterstützung. Wenn Sie LDAP in Evolution verwenden wollen,\n"
-"müssen Sie das Programm aus dem CVS-Quellcode compilieren,\n"
-"nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
-"haben.\n"
-
-#: addressbook/gui/component/addressbook.c:393
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-"Dieses Adressbuch konnte nicht geöffnet werden. Bitte prüfen Sie\n"
-"nach, ob der Pfad existiert und ob Sie darauf zugreifen dürfen."
-
-#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
-msgid "Any field contains"
-msgstr "Irgend ein Feld enthält"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Name contains"
-msgstr "Name enthält"
-
-#: addressbook/gui/component/addressbook.c:556
-msgid "Email contains"
-msgstr "E-Mail enthält"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Category contains"
-msgstr "Kategorie enthält"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "Die URI, die der Suchdienst anzeigen wird"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP-Server"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Datei"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Unbekannter Adressbuch-Typ"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Kein (Anonymer Modus)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
-msgid "Password"
-msgstr "Passwort"
-
-#: addressbook/gui/component/addressbook-config.c:168
-#, fuzzy
-msgid "Unknown auth type"
-msgstr "Unbekannte Beobachtungszeit"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Basis"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Ein"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Unterbaum"
-
-#: addressbook/gui/component/addressbook-config.c:184
-#, fuzzy
-msgid "Unknown scope type"
-msgstr "Unbekannte Beobachtungszeit"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "DN binden:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME DN-Bindungs-Hilfetext hier"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:73
-msgid "Remember this password"
-msgstr "Dieses Passwort speichern"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:42
-msgid "Host:"
-msgstr "Host-Rechner:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME Host-Rechner-Hilfetext hier."
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Root-DN:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Root-DN-Hilfetext hier."
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME Port-Hilfetext hier."
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Suche-Bereich:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Legitimation:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "Komplexe LDAP-Optionen"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:64
-msgid "Path:"
-msgstr "Pfad:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME Pfad-Hilfetext hier"
-
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "Pfad erstellen wenn er noch nicht existiert."
-
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "Adressbuch bearbeiten"
-
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "Adressbuch hinzufügen"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Wählen Sie den Typ ihres Adressbuches und geben Sie die relevanten "
-"Informationen ein."
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:53
-msgid "Name:"
-msgstr "Name:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "FIXME Hilfetext zum Namen hier"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "Beschreibung:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Description help text here"
-msgstr "FIXME Hilfetext zur Beschreibung hier"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Adressbuch-Quellen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
-msgid "Delete"
-msgstr "Löschen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Name"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-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
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(keine)"
-
-#: addressbook/gui/component/e-address-popup.c:579
-msgid "Select an Action"
-msgstr "Eine Aktion wählen"
-
-#: addressbook/gui/component/e-address-popup.c:585
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Einen neuen Kontakt \"%s\" anlegen"
-
-#: addressbook/gui/component/e-address-popup.c:597
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Adresse zu bestehendem Kontakt \"%s\" hinzufügen"
-
-#: addressbook/gui/component/e-address-popup.c:859
-msgid "Querying Addressbook..."
-msgstr "Anfrage beim Adressbuch..."
-
-#: addressbook/gui/component/e-address-popup.c:916
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:274
-msgid "Edit Contact Info"
-msgstr "Kontaktinfo bearbeiten"
-
-#: addressbook/gui/component/e-address-popup.c:946
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:339
-msgid "Add to Contacts"
-msgstr "Zu Kontakten hinzufügen"
-
-#: addressbook/gui/component/e-address-popup.c:989
-msgid "Merge E-Mail Address"
-msgstr "E-Mail-Adresse einfließen lassen"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Abfragen deaktivieren"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Abfragen aktivieren (gefährlich!)"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Eine Bonobo-Control für ein Adress-Popup."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Eine Bonobo-Control, um eine Adresse anzuzeigen."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Eine beispielhafte Bonobo-Komponente, die ein Adressbuch anzeigt."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control, die eine Evolution-Adressbuch-Minikarte anzeigt."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Evolution-Komponente für Kontaktverwaltung."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Factory für die Adressbuch-Minikarten-Control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Factory für den Adressanzeiger des Adressbuchs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Factory für das Adress-Popup des Adressbuchs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Factory für die Evolution-Adressbuch-Komponente."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Factory für die beispielhafte Adressbuch-Kontrolle"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:272 shell/e-shortcuts-view.c:475
-msgid "Remove"
-msgstr "Entfernen"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
-msgid "Remove All"
-msgstr "Alle Entfernen"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
-msgid "Send HTML Mail?"
-msgstr "HTML-Mail verschicken?"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution Namenauswahlschnittstelle für das Adressbuch."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Factory für die Namenauswahl-Schnittstelle des Adressbuchs"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Nachrichtenempfänger"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Namen wählen"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
-msgstr "Name aus _Ordner wählen:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "_Category:"
-msgstr "_Kategorie:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Suchen"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+msgid "Contact List Editor"
+msgstr "Kontaktlisten-Editor"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Trotzdem hinzufügen"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "Doppelt vorhandener Kontakt entdeckt"
 
@@ -1177,18 +1183,14 @@ msgstr ""
 "bereits in diesem Ordner. Möchten Sie ihn trotzdem hinzufügen?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "Trotzdem ändern"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "Geänderter Kontakt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Kontakt in Konflikt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1197,8 +1199,12 @@ msgstr ""
 "Kontakts gibt es bereits in diesem Ordner. Möchten Sie ihn\n"
 "trotzdem hinzufügen?"
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr "Trotzdem _ändern"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Suchen"
 
@@ -1329,9 +1335,9 @@ msgstr "Nachricht an Kontakt schicken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
-#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:55 ui/evolution-tasks.xml.h:9
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Drucken"
 
@@ -1340,139 +1346,203 @@ msgstr "Drucken"
 msgid "Print Envelope"
 msgstr "Umschlag drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:8 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:5
+msgid "Delete"
+msgstr "Löschen"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr "Fehler beim Ändern einer Karte"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+msgid "Success"
+msgstr "Erfolg"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr "Repository offline"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Erlaubnis verweigert"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+msgid "Card not found"
+msgstr "Karte nicht gefunden"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr "Kartenkennung existiert bereits"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr "Protokoll nicht unterstützt"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+msgid "Canceled"
+msgstr "Abgebrochen"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+msgid "Other error"
+msgstr "Anderer Fehler"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding list"
+msgstr "Fehler beim Hinzufügen der Liste"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding card"
+msgstr "Fehler beim Hinzufügen einer Karte"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+msgid "Error modifying list"
+msgstr "Fehler beim Ändern einer Liste"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+msgid "Error removing list"
+msgstr "Fehler beim Entfernen einer Liste"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr "Fehler beim Entfernen einer Karte"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Hier klicken, um einen Kontakt hinzuzufügen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Einsortieren unter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
-msgstr "Hagel"
+msgstr "E-Mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Primäres Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Telefon des Assistenten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Geschäftliches Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Rückruf-Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Firmentelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Telefon zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Geschäftliche Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Adresse zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Geschäftliches Telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Telefon zu Hause 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Anderes Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Andere Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Abteilung"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Büro"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Beruf"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Lebenspartner"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Notiz"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
-msgstr "Frei/beschäftigt-URL"
+msgstr "Verfügbarkeits-Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "Fertig."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-msgid "Error removing card"
-msgstr "Fehler beim Entfernen einer Karte"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "Karten werden entfernt..."
 
-#: addressbook/gui/widgets/e-minicard.c:451
-msgid "Error modifying card"
-msgstr "Fehler beim Ändern einer Karte"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
@@ -1520,12 +1590,12 @@ msgid "Dimensions:"
 msgstr "Ausmaße:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
-msgstr "Schrifart..."
+msgid "F_ont..."
+msgstr "_Schrift..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
-msgstr "Schrifarten"
+msgstr "Schriften"
 
 #: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
@@ -1536,9 +1606,8 @@ msgid "Format"
 msgstr "Format"
 
 #: addressbook/printing/e-contact-print.glade.h:11
-#, fuzzy
 msgid "Header"
-msgstr "Dunst"
+msgstr "Kopfzeile"
 
 #: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
@@ -1609,9 +1678,8 @@ msgid "Paper source:"
 msgstr "Papierquelle:"
 
 #: addressbook/printing/e-contact-print.glade.h:29
-#, fuzzy
 msgid "Portrait"
-msgstr "Teils Nebel"
+msgstr "Hochformat"
 
 #: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
@@ -1661,38 +1729,60 @@ msgstr "Typ:"
 msgid "Width:"
 msgstr "Breite:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+msgid "_Font..."
+msgstr "_Schrift..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:733
+#: calendar/conduits/todo/todo-conduit.c:547
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/calendar/calendar-conduit.c:840
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:652
+#: calendar/conduits/todo/todo-conduit.c:655
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:623
-#: calendar/gui/alarm-notify/alarm-queue.c:922
-#: calendar/gui/alarm-notify/alarm-queue.c:978
-msgid "Reminder of your appointment at "
-msgstr "Erinnerung für Ihren Termin um "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Eine beispielhafte Bonobo-Komponente, die einen Kalender anzeigt."
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-queue.c:914
-#, fuzzy
-msgid "Snooze"
-msgstr "Schneefall"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolutions Chefsesselansichts-Komponente für den Kalender."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:927
-#: calendar/gui/alarm-notify/alarm-queue.c:982
-msgid "Ok"
-msgstr "OK"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "iTip-/iMip-Betrachter für den Evolution-Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Evolution-Komponente für die Verwaltung des Kalenders."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Factory für die Kalenderzusammenfassungs-Komponente."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Factory für die Evolution-Kalender-Komponente."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Factory für die Kalender-iTip-Ansichts-Control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Factory für die beispielhafte Kalender-Control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Fabrik, die Kalender-Komponenteneditor-Dialoge zentralisiert"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1702,88 +1792,85 @@ msgstr "Alarm-Benachrichtigungsdienst"
 msgid "Factory for the alarm notification service"
 msgstr "Factory für den Alarm-Benachrichtigungsdienst."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Hinweis auf Ihren Termin von %s bis %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:157
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Hinweis auf Ihren Termin um %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:162
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Hinweis auf Ihren um %s endenden Termin"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:166
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
 msgid "Notification about your appointment"
 msgstr "Hinweis auf Ihren Termin"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Hinweis auf Ihre Aufgabe von %s bis %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:177
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Hinweis auf Ihre um %s beginnende Aufgabe"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:182
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Hinweis auf Ihre um %s endende Aufgabe"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:186
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
 msgid "Notification about your task"
 msgstr "Hinweis über Ihre Aufgabe"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:193
-#, c-format
-msgid "Notification about your journal entry starting on %s and ending on %s"
-msgstr "Hinweis auf Ihren Journaleintrag von %s bis %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:197
-#, c-format
-msgid "Notification about your journal entry starting on %s"
-msgstr "Hinweis auf Ihren Journaleintrag beginnend um %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:202
-#, c-format
-msgid "Notification about your journal entry ending on %s"
-msgstr "Hinweis auf Ihren Journaleintrag endend um %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:206
-msgid "Notification about your journal entry"
-msgstr "Hinweis auf Ihren Journaleintrag"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
-#, fuzzy
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
 msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "%a, %b %d / %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:301
-msgid "No summary available."
-msgstr "Keine Zusammenfassung verfügbar."
+msgstr "Alarm am %A, %d. %b %Y %H.%M"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: 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.xml.h:4
-msgid "Close"
-msgstr "Schließen"
+#: ui/evolution-comp-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Schließen"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Termin bearbeiten"
+msgid "Snoo_ze"
+msgstr "_Weiterschlafen"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
 msgstr "Weiterschlaf-Zeit (Minuten)"
 
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+msgid "_Edit appointment"
+msgstr "Termin _bearbeiten"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr "Keine Beschreibung verfügbar."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Erinnerung für Ihren Termin um "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Weiterschlafen"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "OK"
+
 #: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
@@ -1805,130 +1892,116 @@ msgstr "gnome-vfs konnte nicht initialisiert werden"
 msgid "Could not create the alarm notify service factory"
 msgstr "Factory für Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/calendar-commands.c:278
-msgid "File not found"
-msgstr "Datei nicht gefunden"
-
-#: calendar/gui/calendar-commands.c:302
-msgid "Open calendar"
-msgstr "Kalender öffnen"
-
-#: calendar/gui/calendar-commands.c:344
-msgid "Save calendar"
-msgstr "Kalender speichern"
-
-#: calendar/gui/calendar-commands.c:596
+#: calendar/gui/calendar-commands.c:497
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Die Kalender-Ansicht konnte nicht erstellt werden. Bitte überprüfen Sie Ihre "
 "ORBit und OAF Einstellungen. "
 
-#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:974
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:306
 msgid "Public"
 msgstr "Öffentlich"
 
-#: calendar/gui/calendar-model.c:382 calendar/gui/calendar-model.c:976
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:307
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:978
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:308
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/calendar-model.c:388 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:519 calendar/gui/calendar-model.c:1150
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1182
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:625
 msgid "High"
 msgstr "Hoch"
 
-#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1152
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1184
+#: calendar/gui/calendar-model.c:1707
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1154
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1186
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:623
 msgid "Low"
 msgstr "Niedrig"
 
-#: calendar/gui/calendar-model.c:559 calendar/gui/calendar-model.c:1206
-#: calendar/gui/e-calendar-table.c:502
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1238
+#: calendar/gui/e-calendar-table.c:382
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:562 calendar/gui/calendar-model.c:1208
-#: calendar/gui/e-calendar-table.c:501
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1240
+#: calendar/gui/e-calendar-table.c:381
 msgid "Opaque"
 msgstr "Opak"
 
-#: calendar/gui/calendar-model.c:711 calendar/gui/calendar-model.c:1260
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1292
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:522
+#: calendar/gui/e-calendar-table.c:402
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
-#: calendar/gui/calendar-model.c:714 calendar/gui/calendar-model.c:1262
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1294
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:523
+#: calendar/gui/e-calendar-table.c:403
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1264
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1296
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:524
+#: calendar/gui/e-calendar-table.c:404
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1266
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1298
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:525 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:405 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Storniert"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:870 e-util/e-time-utils.c:267
-#, fuzzy
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a, %b %d / %H:%M"
+msgstr "%a, %d. %m %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:873 e-util/e-time-utils.c:276
-#, fuzzy
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a, %b %d / %H:%M"
+msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:878
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1939,7 +2012,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:958
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1947,17 +2020,20 @@ msgstr ""
 "sein"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:972 calendar/gui/calendar-model.c:1204
-#: calendar/gui/calendar-model.c:1258 calendar/gui/e-calendar-table.c:425
-#: calendar/gui/e-calendar-table.c:500 mail/mail-account-gui.c:1295
-#: mail/mail-accounts.c:129 mail/mail-accounts.c:380
-#: mail/mail-config.glade.h:56 shell/e-shell-view.c:1397
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:439
-#: widgets/misc/e-dateedit.c:1369 widgets/misc/e-dateedit.c:1484
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1236
+#: calendar/gui/calendar-model.c:1290
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:305 calendar/gui/e-calendar-table.c:380
+#: mail/mail-account-gui.c:1379 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1086
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1967,42 +2043,58 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1094
+#: calendar/gui/calendar-model.c:1126
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschließlich) sein"
 
-#: calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:1167
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Die Priorität muss 'Hoch', 'Normal', 'Niedrig' oder 'Undefiniert' sein."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1148
+#: calendar/gui/calendar-model.c:1180
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:451
+#: calendar/gui/e-calendar-table.c:331
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: calendar/gui/calendar-model.c:1189
+#: calendar/gui/calendar-model.c:1221
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Die Transparenz muss 'Transparent', 'Opak' oder 'Keine' sein."
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1679
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1717
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1717
 msgid "No"
 msgstr "Nein"
 
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+msgid "Day View"
+msgstr "Tagesansicht"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
+msgstr "Werkwochenansicht"
+
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
+msgstr "Wochenansicht"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+msgid "Month View"
+msgstr "Monatsansicht"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
@@ -2024,9 +2116,8 @@ msgid "Program Alarm Options"
 msgstr "Programm-Alarmoptionen"
 
 #: calendar/gui/dialogs/alarm-options.c:390
-#, fuzzy
 msgid "Unknown Alarm Options"
-msgstr "Unbekannte Niederschläge"
+msgstr "Unbekannte Alarmoptionen"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:1
 msgid "Alarm Repeat"
@@ -2056,22 +2147,19 @@ msgstr "Programm ausführen:"
 msgid "With these arguments:"
 msgstr "Mit diesen Argumenten:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:81
-#, fuzzy
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 msgid "days"
-msgstr "Sprühregen"
+msgstr "Tage"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:9
-#, fuzzy
 msgid "extra times every"
-msgstr "Aktualisieren alle "
+msgstr "weitere Male alle"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:82
-#, fuzzy
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 msgid "hours"
-msgstr "Schauer"
+msgstr "Stunden"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "Minuten"
 
@@ -2121,82 +2209,75 @@ msgid "1 second"
 msgstr "1 Sekunde"
 
 #: calendar/gui/dialogs/alarm-page.c:331
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
 #: calendar/gui/dialogs/alarm-page.c:335
-#, fuzzy
-msgid "Show a dialog"
-msgstr "Geringfügiger Hagel"
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+msgid "Display a message"
+msgstr "Eine Nachricht anzeigen"
 
 #: calendar/gui/dialogs/alarm-page.c:339
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
 #: calendar/gui/dialogs/alarm-page.c:343
-#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Ein Programm ausführen"
 
 #: calendar/gui/dialogs/alarm-page.c:361
-msgid " before start of appointment"
-msgstr " vor Terminbeginn"
+msgid "before start of appointment"
+msgstr "vor Terminbeginn"
 
 #: calendar/gui/dialogs/alarm-page.c:364
-msgid " after start of appointment"
-msgstr " nach Terminbeginn"
+msgid "after start of appointment"
+msgstr "nach Terminbeginn"
 
 #: calendar/gui/dialogs/alarm-page.c:374
-msgid " before end of appointment"
-msgstr " vor Terminende"
+msgid "before end of appointment"
+msgstr "vor Terminende"
 
 #: calendar/gui/dialogs/alarm-page.c:377
-msgid " after end of appointment"
-msgstr " nach Terminende"
+msgid "after end of appointment"
+msgstr "nach Terminende"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "Grundlagen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:293
+#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Datum/Zeit:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
-msgid "Display a message"
-msgstr "Eine Nachricht anzeigen"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Options..."
-msgstr "Optionen..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Erinnerungen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:223
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+msgid "_Options..."
+msgstr "_Optionen..."
+
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
 msgid "after"
 msgstr "nach"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:224
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:36
 msgid "before"
 msgstr "vor"
 
@@ -2213,7 +2294,7 @@ msgstr "Ende des Termins"
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:104
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -2254,8 +2335,7 @@ msgid "Beep when alarm windows appear."
 msgstr "Piepsen, wenn Alarmfenster erscheinen."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1001
-#: ui/evolution-calendar.xml.h:4
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -2288,7 +2368,7 @@ msgid "Defaults"
 msgstr "Voreinstellungen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Anzeige"
 
@@ -2305,7 +2385,7 @@ msgid "Fri"
 msgstr "Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: calendar/gui/dialogs/recurrence-page.c:983
 msgid "Friday"
 msgstr "Freitag"
 
@@ -2314,7 +2394,7 @@ msgid "Mon"
 msgstr "Mo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "Monday"
 msgstr "Montag"
 
@@ -2335,7 +2415,7 @@ msgid "Sat"
 msgstr "Sa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:986
+#: calendar/gui/dialogs/recurrence-page.c:984
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -2356,34 +2436,30 @@ msgid "Sun"
 msgstr "So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:987
-#, fuzzy
+#: calendar/gui/dialogs/recurrence-page.c:985
 msgid "Sunday"
-msgstr "Sand"
+msgstr "Sonntag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#, fuzzy
 msgid "Task List"
-msgstr "Dichter Nebel"
+msgstr "Aufgabenliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#, fuzzy
 msgid "Tasks due today"
-msgstr "Heute fällige Einträge"
+msgstr "Heute fällige Aufgaben"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Do"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "Thursday"
 msgstr "Donnerstag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#, fuzzy
 msgid "Time"
-msgstr "Titel"
+msgstr "Zeit"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
@@ -2394,18 +2470,15 @@ msgid "Time format:"
 msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#, fuzzy
 msgid "Time zone:"
-msgstr ""
-"\n"
-"Zeitzone: "
+msgstr "Zeitzone:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Di"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -2414,7 +2487,7 @@ msgid "Wed"
 msgstr "Mi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:983
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -2426,6 +2499,146 @@ msgstr "Werkwoche"
 msgid "minutes before they occur."
 msgstr "Minuten bevor sie auftreten."
 
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+"Der Status der Besprechung hat sich geändert. Aktualisierte Version "
+"verschicken?"
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr ""
+"Sind Sie sicher, dass Sie diese Besprechung absagen und löschen wollen?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Sind Sie sicher, dass Sie diese Aufgabe stornieren und löschen wollen?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr ""
+"Sind Sie sicher, dass Sie diesen Journaleintrag stornieren und löschen "
+"wollen?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr "Dieses Ereignis wurde gelöscht."
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr "Diese Aufgabe wurde gelöscht."
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr "Dieser Journaleintrag wurde gelöscht."
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+"%s  Sie haben Änderungen vorgenommen. Diese vergessen und den Editor "
+"schließen?"
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor schließen?"
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr "Dieses Ereignis wurde geändert."
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr "Diese Aufgabe wurde geändert."
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr "Dieser Journaleintrag wurde geändert."
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+"%s  Sie haben Änderungen vorgenommen. Diese vergessen und den Editor "
+"aktualisieren?"
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr "%s  Sie haben keine Änderungen gemacht, den Editor aktualisieren?"
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:619 calendar/gui/print.c:2116
+msgid " to "
+msgstr " an "
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:623 calendar/gui/print.c:2120
+msgid " (Completed "
+msgstr " (Abgeschlossen "
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:625 calendar/gui/print.c:2122
+msgid "Completed "
+msgstr "Abgeschlossen "
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:630 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr " (Fällig am "
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:632 calendar/gui/print.c:2129
+msgid "Due "
+msgstr "Fällig am "
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Termin bearbeiten"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Termin - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Aufgabe - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Journaleintrag - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Keine Zusammenfassung"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Datei überschreiben?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Eine Datei mit diesem Namen existiert bereits.\n"
+"Überschreiben?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Speichern unter..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr "Aktuelle Version kann nicht erhalten werden!"
+
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -2470,21 +2683,16 @@ msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Sind Sie sicher, dass Sie %d Journaleinträge löschen wollen?"
 
 #: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
-#, fuzzy
 msgid "Select a Time Zone"
-msgstr "Eine Datei wählen"
+msgstr "Eine Zeitzone wählen"
 
 #: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
-#, fuzzy
 msgid "Selection:"
-msgstr "Abschnitte:"
+msgstr "Auswahl:"
 
 #: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
-#, fuzzy
 msgid "Time Zones"
-msgstr ""
-"\n"
-"Zeitzone: "
+msgstr "Zeitzonen"
 
 #: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
 msgid ""
@@ -2510,9 +2718,8 @@ msgstr "Wiederholung"
 
 #: calendar/gui/dialogs/event-editor.c:169
 #: calendar/gui/dialogs/event-editor.c:248
-#, fuzzy
 msgid "Meeting"
-msgstr "Einstellungen"
+msgstr "Besprechung"
 
 #: calendar/gui/dialogs/event-page.glade.h:1
 msgid "A_ll day event"
@@ -2520,7 +2727,7 @@ msgstr "Ganztägiges Ereignis"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:248
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klassifikation"
 
@@ -2549,11 +2756,6 @@ msgstr "Zusammenfassung:"
 msgid "_Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "Kontakte..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "_Endzeit:"
@@ -2562,38 +2764,143 @@ msgstr "_Endzeit:"
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr "Diese Person nimmt schon an der Besprechung teil!"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+msgid "Sent By:"
+msgstr "Verschickt durch:"
+
+#: calendar/gui/dialogs/meeting-page.c:1445
+msgid "_Delegate To..."
+msgstr "_Delegieren an..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Anwesender"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
+msgstr "Gemeinsamer Name"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+msgid "Delegated From"
+msgstr "Delegiert durch"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+msgid "Delegated To"
+msgstr "Delegiert an"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "Language"
+msgstr "Sprache"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
+msgstr "Mitglied"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "UAwg"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Position"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:32
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Status"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Typ"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organisator:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "_Change Organizer"
+msgstr "Organisator _ändern"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
+msgstr "Andere _einladen"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "_Other Organizer"
+msgstr "_Anderer Organisator"
+
+#: calendar/gui/dialogs/recurrence-page.c:439 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a, %d. %b %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:587
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+"Dieser Termin enthält Wiederholungsregeln, die Evolution nicht bearbeiten "
+"kann."
+
+#: calendar/gui/dialogs/recurrence-page.c:952
+msgid "on"
+msgstr "bei"
+
+#: calendar/gui/dialogs/recurrence-page.c:978 filter/filter-datespec.c:83
+msgid "day"
+msgstr "Tag"
+
+#: calendar/gui/dialogs/recurrence-page.c:1108
+msgid "on the"
+msgstr "am"
+
+#: calendar/gui/dialogs/recurrence-page.c:1116
+msgid "th"
+msgstr "."
+
+#: calendar/gui/dialogs/recurrence-page.c:1286
+msgid "occurrences"
+msgstr "Auftreten"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "Benutzerdefinierte Wiederholung"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Alle"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Ausnahmen"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "Ändern"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "Keine Wiederholung"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Vorschau"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "Wiederholungsregel"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "Einfache Wiederholung"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Modify"
+msgstr "_Ändern"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "für"
@@ -2618,67 +2925,45 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1978
-#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
-#, fuzzy
-msgid "%a %b %d %Y"
-msgstr "%a, %b %d / %H:%M"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Wollen Sie die Änderungen speichern?"
 
-#: calendar/gui/dialogs/recurrence-page.c:582
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
-"Dieser Termin enthält Wiederholungsregeln, die Evolution nicht bearbeiten "
-"kann."
-
-#: calendar/gui/dialogs/recurrence-page.c:954
-msgid "on"
-msgstr "bei"
-
-#: calendar/gui/dialogs/recurrence-page.c:980 filter/filter-datespec.c:81
-msgid "day"
-msgstr "Tag"
-
-#: calendar/gui/dialogs/recurrence-page.c:1110
-msgid "on the"
-msgstr "am"
-
-#: calendar/gui/dialogs/recurrence-page.c:1118
-msgid "th"
-msgstr "."
+"Die Besprechungsinformationen haben sich geändert. Eine aktualisierte "
+"Version verschicken?"
 
-#: calendar/gui/dialogs/recurrence-page.c:1288
-msgid "occurrences"
-msgstr "Auftreten"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+"Die Aufgabeninformationen haben sich geändert. Eine aktualisierte Version "
+"verschicken?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Wollen Sie die Änderungen speichern?"
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+"Der Journaleintrag hat sich geändert. Eine aktualisierte Version schicken?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "Abgeschlossen am:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#, fuzzy
 msgid "Delegated From:"
-msgstr "Diese Aufgabe löschen"
+msgstr "Delegiert durch:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
 msgid "Delegated To:"
-msgstr "Diese Aufgabe löschen"
+msgstr "Delegiert an:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#, fuzzy
 msgid "No one"
-msgstr "Keine"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organisator:"
+msgstr "Niemanden"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:902
 msgid "URL:"
 msgstr "URL:"
 
@@ -2711,340 +2996,318 @@ msgstr "_Priorität:"
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-calendar-table.c:247
-msgid "Categories"
-msgstr "Kategorien"
-
-#: calendar/gui/e-calendar-table.c:249
-msgid "Completion Date"
-msgstr "Abschlussdatum"
-
-#: calendar/gui/e-calendar-table.c:250
-msgid "End Date"
-msgstr "Enddatum"
-
-#: calendar/gui/e-calendar-table.c:251
-msgid "Start Date"
-msgstr "Anfangsdatum"
-
-#: calendar/gui/e-calendar-table.c:252
-msgid "Due Date"
-msgstr "Fällig am"
-
-#: calendar/gui/e-calendar-table.c:253
-msgid "Geographical Position"
-msgstr "Geographische Lage"
-
-#: calendar/gui/e-calendar-table.c:254
-msgid "Percent complete"
-msgstr "Fertigstellung in Prozent"
-
-#: calendar/gui/e-calendar-table.c:255 filter/libfilter-i18n.h:45
-#: filter/libfilter-i18n.h:185
-msgid "Priority"
-msgstr "Priorität"
-
-#: calendar/gui/e-calendar-table.c:256
-msgid "Summary"
-msgstr "Zusammenfassung"
-
-#: calendar/gui/e-calendar-table.c:257
-msgid "Transparency"
-msgstr "Transparenz"
-
-#: calendar/gui/e-calendar-table.c:258
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:259
-msgid "Alarms"
-msgstr "Alarme"
-
-#: calendar/gui/e-calendar-table.c:260
-msgid "Click here to add a task"
-msgstr "Hier klicken, um eine Aufgabe hinzuzufügen"
-
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:472
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:473
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:474
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:475
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:477
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:478
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:479
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:480
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:957
+#: calendar/gui/e-calendar-table.c:840
 msgid "Edit this task"
 msgstr "Diese Aufgabe bearbeiten"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3315 calendar/gui/e-week-view.c:3158
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
+#: calendar/gui/e-calendar-table.c:841 calendar/gui/e-calendar-table.c:851
+#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3168
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: calendar/gui/e-calendar-table.c:959 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3317 calendar/gui/e-week-view.c:3160
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: calendar/gui/e-calendar-table.c:842 calendar/gui/e-calendar-table.c:852
+#: calendar/gui/e-day-view.c:3333 calendar/gui/e-week-view.c:3170
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
 msgid "Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-calendar-table.c:970
-#: calendar/gui/e-day-view.c:3290 calendar/gui/e-day-view.c:3319
-#: calendar/gui/e-week-view.c:3134 calendar/gui/e-week-view.c:3162
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-table.c:853
+#: calendar/gui/e-day-view.c:3306 calendar/gui/e-day-view.c:3335
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3172
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
 msgid "Paste"
 msgstr "Einfügen"
 
-#: calendar/gui/e-calendar-table.c:962
+#: calendar/gui/e-calendar-table.c:845
 msgid "Mark as complete"
 msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:963
+#: calendar/gui/e-calendar-table.c:846
 msgid "Delete this task"
 msgstr "Diese Aufgabe löschen"
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:855
 msgid "Mark tasks as complete"
 msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:973 ui/evolution-tasks.xml.h:6
+#: calendar/gui/e-calendar-table.c:856 ui/evolution-tasks.xml.h:6
 msgid "Delete selected tasks"
 msgstr "Ausgewählte Aufgaben löschen"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:574 calendar/gui/e-week-view.c:307
-#: calendar/gui/print.c:785
-#, fuzzy
-msgid "am"
-msgstr "Ruhig"
+#: calendar/gui/e-calendar-table.c:1122
+msgid "Click here to add a task"
+msgstr "Hier klicken, um eine Aufgabe hinzuzufügen"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:577 calendar/gui/e-week-view.c:310
-#: calendar/gui/print.c:787
-msgid "pm"
-msgstr "PM"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% abgeschlossen"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarme"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorien"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Abgeschlossen"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Abschlussdatum"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Fällig am"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Enddatum"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Geographische Lage"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Priorität"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Anfangsdatum"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+msgid "Task sort"
+msgstr "Aufgabensorte"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Transparenz"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i Minuten-Unterteilungen"
 
 #. 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:285 calendar/gui/e-day-view.c:1327
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1341
+#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
 #: calendar/gui/e-week-view-main-item.c:334
 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-top-item.c:293 calendar/gui/e-day-view.c:1354
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: calendar/gui/e-day-view.c:3295 ui/evolution-calendar.xml.h:21
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "AM"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "PM"
+
+#: calendar/gui/e-day-view.c:3311 ui/evolution-calendar.xml.h:16
 msgid "New Appointment"
 msgstr "Neuer Termin"
 
-#: calendar/gui/e-day-view.c:3297 calendar/gui/e-week-view.c:3141
+#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3151
 msgid "New All Day Event"
 msgstr "Neues ganztägiges Ereignis"
 
-#: calendar/gui/e-day-view.c:3302 calendar/gui/e-week-view.c:3146
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
 msgid "Go to Today"
 msgstr "Zum heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3304 calendar/gui/e-week-view.c:3148
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
 msgid "Go to Date..."
 msgstr "Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3311 calendar/gui/e-week-view.c:3154
-#: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
+#: calendar/gui/e-day-view.c:3327 calendar/gui/e-week-view.c:3164
+#: shell/e-shortcuts-view.c:468 ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Öffnen"
 
-#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3156
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
 msgid "Delete this Appointment"
 msgstr "Diesen Termin löschen"
 
-#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3186
 msgid "Make this Occurrence Movable"
 msgstr "Dieses Auftreten beweglich machen"
 
-#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:3346 calendar/gui/e-week-view.c:3188
 msgid "Delete this Occurrence"
 msgstr "Dieses Auftreten löschen"
 
-#: calendar/gui/e-day-view.c:3332
+#: calendar/gui/e-day-view.c:3348
 msgid "Delete all Occurrences"
 msgstr "Jedes Auftreten löschen"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i Minuten-Unterteilungen"
-
-#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
-msgid " to "
-msgstr " an "
-
-#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
-#, fuzzy
-msgid " (Completed "
-msgstr "Abgeschlossen"
-
-#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
-#, fuzzy
-msgid "Completed "
-msgstr "Abgeschlossen"
-
-#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
-msgid " (Due "
-msgstr " (Fällig am "
-
-#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
-#, fuzzy
-msgid "Due "
-msgstr "Fällig am"
-
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:686
 msgid "This is an event that can be added to your calendar."
 msgstr "Dies ist ein Ereignis, das zu Ihrem Kalender hinzugefügt werden kann."
 
-#: calendar/gui/e-itip-control.c:616
-#, fuzzy
+#: calendar/gui/e-itip-control.c:689
 msgid "This is a meeting request."
-msgstr "Dies ist die Postadresse"
+msgstr "Dies ist eine Besprechungsanfrage."
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:692
 msgid "This is one or more additions to a current meeting."
 msgstr "Dies sind ein oder mehrere Nachträge zu einer aktuellen Besprechung."
 
-#: calendar/gui/e-itip-control.c:622
+#: calendar/gui/e-itip-control.c:695
 msgid "This is a request for the latest event information."
 msgstr "Dies ist eine Anfrage zu den neuesten Ereignisinformationen."
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:698
 msgid "This is a reply to a meeting request."
 msgstr "Dies ist eine Antwort auf eine Besprechungsanfrage."
 
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:701
 msgid "This is an event cancellation."
 msgstr "Dies ist eine Ereignisstornierung."
 
-#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:670
-#: calendar/gui/e-itip-control.c:698
-#, fuzzy
+#: calendar/gui/e-itip-control.c:704 calendar/gui/e-itip-control.c:744
+#: calendar/gui/e-itip-control.c:772
 msgid "The message is not understandable."
-msgstr "Diese Nachricht ist derzei nicht verfügbar"
+msgstr "Diese Nachricht ist unverständlich."
 
-#: calendar/gui/e-itip-control.c:655
+#: calendar/gui/e-itip-control.c:729
 msgid "This is an task that can be added to your calendar."
 msgstr "Dies ist eine Aufgabe, die zu Ihrem Kalender hinzugefügt werden kann."
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:732
 msgid "This is a task request."
 msgstr "Dies ist eine Aufgabenanfrage."
 
-#: calendar/gui/e-itip-control.c:661
+#: calendar/gui/e-itip-control.c:735
 msgid "This is a request for the latest task information."
 msgstr "Dies ist eine Anfrage zur neuesten Aufgabeninformation."
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:738
 msgid "This is a reply to a task request."
 msgstr "Dies ist eine Antwort auf eine Aufgabenanfrage."
 
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:741
 msgid "This is an task cancellation."
 msgstr "Dies ist eine Aufgabenstornierung."
 
-#: calendar/gui/e-itip-control.c:689
+#: calendar/gui/e-itip-control.c:763
 msgid "This is freebusy information."
-msgstr ""
+msgstr "Dies sind Verfügbarkeitsinformationen."
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:766
 msgid "This is a request for freebusy information."
-msgstr ""
+msgstr "Dies ist eine Anfrage um Verfügbarkeitsinformationen."
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:769
 msgid "This is a reply to a freebusy request."
-msgstr ""
+msgstr "Dies ist eine Antwort auf eine Verfügbarkeitsanfrage."
 
-#: calendar/gui/e-itip-control.c:718
-#, fuzzy
+#: calendar/gui/e-itip-control.c:826
 msgid "The message does not appear to be properly formed"
-msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
+msgstr "Diese Nachricht schein formell ungültig zu sein"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:845
 msgid "The message contains only unsupported requests."
 msgstr "Die Nachricht enthält keine unterstützten Anfragen."
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:869
 msgid "The information contained in this attachment was not valid"
 msgstr "Die in diesem Anhang enthaltene Information war ungültig."
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:981
 msgid "I couldn't update your calendar file!\n"
 msgstr "Ihre Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:894
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1007
 msgid "I couldn't remove the item from your calendar file!\n"
-msgstr "Ihre Kalenderdatei konnte nicht gelesen werden!\n"
+msgstr "Der Eintrag konnte nicht aus Ihrer Kalenderdatei entfernt werden!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -3083,109 +3346,60 @@ msgstr "datum-ende"
 msgid "date-start"
 msgstr "datum-anfang"
 
-#: calendar/gui/e-tasks.c:184 calendar/gui/e-tasks.c:521
-#: calendar/gui/e-tasks.c:554
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Alle"
 
-#: calendar/gui/e-tasks.c:190
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kategorie:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Die Aufgaben in `%s' konnten nicht geladen werden"
 
-#: calendar/gui/e-tasks.c:341
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 "Die Methode, die zum Laden von `%s' benötigt wird, ist nicht unterstützt"
 
-#: calendar/gui/e-week-view.c:3139 calendar/gui/e-week-view.c:3167
-msgid "New Appointment..."
-msgstr "Neuer Termin..."
-
-#: calendar/gui/e-week-view.c:3180
-msgid "Delete All Occurrences"
-msgstr "Jedes Auftreten löschen"
-
 #. 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/e-week-view-main-item.c:342 calendar/gui/print.c:1586
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/gnome-cal.c:219
-msgid "Summary contains"
-msgstr "Zusammenfassung enthält"
-
-#: calendar/gui/gnome-cal.c:220
-#, fuzzy
-msgid "Description contains"
-msgstr "Abtreibender Regen"
-
-#: calendar/gui/gnome-cal.c:221
-msgid "Comment contains"
-msgstr "Kommentar enthält"
+#: calendar/gui/e-week-view.c:3149 calendar/gui/e-week-view.c:3177
+msgid "New Appointment..."
+msgstr "Neuer Termin..."
 
-#: calendar/gui/gnome-cal.c:222
-msgid "Has category"
-msgstr "Hat Kategorie"
+#: calendar/gui/e-week-view.c:3190
+msgid "Delete All Occurrences"
+msgstr "Jedes Auftreten löschen"
 
-#: calendar/gui/gnome-cal.c:1054
+#: calendar/gui/gnome-cal.c:969
 #, 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:1065
+#: calendar/gui/gnome-cal.c:980
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 "Die Methode, die zum Öffnen von `%s' benötigt wird, wird nicht unterstützt"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Eine beispielhafte Bonobo-Komponente, die einen Kalender anzeigt."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolutions Chefsesselansichts-Komponente für den Kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "iTip-/iMip-Betrachter für den Evolution-Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution-Komponente für die Verwaltung des Kalenders."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Factory für die Kalenderzusammenfassungs-Komponente."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Factory für die Evolution-Kalender-Komponente."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Factory für die Kalender-iTip-Ansichts-Control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Factory für die beispielhafte Kalender-Control"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
 
 #: calendar/gui/goto-dialog.glade.h:2
-#, fuzzy
 msgid "August"
-msgstr "Staub"
+msgstr "August"
 
 #: calendar/gui/goto-dialog.glade.h:3
 msgid "December"
@@ -3200,244 +3414,247 @@ msgid "Go To Date"
 msgstr "Zu Datum gehen"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Zum heutigen Tag"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Januar"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "März"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Oktober"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "_Go To Today"
+msgstr "Zum _heutigen Tag"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr "Ein Organisator muss feststehen."
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "So"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:517
-#, fuzzy
+#: calendar/gui/print.c:491
 msgid "Sa"
-msgstr "Sand"
+msgstr "Sa"
 
-#: calendar/gui/print.c:1847 shell/e-shortcuts.c:1002
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Aufgaben"
 
 #. Day
-#: calendar/gui/print.c:1954
-msgid "Current day (%a %b %d %Y)"
-msgstr "Aktueller Tag (%a, %d. %b %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
+msgstr "Angewählter Tag (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1973 calendar/gui/print.c:1977
-#, fuzzy
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
-msgstr "%a, %b %d / %H:%M"
+msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1974
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1985
+#: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
-msgstr "Aktuelle Woche (%s - %s)"
+msgid "Selected week (%s - %s)"
+msgstr "Angewählte Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1993
-msgid "Current month (%b %Y)"
-msgstr "Aktueller Monat (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
+msgstr "Angewählter Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:2000
-msgid "Current year (%Y)"
-msgstr "Aktuelles Jahr (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
+msgstr "Angewähltes Jahr (%Y)"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:2409 calendar/gui/print.c:2501
-#: mail/mail-callbacks.c:1798 my-evolution/e-summary.c:452
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/print.c:2438
+#: calendar/gui/print.c:2317
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
-#: calendar/gui/print.c:2519
+#: calendar/gui/print.c:2398
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
@@ -3487,100 +3704,6 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMDMDFS"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr "time-now erwartet 0 Argumente"
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr "make-time erwartet 1 argument"
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr "make-time erwartet, dass Argument 1 eine Zeichenkette ist"
-
-#: calendar/pcs/query.c:255
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr ""
-"Argument 1 von make-time muss eine Datum-/Zeit-Zeichenkette nach ISO 8601 "
-"sein"
-
-#: calendar/pcs/query.c:281
-msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day erwartet zwei Argumente"
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr "time-add-day erwartet, dass Argument 1 ein time_t ist"
-
-#: calendar/pcs/query.c:293
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr "time-add-day erwartet, dass Argument 2 eine Ganzzahl ist"
-
-#: calendar/pcs/query.c:318
-msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin erwartet 1 Argument"
-
-#: calendar/pcs/query.c:323
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr "time-day-begin erwartet, dass Argument 1 ein time_t ist"
-
-#: calendar/pcs/query.c:348
-msgid "time-day-end expects 1 argument"
-msgstr "time-day-end erwartet 1 Argument"
-
-#: calendar/pcs/query.c:353
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr "time-day-end erwartet, dass Argument 1 ein time_t ist"
-
-#: calendar/pcs/query.c:389
-msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype erwartet 0 Argumente"
-
-#: calendar/pcs/query.c:485
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr "occur-in-time-range? erwartet 2 Argumente"
-
-#: calendar/pcs/query.c:490
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr "occur-in-time-range? erwartet, dass Argument 1 ein time_t ist"
-
-#: calendar/pcs/query.c:497
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr "occur-in-time-range? erwartet, dass Argument 2 ein time_t ist"
-
-#: calendar/pcs/query.c:627
-msgid "contains? expects 2 arguments"
-msgstr "contains? erwartet 2 Argumente"
-
-#: calendar/pcs/query.c:632
-msgid "contains? expects argument 1 to be a string"
-msgstr "contains? erwartet, dass Argument 1 eine Zeichenkette ist"
-
-#: calendar/pcs/query.c:639
-msgid "contains? expects argument 2 to be a string"
-msgstr "contains? erwartet, dass Argument 2 eine Zeichenkette is"
-
-#: calendar/pcs/query.c:656
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-"contains? erwartet, dass Argument 2 entweder \"any\", \"summary\" oder "
-"\"description\" ist"
-
-#: calendar/pcs/query.c:694
-msgid "has-categories? expects at least 1 argument"
-msgstr "has-categories? erwartet mindestens ein Argument"
-
-#: calendar/pcs/query.c:700
-msgid "has-categories? expects all arguments to be strings"
-msgstr "has-categories? erwartet, dass alle Argumente Zeichenketten sin"
-
-#: calendar/pcs/query.c:948
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr "Die Auswertung des Suchausdrucks ergab keinen Wahrheitswert"
-
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Signieren wird von dieser Verschlüsselung  nicht unterstützt"
@@ -3601,60 +3724,82 @@ msgstr "Verschlüsseln wird von dieser Verschlüsselung nicht unterstützt"
 msgid "Decryption is not supported by this cipher"
 msgstr "Entziffern wird von dieser Verschlüsselung nicht unterstützt"
 
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+"Protokolleintrag konnte nicht geschrieben werden: %s\n"
+"Weitere Operationen auf diesem Server werden nicht wiedergegeben\n"
+"werden, wenn Sie die Netzwerkverbindung wiederherstellen."
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+"'%s' konnte nicht geöffnet werden:\n"
+"%s\n"
+"Änderungen an diesem Ordner werden nicht resynchronisiert werden."
+
+#: camel/camel-disco-diary.c:280
+msgid "Resynchronizing with server"
+msgstr "Resynchronisieren mit dem Server"
+
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "Sie müssen online arbeiten, um diesen Vorgang zu Ende zu bringen"
 
-#: camel/camel-filter-driver.c:526 camel/camel-filter-driver.c:535
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:635
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner kann nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner kann nicht verarbeitet werden"
 
-#: camel/camel-filter-driver.c:658
+#: camel/camel-filter-driver.c:667
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: camel/camel-filter-driver.c:662 camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:663
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Nachricht kann nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:683 camel/camel-filter-driver.c:794
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:799
-msgid "Complete"
-msgstr "Abgeschlossen"
-
-#: camel/camel-filter-driver.c:753
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:758 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: camel/camel-filter-driver.c:876
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:882
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausführen des Filters: %s: %s"
@@ -3695,6 +3840,26 @@ msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ungültiger Typ in body-contains, Zeichenkette wurde erwartet"
 
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Pipe zu Sperrhilfsprogramm konnte nicht angelegt werden: %s"
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Sperrhilfsprogramm kann nicht abgespalten werden: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, 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:212
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s' konnte nicht gesperrt werden"
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
@@ -3718,109 +3883,108 @@ 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-movemail.c:104
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Maildatei %s konnte nicht überprüft werden: %s"
 
-#: camel/camel-movemail.c:118
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Maildatei %s konnte nicht geöffnet werden: %s"
 
-#: camel/camel-movemail.c:126
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Temporäre Maildatei %s konnte nicht geöffnet werden: %s"
 
-#: camel/camel-movemail.c:151
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Fehler beim Lesen der Maildatei: %s"
-
-#: camel/camel-movemail.c:162
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Fehler beim Schreiben der temporären Maildatei: %s"
-
-#: camel/camel-movemail.c:181
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
 
-#: camel/camel-movemail.c:211
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Pipe konnte nicht angelegt werden: %s"
 
-#: camel/camel-movemail.c:223
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "forK() konnte nicht durchgeführt werden: %s"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-Programm fehlgeschlagen: %s"
 
-#: camel/camel-movemail.c:262
-#, fuzzy
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
-msgstr "Unbekanntes Gewitter"
+msgstr "(Unbekannter Fehler)"
+
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Fehler beim Lesen der Maildatei: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Fehler beim Schreiben der temporären Maildatei: %s"
 
-#: camel/camel-movemail.c:492
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Fehler beim Kopieren der temporären Maildatei: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Bitte geben Sie Ihre %s-Passphrase für %s ein."
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Bitte geben Sie Ihre %s-Passphrase ein."
 
-#: camel/camel-pgp-context.c:515
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "Kein Klartext zum Signieren."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:1064 camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Kein Passwort angegeben."
 
-#: camel/camel-pgp-context.c:528 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:883 camel/camel-pgp-context.c:1071
-#: camel/camel-pgp-context.c:1283
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Pipe zu GPG/PGP konnte nicht angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:687
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "Kein Klartext zum Klarsignieren."
 
-#: camel/camel-pgp-context.c:877
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Kein Klartext zum Prüfen."
 
-#: camel/camel-pgp-context.c:894
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Temporäre Datei konnte nicht angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:1054
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Kein Klartext zum Verschlüsseln."
 
-#: camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Keine Empfänger angegeben"
 
-#: camel/camel-pgp-context.c:1268
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "Kein codierter Text zum Entziffern."
 
@@ -3856,7 +4020,7 @@ msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
@@ -3865,13 +4029,13 @@ msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 msgid "(unknown host)"
 msgstr "(unbekannter Rechner)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Verbindung zum Server unerwartet getrennt"
 
@@ -3983,7 +4147,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:438
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Ungültige Legitimationsantwort vom Server."
 
@@ -3996,9 +4160,8 @@ msgid "This option will connect to the server using a simple password."
 msgstr "Diese Option verbindet zum Server mit einem einfachen Passwort."
 
 #: camel/camel-sasl-login.c:127
-#, fuzzy
 msgid "Unknown authentication state."
-msgstr "Unbekannte Beobachtungszeit"
+msgstr "Unbekannter Legitimationszustand."
 
 #: camel/camel-search-private.c:111
 #, c-format
@@ -4053,7 +4216,7 @@ msgstr "Zum Lesen von Mail in Form einer Abfrage über andere Ordner"
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle für Protokoll `%s' verfügbar"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4083,50 +4246,33 @@ msgstr "Das Verschlüsselungszertifikat für \"%s\" existiert nicht."
 
 #: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
 #: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to find certificate for \"%s\"."
-msgstr "Fehler beim Holen der Met-Office-Vorhersagedaten.\n"
+msgstr "Zertifikat für \"%s\" konnte nicht gefunden werden."
 
 #: camel/camel-smime-context.c:545
 msgid "Failed to find a common bulk algorithm."
 msgstr "Es konnte kein allgemeiner Bulk-Algorithmus gefunden werden."
 
 #: camel/camel-smime-context.c:799
-#, fuzzy
 msgid "Failed to decode message."
-msgstr "Fehler beim Holen der Radarkarte.\n"
+msgstr "Nachricht konnte nicht dekodiert werden."
 
 #: camel/camel-smime-context.c:844
 msgid "Failed to verify certificates."
 msgstr "Zertifikate konnten nicht verifiziert werden."
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:987 mail/mail-ops.c:994
-#: mail/mail-ops.c:1012 mail/mail-ops.c:1013
-msgid "Trash"
-msgstr "Müll"
-
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"E-Mail: %s\n"
-"Üblicher Name: %s\n"
-"Organisationseinheit: %s\n"
-"Organisation: %s\n"
-"Örtlichkeit: %s\n"
-"Bundesland/-staat: %s\n"
-"Land: %s"
+"Ausgabestelle: %s\n"
+"Betreff: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:431 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4141,26 +4287,36 @@ msgstr ""
 "\n"
 "Möchten Sie trotzdem akzeptieren?"
 
-#: camel/camel-tcp-stream-openssl.c:426
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"Ausgabestelle: %s\n"
-"Betreff: %s"
+"E-Mail: %s\n"
+"Üblicher Name: %s\n"
+"Organisationseinheit: %s\n"
+"Organisation: %s\n"
+"Örtlichkeit: %s\n"
+"Bundesland/-staat: %s\n"
+"Land: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' konnte nicht geparst werden"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nachricht %s gibt es in %s nicht"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Nachricht gibt es nicht: %s"
@@ -4169,36 +4325,26 @@ msgstr "Nachricht gibt es nicht: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Sie können keine Nachrichten aus diesem Müllordner kopieren."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Cache-Verzeichnis konnte nicht geöffnet werden: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unerwartete Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-#, fuzzy
-msgid "Unknown error"
-msgstr "Unbekanntes Gewitter"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Antwort des Servers endete zu früh."
 
-#: camel/providers/imap/camel-imap-command.c:493
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
 
-#: camel/providers/imap/camel-imap-command.c:530
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
@@ -4217,20 +4363,35 @@ msgstr "Zusammenfassung für %s konnte nicht geladen werden"
 msgid "Folder was destroyed and recreated on server."
 msgstr "Der Ordner wurde zerstört und auf dem Server neu erstellt."
 
-#: camel/providers/imap/camel-imap-folder.c:430
-msgid "Scanning IMAP folder"
-msgstr "IMAP-Ordner wird abgetastet"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+msgid "Scanning for changed messages"
+msgstr "Suchen nach geänderten Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1483
-#: camel/providers/imap/camel-imap-folder.c:1763
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzei nicht verfügbar"
 
-#: camel/providers/imap/camel-imap-folder.c:1796
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr "Überblickinformation für neue Nachrichten wird abgerufen"
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+msgid "Scanning for new messages"
+msgstr "Suchen nach neuen Nachrichten"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Cache-Verzeichnis konnte nicht geöffnet werden: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Nach neuer Mail sehen"
 
@@ -4238,7 +4399,7 @@ msgstr "Nach neuer Mail sehen"
 msgid "Check for new messages in all folders"
 msgstr "In allen Ordnern nach neuer Mail sehen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:642
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Ordner"
 
@@ -4272,29 +4433,29 @@ msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschlüsselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:463
 #, 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:471
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterstützung für Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:497
 #, 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:510
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:536
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4305,11 +4466,15 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "Der Elternordner darf keine Unterordner enthalten"
+
 #: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Mailverzeichnisse im MH-Format"
@@ -4344,6 +4509,7 @@ msgid "For storing local mail in standard Unix spool directories"
 msgstr "Zum Speichern lokaler Mail in normalen Unix-Spool-Verzeichnissen"
 
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Speicherungswurzel %s ist kein absoluter Pfad"
@@ -4383,7 +4549,8 @@ msgstr "Ordner-Zusammenfassungsdatei `%s' konnte nicht gelöscht werden: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ordner-Indexdatei `%s' konnte nicht gelöscht werden: %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Nachricht kann nicht zur Zusammenfassung hinzugefügt werden: Grund unbekannt"
@@ -4400,6 +4567,7 @@ msgstr "Nachricht kann nicht an maildir-Ordner angehängt werden: %s: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4411,6 +4579,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Keine solche Nachricht"
 
@@ -4474,11 +4643,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir-Verzeichnispfad kann nicht geöffnet werden: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ordnersperre auf %s kann nicht erzeugt werden: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Postfach kann nicht geöffnet werden: %s: %s\n"
@@ -4491,6 +4662,9 @@ msgstr "Nachricht kann nicht an mbox-Datei angehängt werden: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4500,10 +4674,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 
 #: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nachrichtenerstellung fehlgeschlagen: Defektes Postfach?"
 
@@ -4549,10 +4725,12 @@ msgstr "Ordner `%s' ist nicht leer. Nicht gelöscht."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Zusammenfassen des Ordners"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
@@ -4560,27 +4738,34 @@ msgstr ""
 "Position %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fataler Mailparser-Fehler nahe Position %ld in Ordner %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Zusammenfassung von Ordner kann nicht erstellt werden: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1461
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Ordner wird synchronisiert"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Ordner konnte nicht zum Zusammenfassen geöffnet werden: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Temporäres Postfach konnte nicht angelegt werden: %s"
@@ -4589,22 +4774,29 @@ msgstr "Temporäres Postfach konnte nicht angelegt werden: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Zusammenfassungs- und Order-Prüffehler, sogar nach einer Synchronisation"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fehler beim Schreiben auf temporäres Postfach: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fehler beim Schreiben auf temporäres Postfach %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
@@ -4619,10 +4811,12 @@ msgstr "Temporärer Ordner konnte nicht geschlossen werden: %s"
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
+#, c-format
 msgid "Unknown error: %s"
-msgstr "Unbekanntes Gewitter"
+msgstr "Unbekannter Fehler: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
 #, c-format
@@ -4639,20 +4833,75 @@ msgstr "`%s' ist kein Verzeichnis."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH-Verzeichnispfad kann nicht geöffnet werden: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Nachricht kann nicht an Spool-Datei angehängt werden: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "Spool '%s' existiert nicht oder ist keine reguläre Datei"
+
+#: camel/providers/local/camel-spool-store.c:159
+#, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Ordner `%s/%s' existiert nicht."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr "Spool-Speicher haben keinen Posteingangsordner"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, c-format
+msgid "Spool mail file %s"
+msgstr "Spool-Maildatei %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr "Spool-Ordner können nicht umbenannt werden"
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr "Spool-Ordner können nicht gelöscht werden"
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Temporärer Ordner %s konnte nicht synchronisiert werden: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Spool-Ordner '%s' konnte nicht synchronisiert werden: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+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:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Bitte geben Sie das NNTP-Passwort für %s@%s ein"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Server lehnte Benutzername ab"
 
-#: camel/providers/nntp/camel-nntp-auth.c:78
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Benutzername konnte nicht an Server gesendet werden"
 
-#: camel/providers/nntp/camel-nntp-auth.c:87
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Server lehnte Benutzername/Passwort ab"
 
@@ -4756,7 +5005,7 @@ msgstr "Mail auf Server belassen"
 msgid "Delete after %s day(s)"
 msgstr "Nach %s Tag(en) löschen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4825,9 +5074,8 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:382
 #: camel/providers/pop3/camel-pop3-store.c:419
-#, fuzzy
 msgid "(Unknown)"
-msgstr "Unbekannt"
+msgstr "(Unbekannt)"
 
 #: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
@@ -4852,7 +5100,7 @@ msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4907,7 +5155,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mailauslieferung über das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:75
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4915,124 +5163,124 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Zum Ausliefern von Mail über einen Mailknotenpunkt im Netz per SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfehler, Befehl nicht erkannt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfehler in Parametern oder Argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Befehl nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Befehlsparameter nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Systemstatus- oder Systemhilfe-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Hilfemeldung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Dienst ist bereit"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Dienst schließt Übertragungskanal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst nicht verfügbar, Übertragungskanal wird geschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Angeforderte Mailaktion in Ordnung, abgeschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "Benutzer nicht lokal; Weiterleitung erfolgt zu <weiterleitungspfad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Angeforderte Mailaktion nicht ausgeführt: Postfach nicht verfügbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Angeforderte Aktion nicht ausgeführt: Postfach nicht verfügbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Angeforderte Aktion abgebrochen: Fehler bei Verarbeitung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Benutzer nicht lokal; probieren Sie es mit <weiterleitungspfad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Angeforderte Aktion nicht ausgeführt: unzureichender Systemspeicher"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Angeforderte Aktion nicht ausgeführt: Speicherzuteilung überschritten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Angeforderte Aktion nicht ausgeführt: Postfachname nicht erlaubt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Maileingabe beginnen; Ende mit <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Transaktion fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Ein Passwordübergang ist notwendig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Legitimationsmechanismus ist zu schwach"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "Für den verlangten Legitimationsmechanismus ist Verschlüsselung erforderlich."
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Zeitweiliger Legitimationsfehlschlag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Legitimation benötigt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Willkommen-Antwortfehler: %s: vielleicht nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 "SMTP-Server %s unterstützt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/smtp/camel-smtp-transport.c:396
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sBitte geben Sie das SMTP-Passwort für %s@%s ein"
 
-#: camel/providers/smtp/camel-smtp-transport.c:419
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5043,117 +5291,129 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:535
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-Server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:537
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-Mailauslieferung über %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:569
+#: camel/providers/smtp/camel-smtp-transport.c:570
 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:583
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Nachricht verschicken"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empfänger angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr "SMTP-Begrüßung"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Zeitüberschreitung bei HELO-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO-Antwortfehler: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:729
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-#: camel/providers/smtp/camel-smtp-transport.c:756
+#: camel/providers/smtp/camel-smtp-transport.c:748
+msgid "SMTP Authentication"
+msgstr "SMTP-Legitimation"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zeitüberschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:810
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Ungültige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei MAIL-FROM-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:855
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL-FROM-Antwortfehler: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei RCPT-TO-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:899
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT-TO-Antwortfehler: %s: Mail nicht verschickt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA-Antwortfehler: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:966
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zeitüberschreitung beim Senden von DATA: Nachrichtenabschluss: %s Mail nicht "
 "verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA-Antwortfehler: Nachrichtenabschluss: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1027
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeitüberschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1046
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET-Antwort-Fehler: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Zeitüberschreitung bei QUIT-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT-Antwortfehler: %s: nicht fatal"
@@ -5183,7 +5443,7 @@ msgid "%.1fG"
 msgstr "%.1f GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "anlage"
 
@@ -5212,9 +5472,68 @@ msgid "MIME type:"
 msgstr "MIME-Typ:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
+#: composer/e-msg-composer-hdrs.c:328
+msgid "Click here for the address book"
+msgstr "Für das Adressbuch hier klicken"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
+msgid "From:"
+msgstr "Von:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+msgid "Reply-To:"
+msgstr "Antwort an:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "To:"
+msgstr "An:"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Enter the recipients of the message"
+msgstr "Gebe die Empfänger der Nachricht ein"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:395
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Gebe die Adressen ein, die eine Kopie der Nachricht erhalten"
+
+#: composer/e-msg-composer-hdrs.c:398
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:399
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Gebe die Adressen ein, die eine Kopie erhalten, dienicht in der "
+"Empfängerliste auftaucht."
+
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Eine Datei beilegen"
+
 #: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
@@ -5233,29 +5552,29 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:869
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Warnung!"
 
-#: composer/e-msg-composer.c:880
+#: composer/e-msg-composer.c:884
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, überschreiben?"
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5263,16 +5582,16 @@ msgstr ""
 "Der Entwürfe-Ordner für diesen Zugang konnte nicht geöffnet werden.\n"
 "Möchten Sie den vorgegebenen Entwürfe-Ordner verwenden?"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1047
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1055
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1061
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5281,7 +5600,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1067
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5290,7 +5609,7 @@ msgstr ""
 "Datei konnte nicht verkürzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5299,20 +5618,16 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1173
 msgid ""
-"Evolution has detected an editor buffer from a previous session.\n"
-"Would you like to recover this buffer?"
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
-"Evolution hat einen Editorpuffer aus einer vorhergehenden Sitzung entdeckt.\n"
-"Möchten Sie diesen Puffer wiederherstellen?"
+"Evolution hat ungespeicherte Dateien aus einer vorhergehenden Sitzung "
+"entdeckt.\n"
+"Möchten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1316 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:231
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:1322
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5322,75 +5637,27 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre Änderungen speichern?"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Datei einfügen"
 
-#: composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2230
+#: composer/e-msg-composer.c:1856 composer/e-msg-composer.c:2245
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:2324
+#: composer/e-msg-composer.c:2339
 msgid "Could not create composer window."
 msgstr "Erstellungsfenster konnte nicht erzeugt werden."
 
-#: composer/e-msg-composer-hdrs.c:325
-msgid "Click here for the address book"
-msgstr "Für das Adressbuch hier klicken"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:356
-msgid "From:"
-msgstr "Von:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:362
-msgid "Reply-To:"
-msgstr "Antwort an:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:373
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "To:"
-msgstr "An:"
-
-#: composer/e-msg-composer-hdrs.c:388
-msgid "Enter the recipients of the message"
-msgstr "Gebe die Empfänger der Nachricht ein"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Gebe die Adressen ein, die eine Kopie der Nachricht erhalten"
-
-#: composer/e-msg-composer-hdrs.c:395
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:396
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Gebe die Adressen ein, die eine Kopie erhalten, dienicht in der "
-"Empfängerliste auftaucht."
-
 #: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -5417,40 +5684,54 @@ msgid "calendar information"
 msgstr "Kalender-Information"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 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:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
-#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 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:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
-#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
+msgstr "%d.%m.%Y"
+
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr "%Y-%m-%d"
+
+#: e-util/e-time-utils.c:242
+#, c-format
+msgid "%x"
+msgstr "%x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5458,67 +5739,65 @@ msgstr "%a, %d.%m.%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
-#, fuzzy
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a, %b %d / %H:%M"
+msgstr "%a, %d.%m.%Y / %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
-#, fuzzy
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a, %b %d / %H:%M"
+msgstr "%a, %d.%m.%Y / %I.%M %p"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "Jahr"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "Jahre"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "Monat"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "Monate"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "Woche"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "Wochen"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "Stunde"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "Minute"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "Sekunde"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "Sekunden"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Hoppla. Sie haben vergessen, ein Datum zu wählen."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Hoppla. Sie haben ein ungültiges Datum gewählt."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5528,7 +5807,7 @@ msgstr ""
 "verglichen, zu der der Filter ausgeführt oder\n"
 "der VOrdner geöffnet wird."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5536,7 +5815,7 @@ msgstr ""
 "Das Datum der Nachricht wird mit der hier\n"
 "von Ihnen angegebenen Zeit verglichen."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5547,29 +5826,36 @@ msgstr ""
 "Zeit, z.B. \"vor einer Woche\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "der aktuellen Zeit"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "einer von Ihnen angegebene Zeit"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "einer zur momentanen Zeit relativen Zeit"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Vergleichen mit"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
-#, fuzzy
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
-msgstr "Schneefall"
+msgstr "jetzt"
+
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr " in der Vergangenheit"
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr "in der Vergangenheit"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<hier klicken, um ein Datum zu wählen>"
 
@@ -5595,8 +5881,8 @@ msgstr ""
 "Bitte gehen Sie zurück und wählen Sie einen gültigen Ordner zum Ausliefern "
 "der Mail."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
-#: mail/mail-account-gui.c:701
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
@@ -5608,46 +5894,6 @@ msgstr "Ordner-URI eingeben"
 msgid "<click here to select a folder>"
 msgstr "<hier klicken, um einen Ordner zu wählen>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Filter bearbeiten"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "VOrdner bearbeiten"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Eingang"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Ausgang"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Virtuelle Ordner"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "nur bestimmte Ordner"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "vOrdner-Quellen"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "mit allen aktiven Ordnern aus dem Netz"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "mit allen lokalen Ordnern und aktiven Ordnern aus dem Netz"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "mit allen lokalen Ordnern"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5669,283 +5915,281 @@ msgstr "Regelname: "
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:647
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Wenn"
 
-#: filter/filter-rule.c:665
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Aktionen ausführen"
 
-#: filter/filter-rule.c:669
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:674
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
-#: filter/filter-rule.c:685
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Kriterium hinzufügen"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "Eingang"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "Ausgang"
 
-#: filter/libfilter-i18n.h:3
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1174
+#: my-evolution/e-summary-preferences.c:1226
+#: my-evolution/e-summary-preferences.c:1288
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Filter bearbeiten"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "VOrdner bearbeiten"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Eingang"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Ausgang"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Virtuelle Ordner"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "nur bestimmte Ordner"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "vOrdner-Quellen"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "mit allen aktiven Ordnern aus dem Netz"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "mit allen lokalen Ordnern und aktiven Ordnern aus dem Netz"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "mit allen lokalen Ordnern"
+
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Color"
 msgstr "Farbe zuweisen"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "Anlagen"
 
-#: filter/libfilter-i18n.h:7 filter/libfilter-i18n.h:89
-#: filter/libfilter-i18n.h:225
-msgid "contains"
-msgstr "enthält"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Sendedatum"
 
-#: filter/libfilter-i18n.h:18 filter/libfilter-i18n.h:94
+#: filter/libfilter-i18n.h:9
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: filter/libfilter-i18n.h:21 filter/libfilter-i18n.h:109
+#: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr "Existieren nicht"
 
-#: filter/libfilter-i18n.h:23 filter/libfilter-i18n.h:110
+#: filter/libfilter-i18n.h:11
 msgid "Draft"
 msgstr "Entwurf"
 
-#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:112
-#, fuzzy
+#: filter/libfilter-i18n.h:12
 msgid "Exist"
-msgstr "Nebel"
+msgstr "Existiert"
 
-#: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:130
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:31 mail/message-list.etspec.h:3
-msgid "Flagged"
-msgstr "Markiert"
-
-#: filter/libfilter-i18n.h:32 filter/libfilter-i18n.h:131
+#: filter/libfilter-i18n.h:14
 msgid "Forward to Address"
 msgstr "Weiterleiten an Adresse"
 
-#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:136
+#: filter/libfilter-i18n.h:15
 msgid "Important"
 msgstr "Wichtig"
 
-#: filter/libfilter-i18n.h:37 filter/libfilter-i18n.h:161
-#, fuzzy
+#: filter/libfilter-i18n.h:16
 msgid "Mailing list"
-msgstr "Abtreibender Nebel"
+msgstr "Mailingliste"
 
-#: filter/libfilter-i18n.h:38 filter/libfilter-i18n.h:163
+#: filter/libfilter-i18n.h:17
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:39 filter/libfilter-i18n.h:164
+#: filter/libfilter-i18n.h:18
 msgid "Message Header"
 msgstr "Nachrichtenkopf"
 
-#: filter/libfilter-i18n.h:40 filter/libfilter-i18n.h:165
+#: filter/libfilter-i18n.h:19
 msgid "Message was received"
 msgstr "Nachricht wurde empfangen"
 
-#: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:166
+#: filter/libfilter-i18n.h:20
 msgid "Message was sent"
 msgstr "Nachricht wurde verschickt"
 
-#: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:167
+#: filter/libfilter-i18n.h:21
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: filter/libfilter-i18n.h:49 filter/libfilter-i18n.h:193
+#: filter/libfilter-i18n.h:22
 msgid "Read"
 msgstr "Gelesen"
 
-#: filter/libfilter-i18n.h:51 filter/libfilter-i18n.h:195
+#: filter/libfilter-i18n.h:23
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: filter/libfilter-i18n.h:52 filter/libfilter-i18n.h:196
+#: filter/libfilter-i18n.h:24
 msgid "Regex Match"
 msgstr "Regex-Treffer"
 
-#: filter/libfilter-i18n.h:54 mail/message-list.c:614
-msgid "Seen"
-msgstr "Gelesen"
+#: filter/libfilter-i18n.h:25
+msgid "Replied to"
+msgstr "Beantwortet an"
 
-#: filter/libfilter-i18n.h:56 filter/libfilter-i18n.h:198
-#: filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
-#, fuzzy
+#: filter/libfilter-i18n.h:26 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
-msgstr "Rauch"
+msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:58 filter/libfilter-i18n.h:199
-#: mail/mail-callbacks.c:1062
-#, fuzzy
+#: filter/libfilter-i18n.h:27 mail/mail-callbacks.c:1091
 msgid "Sender"
-msgstr "Sand"
+msgstr "Absender"
 
-#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:67
-msgid "Set Flag"
-msgstr "Marke setzen"
-
-#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:69
-#: filter/libfilter-i18n.h:200
+#: filter/libfilter-i18n.h:28
 msgid "Set Status"
 msgstr "Status setzen:"
 
-#: filter/libfilter-i18n.h:62 filter/libfilter-i18n.h:206
-#: filter/libfilter-i18n.h:208 filter/libfilter-i18n.h:239
-msgid "sounds like"
-msgstr "klingt wie"
+#: filter/libfilter-i18n.h:29
+msgid "Size (kB)"
+msgstr "Größe (kB)"
 
-#: filter/libfilter-i18n.h:63 filter/libfilter-i18n.h:72
-#: mail/mail-config.glade.h:90
-msgid "Source"
-msgstr "Quelle"
+#: filter/libfilter-i18n.h:30
+msgid "Source Account"
+msgstr "Herkunfts-Account"
 
-#: filter/libfilter-i18n.h:64 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:211
+#: filter/libfilter-i18n.h:31
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:81 filter/libfilter-i18n.h:218
-#: mail/message-list.etspec.h:8
-msgid "Status"
-msgstr "Status"
-
-#: filter/libfilter-i18n.h:83 filter/libfilter-i18n.h:219
+#: filter/libfilter-i18n.h:33
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:84 filter/libfilter-i18n.h:220
-#: mail/mail-format.c:785 mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:34 mail/mail-format.c:866
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/libfilter-i18n.h:97 filter/libfilter-i18n.h:103
-#: filter/libfilter-i18n.h:117 filter/libfilter-i18n.h:226
+#: filter/libfilter-i18n.h:37
+msgid "contains"
+msgstr "enthält"
+
+#: filter/libfilter-i18n.h:38
 msgid "does not contain"
 msgstr "enthält nicht"
 
-#: filter/libfilter-i18n.h:98 filter/libfilter-i18n.h:104
-#: filter/libfilter-i18n.h:118 filter/libfilter-i18n.h:227
+#: filter/libfilter-i18n.h:39
 msgid "does not end with"
 msgstr "endet nicht mit"
 
-#: filter/libfilter-i18n.h:99 filter/libfilter-i18n.h:105
-#: filter/libfilter-i18n.h:119 filter/libfilter-i18n.h:228
+#: filter/libfilter-i18n.h:40
 msgid "does not exist"
 msgstr "existiert nicht"
 
-#: filter/libfilter-i18n.h:100 filter/libfilter-i18n.h:106
-#: filter/libfilter-i18n.h:120 filter/libfilter-i18n.h:229
+#: filter/libfilter-i18n.h:41
 msgid "does not sound like"
 msgstr "klingt nicht wie"
 
-#: filter/libfilter-i18n.h:101 filter/libfilter-i18n.h:107
-#: filter/libfilter-i18n.h:121 filter/libfilter-i18n.h:230
+#: filter/libfilter-i18n.h:42
 msgid "does not start with"
 msgstr "beginnt nicht mit"
 
-#: filter/libfilter-i18n.h:111 filter/libfilter-i18n.h:122
-#: filter/libfilter-i18n.h:231
+#: filter/libfilter-i18n.h:43
 msgid "ends with"
 msgstr "endet mit"
 
-#: filter/libfilter-i18n.h:114 filter/libfilter-i18n.h:123
-#: filter/libfilter-i18n.h:128 filter/libfilter-i18n.h:232
-#, fuzzy
+#: filter/libfilter-i18n.h:44
 msgid "exists"
-msgstr "Nebel"
-
-#: filter/libfilter-i18n.h:139 filter/libfilter-i18n.h:148
-#: filter/libfilter-i18n.h:156 filter/libfilter-i18n.h:172
-#: filter/libfilter-i18n.h:236
-#, fuzzy
-msgid "is"
-msgstr "Nebel"
+msgstr "existiert"
 
-#: filter/libfilter-i18n.h:140 filter/libfilter-i18n.h:149
-#: filter/libfilter-i18n.h:157 filter/libfilter-i18n.h:233
+#: filter/libfilter-i18n.h:45
 msgid "is greater than"
 msgstr "ist größer als"
 
-#: filter/libfilter-i18n.h:141 filter/libfilter-i18n.h:150
-#: filter/libfilter-i18n.h:158 filter/libfilter-i18n.h:234
+#: filter/libfilter-i18n.h:46
 msgid "is less than"
 msgstr "ist kleiner als"
 
-#: filter/libfilter-i18n.h:142 filter/libfilter-i18n.h:151
-#: filter/libfilter-i18n.h:159 filter/libfilter-i18n.h:235
-#, fuzzy
+#: filter/libfilter-i18n.h:47
 msgid "is not"
-msgstr "Nebel"
+msgstr "ist nicht"
 
-#: filter/libfilter-i18n.h:144
-msgid "matches regex"
-msgstr "passt auf Regex"
+#: filter/libfilter-i18n.h:48
+msgid "is"
+msgstr "ist"
 
-#: filter/libfilter-i18n.h:174 filter/libfilter-i18n.h:180
-#: filter/libfilter-i18n.h:190 filter/libfilter-i18n.h:237
+#: filter/libfilter-i18n.h:49
 msgid "on or after"
 msgstr "am oder nach"
 
-#: filter/libfilter-i18n.h:175 filter/libfilter-i18n.h:181
-#: filter/libfilter-i18n.h:191 filter/libfilter-i18n.h:238
+#: filter/libfilter-i18n.h:50
 msgid "on or before"
 msgstr "am oder vor"
 
-#: filter/libfilter-i18n.h:197
-msgid "Replied to"
-msgstr "Beantwortet an"
-
-#: filter/libfilter-i18n.h:204
-msgid "Size (kB)"
-msgstr "Größe (kB)"
-
-#: filter/libfilter-i18n.h:209
-msgid "Source Account"
-msgstr "Herkunfts-Account"
+#: filter/libfilter-i18n.h:51
+msgid "sounds like"
+msgstr "klingt wie"
 
-#: filter/libfilter-i18n.h:213 filter/libfilter-i18n.h:216
-#: filter/libfilter-i18n.h:240
+#: filter/libfilter-i18n.h:52
 msgid "starts with"
 msgstr "beginnt mit"
 
-#: filter/libfilter-i18n.h:244
+#: filter/libfilter-i18n.h:53
 msgid "was after"
 msgstr "war nach"
 
-#: filter/libfilter-i18n.h:245
+#: filter/libfilter-i18n.h:54
 msgid "was before"
 msgstr "war vor"
 
@@ -5965,30 +6209,23 @@ msgstr "Regel bearbeiten"
 msgid "Score Rules"
 msgstr "Bewertungsregeln"
 
-#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:224
-#: importers/netscape-importer.c:769 importers/pine-importer.c:638
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr "Oops. Sie müssen mindestens einen Ordner als Quelle angeben."
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importieren"
 
-#: importers/elm-importer.c:506 importers/netscape-importer.c:774
-#: importers/pine-importer.c:643 my-evolution/my-evolution.glade.h:12
-#, fuzzy
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
-msgstr "Hagel"
-
-#: importers/elm-importer.c:510
-msgid "Elm Aliases"
-msgstr "Elm-Aliase"
-
-#: importers/elm-importer.c:517 importers/evolution-gnomecard-importer.c:236
-#: importers/netscape-importer.c:796 importers/pine-importer.c:660
-#: shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "Mich nicht mehr fragen"
+msgstr "Mail"
 
-#: importers/elm-importer.c:550
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5996,15 +6233,15 @@ msgstr ""
 "Evolution hat Elm-Maildateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Elm-Mail"
 
-#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:653
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: importers/evolution-gnomecard-importer.c:261
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6012,19 +6249,11 @@ msgstr ""
 "Evolution hat GnomeCard-Dateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/netscape-importer.c:779 importers/pine-importer.c:648
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: importers/netscape-importer.c:784 mail/mail-callbacks.c:1710
-msgid "Filters"
-msgstr "Filter"
-
-#: importers/netscape-importer.c:789
-msgid "Addressbooks"
-msgstr "Adressbücher"
-
-#: importers/netscape-importer.c:836
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6032,7 +6261,7 @@ msgstr ""
 "Evolution hat Netscape-Maildateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/pine-importer.c:697
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -6040,191 +6269,207 @@ msgstr ""
 "Evolution hat Pine-Maildateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/pine-importer.c:725
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Pine-Mail"
 
-#: mail/component-factory.c:679
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Evolution-Komponente für den Umgang mit Mail."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution-Mailersteller."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Evolutions Mail-Chefsesselansicht-Komponente."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolution-Komponente zur Mailordneranzeige."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolution-Mailordner-Factory-Komponente."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Factory für den Evolution-Maileditor."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Factory für die Evolution-Mail-Komponente."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Factory für die Mailzusammenfassungs-Komponente."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "Mailkonfigurations-Oberfläche"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
+
+#: mail/component-factory.c:337
+msgid "Properties..."
+msgstr "Eigenschaften..."
+
+#: mail/component-factory.c:337
+msgid "Change this folder's properties"
+msgstr "Die Eigenschaften dieses Ordners ändern"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:813
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser.c:227 mail/mail-display.c:268
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Eigenschaften von \"%s\""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/folder-browser.c:884
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Suche als VOrdner speichern"
 
-#: mail/folder-browser.c:1227
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "VOrdner über _Betreff"
 
-#: mail/folder-browser.c:1230
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "VOrdner über Absender"
 
-#: mail/folder-browser.c:1233
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "VOrdner über Empfänger"
 
-#: mail/folder-browser.c:1236
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner über Mailing_liste"
 
-#: mail/folder-browser.c:1242
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filter über _Betreff"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filter über _Absender"
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filter über _Empfänger"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filter über _Mailingliste"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1271
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Nochmals schicken"
 
-#: mail/folder-browser.c:1264 ui/evolution-calendar.xml.h:54
-#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:17
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: mail/folder-browser.c:1266 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:16
 msgid "_Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:1271 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:86
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1273 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:62
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:60
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:61
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/folder-browser.c:1277
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:1280
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:39
 msgid "Mar_k as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:1282
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:41
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: mail/folder-browser.c:1284
+#: mail/folder-browser.c:1295
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/folder-browser.c:1289
+#: mail/folder-browser.c:1297
+msgid "Mark as Unim_portant"
+msgstr "Als _unwichtig markieren"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: mail/folder-browser.c:1291
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:88
 msgid "_Undelete"
 msgstr "Löschen rückgängig"
 
-#: mail/folder-browser.c:1300
+#: mail/folder-browser.c:1313
 msgid "Add Sender to Address Book"
 msgstr "Absender zu Adressbuch hinzufügen"
 
-#: mail/folder-browser.c:1305
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Filter anwenden"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "_Regel aus Nachricht erzeugen"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filter über Mailingliste"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "VOrdner über Mailingliste"
 
-#: mail/folder-browser.c:1451
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter über Mailingliste (%s)"
 
-#: mail/folder-browser.c:1452
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VOrdner über Mailingliste (%s)"
 
-#: mail/folder-browser-ui.c:253
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Eigenschaften von \"%s\""
-
-#: mail/folder-browser-ui.c:255
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolution-Komponente für den Umgang mit Mail."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution-Mailersteller."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolutions Mail-Chefsesselansicht-Komponente."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution-Komponente zur Mailordneranzeige."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolution-Mailordner-Factory-Komponente."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Factory für den Evolution-Maileditor."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Factory für die Evolution-Mail-Komponente."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Factory für die Mailzusammenfassungs-Komponente."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
-msgstr "Mailkonfigurations-Oberfläche"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Factory, um mbox in Evolution zu importieren."
@@ -6276,20 +6521,25 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "Sie haben nicht alle benötigten Felder ausgefüllt."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:154
+#: mail/mail-account-editor-news.c:160
+msgid "Evolution News Editor"
+msgstr "Evolution-News-Editor"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-account-gui.c:891
+#: mail/mail-account-gui.c:971
 msgid "Save signature"
 msgstr "Signatur speichern"
 
-#: mail/mail-account-gui.c:897
+#: mail/mail-account-gui.c:977
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6299,28 +6549,36 @@ msgstr ""
 "\n"
 "Möchten Sie Ihre Änderungen speichern?"
 
-#: mail/mail-accounts.c:130
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (voreingestellt)"
 
-#: mail/mail-accounts.c:169
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Sind Sie sicher, dass Sie diesen Account löschen wollen?"
 
-#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
+#: mail/mail-accounts.c:268
+msgid "Don't delete"
+msgstr "Nicht löschen"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr "Account wirklich löschen?"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Sind Sie sicher, dass Sie diesen News-Account löschen wollen?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:703
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution-Accountverwaltung"
 
@@ -6409,29 +6667,29 @@ msgid "You must configure an account before you can send this email."
 msgstr ""
 "Sie müssen einen Account einrichten, bevor Sie diese Mail verschicken können."
 
-#: mail/mail-callbacks.c:656
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Am %s schrieb %s:"
 
-#: mail/mail-callbacks.c:888
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Weitergeleitete Nachricht:\n"
 
-#: mail/mail-callbacks.c:982
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:984
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:1339
+#: mail/mail-callbacks.c:1374
 #, 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:1361
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6439,7 +6697,7 @@ msgstr ""
 "Sie können nur im Entwürfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:1395
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6447,37 +6705,25 @@ msgstr ""
 "Sie können nur Nachrichten im\n"
 "Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:1407
+#: mail/mail-callbacks.c:1442
 #, 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:1428
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Keine Nachricht ausgewählt"
 
-#: mail/mail-callbacks.c:1462 mail/mail-display.c:98
-msgid "Overwrite file?"
-msgstr "Datei überschreiben?"
-
-#: mail/mail-callbacks.c:1466 mail/mail-display.c:102
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Eine Datei mit diesem Namen existiert bereits.\n"
-"Überschreiben?"
-
-#: mail/mail-callbacks.c:1510
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:1512
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:1700
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6486,25 +6732,25 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1758
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "Filter"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:1805
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:1900
+#: mail/mail-callbacks.c:1966
 #, 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-config.c:1561 mail/mail-config.c:1564
-msgid "Connecting to server..."
-msgstr "Verbindung zu Server..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6550,10 +6796,14 @@ msgstr ""
 "wird nur für die Bildschirmanzeige verwendet."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution-Account-Druide"
 
+#: mail/mail-config.c:1589 mail/mail-config.c:1592
+msgid "Connecting to server..."
+msgstr "Verbindung zu Server..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Prüfen, welche Typen unterstützt werden "
@@ -6563,60 +6813,64 @@ msgid " color"
 msgstr " Farbe"
 
 #: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "(SSL wird von dieser Binärversion von Evolution nicht unterstützt)"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Account-Information"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Accountverwaltung"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Zugänge"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschlüsselter Mail immer vor mir selber verschlüsseln"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 "Beim Verschicken verschlüsselter Mail immer vor mir selber verschlüsseln"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "Bilder immer aus dem Netz laden"
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anlage"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Automatisch nach neuer Mail sehen alle"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "Kennung des Zertifikats:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Maileditor"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6634,250 +6888,268 @@ msgstr ""
 "Klicken Sie auf \"Beenden\", um Ihre Einstellungen zu\n"
 "speichern."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
 msgstr "Vorgegebener Weiterleitungsstil ist: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "Vorgegebener Zeichensatz: "
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "Digitale Kennungen..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Entwürfe-Ordner:"
 
-#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "E-Mail-Adresse:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Empty trash folders on exit"
 msgstr "Müllordner beim Beenden leeren"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr "Aktiv"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Voller Name:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr "Digitale Kennung erhalten..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "HTML Signature:"
 msgstr "HTML-Signatur:"
 
-#: mail/mail-config.glade.h:41
-#, fuzzy
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
-msgstr "Leichte Niederschläge"
+msgstr "Zitate hervorheben mit"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identität"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "In HTML-Mail"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "An Ort und Stelle"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "Bilder laden, falls Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Mailkonfiguration"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
+msgid "Mailbox location"
+msgstr "Ort des Postfachs"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Dies zu meinem Standardaccount machen"
 
-#: mail/mail-config.glade.h:51
-msgid "Mark messages as \"Read\" after:"
-msgstr "Nachrichten als \"Gelesen\" markieren nach:"
+#: mail/mail-config.glade.h:54
+msgid "Mark messages as Read after"
+msgstr "Nachrichten als gelesen markieren nach"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr "Nachrichtenliste sollte per Vorgabe zu Threads geordnet sein"
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr "Nachrichtenvorschau sollte per Vorgabe angezeigt werden"
+
+#: mail/mail-config.glade.h:57
 msgid "NNTP Server:"
 msgstr "NNTP-Server:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "Bilder nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Nachrichten"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Optionale Information"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr "PGP-Schlüsselkennung:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Pfad zur PGP-Binärdatei:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:67
-#, fuzzy
+#: mail/mail-config.glade.h:72
 msgid "Prompt when sending messages with an empty subject"
-msgstr "Eine Regel erstellen, um Nachrichten mit diesem Betreff zu filtern"
+msgstr "Beim Abschicken von Nachrichten ohne Betreff nachfragen"
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Beim Abschicken von Nachrichten mit ausschließlich BCC-Empfängern nachfragen"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Qmail-maildir "
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "Umschrieben"
 
-#: mail/mail-config.glade.h:70
-#, fuzzy
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
-msgstr "Eisiger Hagel"
+msgstr "Erhalten von E-Mail"
 
-#: mail/mail-config.glade.h:71
-#, fuzzy
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
-msgstr "Eisiger Hagel"
+msgstr "ERhalten von Mail"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Empfangs-Optionen"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr "PGP-Passphrase bis zum Beenden behalten"
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Benötigte Information"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr "Sichere MIME"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "Sicherheit"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "PGP-Binärdatei wählen"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Mail normalerweise im HTML-Format verschicken."
 
-#: mail/mail-config.glade.h:80
-#, fuzzy
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
-msgstr "Eisiger Hagel"
+msgstr "Verschicken von E-Mail"
 
-#: mail/mail-config.glade.h:81
-#, fuzzy
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
-msgstr "Eisiger Hagel"
+msgstr "Verschicken von Mail"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Verschickt"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Nachrichten in \"Verschickt\" und \"Entwürfe\""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Ordner für verschickte Nachrichten:"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Server-Konfiguration"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Servertyp: "
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Server benötigt Legitimation"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Signaturdatei:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr "Quelle"
+
+#: mail/mail-config.glade.h:98
 msgid "Source Information"
 msgstr "Quellinformation"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Quellen"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Besondere Ordner"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix-mbox"
 
-#: mail/mail-config.glade.h:95
-msgid "Type"
-msgstr "Typ"
-
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Sichere Verbindung (SSL) verwenden"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6887,248 +7159,220 @@ msgstr ""
 "\n"
 "Klicken Sie \"Weiter\" zum Beginnen."
 
-#: mail/mail-config.glade.h:103 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
-msgid "_Edit"
-msgstr "_Bearbeiten"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:112
 msgid "newswindow1"
 msgstr "newsfenster1"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr "Platzhalter"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:114
 msgid "seconds."
 msgstr "Sekunden."
 
-#: mail/mail-crypto.c:59
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "PGP-Signaturkontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "PGP-Überprüfungskontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "PGP-Verschlüsselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "PGP-Entschlüsselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME-Signaturkontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr "S/MIME-certsonly-Kontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME-Verschlüsselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
 msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME-Entschlüsselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-display.c:220
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Anlage speichern"
 
-#: mail/mail-display.c:330
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Auf Platte speichern..."
 
-#: mail/mail-display.c:332
-#, c-format
-msgid "Open in %s..."
-msgstr "Öffnen in %s..."
-
-#: mail/mail-display.c:334
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "An Ort und Stelle betrachten"
 
-#: mail/mail-display.c:369
-msgid "External Viewer"
-msgstr "Externer Betrachter"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Öffnen in %s..."
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "An Ort und Stelle betrachten (über %s)"
 
-#: mail/mail-display.c:396
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:1028
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Externer Betrachter"
+
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-display.c:1371
+#: mail/mail-display.c:1404
 msgid "Open Link in Browser"
 msgstr "Link in Browser öffnen"
 
-#: mail/mail-display.c:1373
+#: mail/mail-display.c:1406
 msgid "Copy Link Location"
 msgstr "Linkziel kopieren"
 
-#: mail/mail-display.c:1375
+#: mail/mail-display.c:1408
 msgid "Save Link as (FIXME)"
 msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:1377
-msgid "Save Image as"
-msgstr "Bild speichern unter"
+#: mail/mail-display.c:1410
+msgid "Save Image as..."
+msgstr "Bild speichern unter..."
 
-#: mail/mail-folder-cache.c:166
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d new"
 msgstr "%d neu"
 
-#: mail/mail-folder-cache.c:172 mail/mail-folder-cache.c:179
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:173
+#: mail/mail-folder-cache.c:177
 #, c-format
 msgid "%d hidden"
 msgstr "%d verborgen"
 
-#: mail/mail-folder-cache.c:180
+#: mail/mail-folder-cache.c:186
+#, c-format
+msgid "%d unsent"
+msgstr "%d nicht verschickt"
+
+#: mail/mail-folder-cache.c:188
 #, c-format
 msgid "%d total"
 msgstr "%d insgesamt"
 
-#: mail/mail-format.c:532
+#: mail/mail-format.c:608
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:657
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "MIME-Nachricht konnte nicht geparst werden. Wird als Quellcode angezeigt."
 
-#: mail/mail-format.c:658 mail/message-list.etspec.h:2
+#: mail/mail-format.c:739
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:774 mail/message-list.etspec.h:4
+#: mail/mail-format.c:855 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:777
+#: mail/mail-format.c:858
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:780 mail/message-list.etspec.h:10
+#: mail/mail-format.c:861 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:783
+#: mail/mail-format.c:864
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1105
+#: mail/mail-format.c:1283
 msgid "No GPG/PGP program configured."
 msgstr "Kein GPG/PGP-Programm konfiguriert."
 
-#: mail/mail-format.c:1120
+#: mail/mail-format.c:1298
 msgid "Encrypted message not displayed"
 msgstr "Verschlüsselte Nachricht nicht angezeigt"
 
-#: mail/mail-format.c:1126
+#: mail/mail-format.c:1304
 msgid "Encrypted message"
 msgstr "Verschlüsselte Nachricht"
 
-#: mail/mail-format.c:1127
+#: mail/mail-format.c:1305
 msgid "Click icon to decrypt."
 msgstr "Zum Entschlüsseln Icon klicken."
 
-#: mail/mail-format.c:1183
+#: mail/mail-format.c:1361
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Diese Nachricht ist digital signiert und wurde als authentisch nachgewiesen."
 
-#: mail/mail-format.c:1191
+#: mail/mail-format.c:1369
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Diese Nachricht ist digital signiert, kann aber nicht als authentisch "
 "nachgewiesen werden."
 
-#: mail/mail-format.c:1842
+#: mail/mail-format.c:2023
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:1854
+#: mail/mail-format.c:2035
 #, 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:1858
+#: mail/mail-format.c:2039
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:1892
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:1897
+#: mail/mail-format.c:2078
 msgid "Malformed external-body part."
 msgstr "Ungültiger external-body-Teil."
 
-#: mail/mail-local.c:455
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Öffnen von '%s'..."
 
-#: mail/mail-local.c:755
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:759
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Ordner \"%s\" in \"%s\"-Format umwandeln"
-
-#: mail/mail-local.c:782
-msgid "Reconfiguring folder"
-msgstr "Ordner wird neu konfiguriert"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:811
-msgid "Closing current folder"
-msgstr "Aktueller Ordner wird geschlossen"
-
-#: mail/mail-local.c:838
-msgid "Renaming old folder and opening"
-msgstr "Alter Ordner wird umbenannt und geöffnet"
-
-#: mail/mail-local.c:856
-msgid "Creating new folder"
-msgstr "Neuer Ordner wird angelegt"
-
-#: mail/mail-local.c:870
-msgid "Copying messages"
-msgstr "Nachrichten werden kopiert"
-
-#: mail/mail-local.c:887
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7137,18 +7381,22 @@ msgstr ""
 "Metainformationen zu Ordner können nicht gespeichert werden; Sie\n"
 "werden ihn wahrscheinlich nie mehr öffnen können: %s"
 
-#: mail/mail-local.c:926
+#: mail/mail-local.c:907
 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:1012
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr "Sie können das Format eines nichtlokalen Ordners nicht ändern."
+
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "%s neu konfigurieren"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -7157,7 +7405,7 @@ msgstr ""
 "Fehler beim `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -7166,110 +7414,104 @@ msgstr ""
 "Fehler beim Ausführen eines Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
+#: mail/mail-mt.c:785
 msgid "Working"
 msgstr "In Arbeit"
 
-#: mail/mail-mt.c:867
-msgid "Evolution progress"
-msgstr "Evolution-Fortschritt"
-
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:560
-msgid "Sending message"
-msgstr "Nachricht verschicken"
-
-#: mail/mail-ops.c:676
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:697 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:783
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Machrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Verschiebe"
 
-#: mail/mail-ops.c:882
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopiere"
 
-#: mail/mail-ops.c:972
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
-#: mail/mail-ops.c:1134
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Müll"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1175 mail/mail-ops.c:1313
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s öffnen"
 
-#: mail/mail-ops.c:1242
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Öffnen des Speichers %s"
 
-#: mail/mail-ops.c:1381
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "Ordner wird aktualisiert"
 
-#: mail/mail-ops.c:1549
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s abrufen"
 
-#: mail/mail-ops.c:1665
-msgid "Retrieving messages"
-msgstr "Nachrichten abrufen"
-
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1722
 #, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Rufe Nachricht Nummer %d von %d ab (UID \"%s\")"
+msgid "Retrieving %d message(s)"
+msgstr "%d Nachricht(en) werden/wird abgerufen"
 
-#: mail/mail-ops.c:1749
-msgid "Saving messages"
-msgstr "Nachrichten speichern"
+#: mail/mail-ops.c:1808
+#, c-format
+msgid "Saving %d messsage(s)"
+msgstr "%d Nachricht(en) werden/wird gespeichert"
 
-#: mail/mail-ops.c:1828
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7278,12 +7520,7 @@ msgstr ""
 "Ausgabedatei konnte nicht erstellt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1841
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Nachricht %d von %d (UID \"%s\") speichern"
-
-#: mail/mail-ops.c:1855
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7292,11 +7529,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Speichern der Anlage"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7305,12 +7542,12 @@ msgstr ""
 "Ausgabedatei kann nicht erstellt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
@@ -7319,23 +7556,31 @@ msgstr "Verbindung mit %s wird getrennt"
 msgid "(Untitled Message)"
 msgstr "(Unbenannte Nachricht)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+msgid "Untitled Message"
+msgstr "Unbenannte Nachricht"
+
+#: mail/mail-search.c:239
+msgid "Empty Message"
+msgstr "Leere Nachricht"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "In Nachricht suchen"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "Vorwärts suchen"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Suchen:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr "Passt auf:"
 
@@ -7367,30 +7612,29 @@ msgstr "Verschicken"
 msgid "Cancelled."
 msgstr "Storniert"
 
-#: mail/mail-tools.c:159
+#: mail/mail-session.c:170
+msgid "User canceled operation."
+msgstr "Benutzer hat Aktion abgebrochen."
+
+#: mail/mail-tools.c:175
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Temporäre Mbox `%s' konnte nicht angelegt werden: %s"
 
-#: mail/mail-tools.c:207
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (weitergeleitete Nachricht)"
+#: mail/mail-tools.c:228
+msgid "[Fwd: No Subject]"
+msgstr "[Fwd: (kein Betreff)]"
 
-#: mail/mail-tools.c:217
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (kein Betreff)"
-
-#: mail/mail-tools.c:234
+#: mail/mail-tools.c:245
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:236
+#: mail/mail-tools.c:247
 msgid "Forwarded message (no subject)"
 msgstr "Weitergeleitete Nachricht (kein Betreff)"
 
-#: mail/mail-tools.c:457
+#: mail/mail-tools.c:469
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
@@ -7399,11 +7643,11 @@ msgstr ""
 "-----Weitergeleitete Nachricht-----<br><b>Von:</b> %s<br><b>An:</b> %"
 "s<br><b>Betreff:</b> %s<br>"
 
-#: mail/mail-vfolder.c:250
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/mail-vfolder.c:442
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
@@ -7411,6 +7655,10 @@ msgstr "Neuer VOrdner"
 msgid "Unseen"
 msgstr "Ungelesen"
 
+#: mail/message-list.c:614
+msgid "Seen"
+msgstr "Gelesen"
+
 #: mail/message-list.c:615
 msgid "Answered"
 msgstr "Beantwortet"
@@ -7424,14 +7672,12 @@ msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
 #: mail/message-list.c:621
-#, fuzzy
 msgid "Lowest"
-msgstr "Schauer"
+msgstr "Am niedrigsten"
 
 #: mail/message-list.c:622
-#, fuzzy
 msgid "Lower"
-msgstr "Schauer"
+msgstr "Niedriger"
 
 #: mail/message-list.c:626
 msgid "Higher"
@@ -7458,15 +7704,22 @@ msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
 #: mail/message-list.c:913
-#, fuzzy
 msgid "%b %d %l:%M %p"
-msgstr "%a, %b %d / %H:%M"
+msgstr "%d. %b %H.%M"
 
 #: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.c:2290
+msgid "Updating message list"
+msgstr "Aktualisieren der Nachrichtenliste"
+
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr "Markiert"
+
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Erhalten"
 
@@ -7474,18 +7727,13 @@ msgstr "Erhalten"
 msgid "Size"
 msgstr "Größe"
 
-#: mail/mail-session.c:170
-msgid "User canceled operation."
-msgstr "Benutzer hat Aktion abgebrochen."
-
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Ordner"
 
 #: mail/subscribe-dialog.c:77
-#, fuzzy
 msgid "Store"
-msgstr "Rauch"
+msgstr "Speicher"
 
 #: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
@@ -7524,151 +7772,209 @@ msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 "Evolutions Chefsesselansichts-Komponente kann nicht initialisiert werden."
 
-#: my-evolution/e-summary-calendar.c:158 my-evolution/e-summary-calendar.c:176
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 msgid "Appointments"
 msgstr "Termine"
 
-#: my-evolution/e-summary-calendar.c:159
+#: my-evolution/e-summary-calendar.c:177
 msgid "No appointments"
 msgstr "Keine Termine"
 
-#: my-evolution/e-summary-calendar.c:203 my-evolution/e-summary-calendar.c:209
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: my-evolution/e-summary-calendar.c:226
+msgid "%l:%M%p"
+msgstr "%H.%M"
+
+#: my-evolution/e-summary-calendar.c:228
+msgid "%a %l:%M%p"
+msgstr "%a %H.%M"
 
-#: my-evolution/e-summary-mail.c:100
+#: my-evolution/e-summary-mail.c:104
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
-#: my-evolution/e-summary-rdf.c:378 my-evolution/e-summary-rdf.c:404
+#: my-evolution/e-summary-preferences.c:424
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com: Wort des Tages"
+
+#: my-evolution/e-summary-preferences.c:446
+msgid "Quotes of the Day"
+msgstr "Zitate des Tages"
+
+#: my-evolution/e-summary-preferences.c:882
+msgid "Add a news feed"
+msgstr "Einen Newsstrom hinzufügen"
+
+#: my-evolution/e-summary-preferences.c:890
+msgid "Enter the URL of the news feed you wish to add"
+msgstr "Geben Sie die Adresse des Newsstromes ein, den Sie hinzufügen wollen"
+
+#: my-evolution/e-summary-preferences.c:1425
+msgid "My Evolution Settings"
+msgstr "Einstellungen von My Evolution"
+
+#: my-evolution/e-summary-rdf.c:311
+msgid "There was an error downloading news feed</b></dt>"
+msgstr "Beim Herunterladen des Newsstromes ist ein Fehler aufgetreten</b></dt>"
+
+#: my-evolution/e-summary-rdf.c:393 my-evolution/e-summary-rdf.c:419
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Fehler beim Herunterladen von RDF</b>"
 
-#: my-evolution/e-summary-weather.c:56
+#: my-evolution/e-summary-tasks.c:206
+msgid "No tasks"
+msgstr "Keine Aufgaben"
+
+#: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
 msgstr "Mein Wetter"
 
-#: my-evolution/e-summary-weather.c:296
-msgid "<b>Error downloading Metar</b>"
-msgstr "<b>Fehler beim Herunterladen von Metar</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+"<dd><b>Es konnte keine Verbindung mit dem Wetterserver aufgenommen werden</"
+"b></dd>"
 
-#: my-evolution/e-summary-weather.c:612
+#: my-evolution/e-summary-weather.c:643
 msgid "Regions"
 msgstr "Regionen"
 
-#: my-evolution/e-summary.c:413 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
+msgstr "%A, %d. %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 msgid "Print My Evolution"
 msgstr "My Evolution Drucken"
 
-#: my-evolution/e-summary.c:459
+#: my-evolution/e-summary.c:518
 msgid "Printing of My Evolution failed"
 msgstr "Drucken von My Evolution fehlgeschlagen"
 
 #: my-evolution/main.c:52
-#, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
+msgstr "Chefsesselansichts-Komponente konnte Bonobo nicht initialisieren.\n"
+
+#: my-evolution/metar.c:29
+msgid "°F"
+msgstr "°F"
+
+#: my-evolution/metar.c:29
+msgid "°C"
+msgstr "°C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "Knoten"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "km/h"
 
-#: my-evolution/metar.c:43
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "Zoll Hg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "Torr"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "Meilen"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "Kilometer"
+
+#: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Wolkenloser Himmel"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Broken clouds"
-msgstr ""
+msgstr "Zerfetzte Wolken"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Scattered clouds"
 msgstr "Verstreute Wolken"
 
-#: my-evolution/metar.c:46
-#, fuzzy
+#: my-evolution/metar.c:47
 msgid "Few clouds"
-msgstr "Gewitterwolken"
+msgstr "Wenige Wolken"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Overcast"
 msgstr "Bedeckt"
 
-#: my-evolution/metar.c:55 my-evolution/metar.c:73 my-evolution/metar.c:136
-#, fuzzy
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
 msgid "Invalid"
-msgstr "An Ort und Stelle"
+msgstr "Ungültig"
 
-#: my-evolution/metar.c:62
-#, fuzzy
+#: my-evolution/metar.c:63
 msgid "Variable"
-msgstr "Teils Dunst"
+msgstr "Unbeständig"
 
-#: my-evolution/metar.c:63
-#, fuzzy
+#: my-evolution/metar.c:64
 msgid "North"
-msgstr "Notiz"
+msgstr "Nord"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North - NorthEast"
 msgstr "Nord - Nordost"
 
-#: my-evolution/metar.c:63
-#, fuzzy
+#: my-evolution/metar.c:64
 msgid "Northeast"
-msgstr "Notizen:"
+msgstr "Nordost"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "East - NorthEast"
 msgstr "Ost - Nordost"
 
-#: my-evolution/metar.c:64
-#, fuzzy
+#: my-evolution/metar.c:65
 msgid "East"
-msgstr "Existieren"
+msgstr "Ost"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr "Ost - Südost"
 
-#: my-evolution/metar.c:64
-#, fuzzy
+#: my-evolution/metar.c:65
 msgid "Southeast"
-msgstr "Quellen"
+msgstr "Südost"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr "Süd - Südost"
 
-#: my-evolution/metar.c:65
-#, fuzzy
+#: my-evolution/metar.c:66
 msgid "South"
-msgstr "Monat"
+msgstr "Süd"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr "Süd - Südwest"
 
-#: my-evolution/metar.c:65
-#, fuzzy
+#: my-evolution/metar.c:66
 msgid "Southwest"
-msgstr "Schauer"
+msgstr "Südwest"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr "West - Südwest"
 
-#: my-evolution/metar.c:66
-#, fuzzy
+#: my-evolution/metar.c:67
 msgid "West"
-msgstr "Test"
+msgstr "West"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr "West - Nordwest"
 
-#: my-evolution/metar.c:66
-#, fuzzy
+#: my-evolution/metar.c:67
 msgid "Northwest"
-msgstr "Am niedrigsten"
+msgstr "Nordwest"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "North - Northwest"
 msgstr "Nord - Nordwest"
 
@@ -7676,1210 +7982,1185 @@ msgstr "Nord - Nordwest"
 #. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
 #. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle"
 msgstr "Nieselregen"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle in the vicinity"
 msgstr "Nieselregen in der Umgebung"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Light drizzle"
 msgstr "Leichter Nieselregen"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Moderate drizzle"
 msgstr "Mäßiger Nieselregen"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Heavy drizzle"
 msgstr "Starker Nieselregen"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Shallow drizzle"
 msgstr "Geringfügiger Nieselregen"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Patches of drizzle"
 msgstr "Vereinzelt Nieselregen"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Partial drizzle"
 msgstr "Teils Nieselregen"
 
-#: my-evolution/metar.c:99 my-evolution/metar.c:100
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
 msgid "Thunderstorm"
 msgstr "Gewitter"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Windy drizzle"
 msgstr "Windiger Nieselregen"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Showers"
 msgstr "Schauer"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drifting drizzle"
 msgstr "Abtreibender Nieselregen"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Freezing drizzle"
 msgstr "Eisiger Nieselregen"
 
 #. RAIN
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain"
 msgstr "Regen"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain in the vicinity"
 msgstr "Regen in der Umgebung"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Light rain"
 msgstr "Leichter Regen"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Moderate rain"
 msgstr "Mäßiger Regen"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Heavy rain"
 msgstr "Starker Regen"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Shallow rain"
 msgstr "Geringfügiger Regen"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Patches of rain"
 msgstr "Vereinzelt Regen"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Partial rainfall"
 msgstr "Teils Regen"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Blowing rainfall"
 msgstr "Stürmischer Regen"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain showers"
 msgstr "Regenschauer"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Drifting rain"
 msgstr "Abtreibender Regen"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Freezing rain"
 msgstr "Eisregen"
 
 #. SNOW
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow"
 msgstr "Schneefall"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
 msgstr "Schneefall in der Umgebung"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Light snow"
 msgstr "Leichter Schneefall"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Moderate snow"
 msgstr "Mäßiger Schneefall"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Heavy snow"
 msgstr "Schwerer Schneefall"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Shallow snow"
 msgstr "Geringfügiger Schneefall"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Patches of snow"
 msgstr "Vereinzelt Schneefall"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Partial snowfall"
 msgstr "Teils Schneefall"
 
-#: my-evolution/metar.c:101 my-evolution/metar.c:102
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
 msgid "Snowstorm"
 msgstr "Schneesturm"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Blowing snowfall"
 msgstr "Stürmischer Schneefall"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow showers"
 msgstr "Schneeschauer"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Drifting snow"
 msgstr "Abtreibender Schneefall"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Freezing snow"
 msgstr "Gefrierender Schneefall"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains"
 msgstr "Kornschnee"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains in the vicinity"
 msgstr "Kornschnee in der Umgebung"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Light snow grains"
 msgstr "Leichter Kornschnee"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Moderate snow grains"
 msgstr "Mäßiger Kornschnee"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Heavy snow grains"
 msgstr "Starker Kornschnee"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Shallow snow grains"
 msgstr "Geringfügiger Kornschnee"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Patches of snow grains"
 msgstr "Vereinzelt Kornschnee"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Partial snow grains"
 msgstr "Teils Kornschnee"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Blowing snow grains"
 msgstr "Stürmischer Kornschnee"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grain showers"
 msgstr "Kornschneeschauer"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Drifting snow grains"
 msgstr "Abtreibender Kornschnee"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Freezing snow grains"
 msgstr "Eisiger Kornschnee"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals"
 msgstr "Eiskristalle"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals in the vicinity"
 msgstr "Eiskristalle in der Umgebung"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Few ice crystals"
 msgstr "Wenige Eiskristalle"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Moderate ice crystals"
 msgstr "Mäßige Eiskristalle"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Heavy ice crystals"
 msgstr "Starke Eiskristalle"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Patches of ice crystals"
 msgstr "Vereinzelt Eiskristalle"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Partial ice crystals"
 msgstr "Teils Eiskristalle"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystal storm"
 msgstr "Eiskristallsturm"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Blowing ice crystals"
 msgstr "Stürmische Eiskristalle"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Showers of ice crystals"
 msgstr "Schauer von Eiskristallen"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Drifting ice crystals"
 msgstr "Abtreibende Eiskristalle"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Freezing ice crystals"
 msgstr "Eisige Eiskristalle"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets"
 msgstr "Eiskörner"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets in the vicinity"
 msgstr "Eiskörner in der Umgebung"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Few ice pellets"
 msgstr "Wenige Eiskörner"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Moderate ice pellets"
 msgstr "Mäßige Eiskörner"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Heavy ice pellets"
 msgstr "Viele Eiskörner"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Shallow ice pellets"
 msgstr "Geringfügige Eiskörner"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Patches of ice pellets"
 msgstr "Vereinzelt Eiskörner"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Partial ice pellets"
 msgstr "Teils Eiskörner"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellet storm"
 msgstr "Eiskornsturm"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Blowing ice pellets"
 msgstr "Wind mit Eiskörnern"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Showers of ice pellets"
 msgstr "Eiskornschauer"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Drifting ice pellets"
 msgstr "Abtreibende Eiskörner"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Freezing ice pellets"
 msgstr "Eisige Eiskörner"
 
 #. HAIL
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail"
 msgstr "Hagel"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
 msgstr "Hagel in der Umgebung"
 
-#: my-evolution/metar.c:105 my-evolution/metar.c:106
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
 msgid "Light hail"
 msgstr "Leichter Hagel"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Moderate hail"
 msgstr "Mäßiger Hagel"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Heavy hail"
 msgstr "Starker Hagel"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Shallow hail"
 msgstr "Geringfügiger Hagel"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Patches of hail"
 msgstr "Vereinzelt Hagel"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Partial hail"
 msgstr "Teils Hagel"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hailstorm"
 msgstr "Hagelsturm"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Blowing hail"
 msgstr "Wind und Hagel"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail showers"
 msgstr "Hagelschauer"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Drifting hail"
 msgstr "Abtreibender Hagel"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Freezing hail"
 msgstr "Eisiger Hagel"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail"
 msgstr "Leichter Graupel"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail in the vicinity"
 msgstr "Graupel in der Umgebung"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Moderate small hail"
 msgstr "Mäßiger Graupel"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Heavy small hail"
 msgstr "Starker Graupel"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Shallow small hail"
 msgstr "Geringfügiger Graupel"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Patches of small hail"
 msgstr "Vereinzelt Graupel"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Partial small hail"
 msgstr "Teils Graupel"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hailstorm"
 msgstr "Graupelsturm"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Blowing small hail"
 msgstr "Windiger Graupel"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Showers of small hail"
 msgstr "Graupelschauer"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Drifting small hail"
 msgstr "Abtreibender Graupel"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Freezing small hail"
 msgstr "Eisiger Graupel"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Unknown precipitation"
 msgstr "Unbekannte Niederschläge"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Precipitation in the vicinity"
 msgstr "Niederschläe in der Umgebung"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Light precipitation"
 msgstr "Leichte Niederschläge"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Moderate precipitation"
 msgstr "Mäßige Niederschläge"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Heavy precipitation"
 msgstr "Starke Niederschläge"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Shallow precipitation"
 msgstr "Geringfügige Niederschläge"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Patches of precipitation"
 msgstr "Vereinzelt Niederschläge"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Partial precipitation"
 msgstr "Teils Niederschläge"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Unknown thunderstorm"
 msgstr "Unbekanntes Gewitter"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Blowing precipitation"
 msgstr "Windige Niederschläge"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Showers, type unknown"
 msgstr "Unbekannte Schauer"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Drifting precipitation"
 msgstr "Abtreibende Niederschläge"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Freezing precipitation"
 msgstr "Eisige Niederschläge"
 
 #. MIST
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist"
 msgstr "Nebel"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist in the vicinity"
 msgstr "Nebel in der Umgebung"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Light mist"
 msgstr "Leichter Nebel"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Moderate mist"
 msgstr "Mäßiger Nebel"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Thick mist"
 msgstr "Dichter Nebel"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Shallow mist"
 msgstr "Geringfügiger Nebel"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Patches of mist"
 msgstr "Vereinzelt Nebel"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Partial mist"
 msgstr "Teils Nebel"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist with wind"
 msgstr "Nebel mit Wind"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Drifting mist"
 msgstr "Abtreibender Nebel"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Freezing mist"
 msgstr "Eisiger Nebel"
 
 #. FOG
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog"
 msgstr "Dichter Nebel"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog in the vicinity"
 msgstr "Dichter Nebel in der Umgebung"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Light fog"
 msgstr "Leichter dichter Nebel"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Moderate fog"
 msgstr "Mäßiger dichter Nebel"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Thick fog"
 msgstr "Sehr dichter Nebel"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Shallow fog"
 msgstr "Geringfügiger dichter Nebel"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Patches of fog"
 msgstr "Vereinzelt dichter Nebel"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Partial fog"
 msgstr "Teils dichter Nebel"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog with wind"
 msgstr "Dichter Nebel und Wind"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Drifting fog"
 msgstr "Abtreibender dichter Nebel"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Freezing fog"
 msgstr "Eisiger Nebel"
 
 #. SMOKE
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke"
 msgstr "Rauch"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke in the vicinity"
 msgstr "Rauch in der Umgebung"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thin smoke"
 msgstr "Dünner Rauch"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Moderate smoke"
 msgstr "Mäßiger Rauch"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thick smoke"
 msgstr "Dichter Rauch"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Shallow smoke"
 msgstr "Geringfügiger Rauch"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Patches of smoke"
 msgstr "Vereinzelt Rauch"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Partial smoke"
 msgstr "Teils Rauch"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke w/ thunders"
 msgstr "Gewittriger Rauch"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke with wind"
 msgstr "Rauch mit Wind"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Drifting smoke"
 msgstr "Abtreibender Rauch"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash"
 msgstr "Vulkanasche"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash in the vicinity"
 msgstr "Vulkanasche in der Umgebung"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Moderate volcanic ash"
 msgstr "Mäßige Vulkanasche"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Thick volcanic ash"
 msgstr "Dichte Vulkanasche"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Shallow volcanic ash"
 msgstr "Geringfügige Vulkanasche"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Patches of volcanic ash"
 msgstr "Vereinzelt Vulkanasche"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Partial volcanic ash"
 msgstr "Teils Vulkanasche"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash w/ thunders"
 msgstr "Gewittrige Vulkanasche"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Blowing volcanic ash"
 msgstr "Stürmische Vulkanasche"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Showers of volcanic ash "
 msgstr "Vulkanasche-Schauer"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Drifting volcanic ash"
 msgstr "Abtreibende Vulkanasche"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Freezing volcanic ash"
 msgstr "Eisige Vulkanasche"
 
 #. SAND
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand"
 msgstr "Sand"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
 msgstr "Sand in der Umgebung"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Light sand"
 msgstr "Leichter Sand"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Moderate sand"
 msgstr "Mäßiger Sand"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Heavy sand"
 msgstr "Starker Sand"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Patches of sand"
 msgstr "Vereinzelt Sand"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Partial sand"
 msgstr "Teils Sand"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Blowing sand"
 msgstr "Stürmischer Sand"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Drifting sand"
 msgstr "Abtreibender Sand"
 
 #. HAZE
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze"
 msgstr "Dunst"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
 msgstr "Dunst in der Umgebung"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Light haze"
 msgstr "Leichter Dunst"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Moderate haze"
 msgstr "Mäßiger Dunst"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Thick haze"
 msgstr "Dichter Dunst"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Shallow haze"
 msgstr "Geringfügiger Dunst"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Patches of haze"
 msgstr "Vereinzelt Dunst"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Partial haze"
 msgstr "Teils Dunst"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze with wind"
 msgstr "Stürmischer Dunst"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Drifting haze"
 msgstr "Abtreibender Dunst"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Freezing haze"
 msgstr "Eisiger Dunst"
 
 #. SPRAY
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Sprays"
 msgstr "Sprühregen"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
 msgstr "Sprühregen in der Umgebung"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Light sprays"
 msgstr "Leichter Sprühregen"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Moderate sprays"
 msgstr "Mäßiger Sprühregen"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Heavy sprays"
 msgstr "Starker Sprühregen"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Shallow sprays"
 msgstr "Geringfügiger Sprühregen"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Patches of sprays"
 msgstr "Vereinzelt Sprühregen"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Partial sprays"
 msgstr "Teils Sprühregen"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Blowing sprays"
 msgstr "Stürmischer Sprühregen"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Drifting sprays"
 msgstr "Abtreibender Sprühregen"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Freezing sprays"
 msgstr "Eisiger Sprühregen"
 
 #. DUST
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Dust"
 msgstr "Staub"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
 msgstr "Staub in der Umgebung"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Light dust"
 msgstr "Leichter Staub"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Moderate dust"
 msgstr "Mäßiger Staub"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Heavy dust"
 msgstr "Starker Staub"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Patches of dust"
 msgstr "Vereinzelt Staub"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Partial dust"
 msgstr "Teils Staub"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Blowing dust"
 msgstr "Stürmischer Staub"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Drifting dust"
 msgstr "Abtreibender Staub"
 
 #. SQUALL
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall"
 msgstr "Windböen"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall in the vicinity"
 msgstr "Windböen in der Umgebung"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Light squall"
 msgstr "Leichte Windböen"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Moderate squall"
 msgstr "Mäßige Windböen"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Heavy squall"
 msgstr "Heftige Windböen"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Partial squall"
 msgstr "Teils Windböen"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Thunderous squall"
 msgstr "Gewittrige Windböen"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Blowing squall"
 msgstr "Stürmische Windböen"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Drifting squall"
 msgstr "Abtreibende Windböen"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Freezing squall"
 msgstr "Eisige Windböen"
 
 #. SANDSTORM
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm"
 msgstr "Sandsturm"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm in the vicinity"
 msgstr "Sandsturm in der Umgebung"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Light standstorm"
 msgstr "Leichter Sandsturm"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Moderate sandstorm"
 msgstr "Mäßiger Sandsturm"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Heavy sandstorm"
 msgstr "Schwerer Sandsturm"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Shallow sandstorm"
 msgstr "Geringfügiger Sandsturm"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Partial sandstorm"
 msgstr "Teils Sandsturm"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Thunderous sandstorm"
 msgstr "Gewittriger Sandsturm"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Blowing sandstorm"
 msgstr "Stürmischer Sandsturm"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Drifting sandstorm"
 msgstr "Abtreibender Sandsturm"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Freezing sandstorm"
 msgstr "Eisiger Sandsturm"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm"
 msgstr "Staubsturm"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm in the vicinity"
 msgstr "Staubsturm in der Umgebung"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Light duststorm"
 msgstr "Leichter Staubsturm"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Moderate duststorm"
 msgstr "Mäßiger Staubsturm"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Heavy duststorm"
 msgstr "Heftiger Staubsturm"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Shallow duststorm"
 msgstr "Geringfügiger Staubsturm"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Partial duststorm"
 msgstr "Teils Staubsturm"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Thunderous duststorm"
 msgstr "Gewittriger Staubsturm"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Blowing duststorm"
 msgstr "Stürmischer Staubsturm"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Drifting duststorm"
 msgstr "Abtreibender Staubsturm"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Freezing duststorm"
 msgstr "Eisiger Staubsturm"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud"
 msgstr "Gewitterwolken"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud in the vicinity"
 msgstr "Gewitterwolken in der Umgebung"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Light funnel cloud"
 msgstr "Leichte Gewitterbewölkung"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Moderate funnel cloud"
 msgstr "Mäßige Gewitterbewölkung"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Thick funnel cloud"
 msgstr "Dichte Gewitterwolken"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Shallow funnel cloud"
 msgstr "Geringfügige Gewitterbewölkung"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Patches of funnel clouds"
 msgstr "Vereinzelt Gewitterwolken"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Partial funnel clouds"
 msgstr "Teils Gewitterbewölkung"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud w/ wind"
 msgstr "Gewitterwolken mit Wind"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Drifting funnel cloud"
 msgstr "Abtreibende Gewitterbewölkung"
 
 #. TORNADO
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado in the vicinity"
 msgstr "Tornado in der Umgebung"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Moderate tornado"
 msgstr "Mäßiger Tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Raging tornado"
 msgstr "Wütender Tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Partial tornado"
 msgstr "Teils Tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Thunderous tornado"
 msgstr "Gewittriger Tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Drifting tornado"
 msgstr "Abtreibender Tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Freezing tornado"
 msgstr "Eisiger Tornado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls"
 msgstr "Staubteufel"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls in the vicinity"
 msgstr "Staubteufel in der Umgebung"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Light dust whirls"
 msgstr "Leichte Staubteufel"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Moderate dust whirls"
 msgstr "Mäßige Staubteufel"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Heavy dust whirls"
 msgstr "Starke Staubteufel"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Shallow dust whirls"
 msgstr "Geringfügige Staubteufel"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Patches of dust whirls"
 msgstr "Vereinzelt Staubteufel"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Partial dust whirls"
 msgstr "Teils Staubteufel"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Blowing dust whirls"
 msgstr "Stürmische Staubteufel"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Drifting dust whirls"
 msgstr "Abtreibende Staubteufel"
 
 #: my-evolution/my-evolution.glade.h:1
-#, fuzzy
-msgid "Add ->"
-msgstr "Hinzufügen"
-
-#: my-evolution/my-evolution.glade.h:2
-#, fuzzy
 msgid "Add new feed"
-msgstr "Beantwortet"
+msgstr "Neuen Strom hinzufügen"
 
-#: my-evolution/my-evolution.glade.h:3
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:2
 msgid "All folders:"
-msgstr "Ordner wählen"
+msgstr "Alle Ordner:"
 
-#: my-evolution/my-evolution.glade.h:4
+#: my-evolution/my-evolution.glade.h:3
 msgid "All news feeds:"
-msgstr ""
+msgstr "Alle Newsströme:"
 
-#: my-evolution/my-evolution.glade.h:5
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:4
 msgid "All stations:"
-msgstr "Alle Anwesenden"
+msgstr "Alle Sender:"
 
-#: my-evolution/my-evolution.glade.h:7
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:6
 msgid "Display folders:"
-msgstr "Ordner anzeigen, die beginnen mit:"
+msgstr "Ordner anzeigen:"
 
-#: my-evolution/my-evolution.glade.h:8
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:7
 msgid "Display stations:"
-msgstr "Anzeigeoptionen"
+msgstr "Sender anzeigen:"
 
-#: my-evolution/my-evolution.glade.h:9
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:8
 msgid "Displayed feeds:"
-msgstr "Anzeige"
+msgstr "angezeigte Ströme:"
 
-#: my-evolution/my-evolution.glade.h:10
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:9
 msgid "Five days"
-msgstr "Freitag"
+msgstr "Fünf Tage"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:10
 msgid "How many days should the calendar display at once?"
-msgstr ""
+msgstr "Wie viele Tage soll der Kalender auf einmal anzeigen?"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:12
 msgid "Max number of items shown:"
-msgstr ""
+msgstr "Maximale Anzahl angezeigter Einträge:"
 
-#: my-evolution/my-evolution.glade.h:14
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:13
 msgid "News Feed Settings"
-msgstr "Einstellungen"
+msgstr "Newsstrom-Einstellungen"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:14
 msgid "News Feeds"
-msgstr ""
+msgstr "Newsströme"
 
-#: my-evolution/my-evolution.glade.h:16
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:15
 msgid "One day"
-msgstr "1 Tag"
+msgstr "Ein Tag"
 
-#: my-evolution/my-evolution.glade.h:17
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:16
 msgid "One month"
-msgstr "Monat"
+msgstr "Ein Monat"
 
-#: my-evolution/my-evolution.glade.h:18
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:17
 msgid "One week"
-msgstr "1 Woche"
+msgstr "Eine Woche"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:18
 msgid "Refresh time (seconds):"
-msgstr ""
+msgstr "Aktualisierungszeit (Sekunden):"
 
-#: my-evolution/my-evolution.glade.h:20
-#, fuzzy
-msgid "Remove <-"
-msgstr "Entfernen"
-
-#: my-evolution/my-evolution.glade.h:21
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:19
 msgid "Schedule"
-msgstr ""
-"Termin\n"
-"ansetzen"
+msgstr "Ansetzen"
 
-#: my-evolution/my-evolution.glade.h:22
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:20
 msgid "Show all tasks"
-msgstr "Geringfügiger Graupel"
+msgstr "Alle Aufgaben anzeigen"
 
-#: my-evolution/my-evolution.glade.h:23
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:21
 msgid "Show full path for folders"
-msgstr "Alle _Kopfzeilen anzeigen"
+msgstr "Vollen Pfad für Ordner anzeigen"
 
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:22
 msgid "Show today's tasks"
-msgstr ""
+msgstr "Heutige Aufgaben anzeigen"
 
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:23
 msgid "Tasks "
 msgstr "Aufgaben "
 
-#: my-evolution/my-evolution.glade.h:26
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:24
 msgid "Units: "
-msgstr ""
-"\n"
-"  Einheit:  "
+msgstr "Einheiten: "
 
-#: my-evolution/my-evolution.glade.h:27
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:25
 msgid "Weather"
-msgstr "nach"
+msgstr "Wetter"
 
-#: my-evolution/my-evolution.glade.h:28
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:26
 msgid "Weather settings"
-msgstr "Die Auswahl löschen"
+msgstr "Wetter-Einstellungen"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:27
 msgid "Wipe trackers"
-msgstr ""
+msgstr "Verfolgungen auswischen"
 
-#: my-evolution/my-evolution.glade.h:30
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:28
 msgid "imperial"
-msgstr "April"
+msgstr "englisch"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:29
 msgid "metric"
-msgstr ""
+msgstr "metrisch"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Die Evolution-Shell."
 
 #: shell/e-activity-handler.c:198
-#, fuzzy
 msgid "Show Details"
-msgstr "Geringfügiger Hagel"
+msgstr "Details anzeigen"
 
 #: shell/e-activity-handler.c:200
 msgid "Cancel Operation"
 msgstr "Aktion abbrechen"
 
-#: shell/e-setup.c:125 shell/e-setup.c:195
+#: shell/e-local-storage.c:554
+msgid "Local Folders"
+msgstr "Lokale Ordner"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Installation von Evolution"
 
@@ -8901,17 +9182,17 @@ msgstr ""
 msgid "Could not update files correctly"
 msgstr "Dateien konnte nicht korrekt aktualisiert werden"
 
-#: shell/e-setup.c:199
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Dies scheint das erste Mal zu sein, dass Sie Evolution ausführen."
 
-#: shell/e-setup.c:200
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Bitte klicken Sie \"OK\", um Evolutions Benutzerdateien zu installieren "
 "unter:"
 
-#: shell/e-setup.c:219
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -8923,14 +9204,16 @@ msgstr ""
 "kann nicht angelegt werden.\n"
 "Fehler: %s"
 
-#: shell/e-setup.c:234
-#, fuzzy, c-format
+#: shell/e-setup.c:235
+#, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
-msgstr "Ein Fehler trat beim Lesen der Datei auf."
+msgstr ""
+"Ein Fehler trat auf beim Kopieren von Dateien nach\n"
+"'%s'."
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -8941,7 +9224,7 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:313
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -8956,7 +9239,7 @@ msgstr ""
 "Möchten Sie, dass dieses Verzeichnis\n"
 "entfernt wird?"
 
-#: shell/e-setup.c:338
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -8968,69 +9251,48 @@ msgstr ""
 "es, damit Evolution seine Benutzerdateien\n"
 "installieren kann."
 
-#: shell/e-shell.c:446
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
-
-#: shell/e-shell.c:1308
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"Hoppla! Die Ansicht für `%s' ist unerwartet gestorben.  :-(\n"
-"Das heißt wahrscheinlich, dass die %s-Komponente abgestürzt ist."
-
-#: shell/e-shell-folder-commands.c:159
-#, fuzzy
+#: shell/e-shell-folder-commands.c:160
 msgid "Cannot move a folder over itself."
-msgstr "Ordner kann nicht abgerufen werden: %s: %s"
+msgstr "Ordner kann nicht in sich selbst verschoben werden."
 
-#: shell/e-shell-folder-commands.c:161
-#, fuzzy
+#: shell/e-shell-folder-commands.c:162
 msgid "Cannot copy a folder over itself."
-msgstr ""
-"Dateien können nicht in\n"
-"`%s'\n"
-"kopiert werden."
+msgstr "Ordner kann nicht in sich selbst kopiert werden."
 
-#: shell/e-shell-folder-commands.c:175
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder into one of its descendants."
-msgstr ""
+msgstr "Ein Ordner kann nicht in eines seiner Kinder verschoben werden."
 
-#: shell/e-shell-folder-commands.c:269
+#: shell/e-shell-folder-commands.c:270
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Geben Sie einen Ordner an, in den Ordner \"%s\" kopiert werden soll:"
 
-#: shell/e-shell-folder-commands.c:274
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "Ordner kopieren"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:313
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 "Geben Sie einen Ordner an, in den Ordner \"%s\" verschoben werden soll:"
 
-#: shell/e-shell-folder-commands.c:317
+#: shell/e-shell-folder-commands.c:318
 msgid "Move folder"
 msgstr "Ordner verschieben"
 
-#. Popup a dialog asking if they are sure they want to delete
-#. the folder
-#: shell/e-shell-folder-commands.c:351
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Ordner '%s' löschen"
 
-#: shell/e-shell-folder-commands.c:359
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:363
+#, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
-msgstr "Sind Sie sicher, dass Sie die Aufgabe `%s' löschen wollen?"
+msgstr "Sind Sie sicher, dass Sie den Ordner '%s' entfernen wollen?"
 
-#: shell/e-shell-folder-commands.c:417
+#: shell/e-shell-folder-commands.c:422
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Ordner '%s' umbenennen"
@@ -9060,11 +9322,11 @@ msgstr ""
 "Der Typ des ausgewählten Ordners ist für die \n"
 "gewählte Operation nicht gültig."
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Neu..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
@@ -9174,54 +9436,19 @@ msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
 msgid "Closing connections..."
 msgstr "Verbindungen werden geschlossen..."
 
-#: shell/e-shell-view.c:173
-msgid "(No folder displayed)"
-msgstr "(Kein Ordner angezeigt)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1386 shell/e-storage-set-view.c:1441
-msgid "My Evolution"
-msgstr "My Evolution"
-
-#: shell/e-shell-view.c:1403
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1405
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1443
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution ist zur Zeit online. Klicken Sie diesen Knopf, um offline zu "
-"arbeiten."
-
-#: shell/e-shell-view.c:1450
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution geht gerade offline."
-
-#: shell/e-shell-view.c:1456
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution ist gerade offline. Klicken Sie auf diesen Knopf, um online zu "
-"arbeiten."
-
-#: shell/e-shell-view-menu.c:182
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Der Fehlermelder kann nicht gefunden werden"
 
-#: shell/e-shell-view-menu.c:188
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
-#: shell/e-shell-view-menu.c:233
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9231,47 +9458,79 @@ msgstr ""
 "für Mail sowie Termin- und Kontaktverwaltung\n"
 "in der GNOME-Desktopumgebung."
 
-#: shell/e-shell-view-menu.c:453
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Gehe zu Ordner..."
 
-#: shell/e-shell-view-menu.c:454
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "Wählen Sie den Ordner, den Sie öffnen wollen"
 
-#: shell/e-shell-view-menu.c:599
+#: shell/e-shell-view-menu.c:583
 msgid "Create a new shortcut"
 msgstr "Eine neue Verknüpfung anlegen"
 
-#: shell/e-shell-view-menu.c:600
-#, fuzzy
+#: shell/e-shell-view-menu.c:584
 msgid "Select the folder you want the shortcut to point to:"
-msgstr "Wählen Sie den Ordner, den Sie öffnen wollen"
+msgstr "Wählen Sie den Ordner, auf den die Verknüpfung zeigen soll:"
 
-#: shell/e-shell-view-menu.c:705
-msgid "Work online"
+#: shell/e-shell-view-menu.c:689
+msgid "Work Online"
 msgstr "Online arbeiten"
 
-#: shell/e-shell-view-menu.c:717 shell/e-shell-view-menu.c:729
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: shell/e-shortcuts.c:601
-msgid "Error saving shortcuts."
-msgstr "Fehler beim Speichern von Verknüpfungen."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shortcuts.c:998
-#, fuzzy
-msgid "Shortcuts"
-msgstr "Schauer"
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+msgid "My Evolution"
+msgstr "My Evolution"
 
-#: shell/e-shortcuts.c:1000
-msgid "Inbox"
-msgstr "Inbox"
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
 
-#: shell/e-shortcuts.c:1003
-msgid "Contacts"
-msgstr "Kontakte"
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution ist zur Zeit online. Klicken Sie diesen Knopf, um offline zu "
+"arbeiten."
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution geht gerade offline."
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution ist gerade offline. Klicken Sie auf diesen Knopf, um online zu "
+"arbeiten."
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Hoppla! Die Ansicht für `%s' ist unerwartet gestorben.  :-(\n"
+"Das heißt wahrscheinlich, dass die %s-Komponente abgestürzt ist."
 
 #: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
@@ -9359,18 +9618,17 @@ msgid "Rename selected shortcut to:"
 msgstr "Ausgewählte Verknüpfungsgruppe umbenennen in:"
 
 #: shell/e-shortcuts-view.c:468
-#, fuzzy
 msgid "Open the folder linked to this shortcut"
-msgstr "Diesen Ordner in einem anderen Fenster öffnen"
+msgstr "Den mit dieser Verknüpfung verbundenen Ordner öffnen"
 
 #: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "In neuem Fenster öffnen"
 
 #: shell/e-shortcuts-view.c:470
-#, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Die ausgewählte Nachricht in einem neuen Fenster öffnen"
+msgstr ""
+"Den mit dieser Verknüpfung verbundenen Ordner in einem neuen Fenster öffnen"
 
 #: shell/e-shortcuts-view.c:473
 msgid "Rename"
@@ -9384,64 +9642,93 @@ msgstr "Diese Verknüpfung umbenennen"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Fehler beim Speichern von Verknüpfungen."
+
+#: shell/e-shortcuts.c:982
+msgid "Shortcuts"
+msgstr "Verknüpfungen"
+
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-shortcuts.c:987
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Kein Name)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ungültig"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Nicht genügend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funktion für diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Erlaubnis verweigert"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operation nicht unterstützt"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Der angegebene Typ wird für diese Speicherweise nicht unterstützt"
 
-#: shell/e-task-widget.c:167
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
-msgstr ""
+msgstr "%s (...)"
 
-#: shell/e-task-widget.c:172
+#: shell/e-task-widget.c:173
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
+#: shell/glade/e-active-connection-dialog.glade.h:1
+msgid "Active connections"
+msgstr "Aktive Verbindungen"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+"Klicken Sie OK, um diese Verbindungen zu schließen und offline zu gehen"
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Host"
+msgstr "Rechner"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr "Die folgenden Verbindungen sind zur Zeit aktiv:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Ordnername:"
@@ -9454,10 +9741,6 @@ msgstr "Ordnertyp:"
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner erstellt werden soll:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Die Evolution-Shell."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -9490,8 +9773,16 @@ msgstr "Importeure"
 msgid "Don't import"
 msgstr "Nicht importieren"
 
-#: shell/main.c:89
-#, fuzzy, no-c-format
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Mich nicht mehr fragen"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr "Evolution hat die folgenden Datenquellen gefunden:"
+
+#: shell/main.c:96
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -9507,25 +9798,19 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 "Hallo. Viele Dank dafür, dass Sie sich die Zeit genommen haben, diese\n"
-"VORSCHAUVERSION der Evolution-Groupware-Suite herunterzuladen.\n"
+"Vorschauversion der Evolution-Groupware-Suite herunterzuladen.\n"
 "\n"
 "Evolution ist noch nicht fertig. Es ist nahe dran, aber es gibt noch\n"
 "Stellen, wo Funktionen entweder fehlen oder nur halbwegs arbeiten.\n"
-"Wenn Sie nicht herausfinden können, wie etwas geht, liegt das\n"
-"wahrscheinlich daran, dass es noch nicht möglich ist! :-)\n"
 "\n"
-"Wir hoffen, dass Evolution für Sie benutzbar sein wird, aber wir\n"
-"halten es immer noch für notwendig, Sie zu warnen: Es könnte\n"
-"abstürzen, Ihre Mail verlieren, freilaufende Prozesse zurücklassen,\n"
-"100% Ihrer CPU verbrauchen, nicht akzeptierte Befehle an Ihre Server\n"
-"schicken und Sie ganz allgemein vor Ihren Freunden und Mitarbeitern\n"
-"lächerlich machen. Zu Risiken und Nebenwirkungen fragen Sie Ihren Arzt\n"
-"oder Apotheker.\n"
+"Falls Sie Fehler finden, melden Sie sie uns bitte auf bugzilla.ximian.com.\n"
+"Auf dieses Produkt gibt es keinerlei Garantie und es ist nicht für\n"
+"Individuen bestimmt, die zu gewalttätigen Wutanfällen neigen.\n"
 "\n"
 "Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
 "werden, und wir hoffen auf Ihre Mitarbeit!\n"
 
-#: shell/main.c:110
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9533,28 +9818,28 @@ msgstr ""
 "Danke.\n"
 "das Evolution-Team\n"
 
-#: shell/main.c:148
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "Auf Evolution-Shell kann nicht zugegriffen werden."
 
-#: shell/main.c:208
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Splashscreen deaktivieren"
 
-#: shell/main.c:209
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: shell/main.c:244
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Das Bonobo-Komponentensystem kann nicht initialisiert werden."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
@@ -9566,7 +9851,7 @@ msgstr "Einen neuen Kontakt anlegen"
 msgid "Create new contact list"
 msgstr "Neuen Kontaktliste anlegen"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
@@ -9582,7 +9867,7 @@ msgstr "Neuer Kontakt"
 msgid "New list"
 msgstr "Neue Liste"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Inhalt der Zwischenablage einfügen"
 
@@ -9622,19 +9907,18 @@ msgstr "_Kontakt"
 msgid "_Contact Group"
 msgstr "_Kontaktgruppe"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:31
+#: ui/evolution-tasks.xml.h:13
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:34
+#: ui/evolution-tasks.xml.h:15
 msgid "_Paste"
 msgstr "Einfügen"
 
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Drucken..."
 
@@ -9646,172 +9930,126 @@ msgstr "Nach Kontakten _suchen"
 msgid "_Select All"
 msgstr "Alle auswählen"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
 #: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "Werkzeuge"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Tage"
-
 #: ui/evolution-calendar.xml.h:2
-msgid "Alter preferences"
-msgstr "Einstellungen ändern"
+msgid "Configure the calendar's settings"
+msgstr "Einstellungen des Kalenders konfigurieren"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new all day Event"
-msgstr "Ein neues ganztägiges Ereignis anlegen"
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a New All-Day _Event"
+msgstr "Ein neues ganztägiges _Ereignis anlegen"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:5
+msgid "Create a _New Appointment"
+msgstr "Einen _neuen Termin anlegen"
+
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new calendar"
-msgstr "Einen neuen Kalender anlegen"
-
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Tag"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr "Ein ganztägiges Ereignis anlegen"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Go To"
 msgstr "Gehe zu"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "In der Zeit zurückgehen"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "In der Zeit vorangehen"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Gehe zu _Datum"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Zu bestimmtem Datum gehen"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Zur aktuellen Zeit gehen"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Month"
-msgstr "Monat"
-
-#: ui/evolution-calendar.xml.h:22
-msgid "New _Event"
-msgstr "Neues _Ereignis"
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
-msgid "Next"
-msgstr "Weiter"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Open Calendar"
-msgstr "Kalender öffnen"
-
-#: ui/evolution-calendar.xml.h:28
-msgid "Prev"
-msgstr "Zurück"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Zeigt eine Vorschau des zu druckenden Kalenders"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:34
-#, fuzzy
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy Information"
-msgstr "Benötigte Information"
+msgstr "Verfügbarkeitsinformationen veröffentlichen"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "Speichern _unter"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "Save calendar as something else"
-msgstr "Kalender als etwas anderes speichern"
-
-#: ui/evolution-calendar.xml.h:38
-msgid "Settings..."
-msgstr "Einstellungen..."
+msgstr "Verfügbarkeitsinformationen für diesen Kalender veröffentlichen"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Einen Tag zeigen"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "1 Monat zeigen"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "1 Woche zeigen"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Die Werkwoche zeigen"
 
-#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
-#: widgets/misc/e-dateedit.c:431
-msgid "Today"
-msgstr "Heute"
-
-#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "_Werkwoche"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "Week"
-msgstr "Woche"
+#: ui/evolution-calendar.xml.h:29
+msgid "_Appointment..."
+msgstr "_Termin..."
 
-#: ui/evolution-calendar.xml.h:46
-msgid "_Appointment"
-msgstr "_Termin"
+#: ui/evolution-calendar.xml.h:30
+msgid "_Calendar Settings..."
+msgstr "_Kalender-Einstellungen..."
 
-#: ui/evolution-calendar.xml.h:48
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Tag"
 
-#: ui/evolution-calendar.xml.h:49
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Monat"
 
-#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:56
-msgid "_New"
-msgstr "_Neu"
-
-#: ui/evolution-calendar.xml.h:51
-msgid "_Open Calendar"
-msgstr "Kalender öffnen"
-
-#: ui/evolution-calendar.xml.h:56
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Woche"
 
-#: ui/evolution-comp-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Schließen"
+#: 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:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Schließen"
 
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this appointment"
@@ -9839,22 +10077,15 @@ msgid "Print S_etup"
 msgstr "Druck_einstellungen"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
-#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
 #: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:6
 msgid "Print..."
 msgstr "Drucken..."
 
-#: ui/evolution-comp-editor.xml.h:14 widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Speichern unter..."
-
 #: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
@@ -9874,18 +10105,15 @@ msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker einrichten"
 msgid "_Action"
 msgstr "_Aktion"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Datei"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution.xml.h:51
-msgid "_Help"
-msgstr "_Hilfe"
-
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Diesen Eintrag löschen"
@@ -9900,13 +10128,12 @@ msgid "Help"
 msgstr "Hilfe"
 
 #: ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Print En_velope..."
 msgstr "Umschlag drucken..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Speichern _unter..."
 
@@ -9927,36 +10154,35 @@ msgid "Send _message to contact..."
 msgstr "_Nachricht an Kontakt schicken..."
 
 #: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Speichern"
 
 #: ui/evolution-contact-list-editor.xml.h:2
-msgid "Delete this group"
-msgstr "Diese Gruppe löschen"
+msgid "Delete this list"
+msgstr "Diese Liste löschen"
 
-#: ui/evolution-contact-list-editor.xml.h:9
-#, fuzzy
-msgid "Save the group and close the dialog box"
-msgstr "Die Aufgabe speichern und das Dialogfenster schließen"
+#: ui/evolution-contact-list-editor.xml.h:6
+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:10
-msgid "Se_nd group to other..."
-msgstr "Gruppe an anderen _schicken..."
+#: ui/evolution-contact-list-editor.xml.h:7
+msgid "Se_nd list to other..."
+msgstr "Liste an andere schicken..."
 
-#: ui/evolution-contact-list-editor.xml.h:11
-msgid "Send _message to group..."
-msgstr "_Nachricht an Gruppe schicken..."
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Send _message to list..."
+msgstr "_Nachricht an Liste schicken..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Besprechung _absagen"
 
 #: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
-#, fuzzy
 msgid "Cancel the meeting for this item"
-msgstr "Die Eigenschaften dieses Ordners ändern"
+msgstr "Die Besprechung für diesen Eintrag stornieren"
 
 #: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 msgid "Forward as i_Calendar"
@@ -9968,7 +10194,7 @@ msgstr "Diesen Eintrag per E-Mail weiterleiten"
 
 #: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
 msgid "Obtain the latest meeting information"
-msgstr ""
+msgstr "Die letzten Besprechungsinformationen erhalten"
 
 #: ui/evolution-event-editor.xml.h:6
 msgid "Re_fresh Meeting"
@@ -9979,9 +10205,8 @@ msgid "Schedule _Meeting"
 msgstr "Besprechung ansetzen"
 
 #: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
-#, fuzzy
 msgid "Schedule a meeting for this item"
-msgstr "Besprechung ansetzen"
+msgstr "Eine Besprechung für diesen Eintrag ansetzen"
 
 #: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
@@ -9993,9 +10218,8 @@ msgid "Customise My Evolution"
 msgstr "My Evolution anpassen"
 
 #: ui/evolution-mail-global.xml.h:1
-#, fuzzy
 msgid "Cancel"
-msgstr "Ruhig"
+msgstr "Abbrechen"
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -10006,79 +10230,83 @@ msgid "Compose"
 msgstr "Erstellen"
 
 #: ui/evolution-mail-global.xml.h:4
+msgid "Compose _New Message"
+msgstr "_Neue Nachricht erstellen"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr "Mailaccounts anlegen und bearbeiten sowie andere Vorlieben"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "Regeln zum Filtern neuer Mail anlegen oder bearbeiten"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr "Definitionen virtueller Ordner anlegen oder bearbeiten"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "_Müll leeren"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "Passwörter vergessen"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Erinnerte Passwörter vergessen, so dass Sie wieder nach ihnen gefragt werden"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
 msgid "Manage _Subscriptions..."
 msgstr "_Abonnements verwalten..."
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr "Ein Fenster zum Erstellen einer Mailnachricht öffnen"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:13
 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:13
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send / Receive"
 msgstr "Verschicken / Empfangen"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr "Mail in der Warteschlange verschicken und neue Mail abholen"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Nachrichten-Vorschaufenster zeigen"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Ordner auf entfernten Servern abonnieren oder abbestellen"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor für virtuelle Ordner..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filter..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "Nachricht _verschicken"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "_Mail-Einstellungen..."
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "_Vorschaufläche"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_Verschicken / Empfangen"
 
@@ -10103,7 +10331,7 @@ msgid "Hide _Deleted Messages"
 msgstr "_Gelöschte Nachrichten verbergen"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide _Read messages"
+msgid "Hide _Read Messages"
 msgstr "Ge_lesene Nachrichten verbergen"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -10275,20 +10503,20 @@ msgid "Display the previous unread message"
 msgstr "Die letzte ungelesene Nachricht anzeigen"
 
 #: ui/evolution-mail-message.xml.h:24
-msgid "Filter on Mailing _List"
-msgstr "Filter über Mailing_liste"
+msgid "Filter on Mailing _List..."
+msgstr "Filter über Mailing_liste..."
 
 #: ui/evolution-mail-message.xml.h:25
-msgid "Filter on Se_nder"
-msgstr "Filter über Absender"
+msgid "Filter on Se_nder..."
+msgstr "Filter über _Absender..."
 
 #: ui/evolution-mail-message.xml.h:26
-msgid "Filter on _Recipients"
-msgstr "Filter über Empfänger"
+msgid "Filter on _Recipients..."
+msgstr "Filter über _Empfänger..."
 
 #: ui/evolution-mail-message.xml.h:27
-msgid "Filter on _Subject"
-msgstr "Filter über _Betreff"
+msgid "Filter on _Subject..."
+msgstr "Filter über _Betreff..."
 
 #: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
@@ -10334,176 +10562,174 @@ msgstr "Die ausgewählte Nachricht an jemanden als Anlage weiterleiten"
 msgid "Load _Images"
 msgstr "_Bilder laden"
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Mar_k As Read"
-msgstr "Als _gelesen markieren"
-
 #: ui/evolution-mail-message.xml.h:40
-msgid "Mark As I_mportant"
+msgid "Mark as I_mportant"
 msgstr "Als _wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:41
-msgid "Mark As U_nread"
-msgstr "Als u_ngelesen markieren"
-
 #: ui/evolution-mail-message.xml.h:42
+msgid "Mark as Unimp_ortant"
+msgstr "Als _unwichtig markieren"
+
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark the selected messages as having been read"
 msgstr "Die gewählten Nachrichten als gelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:43
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as important"
-msgstr "Alle sichtbaren Nachrichten zum Löschen vorsehen"
+msgstr "Die ausgewählten Nachrichten als wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as not having been read"
 msgstr "Die ausgewählten Nachrichten als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as unimportant"
+msgstr "Die ausgewählten Nachrichten als unwichtig markieren"
+
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages for deletion"
 msgstr "Alle sichtbaren Nachrichten zum Löschen vorsehen"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move selected messages to another folder"
 msgstr "Ausgewählte Nachrichten in einen anderen Ordner kopieren"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
+msgid "Next"
+msgstr "Weiter"
+
+#: ui/evolution-mail-message.xml.h:51
 msgid "Open the selected message in a new window"
 msgstr "Die ausgewählte Nachricht in einem neuen Fenster öffnen"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Die gewählte Nachrichten im Maileditor öffnen, um sie nochmals zu verschicken"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Previews the message to be printed"
 msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 msgid "Previous"
 msgstr "Zurück"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Print Message..."
 msgstr "Nachricht drucken..."
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Print Preview..."
 msgstr "Druckvorschau..."
 
-#: ui/evolution-mail-message.xml.h:56
-msgid "Print message to the printer"
-msgstr "Nachricht auf dem Drucker drucken"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Redirect (FIXME: implement me)"
-msgstr "Umleitung (FIXME: implementier mich)"
-
 #: ui/evolution-mail-message.xml.h:58
+msgid "Print this message"
+msgstr "Diese Nachricht drucken"
+
+#: ui/evolution-mail-message.xml.h:59
 msgid "Reply"
 msgstr "Antworten"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:60
 msgid "Reply to All"
 msgstr "Allen antworten"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:63
 msgid "S_earch Message"
 msgstr "Nachricht durch_suchen"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Save the message as a text file"
 msgstr "Die Nachricht als Textdatei speichern"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:65
 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:65
+#: ui/evolution-mail-message.xml.h:66
 msgid "Show Email _Source"
 msgstr "E-Mail-_Quellcode zeigen"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:67
 msgid "Show Full _Headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:68
 msgid "Show message in the normal style"
 msgstr "Nachricht im normalen Stil zeigen"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:69
 msgid "Show message with all email headers"
 msgstr "Nachricht mit allen E-Mail-Kopfzeilen zeigen"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:70
 msgid "Show the raw email source of the message"
 msgstr "Den rohen E-Mail-Quellcode dieser Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:71
 msgid "Un-delete the selected messages"
 msgstr "Löschen für ausgewählte Nachrichten rückgängig machen"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:72
 msgid "VFolder on Mailing _List..."
 msgstr "VOrdner über Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:73
 msgid "VFolder on Se_nder..."
 msgstr "VOrdner über _Absender..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:74
 msgid "VFolder on _Recipients..."
 msgstr "VOrdner über _Empfänger..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "VFolder on _Subject..."
 msgstr "VOrdner über _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "_Apply Filters"
 msgstr "Filter _anwenden"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:78
 msgid "_Create Filter From Message"
 msgstr "Filter aus Nachricht _erzeugen"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "_Forward Message"
 msgstr "Nachricht _weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "_Normal Display"
 msgstr "_Normale Anzeige"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Open Message"
 msgstr "Nachricht _öffnen"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Re-send Message"
 msgstr "Nachricht _nochmals verschicken"
 
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-#, fuzzy
 msgid "Close this window"
-msgstr "Rauch mit Wind"
+msgstr "Dieses Fenster schließen"
 
 #: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
 msgid "Customi_ze Toolbars..."
@@ -10518,7 +10744,8 @@ msgid "Customize toolbars"
 msgstr "Werkzeugleisten anpassen"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:42
 msgid "_Close"
 msgstr "Schließen"
@@ -10532,11 +10759,7 @@ msgstr "_Ansicht"
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Eine Datei beilegen"
-
-#: ui/evolution-message-composer.xml.h:4
+#: 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"
 
@@ -10562,50 +10785,56 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+msgid "Inline Text _File..."
+msgstr "Text_datei an Ort und Stelle einfügen..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Eine Datei als Text in die Nachricht einfügen"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Textdatei einfügen..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Eine Datei öffnen"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Mit PGP verschlüsseln"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Mit PGP signieren"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "Mit S/MIME verschlüsseln"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Mit S/MIME signieren"
 
-#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Speichern"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _Draft"
-msgstr "Entwurf speichern"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Speichern _unter"
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "In Ordner speichern... (FIXME)"
+msgid "Save _Draft"
+msgstr "Entwurf speichern"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "In Ordner speichern..."
 
 #: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Die aktuelle Datei speichern"
 
@@ -10618,9 +10847,8 @@ msgid "Save the message in a specified folder"
 msgstr "Die Nachricht in einem bestimmten Ordner speichern"
 
 #: ui/evolution-message-composer.xml.h:27
-#, fuzzy
 msgid "Send"
-msgstr "Sand"
+msgstr "Verschicken"
 
 #: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
@@ -10679,33 +10907,35 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Anzeige des Antwort-an-Feldes an/aus"
 
 #: ui/evolution-message-composer.xml.h:42
+msgid "_Attachment..."
+msgstr "_Anlage..."
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "_BCC-Feld"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "_CC-Feld"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Diagnose"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "Alle _löschen"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "_Von-Feld"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "Einfügen"
 
-#: ui/evolution-message-composer.xml.h:51
-msgid "_Insert text file..."
-msgstr "_Textdatei einfügen..."
-
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Öffnen..."
@@ -10718,6 +10948,10 @@ msgstr "Antwort-an-Feld"
 msgid "_Security"
 msgstr "_Sicherheit"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Hilfe"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufügen"
@@ -10787,17 +11021,17 @@ msgid "Set task view preferences"
 msgstr "Aufgaben-Ansichtseinstellungen ändern"
 
 #: ui/evolution-tasks.xml.h:12
-msgid "Tasks Preferences..."
-msgstr "Aufgaben-Vorlieben..."
-
-#: ui/evolution-tasks.xml.h:13
 msgid "TasksPreferences"
 msgstr "Aufgaben-Vorlieben"
 
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:18
 msgid "_Task"
 msgstr "Aufgabe"
 
+#: ui/evolution-tasks.xml.h:19
+msgid "_Tasks Settings..."
+msgstr "_Aufgaben-Einstellungen..."
+
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Über Evolution..."
@@ -10918,10 +11152,6 @@ msgstr "Den _Mailer benutzen"
 msgid "View the selected folder"
 msgstr "Den gewählten Ordner betrachten"
 
-#: ui/evolution.xml.h:38
-msgid "Work Offline"
-msgstr "Offline arbeiten"
-
 #: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "Über Evolution..."
@@ -10962,6 +11192,10 @@ msgstr "_Mailnachricht"
 msgid "_Move..."
 msgstr "_Verschieben..."
 
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Neu"
+
 #: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "Neuer Ordner"
@@ -11006,22 +11240,6 @@ msgstr "Nach Firma"
 msgid "Phone List"
 msgstr "Telefonliste"
 
-#: views/calendar/galview.xml.h:1
-msgid "Day View"
-msgstr "Tagesansicht"
-
-#: views/calendar/galview.xml.h:2
-msgid "Month View"
-msgstr "Monatsansicht"
-
-#: views/calendar/galview.xml.h:3
-msgid "Week View"
-msgstr "Wochenansicht"
-
-#: views/calendar/galview.xml.h:4
-msgid "Work Week View"
-msgstr "Werkwochenansicht"
-
 #: views/mail/galview.xml.h:1
 msgid "By Sender"
 msgstr "Nach Absender"
@@ -11042,6 +11260,13 @@ msgstr "Nachrichten"
 msgid "With Category"
 msgstr "Mit Kategorie"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%a, %d. %B %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Vorläufig"
@@ -11076,7 +11301,7 @@ msgstr "Weggezoomt anzeigen"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
-msgstr "Frei/beschäftigt aktualisieren"
+msgstr "Verfügbarkeit _aktualisieren"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
@@ -11118,14 +11343,6 @@ msgstr "Ende der Besprechung:"
 msgid "All Attendees"
 msgstr "Alle Anwesenden"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-#, fuzzy
-msgid "%A, %B %d, %Y"
-msgstr "%a, %b %d / %H:%M"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "Aktuelle Ansicht"
@@ -11136,19 +11353,23 @@ 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:427
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
+#: widgets/misc/e-calendar-item.c:1068
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Jetzt"
 
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Heute"
+
 #: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
@@ -11159,101 +11380,97 @@ msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
 
 #: widgets/misc/e-charset-picker.c:59
-#, fuzzy
 msgid "Baltic"
-msgstr "Grundlagen"
+msgstr "Baltisch"
 
 #: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
-msgstr ""
+msgstr "Mitteleuropäisch"
 
 #: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
-msgstr ""
+msgstr "Chinesisch"
 
 #: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
-msgstr ""
+msgstr "Kyrillisch"
 
 #: widgets/misc/e-charset-picker.c:63
-#, fuzzy
 msgid "Greek"
-msgstr "Woche"
+msgstr "Griechisch"
 
 #: widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
-msgstr ""
+msgstr "Japanisch"
 
 #: widgets/misc/e-charset-picker.c:65
 msgid "Korean"
-msgstr ""
+msgstr "Koreanisch"
 
 #: widgets/misc/e-charset-picker.c:66
-#, fuzzy
 msgid "Turkish"
-msgstr "Müll"
+msgstr "Türkisch"
 
 #: widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
-msgstr ""
+msgstr "Unicode"
 
 #: widgets/misc/e-charset-picker.c:68
 msgid "Western European"
-msgstr ""
+msgstr "Westeuropäisch"
 
 #: widgets/misc/e-charset-picker.c:85
-#, fuzzy
 msgid "Traditional"
-msgstr "Transaktion fehlgeschlagen"
+msgstr "Traditionell"
 
 #: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
 msgid "Simplified"
-msgstr ""
+msgstr "Vereinfach"
 
 #: widgets/misc/e-charset-picker.c:91
 msgid "Ukrainian"
-msgstr ""
+msgstr "Ukrainisch"
 
 #: widgets/misc/e-charset-picker.c:102
-#, fuzzy
 msgid "New"
-msgstr "_Neu"
+msgstr "Neu"
 
 #: widgets/misc/e-charset-picker.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown character set: %s"
-msgstr "Vorgegebener Zeichensatz: "
+msgstr "Unbekannter Zeichensatz: %s"
 
 #: widgets/misc/e-charset-picker.c:202
-#, fuzzy
 msgid "Enter the character set to use"
-msgstr "Vorgegebener Zeichensatz: "
+msgstr "Geben Sie den zu verwendenden Zeichensatz an"
 
 #: widgets/misc/e-charset-picker.c:277
-#, fuzzy
 msgid "Other..."
-msgstr "Andere"
+msgstr "Anderer..."
 
 #: widgets/misc/e-charset-picker.c:394
 msgid "Character Encoding"
-msgstr ""
+msgstr "Zeichenkodierung"
 
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:167
+#: widgets/misc/e-filter-bar.c:157
+msgid "Search Editor"
+msgstr "Editor für Suchen"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Suche speichren"
 
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
 #: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
-#, fuzzy
 msgid "Show All"
-msgstr "Geringfügiger Hagel"
+msgstr "Alle zeigen"
 
 #: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
@@ -11307,18 +11524,3 @@ msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
-
-#~ msgid "WeatherInfo missing location"
-#~ msgstr "Fehlender Ort in WeatherInfo"
-
-#~ msgid "Failed to get METAR data.\n"
-#~ msgstr "Fehler beim Holen der METAR-Daten.\n"
-
-#~ msgid "Failed to get IWIN forecast data.\n"
-#~ msgstr "Fehler beim Holen der IWIN-Vorhersagedaten.\n"
-
-#~ msgid "Another update already in progress!\n"
-#~ msgstr "Eine andere Aktualisierung ist bereits im Gange!\n"
-
-#~ msgid "Retrieval failed"
-#~ msgstr "Empfang fehlgeschlagen"