Updated German translation

svn path=/trunk/; revision=12714

2 files changed, 2057 insertions, 2529 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 1aba2df813..4ae09d1294 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-09  Matthias Warkus  <mawarkus@gnome.org>
+
+	* de.po: Updated German translation.
+
 2001-09-08  Christophe Merlet  <redfox@eikonex.org>
 
 	* fr.po: Updated French translation with contributions from
diff --git a/po/de.po b/po/de.po
index d1b47f3846..487959799f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,12 +7,11 @@
 # task = Aufgabe (Auftrag klingt nach Buchhaltung)
 # mailbox = Postfach (dt. Mailbox ist die Übersetzung von "BBS")
 #
-#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.8cvs\n"
-"POT-Creation-Date: 2001-08-22 18:50-0400\n"
-"PO-Revision-Date: 2001-07-30 18:29+02:00\n"
+"POT-Creation-Date: 2001-09-08 17:24+0200\n"
+"PO-Revision-Date: 2001-09-08 17:32+02:00\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +26,283 @@ msgstr "Factory, um VCard-Dateien in Evolution zu importieren."
 msgid "Imports VCard files into Evolution."
 msgstr "Importiert VCard-Dateien in Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3595
+#: addressbook/backend/ebook/e-card-simple.c:58
+#: addressbook/gui/widgets/e-addressbook-view.c:868
+msgid "File As"
+msgstr "Einsortieren unter"
+
+#: addressbook/backend/ebook/e-card-simple.c:59
+msgid "Name"
+msgstr "Name"
+
+#: addressbook/backend/ebook/e-card-simple.c:60
+msgid "Family Name"
+msgstr "Familienname"
+
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/widgets/e-addressbook-view.c:870
+msgid "Email"
+msgstr "E-Mail"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/contact-editor/e-contact-editor.c:1581
+msgid "Primary"
+msgstr "Primär"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+msgid "Prim"
+msgstr "Prim"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+msgid "Assistant"
+msgstr "Assistent"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
+#: addressbook/gui/contact-editor/e-contact-editor.c:1634
+msgid "Business"
+msgstr "Geschäftlich"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+msgid "Bus"
+msgstr "Geschäft"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+msgid "Callback"
+msgstr "Rückruf"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
+msgid "Company"
+msgstr "Firma"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+msgid "Comp"
+msgstr "Fa."
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1635
+msgid "Home"
+msgstr "Zu Hause"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+msgid "Org"
+msgstr "Org"
+
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+msgid "Mobile"
+msgstr "Mobil"
+
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+msgid "Car"
+msgstr "Auto"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+msgid "Business Fax"
+msgstr "Geschäftliches Fax"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+msgid "Bus Fax"
+msgstr "Gesch. Fax"
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+msgid "Home Fax"
+msgstr "Fax zu Hause"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+msgid "Business 2"
+msgstr "Geschäftlich 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+msgid "Bus 2"
+msgstr "Geschäft 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+msgid "Home 2"
+msgstr "Zu Hause 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
+#: addressbook/gui/widgets/e-addressbook-view.c:886
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: mail/mail-config.glade.h:51
+msgid "Other"
+msgstr "Andere"
+
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+msgid "Other Fax"
+msgstr "Anderes Fax"
+
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1580
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+msgid "Pager"
+msgstr "Pager"
+
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1582
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Radio"
+msgstr "Funk"
+
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1583
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "TTY"
+msgstr "Telex"
+
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/gui/widgets/e-addressbook-view.c:894
+msgid "Email 2"
+msgstr "E-Mail 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+msgid "Email 3"
+msgstr "E-Mail 3"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/widgets/e-addressbook-view.c:896
+msgid "Web Site"
+msgstr "Website"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+msgid "Url"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Department"
+msgstr "Abteilung"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+msgid "Dep"
+msgstr "Abt"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Office"
+msgstr "Büro"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+msgid "Off"
+msgstr "Büro"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+msgid "Title"
+msgstr "Titel"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+msgid "Profession"
+msgstr "Beruf"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+msgid "Prof"
+msgstr "Beruf"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+msgid "Manager"
+msgstr "Vorgesetzter"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+msgid "Man"
+msgstr "Chef"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+msgid "Ass"
+msgstr "Ass"
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+msgid "Nick"
+msgstr "Spitzn."
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+msgid "Spouse"
+msgstr "Lebenspartner"
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+msgid "Note"
+msgstr "Notiz"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:906
+msgid "Free-busy URL"
+msgstr "Verfügbarkeits-Adresse"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+msgid "FBUrl"
+msgstr "VURL"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Anniversary"
+msgstr "Jahrestag"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Anniv"
+msgstr "JTag"
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+msgid "Birth Date"
+msgstr "Geburtsdatum"
+
+#: addressbook/backend/ebook/e-card-simple.c:102
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorien"
+
+#: addressbook/backend/ebook/e-card.c:3684
 msgid "Card: "
 msgstr "Karte: "
 
-#: addressbook/backend/ebook/e-card.c:3597
+#: addressbook/backend/ebook/e-card.c:3686
 msgid ""
 "\n"
 "Name: "
@@ -39,7 +310,7 @@ msgstr ""
 "\n"
 "Name: "
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "  Prefix:     "
@@ -47,7 +318,7 @@ msgstr ""
 "\n"
 "  Präfix:     "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3688
 msgid ""
 "\n"
 "  Given:      "
@@ -55,7 +326,7 @@ msgstr ""
 "\n"
 "  Vorname:     "
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3689
 msgid ""
 "\n"
 "  Additional: "
@@ -63,7 +334,7 @@ msgstr ""
 "\n"
 "  Zusätzlich: "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "  Family:     "
@@ -71,7 +342,7 @@ msgstr ""
 "\n"
 "  Familienname:     "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3691
 msgid ""
 "\n"
 "  Suffix:     "
@@ -79,7 +350,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3616
+#: addressbook/backend/ebook/e-card.c:3705
 msgid ""
 "\n"
 "Birth Date: "
@@ -87,7 +358,7 @@ msgstr ""
 "\n"
 "Geburtsdatum: "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "Address:"
@@ -95,7 +366,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -103,7 +374,7 @@ msgstr ""
 "\n"
 "  Postfach:  "
 
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Ext:         "
@@ -111,7 +382,7 @@ msgstr ""
 "\n"
 "  Suffix:        "
 
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3720
 msgid ""
 "\n"
 "  Street:      "
@@ -119,7 +390,7 @@ msgstr ""
 "\n"
 "  Straße:     "
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3721
 msgid ""
 "\n"
 "  City:        "
@@ -127,7 +398,7 @@ msgstr ""
 "\n"
 "  Ort:     "
 
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3722
 msgid ""
 "\n"
 "  Region:      "
@@ -135,7 +406,7 @@ msgstr ""
 "\n"
 "  Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3634
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "  Postal Code: "
@@ -143,7 +414,7 @@ msgstr ""
 "\n"
 "  Postleitzahl: "
 
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3724
 msgid ""
 "\n"
 "  Country:     "
@@ -151,7 +422,7 @@ msgstr ""
 "\n"
 "  Land:     "
 
-#: addressbook/backend/ebook/e-card.c:3648
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Delivery Label: "
@@ -159,7 +430,7 @@ msgstr ""
 "\n"
 "Postvermerk: "
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Telephones:\n"
@@ -167,7 +438,7 @@ msgstr ""
 "\n"
 "Telefone:\n"
 
-#: addressbook/backend/ebook/e-card.c:3663
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "Telephone:"
@@ -175,7 +446,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3687
+#: addressbook/backend/ebook/e-card.c:3776
 msgid ""
 "\n"
 "E-mail:\n"
@@ -183,7 +454,7 @@ msgstr ""
 "\n"
 "E-Mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3779
 msgid ""
 "\n"
 "E-mail:"
@@ -191,7 +462,7 @@ msgstr ""
 "\n"
 "E-Mail:"
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3798
 msgid ""
 "\n"
 "Mailer: "
@@ -199,7 +470,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "Time Zone: "
@@ -207,7 +478,7 @@ msgstr ""
 "\n"
 "Zeitzone: "
 
-#: addressbook/backend/ebook/e-card.c:3723
+#: addressbook/backend/ebook/e-card.c:3812
 msgid ""
 "\n"
 "Geo Location: "
@@ -215,7 +486,7 @@ msgstr ""
 "\n"
 "Geographischer Ort: "
 
-#: addressbook/backend/ebook/e-card.c:3727
+#: addressbook/backend/ebook/e-card.c:3816
 msgid ""
 "\n"
 "Business Role: "
@@ -223,7 +494,7 @@ msgstr ""
 "\n"
 "Berufsbezeichnung: "
 
-#: addressbook/backend/ebook/e-card.c:3739
+#: addressbook/backend/ebook/e-card.c:3828
 msgid ""
 "\n"
 "Org: "
@@ -231,7 +502,7 @@ msgstr ""
 "\n"
 "Firma: "
 
-#: addressbook/backend/ebook/e-card.c:3740
+#: addressbook/backend/ebook/e-card.c:3829
 msgid ""
 "\n"
 "  Name:  "
@@ -239,7 +510,7 @@ msgstr ""
 "\n"
 "  Name:  "
 
-#: addressbook/backend/ebook/e-card.c:3741
+#: addressbook/backend/ebook/e-card.c:3830
 msgid ""
 "\n"
 "  Unit:  "
@@ -247,7 +518,7 @@ msgstr ""
 "\n"
 "  Einheit:  "
 
-#: addressbook/backend/ebook/e-card.c:3742
+#: addressbook/backend/ebook/e-card.c:3831
 msgid ""
 "\n"
 "  Unit2: "
@@ -255,7 +526,7 @@ msgstr ""
 "\n"
 "  Einheit2: "
 
-#: addressbook/backend/ebook/e-card.c:3743
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "  Unit3: "
@@ -263,7 +534,7 @@ msgstr ""
 "\n"
 "  Einheit3: "
 
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3833
 msgid ""
 "\n"
 "  Unit4: "
@@ -271,7 +542,7 @@ msgstr ""
 "\n"
 "  Einheit4: "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3837
 msgid ""
 "\n"
 "Categories: "
@@ -279,7 +550,7 @@ msgstr ""
 "\n"
 "Kategorien: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3838
 msgid ""
 "\n"
 "Comment: "
@@ -297,7 +568,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3762
+#: addressbook/backend/ebook/e-card.c:3851
 msgid ""
 "\n"
 "Unique String: "
@@ -305,7 +576,7 @@ msgstr ""
 "\n"
 "Eindeutige Zeichenkette: "
 
-#: addressbook/backend/ebook/e-card.c:3765
+#: addressbook/backend/ebook/e-card.c:3854
 msgid ""
 "\n"
 "Public Key: "
@@ -313,11 +584,11 @@ msgstr ""
 "\n"
 "Öffentlicher Schlüssel: "
 
-#: addressbook/backend/ebook/e-card.c:4037
+#: addressbook/backend/ebook/e-card.c:4204
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/backend/ebook/e-card.c:4045
+#: addressbook/backend/ebook/e-card.c:4212
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard für %s"
@@ -330,7 +601,7 @@ msgstr "VCard für %s"
 #: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
-#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
@@ -396,47 +667,43 @@ 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-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
 #: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
-#: shell/e-shortcuts.c:1048
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-shortcuts.c:1063
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: addressbook/gui/component/addressbook-component.c:68
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:66
 msgid "Folder containing contact information"
-msgstr ""
-"Fehler beim Laden von Filterinformation:\n"
-"%s"
+msgstr "Ordner mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "LDAP Server"
+msgstr "LDAP-Server:"
+
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "LDAP server containing contact information"
+msgstr "LDAP-Server mit Kontaktinformationen"
 
 #: addressbook/gui/component/addressbook-component.c:386
 #: ui/evolution-addressbook.xml.h:11
-#, fuzzy
 msgid "New Contact"
-msgstr "Neuer Kontakt:"
+msgstr "Neuer Kontakt"
 
 #: addressbook/gui/component/addressbook-component.c:386
-#, fuzzy
 msgid "New _Contact"
-msgstr "Neuer Kontakt:"
+msgstr "Neuer _Kontakt"
 
 #: addressbook/gui/component/addressbook-component.c:387
-#, fuzzy
 msgid "New Contact List"
-msgstr "Neuer Kontakt:"
+msgstr "Neu Kontaktliste"
 
 #: addressbook/gui/component/addressbook-component.c:387
-#, fuzzy
 msgid "New Contact _List"
-msgstr "Neuer Kontakt:"
+msgstr "Neue Kontakt_liste"
 
 #: addressbook/gui/component/addressbook-config.c:144
 msgid "Edit Addressbook"
@@ -444,12 +711,11 @@ msgstr "Adressbuch bearbeiten"
 
 #: addressbook/gui/component/addressbook-config.glade.h:1
 msgid "389"
-msgstr ""
+msgstr "389"
 
 #: addressbook/gui/component/addressbook-config.glade.h:2
-#, fuzzy
 msgid "Account Name"
-msgstr "Account"
+msgstr "Accountname"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
 msgid "Add Addressbook"
@@ -460,9 +726,8 @@ msgid "Addressbook Sources"
 msgstr "Adressbuch-Quellen"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#, fuzzy
 msgid "Advanced"
-msgstr "Komplex..."
+msgstr "Komplex"
 
 #: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "Base"
@@ -470,9 +735,8 @@ msgstr "Basis"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
 #: calendar/gui/dialogs/task-editor.c:151
-#, fuzzy
 msgid "Basic"
-msgstr "Grundlagen"
+msgstr "Grundlegend"
 
 #: addressbook/gui/component/addressbook-config.glade.h:8
 msgid "De_lete"
@@ -483,19 +747,16 @@ msgid "One"
 msgstr "Ein"
 
 #: addressbook/gui/component/addressbook-config.glade.h:10
-#, fuzzy
 msgid "Search _base:"
-msgstr "Suche-Bereich:"
+msgstr "Such_basis:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:11
-#, fuzzy
 msgid "Search s_cope: "
-msgstr "Suche-Bereich:"
+msgstr "Suchebe_reich:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:12
-#, fuzzy
 msgid "Server Name"
-msgstr "Namen wählen"
+msgstr "Servername"
 
 #: addressbook/gui/component/addressbook-config.glade.h:13
 #, fuzzy
@@ -504,103 +765,103 @@ msgstr "So"
 
 #: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "The information below is required in order to add an addressbook.  "
-msgstr ""
+msgstr "Die Information unten wird benötigt, um ein Adressbuch hinzuzufügen."
 
 #: addressbook/gui/component/addressbook-config.glade.h:15
 msgid "This information is not required for most ldap servers. "
-msgstr ""
+msgstr "Diese Informationen werden für die meisten LDAP-Server nicht benötigt."
 
 #: addressbook/gui/component/addressbook-config.glade.h:16
 msgid ""
 "This information is used by your ldap server to specify which nodes are used "
 "in a search. Contact your server administrator for more information."
 msgstr ""
+"Diese Informationen werden von Ihrem LDAP-Server benutzt, um anzugeben, "
+"welche Knoten bei einer Suche verwendet werden. Nehmen Sie für weitere "
+"Informationen Kontakt zu Ihrem Serveradministrator auf."
 
 #: addressbook/gui/component/addressbook-config.glade.h:17
 msgid ""
 "This is the base node for all your searches on the ldap server. Contact your "
 "server administrator for more information."
 msgstr ""
+"Dies ist der Basisknoten für alle Ihre Suchen auf dem LDAP-Server. Nehmen "
+"Sie für weitere Informationen Kontakt zu Ihrem Serveradministrator auf."
 
 #: addressbook/gui/component/addressbook-config.glade.h:18
 msgid "This is the name of the server where your addressbook is located."
-msgstr ""
+msgstr "Dies ist der Name des Servers, auf dem das Adressbuch liegt."
 
 #: addressbook/gui/component/addressbook-config.glade.h:19
 msgid "This is the port that your ldap server uses."
-msgstr ""
+msgstr "Dies ist der Port, den Ihr LDAP-Server verwendet."
 
 #: addressbook/gui/component/addressbook-config.glade.h:20
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
 msgstr ""
+"Dieser Name wird verwendet, um Ihren Zugang zu identifizieren. Er erscheint "
+"nur zu Anzeigezwecken."
 
 #: addressbook/gui/component/addressbook-config.glade.h:21
-#, fuzzy
 msgid "_Account name:"
-msgstr "Accountverwaltung"
+msgstr "_Accountname:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "Hinzufügen"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
 #: filter/filter.glade.h:9 mail/mail-config.glade.h:95
-#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:36
+#: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
 #: addressbook/gui/component/addressbook-config.glade.h:24
-#, fuzzy
 msgid "_My server requires authentication"
-msgstr "Server benötigt Legitimation"
+msgstr "_Mein Server benötigt Legitimation"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#, fuzzy
 msgid "_Port:"
-msgstr "Port:"
+msgstr "_Port:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:26
-#, fuzzy
 msgid "_Server name:"
-msgstr "Server-Nachricht:"
+msgstr "_Servername:"
 
-#: addressbook/gui/component/addressbook-storage.c:138
-msgid "Other Contacts"
-msgstr "Andere Kontakte"
-
-#: addressbook/gui/component/addressbook.c:386
-#, fuzzy, c-format
+#: addressbook/gui/component/addressbook.c:393
+#, c-format
 msgid "Please enter your email address and password for access to %s"
-msgstr "Bitte geben Sie Ihr Passwort für %s ein"
+msgstr ""
+"Bitte geben Sie Ihre E-Mail-Adresse und Ihr Passwort für den Zugriff auf %s "
+"ein"
 
-#: addressbook/gui/component/addressbook.c:394
-#, fuzzy
+#: addressbook/gui/component/addressbook.c:401
 msgid "LDAP Authentication"
-msgstr "Legitimation"
+msgstr "LDAP-Legitimation"
 
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:412
 msgid "Email Address:"
 msgstr "E-Mail-Adresse:"
 
-#: addressbook/gui/component/addressbook.c:418
-#, fuzzy
+#: addressbook/gui/component/addressbook.c:425
 msgid "Password:"
-msgstr "Passwort"
+msgstr "Passwort:"
 
-#: addressbook/gui/component/addressbook.c:481
+#: addressbook/gui/component/addressbook.c:488
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch kann nicht geöffnet werden"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:495
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -610,7 +871,7 @@ msgstr ""
 "bedeutet entweder, dass Sie einen ungültigen URI eingegeben\n"
 "haben oder dass der LDAP-Server unerreichbar ist."
 
-#: addressbook/gui/component/addressbook.c:493
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -623,7 +884,7 @@ msgstr ""
 "nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
 "haben.\n"
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:508
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -631,39 +892,37 @@ 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:642
+#: addressbook/gui/component/addressbook.c:649
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Irgend ein Feld enthält"
 
-#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:650
 msgid "Name contains"
 msgstr "Name enthält"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:651
 msgid "Email contains"
 msgstr "E-Mail enthält"
 
-#: addressbook/gui/component/addressbook.c:645
+#: addressbook/gui/component/addressbook.c:652
 #: calendar/gui/cal-search-bar.c:59
-#, fuzzy
 msgid "Category is"
-msgstr "Kategorien"
+msgstr "Kategorie ist"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Komplex..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:874
+#: addressbook/gui/component/addressbook.c:883
 #: calendar/gui/cal-search-bar.c:412
-#, fuzzy
 msgid "Any Category"
-msgstr "Kategorie:"
+msgstr "Beliebige Kategorie"
 
-#: addressbook/gui/component/addressbook.c:912
+#: addressbook/gui/component/addressbook.c:925
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -678,22 +937,10 @@ 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:1603
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
 msgid "Primary Email"
 msgstr "Primäre E-Mail"
 
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:860
-msgid "Email 2"
-msgstr "E-Mail 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
-#: addressbook/gui/widgets/e-addressbook-view.c:861
-msgid "Email 3"
-msgstr "E-Mail 3"
-
 #: addressbook/gui/component/e-address-popup.c:579
 msgid "Select an Action"
 msgstr "Eine Aktion wählen"
@@ -714,13 +961,13 @@ msgstr "Anfrage beim Adressbuch..."
 
 #: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:310
+#: addressbook/gui/component/select-names/e-select-names-popup.c:314
 msgid "Edit Contact Info"
 msgstr "Kontaktinfo bearbeiten"
 
 #: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:383
+#: addressbook/gui/component/select-names/e-select-names-popup.c:392
 msgid "Add to Contacts"
 msgstr "Zu Kontakten hinzufügen"
 
@@ -744,23 +991,22 @@ msgstr "Evolution Namenauswahlschnittstelle für das Adressbuch."
 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-popup.c:157
 #: addressbook/gui/component/select-names/e-select-names.c:729
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
-#: shell/e-shortcuts-view.c:385
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:181
 msgid "Remove"
 msgstr "Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#: addressbook/gui/component/select-names/e-select-names-popup.c:172
 msgid "Remove All"
 msgstr "Alle Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#: addressbook/gui/component/select-names/e-select-names-popup.c:196
 msgid "Send HTML Mail?"
 msgstr "HTML-Mail verschicken?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:368
+#: addressbook/gui/component/select-names/e-select-names-popup.c:415
 msgid "Unnamed Contact"
 msgstr "Namenloser Kontakt"
 
@@ -771,22 +1017,19 @@ msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names.c:560
 msgid "Select Contacts from Addressbook"
-msgstr ""
+msgstr "Kontakte aus Adressbuch wählen"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-#, fuzzy
 msgid "C_ontaining:"
-msgstr "enthält"
+msgstr "Ent_haltend:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-#, fuzzy
 msgid "Co_ntacts:"
-msgstr "Kontakte"
+msgstr "_Kontakte:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-#, fuzzy
 msgid "F_ind"
-msgstr "Suchen:"
+msgstr "_Suchen:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Select Names"
@@ -794,21 +1037,19 @@ msgstr "Namen wählen"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show contacts matching the following criteria:"
-msgstr ""
+msgstr "Kontakte zeigen, die auf folgende Kriterien passen:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "_Category:"
 msgstr "_Kategorie:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:7
-#, fuzzy
 msgid "_Folder:"
-msgstr "_Ordner"
+msgstr "_Ordner:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
-#, fuzzy
 msgid "_Message Recipients:"
-msgstr "Nachrichtenempfänger"
+msgstr "_Nachrichtenempfänger:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -828,7 +1069,9 @@ msgstr "Geschäftliches Fax"
 msgid "Ca_tegories..."
 msgstr "Kategorien..."
 
+#. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor.c:1213
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
@@ -838,9 +1081,8 @@ msgid "Details"
 msgstr "Details"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#, fuzzy
 msgid "File A_s:"
-msgstr "Einsortieren unter:"
+msgstr "Einsortieren _unter:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "General"
@@ -890,8 +1132,8 @@ msgstr "Kontakte..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
-#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: calendar/gui/dialogs/meeting-page.c:1483 filter/filter.glade.h:8
+#: mail/folder-browser.c:1318 mail/mail-config.glade.h:94
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -942,125 +1184,40 @@ msgid "_This is the mailing address"
 msgstr "Dies ist die Postadresse"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#, fuzzy
 msgid "_Web page address:"
-msgstr "Adresse der Webseite:"
+msgstr "Adresse der _Webseite:"
 
 #: 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:730
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt gehört in folgende Kategorien:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
-#: addressbook/gui/widgets/e-addressbook-view.c:868
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
-msgid "Business"
-msgstr "Geschäftlich"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
-msgid "Business 2"
-msgstr "Geschäftlich 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: addressbook/gui/widgets/e-addressbook-view.c:848
-msgid "Business Fax"
-msgstr "Geschäftliches Fax"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
-msgid "Callback"
-msgstr "Rückruf"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
-msgid "Car"
-msgstr "Auto"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-msgid "Home"
-msgstr "Zu Hause"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
-msgid "Home 2"
-msgstr "Zu Hause 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
-#: addressbook/gui/widgets/e-addressbook-view.c:849
-msgid "Home Fax"
-msgstr "Fax zu Hause"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
-msgid "Mobile"
-msgstr "Mobil"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: mail/mail-config.glade.h:51
-msgid "Other"
-msgstr "Andere"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1574
-#: addressbook/gui/widgets/e-addressbook-view.c:854
-msgid "Other Fax"
-msgstr "Anderes Fax"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
-#: addressbook/gui/widgets/e-addressbook-view.c:855
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1576
-msgid "Primary"
-msgstr "Primär"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1577
-#: addressbook/gui/widgets/e-addressbook-view.c:856
-msgid "Radio"
-msgstr "Funk"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1578
-#: addressbook/gui/widgets/e-addressbook-view.c:857
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1579
+#: addressbook/gui/contact-editor/e-contact-editor.c:1584
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2198
-#, fuzzy, c-format
+#: addressbook/gui/contact-editor/e-contact-editor.c:2203
+#, c-format
 msgid "Could not find widget for a field: `%s'"
-msgstr "Ordner-Zusammenfassungsdatei `%s' konnte nicht gelöscht werden: %s"
+msgstr "Widget für ein Feld konnte nicht gefunden werden: '%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufügen"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
 msgid "Edit Full"
 msgstr "Voll bearbeiten"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:835
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Full Name"
 msgstr "Voller Name"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
 msgid "E-mail"
 msgstr "E-Mail"
 
@@ -1070,139 +1227,132 @@ msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
+"%s gibt es bereits\n"
+"Möchten Sie sie überschreiben?"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
-#, fuzzy
 msgid "Afghanistan"
-msgstr "Assistent"
+msgstr "Afghanistan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Albania"
-msgstr ""
+msgstr "Albanien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Algeria"
-msgstr ""
+msgstr "Algerien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "American Samoa"
-msgstr ""
+msgstr "Amerikanisch-Samoa"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "Anguilla"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:9
-#, fuzzy
 msgid "Antarctica"
-msgstr "Automatisch"
+msgstr "Antarktika"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antigua und Barbuda"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:11
-#, fuzzy
 msgid "Argentina"
-msgstr "Ausrichtung"
+msgstr "Argentinien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:12
 msgid "Armenia"
-msgstr ""
+msgstr "Armenien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:13
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:14
 msgid "Australia"
-msgstr ""
+msgstr "Australien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:15
-#, fuzzy
 msgid "Austria"
-msgstr "August"
+msgstr "Österreich"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:16
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Aserbaidschan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:17
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamas"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:18
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrein"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:19
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesch"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:20
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:21
-#, fuzzy
 msgid "Belarus"
-msgstr "Jahre"
+msgstr "Weißrussland"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:22
 msgid "Belgium"
-msgstr ""
+msgstr "Belgien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:23
-#, fuzzy
 msgid "Belize"
-msgstr "Größe"
+msgstr "Belize"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:24
-#, fuzzy
 msgid "Benin"
-msgstr "Verschicken"
+msgstr "Benin"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:25
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermudas"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:26
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:27
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:28
 msgid "Bosnia And Herzegowina"
-msgstr ""
+msgstr "Bosnien und Herzegowina"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:29
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:30
-#, fuzzy
 msgid "Bouvet Island"
-msgstr "Mäßiger Sand"
+msgstr "Bouvet-Insel"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:31
-#, fuzzy
 msgid "Brazil"
-msgstr "Hagel"
+msgstr "Brasilien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:32
 msgid "British Indian Ocean Territory"
@@ -1210,7 +1360,7 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:33
 msgid "British Virgin Islands"
-msgstr ""
+msgstr "Britische Jungferninseln"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:34
 msgid "Brunei Darussalam"
@@ -1218,23 +1368,23 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:35
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgarien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:36
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:37
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:38
 msgid "Cambodia"
-msgstr ""
+msgstr "Kambodscha"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:39
 msgid "Cameroon"
-msgstr ""
+msgstr "Kamerun"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
@@ -1242,68 +1392,63 @@ msgstr "Kanada"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:41
 msgid "Cape Verde"
-msgstr ""
+msgstr "Kap Verde"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:42
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Cayman-Inseln"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:43
 msgid "Central African Republic"
-msgstr ""
+msgstr "Zentralafrikanische Republic"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:44
-#, fuzzy
 msgid "Chad"
-msgstr "Auto"
+msgstr "Tschad"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
 msgstr "Adresse prüfen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:46
-#, fuzzy
 msgid "Chile"
-msgstr "Chinesisch"
+msgstr "Chile"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:47
-#, fuzzy
 msgid "China"
-msgstr "Chinesisch"
+msgstr "China"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:48
 msgid "Christmas Island"
-msgstr ""
+msgstr "Weihnachtsinsel"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:49
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Kokos-(Keeling-)Inseln"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:50
 msgid "Colombia"
-msgstr ""
+msgstr "Kolumbien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:51
-#, fuzzy
 msgid "Comoros"
-msgstr "Erstellen"
+msgstr "Komoren"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:52
-#, fuzzy
 msgid "Congo"
-msgstr "Kopiere"
+msgstr "Kongo"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:53
 msgid "Cook Islands"
-msgstr ""
+msgstr "Cook-Inseln"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:54
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:55
 msgid "Cote d'Ivoire"
-msgstr ""
+msgstr "Elfenbeinküste"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
@@ -1311,27 +1456,27 @@ msgstr "Land:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:57
 msgid "Croatia"
-msgstr ""
+msgstr "Kroatien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:58
 msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:59
 msgid "Cyprus"
-msgstr ""
+msgstr "Zypern"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:60
 msgid "Czech Republic"
-msgstr ""
+msgstr "Tschechische Republik"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:61
 msgid "Denmark"
-msgstr ""
+msgstr "Dänemark"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:62
 msgid "Djibouti"
-msgstr ""
+msgstr "Dschibuti"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:63
 msgid "Dominica"
@@ -1339,398 +1484,367 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:64
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominikanische Republik"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:65
 msgid "East Timor"
-msgstr ""
+msgstr "Osttimor"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:66
 msgid "Ecuador"
-msgstr ""
+msgstr "Ecuador"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:67
 msgid "Egypt"
-msgstr ""
+msgstr "Ägypten"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:68
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:69
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Äquatorial-Guinea"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:70
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:71
 msgid "Estonia"
-msgstr ""
+msgstr "Estland"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:72
 msgid "Ethiopia"
-msgstr ""
+msgstr "Äthiopien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:73
 msgid "Falkland Islands"
-msgstr ""
+msgstr "Falklandinseln"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:74
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Faröer"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:75
 msgid "Fiji"
-msgstr ""
+msgstr "Fidschi"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "Finnland"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:77
-#, fuzzy
 msgid "France"
-msgstr "Abbrechen"
+msgstr "Frankreich"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:78
 msgid "French Guiana"
-msgstr ""
+msgstr "Französisch-Guyana"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:79
 msgid "French Polynesia"
-msgstr ""
+msgstr "Französisch-Polynesian"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:80
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Französische Südgebiete"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:81
 msgid "Gabon"
-msgstr ""
+msgstr "Gabun"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:82
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:83
 msgid "Georgia"
-msgstr ""
+msgstr "Georgien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:84
 msgid "Germany"
-msgstr ""
+msgstr "Deutschland"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:85
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:86
 msgid "Gibraltar"
-msgstr ""
+msgstr "Gibraltar"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:87
-#, fuzzy
 msgid "Greece"
-msgstr "Griechisch"
+msgstr "Griechenland"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:88
-#, fuzzy
 msgid "Greenland"
-msgstr "Finnland"
+msgstr "Grönland"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:89
-#, fuzzy
 msgid "Grenada"
-msgstr "Kanada"
+msgstr "Grenada"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:90
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadeloupe"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:91
-#, fuzzy
 msgid "Guam"
-msgstr "AM"
+msgstr "Guam"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:92
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:93
-#, fuzzy
 msgid "Guinea"
-msgstr "Allgemein"
+msgstr "Guinea"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:94
 msgid "Guinea-bissau"
-msgstr ""
+msgstr "Guinea-Bissau"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:95
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:96
-#, fuzzy
 msgid "Haiti"
-msgstr "Hagel"
+msgstr "Haiti"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:97
 msgid "Heard And McDonald Islands"
-msgstr ""
+msgstr "Heard- und McDonald-Inseln"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:98
 msgid "Holy See"
-msgstr ""
+msgstr "Heiliger Stuhl"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:99
-#, fuzzy
 msgid "Honduras"
-msgstr "Stunden"
+msgstr "Honduras"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:100
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hongkong"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:101
-#, fuzzy
 msgid "Hungary"
-msgstr "Sonntag"
+msgstr "Ungarn"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:102
 msgid "Iceland"
-msgstr ""
+msgstr "Island"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:103
 msgid "India"
-msgstr ""
+msgstr "Indien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:104
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonesien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:105
-#, fuzzy
 msgid "Ireland"
-msgstr "Koreanisch"
+msgstr "Irland"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:106
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:107
 msgid "Italy"
-msgstr ""
+msgstr "Italien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:108
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaika"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:109
-#, fuzzy
 msgid "Japan"
-msgstr "Japanisch"
+msgstr "Japan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:110
-#, fuzzy
 msgid "Jordan"
-msgstr "Koreanisch"
+msgstr "Jordan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:111
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kasachstan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:112
 msgid "Kenya"
-msgstr ""
+msgstr "Kenia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:113
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:114
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:115
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirgisistan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:116
-#, fuzzy
 msgid "Laos"
-msgstr "Am niedrigsten"
+msgstr "Laos"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:117
 msgid "Latvia"
-msgstr ""
+msgstr "Lettland"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:118
 msgid "Lebanon"
-msgstr ""
+msgstr "Libanon"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:119
-#, fuzzy
 msgid "Lesotho"
-msgstr "Am niedrigsten"
+msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:120
-#, fuzzy
 msgid "Liberia"
-msgstr "englisch"
+msgstr "Liberia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:121
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:122
-#, fuzzy
 msgid "Lithuania"
-msgstr "Leichter Hagel"
+msgstr "Litauen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:123
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxemburg"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:124
-#, fuzzy
 msgid "Macau"
-msgstr "März"
+msgstr "Macao"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:125
 msgid "Macedonia"
-msgstr ""
+msgstr "Mazedonien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:126
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskar"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:127
-#, fuzzy
 msgid "Malawi"
-msgstr "Mail"
+msgstr "Malawi"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:128
 msgid "Malaysia"
-msgstr ""
+msgstr "Malaysia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:129
 msgid "Maldives"
-msgstr ""
+msgstr "Malediven"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:130
-#, fuzzy
 msgid "Mali"
-msgstr "Mail"
+msgstr "Mali"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:131
-#, fuzzy
 msgid "Malta"
-msgstr "Mail"
+msgstr "Malta"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:132
-#, fuzzy
 msgid "Marshall Islands"
-msgstr "Teils Sand"
+msgstr "Marshall-Inseln"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:133
 msgid "Martinique"
-msgstr ""
+msgstr "Martinique"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:134
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauretanien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:135
-#, fuzzy
 msgid "Mauritius"
-msgstr "Ränder"
+msgstr "Mauritius"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:136
-#, fuzzy
 msgid "Mayotte"
-msgstr "Mai"
+msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:137
 msgid "Mexico"
-msgstr ""
+msgstr "Mexiko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:138
 msgid "Micronesia"
-msgstr ""
+msgstr "Mikronesien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:139
-#, fuzzy
 msgid "Monaco"
-msgstr "Montag"
+msgstr "Monaco"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:140
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolei"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:141
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:142
 msgid "Morocco"
-msgstr ""
+msgstr "Marokko"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:143
-#, fuzzy
 msgid "Mozambique"
-msgstr "Mobil"
+msgstr "Mosambik"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:144
-#, fuzzy
 msgid "Myanmar"
-msgstr "Vorgesetzter"
+msgstr "Myanmar"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:145
 msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:146
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:147
-#, fuzzy
 msgid "Nepal"
-msgstr "Antworten"
+msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:148
-#, fuzzy
 msgid "Netherlands"
-msgstr "_Strang auswählen"
+msgstr "Niederlande"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:149
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Niederländische Antillen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:150
-#, fuzzy
 msgid "New Caledonia"
-msgstr "Neuer Kontakt:"
+msgstr "Neukaledonien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:151
 msgid "New Zealand"
-msgstr ""
+msgstr "Neuseeland"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:152
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:153
-#, fuzzy
 msgid "Niger"
-msgstr "Höher"
+msgstr "Niger"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:154
-#, fuzzy
 msgid "Nigeria"
-msgstr "englisch"
+msgstr "Nigeria"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:155
 #, fuzzy
@@ -1739,264 +1853,239 @@ msgstr "Minute"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:156
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolkinsel"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:157
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Nördliche Marianen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:158
-#, fuzzy
 msgid "Norway"
-msgstr "Jetzt"
+msgstr "Norwegen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:159
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:160
-#, fuzzy
 msgid "Pakistan"
-msgstr "Einfügen"
+msgstr "Pakistan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:161
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:162
-#, fuzzy
 msgid "Panama"
-msgstr "Kanada"
+msgstr "Panama"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:163
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua-Neuguinea"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:164
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:165
-#, fuzzy
 msgid "Peru"
-msgstr "Papier"
+msgstr "Peru"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:166
 msgid "Philippines"
-msgstr ""
+msgstr "Philippinen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:167
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:168
-#, fuzzy
 msgid "Poland"
-msgstr "Finnland"
+msgstr "Polen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:169
-#, fuzzy
 msgid "Portugal"
-msgstr "Hochformat"
+msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:170
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:171
-#, fuzzy
 msgid "Qatar"
-msgstr "nach"
+msgstr "Katar"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:172
 msgid "Republic Of Korea"
-msgstr ""
+msgstr "Republik Korea"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:173
 msgid "Republic Of Moldova"
-msgstr ""
+msgstr "Republik Moldawien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:174
-#, fuzzy
 msgid "Reunion"
-msgstr "Regionen"
+msgstr "Reunion"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:175
 msgid "Romania"
-msgstr ""
+msgstr "Rumänien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:176
 msgid "Russian Federation"
-msgstr ""
+msgstr "Russische Föderation"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:177
-#, fuzzy
 msgid "Rwanda"
-msgstr "Kanada"
+msgstr "Rwanda"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:178
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "Saint Kitts und Nevis"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:179
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Saint Lucia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:180
 msgid "Saint Vincent And The Grena-dines"
-msgstr ""
+msgstr "Saint Vincent und die Grenadinen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:181
-#, fuzzy
 msgid "Samoa"
-msgstr "Rauch"
+msgstr "Samoa"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:182
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:183
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "Sao Tome und Principe"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:184
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudi-Arabien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:185
-#, fuzzy
 msgid "Senegal"
-msgstr "Allgemein"
+msgstr "Senegal"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:186
-#, fuzzy
 msgid "Seychelles"
-msgstr "Ansetzen"
+msgstr "Seychellen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:187
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:188
 msgid "Singapore"
-msgstr ""
+msgstr "Singapur"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:189
 msgid "Slovakia"
-msgstr ""
+msgstr "Slowakei"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:190
 msgid "Slovenia"
-msgstr ""
+msgstr "Slowenien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:191
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Salomonen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:192
-#, fuzzy
 msgid "Somalia"
-msgstr "Normal"
+msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:193
 msgid "South Africa"
-msgstr ""
+msgstr "Südafrika"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:194
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "Südgeorgien und die Südlichen Sandwichinseln"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:195
-#, fuzzy
 msgid "Spain"
-msgstr "Sand"
+msgstr "Spanien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:196
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:197
 msgid "St. Helena"
-msgstr ""
+msgstr "Sankt Helena"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:198
 msgid "St. Pierre And Miquelon"
-msgstr ""
+msgstr "St. Pierre und Miquelon"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:199
-#, fuzzy
 msgid "Sudan"
-msgstr "So"
+msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:200
-#, fuzzy
 msgid "Suriname"
-msgstr "Spitzname"
+msgstr "Surinam"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:201
 msgid "Svalbard And Jan Mayen Islands"
-msgstr ""
+msgstr "Svalbard- und Jan-Mayen-Inseln"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:202
-#, fuzzy
 msgid "Swaziland"
-msgstr "Finnland"
+msgstr "Swasiland"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:203
-#, fuzzy
 msgid "Sweden"
-msgstr "Gelesen"
+msgstr "Schweden"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:204
 msgid "Switzerland"
-msgstr ""
+msgstr "Schweiz"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:205
-#, fuzzy
 msgid "Taiwan"
-msgstr "Regen"
+msgstr "Taiwan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:206
-#, fuzzy
 msgid "Tajikistan"
-msgstr "Aufgabenliste"
+msgstr "Tadschikistan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:207
-#, fuzzy
 msgid "Thailand"
-msgstr "Finnland"
+msgstr "Thailand"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:208
-#, fuzzy
 msgid "Togo"
-msgstr "An"
+msgstr "Togo"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:209
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:210
-#, fuzzy
 msgid "Tonga"
-msgstr "Tornado"
+msgstr "Tonga"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:211
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidad und Tobago"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:212
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunesien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:213
-#, fuzzy
 msgid "Turkey"
-msgstr "Di"
+msgstr "Türkei"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:214
-#, fuzzy
 msgid "Turkmenistan"
-msgstr "Türkisch"
+msgstr "Turkmenistan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:215
 msgid "Turks And Caicos Islands"
@@ -2004,89 +2093,83 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:216
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuval"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:217
 msgid "U.S. Virgin Islands"
-msgstr ""
+msgstr "U.S.-Jungferninseln"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:218
-#, fuzzy
 msgid "Uganda"
-msgstr "Kanada"
+msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:219
-#, fuzzy
 msgid "Ukraine"
-msgstr "Ukrainisch"
+msgstr "Ukraine"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:220
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Vereinigte Arabische Emirate"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:221
 msgid "United Kingdom"
-msgstr ""
+msgstr "Vereinigtes Königreich"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:222
 msgid "United Republic Of Tanzania"
-msgstr ""
+msgstr "Vereinigte Republik Tansania"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:223
-#, fuzzy
 msgid "United States"
-msgstr "Unbenannte Nachricht"
+msgstr "Vereinigte Staaten"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:224
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Kleinere abseitsliegende Inseln der Vereinigten Staaten"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:225
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:226
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Usbekistan"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:227
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:228
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:229
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Namen wählen"
+msgstr "Vietnam"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:230
 msgid "Wallis And Futuna Islands"
-msgstr ""
+msgstr "Wallis und Futuna"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:231
-#, fuzzy
 msgid "Western Sahara"
-msgstr "Westeuropäisch"
+msgstr "Westsahara"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:232
-#, fuzzy
 msgid "Yemen"
-msgstr "Gelesen"
+msgstr "Jemen"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:233
 msgid "Yugoslavia"
-msgstr ""
+msgstr "Jugoslawien"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:234
 msgid "Zambia"
-msgstr ""
+msgstr "Sambia"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:235
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Simbabwe"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
@@ -2234,9 +2317,8 @@ 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
-#, fuzzy
 msgid "Change Anyway"
-msgstr "Trotzdem _ändern"
+msgstr "Trotzdem ändern"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
@@ -2261,161 +2343,64 @@ msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:260
+#: mail/mail-search.c:264
 msgid "Search"
 msgstr "Suchen"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
+#: addressbook/gui/widgets/e-addressbook-model.c:121
+msgid "No cards"
+msgstr "Keine Karten"
 
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
+#: addressbook/gui/widgets/e-addressbook-model.c:124
+msgid "1 card"
+msgstr "1 Karte"
 
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-model.c:127
+#, c-format
+msgid "%d cards"
+msgstr "%d Karten"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:655
-#: addressbook/gui/widgets/e-addressbook-view.c:717
-#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:138
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:691
+#: addressbook/gui/widgets/e-addressbook-view.c:753
+#: addressbook/gui/widgets/e-addressbook-view.c:1373
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
-#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Öffnen"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:754
 #: ui/evolution-addressbook.xml.h:10
-#, fuzzy
 msgid "Forward Contact"
-msgstr "Als _Anlage weiterleiten"
+msgstr "Kontakt weiterleiten"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:719
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:755
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:756
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Drucken"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
+#: addressbook/gui/widgets/e-addressbook-view.c:758
 msgid "Print Envelope"
 msgstr "Umschlag drucken"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
+#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:282 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
 #: ui/evolution-tasks.xml.h:8
@@ -2424,7 +2409,7 @@ 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
+#: addressbook/gui/widgets/e-minicard.c:452
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
@@ -2433,7 +2418,7 @@ msgid "Success"
 msgstr "Erfolg"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1654
 #: shell/e-storage.c:515
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
@@ -2461,8 +2446,8 @@ msgstr "Protokoll nicht unterstützt"
 #: addressbook/gui/widgets/e-addressbook-util.c:41
 #: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
-#: camel/camel-service.c:581
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Storniert"
 
@@ -2487,134 +2472,85 @@ 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:1218
+#: addressbook/gui/widgets/e-addressbook-view.c:1248
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:399
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",123,a,ä,b,c,d,e,f,g,h,i,j,k,l,m,n,o,ö,p,q,r,s,t,u,ü,v,w,x,y,z"
+
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:404
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",0,a,ä,b,c,d,e,f,g,h,i,j,k,l,m,n,o,ö,p,q,r,s,t,u,ü,v,w,x,y,z"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "* Click here to add a contact *"
 msgstr "* Hier klicken, um einen Kontakt hinzuzufügen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:834
-msgid "File As"
-msgstr "Einsortieren unter"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Email"
-msgstr "E-Mail"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:837
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Primary Phone"
 msgstr "Primäres Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Assistant Phone"
 msgstr "Telefon des Assistenten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "Business Phone"
 msgstr "Geschäftliches Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:840
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Callback Phone"
 msgstr "Rückruf-Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Company Phone"
 msgstr "Firmentelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:842
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Home Phone"
 msgstr "Telefon zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:843
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:844
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Business Address"
 msgstr "Geschäftliche Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:845
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Home Address"
 msgstr "Adresse zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:846
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:847
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Business Phone 2"
 msgstr "Geschäftliches Telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Home Phone 2"
 msgstr "Telefon zu Hause 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Other Phone"
 msgstr "Anderes Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
-msgid "TTY"
-msgstr "Telex"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Other Address"
 msgstr "Andere Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
-msgid "Web Site"
-msgstr "Website"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:863
-msgid "Department"
-msgstr "Abteilung"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:864
-msgid "Office"
-msgstr "Büro"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:865
-msgid "Title"
-msgstr "Titel"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:866
-msgid "Profession"
-msgstr "Beruf"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:867
-msgid "Manager"
-msgstr "Vorgesetzter"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:869
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:870
-msgid "Spouse"
-msgstr "Lebenspartner"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:871
-msgid "Note"
-msgstr "Notiz"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:872
-msgid "Free-busy URL"
-msgstr "Verfügbarkeits-Adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1215
-msgid "Done."
-msgstr "Fertig."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1247
-msgid "Removing cards..."
-msgstr "Karten werden entfernt..."
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
@@ -2805,20 +2741,17 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift..."
 
-#: addressbook/printing/e-contact-print.c:1091
-#, fuzzy
+#: addressbook/printing/e-contact-print.c:1092
 msgid "Print cards"
-msgstr "Kalender drucken"
+msgstr "Karten drucken"
 
-#: addressbook/printing/e-contact-print.c:1111
-#: addressbook/printing/e-contact-print.c:1133
-#, fuzzy
+#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1134
 msgid "Print card"
-msgstr "Kalender drucken"
+msgstr "Karte drucken"
 
 #: addressbook/printing/e-contact-print-envelope.c:216
 #: addressbook/printing/e-contact-print-envelope.c:237
-#, fuzzy
 msgid "Print envelope"
 msgstr "Umschlag drucken"
 
@@ -2858,21 +2791,21 @@ 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
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the sample Calendar control"
 msgstr "Factory für die beispielhafte Kalender-Control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Fabrik, die Kalender-Komponenteneditor-Dialoge zentralisiert"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory to create a component editor factory"
+msgstr "Fabrik, um eine Komponenteneditor-Fabrik zu erzeugen"
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Alarm-Benachrichtigungsdienst"
@@ -2940,23 +2873,23 @@ msgstr "Weiterschlaf-Zeit (Minuten)"
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:487
+#: calendar/gui/alarm-notify/alarm-queue.c:606
 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
+#: calendar/gui/alarm-notify/alarm-queue.c:825
+#: calendar/gui/alarm-notify/alarm-queue.c:1124
+#: calendar/gui/alarm-notify/alarm-queue.c:1180
 msgid "Reminder of your appointment at "
 msgstr "Erinnerung für Ihren Termin um "
 
-#: calendar/gui/alarm-notify/alarm-queue.c:991
+#: calendar/gui/alarm-notify/alarm-queue.c:1116
 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
+#: calendar/gui/alarm-notify/alarm-queue.c:1129
+#: calendar/gui/alarm-notify/alarm-queue.c:1184
 msgid "Ok"
 msgstr "OK"
 
@@ -2969,11 +2902,11 @@ msgstr ""
 "Es ist %s. Die Unix-Zeit ist momentan %ld. Wir dachten nur, dass Sie das "
 "vielleicht wissen wollten."
 
-#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "GNOME konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:106
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs konnte nicht initialisiert werden"
 
@@ -2981,45 +2914,41 @@ 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:414
-#, fuzzy
+#: calendar/gui/calendar-commands.c:426
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:429 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
-#: calendar/gui/calendar-commands.c:426
-#, fuzzy
+#: calendar/gui/calendar-commands.c:431 calendar/gui/calendar-commands.c:436
+#: calendar/gui/calendar-commands.c:438
 msgid "%a %d %b %Y"
-msgstr "%a, %d. %b"
+msgstr "%a, %d. %Y"
 
-#: calendar/gui/calendar-commands.c:435
-#, fuzzy, c-format
+#: calendar/gui/calendar-commands.c:447
+#, c-format
 msgid "%d"
-msgstr "d"
+msgstr "%d"
 
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
-#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
-#, fuzzy
+#: calendar/gui/calendar-commands.c:449 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:464
 msgid "%d %B %Y"
-msgstr "%A, %d. %B %Y"
+msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:454
 #: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:240
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-commands.c:604
+#: calendar/gui/calendar-commands.c:664
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3058,28 +2987,27 @@ msgstr "W"
 
 #: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
 msgid "High"
 msgstr "Hoch"
 
 #: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
 #: calendar/gui/calendar-model.c:1624
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
 msgid "Low"
 msgstr "Niedrig"
 
 #: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
 #: calendar/gui/e-calendar-table.c:380
-#, fuzzy
 msgid "Free"
-msgstr "Griechisch"
+msgstr "Frei"
 
 #: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
@@ -3099,20 +3027,20 @@ msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:323
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d. %m %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:332
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -3154,10 +3082,10 @@ msgid "Undefined"
 msgstr "Undefiniert"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
-#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:360
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1430
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:49
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
 #: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
@@ -3172,15 +3100,15 @@ msgstr "Wiederkehrend"
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1187
-#: calendar/gui/dialogs/meeting-page.c:1283
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:637
+#: calendar/gui/dialogs/meeting-page.c:647
+#: calendar/gui/dialogs/meeting-page.c:1179
+#: calendar/gui/dialogs/meeting-page.c:1286
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1284
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:649
+#: calendar/gui/dialogs/meeting-page.c:1287
 msgid "No"
 msgstr "Nein"
 
@@ -3201,63 +3129,56 @@ msgid "Month View"
 msgstr "Monatsansicht"
 
 #: calendar/gui/cal-search-bar.c:56
-#, fuzzy
 msgid "Summary contains"
-msgstr "E-Mail enthält"
+msgstr "Zusammenfassung enthält"
 
 #: calendar/gui/cal-search-bar.c:57
-#, fuzzy
 msgid "Description contains"
-msgstr "Beschreibung:"
+msgstr "Beschreibung enthält"
 
 #: calendar/gui/cal-search-bar.c:58
-#, fuzzy
 msgid "Comment contains"
-msgstr "Name enthält"
+msgstr "Kommentar enthält"
 
 #: calendar/gui/cal-search-bar.c:416
 msgid "Unmatched"
-msgstr ""
+msgstr "Nicht passend"
 
-#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+#: calendar/gui/component-factory.c:61 my-evolution/my-evolution.glade.h:6
+#: shell/e-shortcuts.c:1057
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:55
+#: calendar/gui/component-factory.c:62
 msgid "Folder containing appointments and events"
-msgstr ""
+msgstr "Ordner mit Terminen und Ereignissen"
 
-#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: calendar/gui/component-factory.c:66 calendar/gui/print.c:1707
 #: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
-#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
-#: views/tasks/galview.xml.h:1
+#: shell/e-shortcuts.c:1060 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: calendar/gui/component-factory.c:56
-#, fuzzy
+#: calendar/gui/component-factory.c:67
 msgid "Folder containing to-do items"
-msgstr "VOrdner über Mailingliste"
+msgstr "Ordner mit To-Do-Einträgen"
 
-#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:512 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
-#, fuzzy
+#: calendar/gui/component-factory.c:513 calendar/gui/e-day-view.c:3420
 msgid "New _Appointment"
-msgstr "Neuer Termin"
+msgstr "Neuer _Termin"
 
-#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:518 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: calendar/gui/component-factory.c:409
-#, fuzzy
+#: calendar/gui/component-factory.c:519
 msgid "New _Task"
-msgstr "Neue Aufgabe"
+msgstr "Neue _Aufgabe"
 
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
@@ -3327,95 +3248,95 @@ msgstr "Stunden"
 msgid "minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:332
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 day"
 msgstr "1 Tag"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:311
 msgid "1 week"
 msgstr "1 Woche"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:314
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:316
 msgid "1 hour"
 msgstr "1 Stunde"
 
-#: calendar/gui/dialogs/alarm-page.c:347
+#: calendar/gui/dialogs/alarm-page.c:319
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:321
 msgid "1 minute"
 msgstr "1 Minute"
 
-#: calendar/gui/dialogs/alarm-page.c:352
+#: calendar/gui/dialogs/alarm-page.c:324
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:326
 msgid "1 second"
 msgstr "1 Sekunde"
 
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:351
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:355
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Eine Nachricht anzeigen"
 
-#: calendar/gui/dialogs/alarm-page.c:387
+#: calendar/gui/dialogs/alarm-page.c:359
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:363
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Ein Programm ausführen"
 
-#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
-#: calendar/gui/dialogs/meeting-page.c:601
-#: calendar/gui/dialogs/meeting-page.c:636
-#: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1255
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/alarm-page.c:369 calendar/gui/dialogs/alarm-page.c:405
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:693
+#: calendar/gui/dialogs/meeting-page.c:1258
+#: calendar/gui/dialogs/meeting-page.c:1274
 #: camel/providers/smtp/camel-smtp-transport.c:224
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: calendar/gui/dialogs/alarm-page.c:409
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "before start of appointment"
 msgstr "vor Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:412
+#: calendar/gui/dialogs/alarm-page.c:384
 msgid "after start of appointment"
 msgstr "nach Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:422
+#: calendar/gui/dialogs/alarm-page.c:394
 msgid "before end of appointment"
 msgstr "vor Terminende"
 
-#: calendar/gui/dialogs/alarm-page.c:425
+#: calendar/gui/dialogs/alarm-page.c:397
 msgid "after end of appointment"
 msgstr "nach Terminende"
 
@@ -3464,7 +3385,7 @@ msgstr "Ende des Termins"
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:116
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -3493,9 +3414,8 @@ msgid "60 minutes"
 msgstr "60 Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#, fuzzy
 msgid "Calendar and Tasks Settings"
-msgstr "_Kalender-Einstellungen..."
+msgstr "Kalender- und Aufgaben-Einstellungen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Color for overdue tasks"
@@ -3506,92 +3426,79 @@ msgid "Color for tasks due today"
 msgstr "Farbe für heute fällige Aufgaben"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
 msgid "Create new appointments with a default _reminder"
-msgstr "Einen neuen Termin anlegen"
+msgstr "Neue Termine mit einer voreingestellten _Erinnerung erzeugen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
 msgid "Days"
 msgstr "Tage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#, fuzzy
 msgid "First day of wee_k:"
-msgstr "Erster Tag der Woche:"
+msgstr "Erster Tag der _Woche:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:969
+#: calendar/gui/dialogs/recurrence-page.c:950
 msgid "Friday"
 msgstr "Freitag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#, fuzzy
 msgid "Hours"
 msgstr "Stunden"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#, fuzzy
 msgid "Minutes"
 msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:946
 msgid "Monday"
 msgstr "Montag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
 msgid "O_verdue tasks:"
-msgstr "Überfällige Aufgaben"
+msgstr "_Überfällige Aufgaben:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:970
+#: calendar/gui/dialogs/recurrence-page.c:951
 msgid "Saturday"
 msgstr "Samstag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
 msgid "Show appointment _end times in week and month views"
-msgstr "Endzeiten von Terminen in Wochen- und Monatsansichten zeigen"
+msgstr "_Endzeiten von Terminen in Wochen- und Monatsansichten zeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#, fuzzy
 msgid "Show week _numbers in date navigator"
-msgstr "Wochennummern zeigen"
+msgstr "_Wochennummern in Datumsnavigator zeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#, fuzzy
 msgid "Sta_rt of day:"
-msgstr "Anfang des Tages:"
+msgstr "_Anfang des Tages:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#, fuzzy
 msgid "Su_n"
-msgstr "So"
+msgstr "S_o"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:971
+#: calendar/gui/dialogs/recurrence-page.c:952
 msgid "Sunday"
 msgstr "Sonntag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
 msgid "T_hu"
-msgstr "Do"
+msgstr "_Do"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
 msgid "T_ue"
-msgstr "Di"
+msgstr "D_i"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#, fuzzy
 msgid "Tas_ks due today:"
-msgstr "Heute fällige Aufgaben"
+msgstr "Heute fällige _Aufgaben:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:968
+#: calendar/gui/dialogs/recurrence-page.c:949
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -3600,26 +3507,24 @@ msgid "Time"
 msgstr "Zeit"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#, fuzzy
 msgid "Time _zone:"
-msgstr "Zeitzone:"
+msgstr "Zeit_zone:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
 msgid "Time di_visions:"
-msgstr "Zeit-Unterteilungen:"
+msgstr "Zeit-_Unterteilungen:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Time format:"
 msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:966
+#: calendar/gui/dialogs/recurrence-page.c:947
 msgid "Tuesday"
 msgstr "Dienstag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:967
+#: calendar/gui/dialogs/recurrence-page.c:948
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -3629,76 +3534,62 @@ msgid "Work Week"
 msgstr "Werkwoche"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#, fuzzy
 msgid "_12 hour (AM/PM)"
-msgstr "12 Stunden (am/pm)"
+msgstr "_12 Stunden (am/pm)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#, fuzzy
 msgid "_24 hour"
-msgstr "24 Stunden"
+msgstr "_24 Stunden"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Ask for confirmation when deleting items"
-msgstr ""
+msgstr "Beim Löschen von Objekten um Bestätigung _anfragen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#, fuzzy
 msgid "_Compress weekends in month view"
-msgstr "Wochenenden in Monatsansicht komprimieren"
+msgstr "Wochenenden in Monatsansicht _komprimieren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#, fuzzy
 msgid "_Display"
-msgstr "Anzeige"
+msgstr "_Anzeige"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#, fuzzy
 msgid "_End of day:"
-msgstr "Ende des Tages:"
+msgstr "_Ende des Tages:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#, fuzzy
 msgid "_Fri"
-msgstr "Fr"
+msgstr "_Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#, fuzzy
 msgid "_General"
-msgstr "Allgemein"
+msgstr "_Allgemein"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
 msgid "_Hide completed tasks after"
-msgstr "_Gelöschte Nachrichten verbergen"
+msgstr "Erledigte Aufgaben _verbergen nach"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#, fuzzy
 msgid "_Mon"
-msgstr "Mo"
+msgstr "_Mo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#, fuzzy
 msgid "_Other"
-msgstr "Andere"
+msgstr "_Andere"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#, fuzzy
 msgid "_Sat"
-msgstr "Sa"
+msgstr "S_a"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#, fuzzy
 msgid "_Task List"
-msgstr "Aufgabenliste"
+msgstr "_Aufgabenliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#, fuzzy
 msgid "_Wed"
-msgstr "Mi"
+msgstr "_Mi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#, fuzzy
 msgid "before the start of the appointment"
 msgstr "vor Terminbeginn"
 
@@ -3791,36 +3682,36 @@ msgstr " (Fällig am "
 msgid "Due "
 msgstr "Fällig am "
 
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:469
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/comp-editor.c:467
+#: calendar/gui/dialogs/comp-editor.c:474
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:470
+#: calendar/gui/dialogs/comp-editor.c:477
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:480
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:487
+#: calendar/gui/dialogs/comp-editor.c:494
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
-#: mail/mail-display.c:99
+#: calendar/gui/dialogs/comp-editor.c:860 mail/mail-callbacks.c:1524
+#: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
-#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
-#: mail/mail-display.c:103
+#: calendar/gui/dialogs/comp-editor.c:864 mail/mail-callbacks.c:1530
+#: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3828,12 +3719,12 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits.\n"
 "Überschreiben?"
 
-#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:927 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1077
+#: calendar/gui/dialogs/comp-editor.c:1080
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version kann nicht erhalten werden!"
 
@@ -3881,19 +3772,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-delegate-dialog.glade.h:1
-#, fuzzy
 msgid "Addressbook..."
-msgstr "Adressbuch"
+msgstr "Adressbuch..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#, fuzzy
 msgid "Delegate To:"
-msgstr "Delegiert an:"
+msgstr "Delegieren an:"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
-#, fuzzy
 msgid "Enter Delegate"
-msgstr "Gelöscht"
+msgstr "Delegaten eingeben"
 
 #: calendar/gui/dialogs/event-editor.c:156
 msgid "Appointment"
@@ -3917,9 +3805,8 @@ msgid "A_ll day event"
 msgstr "Ganztägiges Ereignis"
 
 #: calendar/gui/dialogs/event-page.glade.h:2
-#, fuzzy
 msgid "B_usy"
-msgstr "Beschäftigt"
+msgstr "_Beschäftigt"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:2
@@ -3928,9 +3815,8 @@ msgid "Classification"
 msgstr "Klassifikation"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
-#, fuzzy
 msgid "Con_fidential"
-msgstr "Vertraulich"
+msgstr "_Vertraulich"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
@@ -3938,9 +3824,8 @@ msgid "Date & Time"
 msgstr "Datum & Zeit"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
 msgid "F_ree"
-msgstr "Griechisch"
+msgstr "_Frei"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -3954,9 +3839,8 @@ msgstr "Öffentlich"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/e-calendar-table.etspec.h:12
-#, fuzzy
 msgid "Show Time As"
-msgstr "Schauer"
+msgstr "Zeit zeigen als"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:8
@@ -3971,135 +3855,123 @@ msgstr "_Endzeit:"
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1251
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:585
+#: calendar/gui/dialogs/meeting-page.c:1175
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Individual"
-msgstr ""
+msgstr "Individuell"
 
-#: calendar/gui/dialogs/meeting-page.c:578
-#: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1252
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:587
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "Group"
-msgstr "Gruppenname:"
+msgstr "Gruppe"
 
-#: calendar/gui/dialogs/meeting-page.c:580
-#: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1253
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:589
+#: calendar/gui/dialogs/meeting-page.c:1256
 msgid "Resource"
-msgstr "Quelle"
+msgstr "Ressource"
 
-#: calendar/gui/dialogs/meeting-page.c:582
-#: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1254
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:591
+#: calendar/gui/dialogs/meeting-page.c:1257
 msgid "Room"
-msgstr ""
+msgstr "Raum"
 
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1267
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Chair"
-msgstr "Auto"
+msgstr "Vorsitzender"
 
-#: calendar/gui/dialogs/meeting-page.c:613
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1185
-#: calendar/gui/dialogs/meeting-page.c:1268
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:622
+#: calendar/gui/dialogs/meeting-page.c:1177
+#: calendar/gui/dialogs/meeting-page.c:1271
 msgid "Required Participant"
-msgstr "Benötigte Information"
+msgstr "Benötigter Teilnehmer"
 
-#: calendar/gui/dialogs/meeting-page.c:615
-#: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1269
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:624
+#: calendar/gui/dialogs/meeting-page.c:1272
 msgid "Optional Participant"
-msgstr "Optionale Information"
+msgstr "Optionaler Teilnehmer"
 
-#: calendar/gui/dialogs/meeting-page.c:617
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:1273
 msgid "Non-Participant"
-msgstr ""
+msgstr "Nicht-Teilnehmer"
 
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1193
-#: calendar/gui/dialogs/meeting-page.c:1296
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:678
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1299
 msgid "Needs Action"
-msgstr "Eine Aktion wählen"
+msgstr "Erfordert Maßnahme"
 
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1297
+#: calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:680
+#: calendar/gui/dialogs/meeting-page.c:1300
 msgid "Accepted"
-msgstr ""
+msgstr "Angenommen"
 
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1298
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:659
+#: calendar/gui/dialogs/meeting-page.c:682
+#: calendar/gui/dialogs/meeting-page.c:1301
 msgid "Declined"
-msgstr "Gelöscht"
+msgstr "Abgelehnt"
 
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1299
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:684
+#: calendar/gui/dialogs/meeting-page.c:1302
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1300
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1303
 msgid "Delegated"
-msgstr "Gelöscht"
+msgstr "Delegiert"
 
-#: calendar/gui/dialogs/meeting-page.c:675
-#: calendar/gui/dialogs/meeting-page.c:698
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/dialogs/meeting-page.c:737
+#: calendar/gui/dialogs/meeting-page.c:729
 msgid "That person is already attending the meeting!"
 msgstr "Diese Person nimmt schon an der Besprechung teil!"
 
-#: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:842
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:780
+#: calendar/gui/dialogs/meeting-page.c:834
 msgid "Chair Persons"
-msgstr "Autotelefon"
+msgstr "Vorsitzende"
 
-#: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:842
-#: calendar/gui/dialogs/meeting-page.c:962
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:782
+#: calendar/gui/dialogs/meeting-page.c:834
+#: calendar/gui/dialogs/meeting-page.c:954
 msgid "Required Participants"
-msgstr "Benötigte Information"
+msgstr "Benötigte Teilnehmer"
 
-#: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:842
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:784
+#: calendar/gui/dialogs/meeting-page.c:834
 msgid "Optional Participants"
-msgstr "Optionale Information"
+msgstr "Optionale Teilnehmer"
 
-#: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:786
+#: calendar/gui/dialogs/meeting-page.c:834
 msgid "Non-Participants"
-msgstr ""
+msgstr "Nicht-Teilnehmer"
 
-#: calendar/gui/dialogs/meeting-page.c:920
+#: calendar/gui/dialogs/meeting-page.c:912
 msgid "Sent By:"
 msgstr "Verschickt durch:"
 
-#: calendar/gui/dialogs/meeting-page.c:1471
+#: calendar/gui/dialogs/meeting-page.c:1478
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
@@ -4164,41 +4036,40 @@ msgstr "Andere _einladen"
 msgid "_Other Organizer"
 msgstr "_Anderer Organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:417 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:584
+#: calendar/gui/dialogs/recurrence-page.c:565
 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:938
+#: calendar/gui/dialogs/recurrence-page.c:919
 msgid "on"
 msgstr "bei"
 
-#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:945 filter/filter-datespec.c:83
 msgid "day"
 msgstr "Tag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "on the"
 msgstr "am"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1083
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1275
+#: calendar/gui/dialogs/recurrence-page.c:1256
 msgid "occurrences"
 msgstr "Auftreten"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
-#, fuzzy
 msgid "A_dd"
-msgstr "Hinzufügen"
+msgstr "_Hinzufügen"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -4217,23 +4088,20 @@ msgid "Recurrence Rule"
 msgstr "Wiederholungsregel"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-#, fuzzy
 msgid "_Custom recurrence"
-msgstr "Benutzerdefinierte Wiederholung"
+msgstr "_Benutzerdefinierte Wiederholung"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr "_Ändern"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
-#, fuzzy
 msgid "_No recurrence"
-msgstr "Keine Wiederholung"
+msgstr "_Keine Wiederholung"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:13
-#, fuzzy
 msgid "_Simple recurrence"
-msgstr "Einfache Wiederholung"
+msgstr "_Einfache Wiederholung"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
@@ -4295,7 +4163,7 @@ msgid "Progress"
 msgstr "Fortschritt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:897
+#: my-evolution/e-summary-preferences.c:896
 msgid "URL:"
 msgstr "URL:"
 
@@ -4309,9 +4177,8 @@ msgstr "Status:"
 
 #: calendar/gui/dialogs/task-editor.c:161
 #: calendar/gui/dialogs/task-editor.c:239
-#, fuzzy
 msgid "Assignment"
-msgstr "Zugewiesen"
+msgstr "Arbeitsauftrag"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
@@ -4386,65 +4253,57 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
+#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1283
+#: shell/e-shortcuts-view.c:383
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
+#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
-#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
-#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
-#: ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
+#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
+#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "Einfügen"
 
 #: calendar/gui/e-calendar-table.c:863
-#, fuzzy
 msgid "_Mark as Complete"
-msgstr "Als abgeschlossen markieren"
+msgstr "Als abgeschlossen _markieren"
 
 #: calendar/gui/e-calendar-table.c:865
-#, fuzzy
 msgid "_Delete this Task"
-msgstr "Diese Aufgabe löschen"
+msgstr "Diese Aufgabe _löschen"
 
 #: calendar/gui/e-calendar-table.c:868
-#, fuzzy
 msgid "_Mark Tasks as Complete"
-msgstr "Als abgeschlossen markieren"
+msgstr "Aufgaen als abgeschlossen _markieren"
 
 #: calendar/gui/e-calendar-table.c:870
-#, fuzzy
 msgid "_Delete Selected Tasks"
-msgstr "Ausgewählte Aufgaben löschen"
+msgstr "Ausgewählte Aufgaben _löschen"
 
 #: calendar/gui/e-calendar-table.c:1130
-#, fuzzy
 msgid "Click to add a task"
-msgstr "Hier klicken, um eine Aufgabe hinzuzufügen"
+msgstr "Klicken, um eine Aufgabe hinzuzufügen"
 
 #: 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"
@@ -4477,8 +4336,8 @@ msgstr "Anfangsdatum"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
-#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1051
+#: shell/e-storage-set-view.c:1418
 msgid "Summary"
 msgstr "Zusammenfassung"
 
@@ -4497,259 +4356,235 @@ 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:1354
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 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:1381
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1401
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
 #: 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:591 calendar/gui/e-week-view.c:327
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
 #: calendar/gui/print.c:761
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
-#, fuzzy
+#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
 msgid "New All Day _Event"
-msgstr "Neues ganztägiges Ereignis"
+msgstr "Neues ganztägiges _Ereignis"
 
-#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
-#, fuzzy
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
 msgid "_Go to Date..."
-msgstr "Gehe zu Datum..."
+msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
-#, fuzzy
+#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
 msgid "_Delete this Appointment"
-msgstr "Diesen Termin löschen"
+msgstr "Diesen Termin _löschen"
 
-#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
-#, fuzzy
+#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
 msgid "Make this Occurrence _Movable"
-msgstr "Dieses Auftreten beweglich machen"
+msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
-#, fuzzy
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
 msgid "Delete this _Occurrence"
-msgstr "Dieses Auftreten löschen"
+msgstr "Dieses _Auftreten löschen"
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
-#, fuzzy
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
 msgid "Delete _All Occurrences"
-msgstr "Jedes Auftreten löschen"
+msgstr "Jedes _Auftreten löschen"
 
 #: calendar/gui/e-itip-control.c:617
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has published meeting information."
-msgstr "Die letzten Besprechungsinformationen erhalten"
+msgstr "<b>%s</b> hat Besprechungsinformationen veröffentlicht."
 
 #: calendar/gui/e-itip-control.c:618
-#, fuzzy
 msgid "Meeting Information"
-msgstr "Optionale Information"
+msgstr "Besprechungsinformationen"
 
 #: calendar/gui/e-itip-control.c:622
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
+msgstr "<b>%s</b> wünscht Ihre Anwesenheit bei einer Besprechung."
 
 #: calendar/gui/e-itip-control.c:623
-#, fuzzy
 msgid "Meeting Proposal"
-msgstr "Besprechung"
+msgstr "Besprechungsvorschlag"
 
 #: calendar/gui/e-itip-control.c:627
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
+msgstr "<b>%s</b> wünscht, etwas zu einer geplanten Besprechung hinzuzufügen."
 
 #: calendar/gui/e-itip-control.c:628
-#, fuzzy
 msgid "Meeting Update"
-msgstr "Ende der Besprechung:"
+msgstr "Aktualisierung der Besprechung"
 
 #: calendar/gui/e-itip-control.c:632
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "Die letzten Besprechungsinformationen erhalten"
+msgstr "<b>%s</b> möchte die letzten Besprechungsinformationen erhalten."
 
 #: calendar/gui/e-itip-control.c:633
 msgid "Meeting Update Request"
-msgstr ""
+msgstr "Besprechungs-Aktualisierungsanfrage"
 
 #: calendar/gui/e-itip-control.c:637
-#, fuzzy, c-format
-msgid "<b>%s</b> has replyed to a meeting request."
-msgstr "Dies ist eine Antwort auf eine Besprechungsanfrage."
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
 
 #: calendar/gui/e-itip-control.c:638
-#, fuzzy
 msgid "Meeting Reply"
-msgstr "Besprechung"
+msgstr "Besprechungsantwort"
 
 #: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
+msgstr "<b>%s</b> hat eine Besprechung abgesagt."
 
 #: calendar/gui/e-itip-control.c:643
-#, fuzzy
 msgid "Meeting Cancellation"
-msgstr "Eine Aktion wählen"
+msgstr "Besprechungsstornierung"
 
 #: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
 #: calendar/gui/e-itip-control.c:728
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
+msgstr "<b>%s</b> hat eine unverständliche Nachricht geschickt."
 
 #: calendar/gui/e-itip-control.c:648
-#, fuzzy
 msgid "Bad Meeting Message"
-msgstr "In Nachricht suchen"
+msgstr "Meldung einer ungültigen Besprechung"
 
 #: calendar/gui/e-itip-control.c:665
 #, c-format
 msgid "<b>%s</b> has published task information."
-msgstr ""
+msgstr "<b>%s</b> hat Aufgabeninformationen veröffentlicht."
 
 #: calendar/gui/e-itip-control.c:666
-#, fuzzy
 msgid "Task Information"
-msgstr "Information"
+msgstr "Aufgaben-Informationen"
 
 #: calendar/gui/e-itip-control.c:670
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
-msgstr ""
+msgstr "<b>%s</b> wünscht, dass Sie eine Aufgabe erledigen."
 
 #: calendar/gui/e-itip-control.c:671
 msgid "Task Proposal"
-msgstr ""
+msgstr "Aufgabenvorschlag"
 
 #: calendar/gui/e-itip-control.c:675
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
+msgstr "<b>%s</b> möchte etwas zu einer geplanten Aufgabe hinzufügen."
 
 #: calendar/gui/e-itip-control.c:676
-#, fuzzy
 msgid "Task Update"
-msgstr "war nach"
+msgstr "Aktualisierung einer Aufgabe"
 
 #: calendar/gui/e-itip-control.c:680
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "Dies ist eine Anfrage zur neuesten Aufgabeninformation."
+msgstr "<b>%s</b> möchte die neuesten Aufgabeninformationen erhalten."
 
 #: calendar/gui/e-itip-control.c:681
 msgid "Task Update Request"
-msgstr ""
+msgstr "Aufgaben-Aktualisierungsanfrage"
 
 #: calendar/gui/e-itip-control.c:685
 #, c-format
-msgid "<b>%s</b> has replyed to a task assignment."
-msgstr ""
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
 
 #: calendar/gui/e-itip-control.c:686
-#, fuzzy
 msgid "Task Reply"
-msgstr "Antworten"
+msgstr "Aufgabenantwort"
 
 #: calendar/gui/e-itip-control.c:690
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
-msgstr ""
+msgstr "<b>%s</b> hat eine Aufgabe storniert."
 
 #: calendar/gui/e-itip-control.c:691
-#, fuzzy
 msgid "Task Cancellation"
-msgstr "Dies ist eine Aufgabenstornierung."
+msgstr "Aufgabenstornierung"
 
 #: calendar/gui/e-itip-control.c:696
-#, fuzzy
 msgid "Bad Task Message"
-msgstr "Kalendermitteilung"
+msgstr "Meldung einer ungültigen Aufgabe"
 
 #: calendar/gui/e-itip-control.c:713
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has published free/busy information."
-msgstr "Dies sind Verfügbarkeitsinformationen."
+msgstr "<b>%s</b> hat Verfügbarkeitsinformationen veröffentlicht."
 
 #: calendar/gui/e-itip-control.c:714
-#, fuzzy
 msgid "Free/Busy Information"
-msgstr "Verfügbarkeitsinformationen veröffentlichen"
+msgstr "Verfügbarkeitsinformationen"
 
 #: calendar/gui/e-itip-control.c:718
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> requests your free/busy information."
-msgstr "Dies ist eine Anfrage um Verfügbarkeitsinformationen."
+msgstr "<b>%s</b> fragt um Ihre Verfügbarkeitsinformationen an."
 
 #: calendar/gui/e-itip-control.c:719
-#, fuzzy
 msgid "Free/Busy Request"
-msgstr "Verfügbarkeits-Adresse"
+msgstr "Verfügbarkeitsanfrage"
 
 #: calendar/gui/e-itip-control.c:723
-#, fuzzy, c-format
-msgid "<b>%s</b> has replyed to a free/busy request."
-msgstr "Dies ist eine Antwort auf eine Verfügbarkeitsanfrage."
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> hat auf eine Verfügbarkeitsanfrage geantwortet."
 
 #: calendar/gui/e-itip-control.c:724
-#, fuzzy
 msgid "Free/Busy Reply"
-msgstr "Verfügbarkeits-Adresse"
+msgstr "Verfügbarkeitsantwort"
 
 #: calendar/gui/e-itip-control.c:729
-#, fuzzy
 msgid "Bad Free/Busy Message"
-msgstr "Nachricht drucken"
+msgstr "Ungültige Verfügbarkeitsnachricht"
 
 #: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr "Ihre Kalenderdatei konnte nicht aktualisiert werden!\n"
 
 #: calendar/gui/e-itip-control.c:942
-#, fuzzy
 msgid "Update complete\n"
-msgstr "Abgeschlossen am:"
+msgstr "Aktualisierung abgeschlossen\n"
 
 #: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Der Eintrag konnte nicht aus Ihrer Kalenderdatei entfernt werden!\n"
 
 #: calendar/gui/e-itip-control.c:969
-#, fuzzy
 msgid "Removal Complete"
-msgstr "% abgeschlossen"
+msgstr "Entfernen abgeschlossen"
 
 #: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
-#, fuzzy
 msgid "Item sent!\n"
-msgstr "Sendedatum"
+msgstr "Eintrag verschickt!\n"
 
 #: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
 msgid "The item could not be sent!\n"
-msgstr ""
+msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4799,17 +4634,16 @@ 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:3244 calendar/gui/e-week-view.c:3282
-#, fuzzy
+#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
 msgid "New _Appointment..."
-msgstr "Neuer Termin..."
+msgstr "Neuer _Termin..."
 
-#: calendar/gui/gnome-cal.c:1260
+#: calendar/gui/gnome-cal.c:1318
 #, 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:1271
+#: calendar/gui/gnome-cal.c:1329
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -4836,9 +4670,8 @@ msgid "Go To Date"
 msgstr "Zu Datum gehen"
 
 #: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
 msgid "Go To Today"
-msgstr "Zum _heutigen Tag"
+msgstr "Zum heutigen Tag"
 
 #: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
@@ -4872,10 +4705,14 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:254
 msgid "An organizer must be set."
 msgstr "Ein Organisator muss feststehen."
 
+#: calendar/gui/main.c:92
+msgid "Could not create the component editor factory"
+msgstr "Komponenteneditor-Fabrik konnte nicht angelegt werden"
+
 #: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
@@ -5061,7 +4898,7 @@ msgid "Print Calendar"
 msgstr "Kalender drucken"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: mail/mail-callbacks.c:1933 my-evolution/e-summary.c:511
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Druckvorschau"
@@ -5104,8 +4941,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"`%s' konnte nicht geöffnet werden; es werden keine Objekte aus dem "
-"Kalenderordner in den Aufgaben-Ordner migriert."
+"`%s' konnte nicht geöffnet werden; es migrieren keine Einträge aus dem "
+"Kalenderordner in den Aufgaben-Ordner."
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
@@ -5120,102 +4957,107 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMDMDFS"
 
-#: calendar/pcs/query.c:218
+#: calendar/pcs/query.c:230
 msgid "time-now expects 0 arguments"
-msgstr ""
+msgstr "time-now erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:242
+#: calendar/pcs/query.c:254
 msgid "make-time expects 1 argument"
-msgstr ""
+msgstr "make-time erwartet 1 Argument"
 
-#: calendar/pcs/query.c:247
+#: calendar/pcs/query.c:259
 msgid "make-time expects argument 1 to be a string"
-msgstr ""
+msgstr "make-time erwartet eine Zeichenkette als 1. Argument"
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:267
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
+"make-time erwartet eine Datum-/Zeit-Zeichenkette nach ISO 8601 als 1. "
+"Argument"
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:296
 msgid "time-add-day expects 2 arguments"
-msgstr ""
+msgstr "time-add-day erwartet zwei Argumente"
 
-#: calendar/pcs/query.c:289
+#: calendar/pcs/query.c:301
 msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
+msgstr "time-add-day erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:296
+#: calendar/pcs/query.c:308
 msgid "time-add-day expects argument 2 to be an integer"
-msgstr ""
+msgstr "time-add-day erwartet eine Ganzzahl als 2. Argument"
 
-#: calendar/pcs/query.c:323
+#: calendar/pcs/query.c:335
 msgid "time-day-begin expects 1 argument"
-msgstr ""
+msgstr "time-day-begin erwartet 1 Argument"
 
-#: calendar/pcs/query.c:328
+#: calendar/pcs/query.c:340
 msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr ""
+msgstr "time-day-begin erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:355
+#: calendar/pcs/query.c:367
 msgid "time-day-end expects 1 argument"
-msgstr ""
+msgstr "time-day-end erwartet 1 Argument"
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:372
 msgid "time-day-end expects argument 1 to be a time_t"
-msgstr ""
+msgstr "time-day-end erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:396
+#: calendar/pcs/query.c:408
 msgid "get-vtype expects 0 arguments"
-msgstr ""
+msgstr "get-vtype erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:492
+#: calendar/pcs/query.c:504
 msgid "occur-in-time-range? expects 2 arguments"
-msgstr ""
+msgstr "occur-in-time-range? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:497
+#: calendar/pcs/query.c:509
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr ""
+msgstr "occur-in-time-range? erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:504
+#: calendar/pcs/query.c:516
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr ""
+msgstr "occur-in-time-range? erwartet einen time_t-Wert als 2. Argument"
 
-#: calendar/pcs/query.c:634
-#, fuzzy
+#: calendar/pcs/query.c:646
 msgid "contains? expects 2 arguments"
-msgstr "Syntaxfehler in Parametern oder Argumenten"
+msgstr "contains? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:639
+#: calendar/pcs/query.c:651
 msgid "contains? expects argument 1 to be a string"
-msgstr ""
+msgstr "contains? erwartet eine Zeichenkette als 1. Argument"
 
-#: calendar/pcs/query.c:646
+#: calendar/pcs/query.c:658
 msgid "contains? expects argument 2 to be a string"
-msgstr ""
+msgstr "contains? erwartet eine Zeichenkette als 2. Argument"
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:675
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
+"contains? erwartet als 1. Argument entweder \"any\", \"summary\" oder "
+"\"description\""
 
-#: calendar/pcs/query.c:705
+#: calendar/pcs/query.c:717
 msgid "has-categories? expects at least 1 argument"
-msgstr ""
+msgstr "has-categories? erwartet mindestens 1 Argument"
 
-#: calendar/pcs/query.c:717
+#: calendar/pcs/query.c:729
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
+"has-categories? erwartet Zeichenketten als Argumente oder aber ein einziges "
+"Argument, das dem Wahrheitswert 'falsch' (#f) entspricht"
 
-#: calendar/pcs/query.c:805
+#: calendar/pcs/query.c:817
 msgid "is-completed? expects 0 arguments"
-msgstr ""
+msgstr "is-completed? erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:1008
+#: calendar/pcs/query.c:1085
 msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr ""
+msgstr "Auswertung des Suchausdrucks ergab keinen Wahrheitswert"
 
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
@@ -5259,7 +5101,7 @@ msgstr ""
 "%s\n"
 "Änderungen an diesem Ordner werden nicht resynchronisiert werden."
 
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:285
 msgid "Resynchronizing with server"
 msgstr "Resynchronisieren mit dem Server"
 
@@ -5280,7 +5122,6 @@ msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner kann nicht verarbeitet werden"
 
 #: camel/camel-filter-driver.c:667
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
@@ -5465,13 +5306,13 @@ msgid "No plaintext to sign."
 msgstr "Kein Klartext zum Signieren."
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
+#: camel/camel-pgp-context.c:1079 camel/camel-pgp-context.c:1266
 msgid "No password provided."
 msgstr "Kein Passwort angegeben."
 
 #: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
-#: camel/camel-pgp-context.c:1302
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1273
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Pipe zu GPG/PGP konnte nicht angelegt werden: %s"
@@ -5489,15 +5330,15 @@ msgstr "Kein Klartext zum Prüfen."
 msgid "Couldn't create temp file: %s"
 msgstr "Temporäre Datei konnte nicht angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:1070
+#: camel/camel-pgp-context.c:1069
 msgid "No plaintext to encrypt."
 msgstr "Kein Klartext zum Verschlüsseln."
 
-#: camel/camel-pgp-context.c:1096
+#: camel/camel-pgp-context.c:1095
 msgid "No recipients specified"
 msgstr "Keine Empfänger angegeben"
 
-#: camel/camel-pgp-context.c:1287
+#: camel/camel-pgp-context.c:1258
 msgid "No ciphertext to decrypt."
 msgstr "Kein codierter Text zum Entziffern."
 
@@ -5518,39 +5359,40 @@ msgstr "%s konnte nicht geladen werden: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul."
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s server %s"
 msgstr "%s-Server %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:207
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-Dienst für %s auf %s"
 
-#: camel/camel-remote-store.c:252
+#: camel/camel-remote-store.c:264
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
-#: camel/camel-remote-store.c:255
+#: camel/camel-remote-store.c:267
 #: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/camel-remote-store.c:256
+#: camel/camel-remote-store.c:268
 msgid "(unknown host)"
 msgstr "(unbekannter Rechner)"
 
-#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
+#: camel/camel-remote-store.c:486
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
 #: camel/camel-remote-store.c:489
-msgid "Server unexpectedly disconnected"
-msgstr "Verbindung zum Server unerwartet getrennt"
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Verbindung zum Server unerwartet getrennt: %s"
 
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
@@ -5660,7 +5502,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:485
 msgid "Bad authentication response from server."
 msgstr "Ungültige Legitimationsantwort vom Server."
 
@@ -5678,67 +5520,66 @@ msgstr "Unbekannter Legitimationszustand."
 
 #: 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:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
 msgid "Password"
 msgstr "Passwort"
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
-msgstr ""
+msgstr "POP vor SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr ""
+msgstr "Diese Option autorisiert eine POP-Verbindung, bevor SMTP versucht wird"
 
 #: camel/camel-sasl-popb4smtp.c:107
-#, fuzzy
 msgid "POP Source URI"
-msgstr "Quelle"
+msgstr "POP-Quell-URI"
 
 #: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
-msgstr ""
+msgstr "POP-vor-SMTP-Authentifikation mit einem unbekannten Übertragungsweg"
 
 #: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
-msgstr ""
+msgstr "POP-vor-SMTP-Authentifikation mit einer Nicht-POP-Quelle"
 
 #: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fehler beim Compilieren eines regulären Ausdrucks: %s: %s"
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' benötigt einen Benutzernamen-Teil"
 
-#: camel/camel-service.c:163
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' braucht einen Rechnernamen-Teil"
 
-#: camel/camel-service.c:171
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%ss' braucht einen Pfad-Teil"
 
-#: camel/camel-service.c:549
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr "%s wird aufgelöst"
 
-#: camel/camel-service.c:576
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fehler beim Auflösen eines Namens: %s"
 
-#: camel/camel-service.c:601
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: Rechner nicht gefunden"
 
-#: camel/camel-service.c:603
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: unbekannter Grund"
@@ -5784,21 +5625,21 @@ msgstr "Das Signaturzertifikat für \"%s\" existiert nicht."
 msgid "The encryption certificate for \"%s\" does not exist."
 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
+#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "Zertifikat für \"%s\" konnte nicht gefunden werden."
 
-#: camel/camel-smime-context.c:545
+#: camel/camel-smime-context.c:556
 msgid "Failed to find a common bulk algorithm."
 msgstr "Es konnte kein allgemeiner Bulk-Algorithmus gefunden werden."
 
-#: camel/camel-smime-context.c:799
+#: camel/camel-smime-context.c:810
 msgid "Failed to decode message."
 msgstr "Nachricht konnte nicht dekodiert werden."
 
-#: camel/camel-smime-context.c:844
+#: camel/camel-smime-context.c:855
 msgid "Failed to verify certificates."
 msgstr "Zertifikate konnten nicht verifiziert werden."
 
@@ -5812,7 +5653,7 @@ msgstr ""
 "Betreff: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5827,7 +5668,7 @@ msgstr ""
 "\n"
 "Möchten Sie trotzdem akzeptieren?"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-ssl.c:353
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5909,7 +5750,7 @@ msgid "Scanning for changed messages"
 msgstr "Suchen nach geänderten Nachrichten"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1915
+#: camel/providers/imap/camel-imap-folder.c:1968
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzei nicht verfügbar"
 
@@ -5922,7 +5763,7 @@ msgstr "Überblickinformation für neue Nachrichten wird abgerufen"
 msgid "Scanning for new messages"
 msgstr "Suchen nach neuen Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:2001
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -5939,7 +5780,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:720
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:750
 msgid "Folders"
 msgstr "Ordner"
 
@@ -5960,8 +5801,8 @@ msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Filter auf neue Nachrichten in INBOX dieses Servers anwenden"
 
 #: camel/providers/imap/camel-imap-provider.c:63
-msgid "IMAPv4"
-msgstr "IMAPv4"
+msgid "IMAP"
+msgstr "IMAP"
 
 #: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
@@ -5973,29 +5814,29 @@ msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschlüsselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:463
+#: camel/providers/imap/camel-imap-store.c:508
 #, 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:473
+#: camel/providers/imap/camel-imap-store.c:518
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterstützung für Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:497
+#: camel/providers/imap/camel-imap-store.c:542
 #, 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:512
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:538
+#: camel/providers/imap/camel-imap-store.c:583
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6006,12 +5847,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:837
+#: camel/providers/imap/camel-imap-store.c:882
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1038
+#: camel/providers/imap/camel-imap-store.c:1083
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
@@ -6020,33 +5861,32 @@ msgid "MH-format mail directories"
 msgstr "Mailverzeichnisse im MH-Format"
 
 #: camel/providers/local/camel-local-provider.c:41
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Zum Speichern lokaler Mail in Mailverzeichnissen im MH-Format"
+msgid "For storing local mail in MH-like mail directories."
+msgstr "Zum Speichern lokaler Mail in MH-Mailverzeichnissen"
 
 #: camel/providers/local/camel-local-provider.c:50
-msgid "Standard Unix mailbox file"
-msgstr "Standard-Unix-Postfachdatei"
+msgid "Local delivery"
+msgstr "Lokale Auslieferung"
 
 #: camel/providers/local/camel-local-provider.c:51
-msgid "For storing local mail in standard mbox format"
-msgstr "Zum Speichern lokaler Mail im Standard-mbox-Format"
+msgid "For retrieving local mail from standard mbox formated spools."
+msgstr "Zum Empfangen lokaler Mail aus Spools im Standard-mbox-Format."
 
 #: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Maildateien im Qmail-maildir-Format"
 
 #: camel/providers/local/camel-local-provider.c:61
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-"Zum Speichern lokaler Mail in Mailverzeichnissen im qmail-maildir-Format"
+msgid "For storing local mail in qmail maildir directories."
+msgstr "Zum Speichern lokaler Mail in qmail-maildir-Verzeichnissen."
 
 #: camel/providers/local/camel-local-provider.c:70
-msgid "Unix mbox spool-format mail files"
-msgstr "Maildateien im Unix-mbox-Spool-Format"
+msgid "Standard Unix mbox spools"
+msgstr "Standard-Unix-mbox-Spools"
 
 #: camel/providers/local/camel-local-provider.c:71
-msgid "For storing local mail in standard Unix spool directories"
-msgstr "Zum Speichern lokaler Mail in normalen Unix-Spool-Verzeichnissen"
+msgid "For reading and storing local mail in standard mbox spool files."
+msgstr "Zum Lesen und Speichern lokaler Mail in normalen mbox-Spooldateien."
 
 #: camel/providers/local/camel-local-store.c:127
 #: camel/providers/local/camel-spool-store.c:111
@@ -6265,14 +6105,11 @@ 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
-#, fuzzy
 msgid "Summarizing folder"
 msgstr "Zusammenfassen des Ordners"
 
 #: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
 "Ordner konnte nicht geöffnet werden: %s: Zusammenfassung wird begonnen bei "
@@ -6285,7 +6122,7 @@ 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
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot summarize folder: %s: %s"
 msgstr "Zusammenfassung von Ordner kann nicht erstellt werden: %s: %s"
 
@@ -6293,15 +6130,15 @@ msgstr "Zusammenfassung von Ordner kann nicht erstellt werden: %s: %s"
 #: camel/providers/local/camel-mbox-summary.c:703
 #: camel/providers/local/camel-spool-summary.c:644
 #: camel/providers/local/camel-spool-summary.c:931
-#, fuzzy
-msgid "Synchronizing folder"
-msgstr "Ordner wird synchronisiert"
+msgid "Storing folder"
+msgstr "Ordner wird gespeichert"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
-#, fuzzy, c-format
-msgid "Could not open folder to summarize: %s: %s"
-msgstr "Ordner konnte nicht zum Zusammenfassen geöffnet werden: %s: %s"
+#: camel/providers/local/camel-spool-summary.c:649
+#, c-format
+msgid "Could not open file: %s: %s"
+msgstr "Datei konnte nicht geöffnet werden: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -6387,34 +6224,37 @@ msgstr "Spool '%s' existiert nicht oder ist keine reguläre Datei"
 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
+#: camel/providers/local/camel-spool-store.c:184
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool-Maildatei %s"
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:220
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-Ordner können nicht umbenannt werden"
 
-#: camel/providers/local/camel-spool-store.c:230
+#: camel/providers/local/camel-spool-store.c:228
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-Ordner können nicht gelöscht werden"
 
+#. 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-spool-summary.c:379
+msgid "Summarising folder"
+msgstr "Zusammenfassen des Ordners"
+
+#: camel/providers/local/camel-spool-summary.c:384
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+"Ordner konnte nicht geöffnet werden: %s: Zusammenfassung wird begonnen bei "
+"Position %ld: %s"
+
 #: 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-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-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
@@ -6438,6 +6278,11 @@ msgstr ""
 "Spool-Ordner %s konnte nicht synchronisiert werden: %s\n"
 "Ordner könnte beschädigt sein, Kopie in '%s' gespeichert"
 
+#: camel/providers/local/camel-spool-summary.c:936
+#, c-format
+msgid "Could not file: %s: %s"
+msgstr "Datei konnte nicht werden: %s: %s"
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -6522,22 +6367,26 @@ msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Ordner konnte nicht geöffnet werden: Nachrichtenliste war unvollständig."
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
+#: camel/providers/pop3/camel-pop3-folder.c:259
+msgid "Expunging deleted messages"
+msgstr "Gelöschte Nachrichten werden ausgeräumt"
+
+#: camel/providers/pop3/camel-pop3-folder.c:335
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nachricht konnte nicht abgeholt werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:344
+#: camel/providers/pop3/camel-pop3-folder.c:351
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nachricht konnte nicht vom POP-Server %s abgerufen werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:367
+#: camel/providers/pop3/camel-pop3-folder.c:374
 #, c-format
 msgid "No message with uid %s"
 msgstr "Keine Nachricht mit UID %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:378
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Abrufen der POP-Nachricht %d"
@@ -6550,25 +6399,20 @@ msgstr "Nachrichtenspeicherung"
 msgid "Leave messages on server"
 msgstr "Mail auf Server belassen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:42
 #, c-format
 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:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:50
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Zum Verbinden mit POP-Servern. Das PO-Protokoll kann auch verwendet werden, "
-"om Mail von manchen Web-Mailprovidern und proprietären E-Mail-Systemen "
-"abzurufen."
+#: camel/providers/pop3/camel-pop3-provider.c:53
+msgid "For connecting to and downloading mail from POP servers."
+msgstr "Zum Verbinden mit und Herunterladen von Mail von POP-Servern."
 
-#: camel/providers/pop3/camel-pop3-provider.c:69
+#: camel/providers/pop3/camel-pop3-provider.c:70
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6576,7 +6420,7 @@ msgstr ""
 "Diese Option wird mit dem POP-Server unter einem unverschlüsselten Passwort "
 "verbinden. Viele POP-Server unterstützen nur dies."
 
-#: camel/providers/pop3/camel-pop3-provider.c:79
+#: camel/providers/pop3/camel-pop3-provider.c:80
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -6586,7 +6430,7 @@ msgstr ""
 "über das APO-Protokoll verbinden. Dies funktioniert evtl. nicht für alle "
 "Benutzer, sogar auf Servern, die behaupten, es zu unterstützen."
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
+#: camel/providers/pop3/camel-pop3-provider.c:92
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
@@ -6649,6 +6493,11 @@ msgstr ""
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
 
+#: camel/providers/pop3/camel-pop3-store.c:567
+#, c-format
+msgid "Unexpected response from POP server: %s"
+msgstr "Unerwartete Antwort von POP-Server: %s"
+
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
@@ -6861,7 +6710,7 @@ msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht gültig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:602
 msgid "Sending message"
 msgstr "Nachricht verschicken"
 
@@ -6935,35 +6784,35 @@ msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA-Antwortfehler: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1008
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 #, 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:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 #, 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:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1069
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeitüberschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1086
+#: camel/providers/smtp/camel-smtp-transport.c:1088
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET-Antwort-Fehler: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1111
 #, 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:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1130
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT-Antwortfehler: %s: nicht fatal"
@@ -6993,7 +6842,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:133
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:134
 msgid "attachment"
 msgstr "anlage"
 
@@ -7169,13 +7018,11 @@ msgstr ""
 "%s"
 
 #: composer/e-msg-composer.c:1172
-#, fuzzy
 msgid ""
-"Evolution has found unsaved files from a previous session.\n"
+"Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
-"Evolution hat ungespeicherte Dateien aus einer vorhergehenden Sitzung "
-"entdeckt.\n"
+"Ximian Evolution hat ungespeicherte Dateien aus einer vorhergehenden Sitzung entdeckt.\n"
 "Möchten Sie eine Wiederherstellung versuchen?"
 
 #: composer/e-msg-composer.c:1320
@@ -7188,10 +7035,9 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre Änderungen speichern?"
 
-#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:217
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1327
+msgid "Warning: Modified Message"
+msgstr "Warnung: Geänderte Nachricht"
 
 #: composer/e-msg-composer.c:1350
 msgid "Open file"
@@ -7222,6 +7068,10 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutions Maileditor kann nicht initialisiert werden."
 
+#: data/evolution.desktop.in.h:1
+msgid "Evolution"
+msgstr "Evolution"
+
 #: data/evolution.desktop.in.h:2
 msgid "The Evolution groupware suite"
 msgstr "Die Groupware-Suite Evolution"
@@ -7235,100 +7085,97 @@ msgid "calendar information"
 msgstr "Kalender-Information"
 
 #: default_user/searches.xml.h:1
-#, fuzzy
 msgid "Body contains"
-msgstr "enthält"
+msgstr "Rumpf enthält"
 
 #: default_user/searches.xml.h:2
-#, fuzzy
 msgid "Body does not contain"
-msgstr "enthält nicht"
+msgstr "Rumpf enthält nicht"
 
 #: default_user/searches.xml.h:3
-#, fuzzy
 msgid "Body or subject contains"
-msgstr "enthält nicht"
+msgstr "Rumpf oder Betreff enthält"
 
 #: default_user/searches.xml.h:4
-#, fuzzy
 msgid "Message contains"
-msgstr "Name enthält"
+msgstr "Nachricht enthält"
 
 #: default_user/searches.xml.h:5
-#, fuzzy
 msgid "Recipients contain"
-msgstr "Empfänger"
+msgstr "Empfänger enthalten"
 
 #: default_user/searches.xml.h:6
-#, fuzzy
 msgid "Sender contains"
-msgstr "Name enthält"
+msgstr "Absender enthält"
 
 #: default_user/searches.xml.h:7
-#, fuzzy
 msgid "Subject contains"
-msgstr "Name enthält"
+msgstr "Betreff enthält"
 
 #: default_user/searches.xml.h:8
-#, fuzzy
 msgid "Subject does not contain"
-msgstr "enthält nicht"
+msgstr "Betreff enthält nicht"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
-#: e-util/e-time-utils.c:240
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:131
+#: e-util/e-time-utils.c:243
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
 #: widgets/misc/e-dateedit.c:1531
 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:99 e-util/e-time-utils.c:274
-#: e-util/e-time-utils.c:362
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:368
 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:102 e-util/e-time-utils.c:277
-#: e-util/e-time-utils.c:354
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:280
+#: e-util/e-time-utils.c:360
 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:105 e-util/e-time-utils.c:281
-#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:365 widgets/misc/e-dateedit.c:1339
 #: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
+#. strptime format for hour and AM/PM
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:287
+msgid "%I %p"
+msgstr "%I %p"
+
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
-#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: e-util/e-time-utils.c:111 e-util/e-time-utils.c:290
+#: e-util/e-time-utils.c:357 widgets/misc/e-dateedit.c:1336
 #: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is the second-choice date format for the locale, which we use
 #. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:244
+#: e-util/e-time-utils.c:247
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. This is the third-choice date format for the locale, which we use
 #. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:248
+#: e-util/e-time-utils.c:251
 msgid "%Y/%m/%d"
 msgstr "%Y-%m-%d"
 
 #. This is the final-choice date format for the locale, which we use
 #. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:252
+#: e-util/e-time-utils.c:255
 #, c-format
 msgid "%x"
 msgstr "%x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:308
+#: e-util/e-time-utils.c:314
 #: 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"
@@ -7336,13 +7183,13 @@ 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:313
+#: e-util/e-time-utils.c:319
 msgid "%a %m/%d/%Y %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:322
+#: e-util/e-time-utils.c:328
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y / %I.%M %p"
 
@@ -7452,7 +7299,7 @@ msgstr " in der Vergangenheit"
 msgid "ago"
 msgstr "in der Vergangenheit"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:936
+#: filter/filter-datespec.c:711 mail/message-list.c:940
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %H.%M"
 
@@ -7483,7 +7330,7 @@ msgstr ""
 "der Mail."
 
 #: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:809
+#: mail/mail-account-gui.c:820
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
@@ -7678,7 +7525,7 @@ msgstr "Beantwortet an"
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1109
 msgid "Sender"
 msgstr "Absender"
 
@@ -7799,18 +7646,38 @@ msgstr "Bewertungsregeln"
 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:816 importers/pine-importer.c:627
-#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
-msgid "Import"
-msgstr "Importieren"
+#: importers/elm-importer.c:96
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution importiert Ihre alte Elm-Mail."
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:821
-#: importers/pine-importer.c:632 mail/component-factory.c:96
+#: importers/elm-importer.c:97 importers/netscape-importer.c:108
+#: importers/pine-importer.c:101
+msgid "Importing..."
+msgstr "Importieren..."
+
+#: importers/elm-importer.c:99 importers/netscape-importer.c:110
+#: importers/pine-importer.c:103
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: importers/elm-importer.c:171 importers/netscape-importer.c:687
+#: importers/pine-importer.c:438
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Importieren von %s als %s"
+
+#: importers/elm-importer.c:377 importers/netscape-importer.c:780
+#: importers/pine-importer.c:576
+#, c-format
+msgid "Scanning %s"
+msgstr "%s wird abgetastet"
+
+#: importers/elm-importer.c:528 importers/netscape-importer.c:953
+#: importers/pine-importer.c:739 mail/component-factory.c:95
 msgid "Mail"
 msgstr "Mail"
 
-#: importers/elm-importer.c:498
+#: importers/elm-importer.c:548
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -7818,15 +7685,19 @@ msgstr ""
 "Evolution hat Elm-Maildateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/elm-importer.c:527
-msgid "Elm mail"
-msgstr "Elm-Mail"
+#: importers/elm-importer.c:577
+msgid "Elm"
+msgstr "Elm"
+
+#: importers/evolution-gnomecard-importer.c:230
+msgid "GnomeCard:"
+msgstr "GnomeCard:"
 
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:744
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: importers/evolution-gnomecard-importer.c:253
+#: importers/evolution-gnomecard-importer.c:250
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7834,11 +7705,23 @@ msgstr ""
 "Evolution hat GnomeCard-Dateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/netscape-importer.c:826
+#: importers/netscape-importer.c:107
+msgid "Evolution is importing your old Netscape data"
+msgstr "Evolution importiert Ihre alten Netscape-Daten"
+
+#: importers/netscape-importer.c:883 importers/pine-importer.c:672
+msgid "Scanning directory"
+msgstr "Verzeichnis wird abgetastet"
+
+#: importers/netscape-importer.c:892
+msgid "Starting import"
+msgstr "Import beginnt"
+
+#: importers/netscape-importer.c:958
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: importers/netscape-importer.c:851
+#: importers/netscape-importer.c:979
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7846,7 +7729,11 @@ msgstr ""
 "Evolution hat Netscape-Maildateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:100
+msgid "Evolution is importing your old Pine data"
+msgstr "Evolution importiert Ihre alten Pine-Daten"
+
+#: importers/pine-importer.c:765
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -7854,9 +7741,9 @@ msgstr ""
 "Evolution hat Pine-Maildateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/pine-importer.c:691
-msgid "Pine mail"
-msgstr "Pine-Mail"
+#: importers/pine-importer.c:793
+msgid "Pine"
+msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
@@ -7883,49 +7770,54 @@ 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
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Mail configuration interface"
 msgstr "Mailkonfigurations-Oberfläche"
 
-#: mail/component-factory.c:96
-#, fuzzy
+#: mail/component-factory.c:95
 msgid "Folder containing mail"
-msgstr "VOrdner über Mailingliste"
+msgstr "Mail enthaltender Ordner"
+
+#: mail/component-factory.c:96
+msgid "Mail storage folder (internal)"
+msgstr "Mailspeicher-Ordner (intern)"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:97
+msgid "Virtual Trash"
+msgstr "Virtueller Müll"
+
+#: mail/component-factory.c:97
+msgid "Virtual Trash folder"
+msgstr "Virtueller Müllordner"
+
+#: mail/component-factory.c:113
 msgid "This folder cannot contain messages."
 msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
 
-#: mail/component-factory.c:341
+#: mail/component-factory.c:344
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: mail/component-factory.c:341
+#: mail/component-factory.c:344
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: mail/component-factory.c:757
-#, fuzzy
+#: mail/component-factory.c:766
 msgid "New Mail Message"
-msgstr "Nachricht _verschicken"
+msgstr "Neue Mail-Nachricht"
 
-#: mail/component-factory.c:757
-#, fuzzy
+#: mail/component-factory.c:766
 msgid "New _Mail Message"
-msgstr "Nachricht _verschicken"
+msgstr "Neue _Mail-Nachricht"
 
-#: mail/component-factory.c:789
+#: mail/component-factory.c:797
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:928
+#: mail/component-factory.c:974
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
@@ -7938,139 +7830,136 @@ msgstr "Eigenschaften von \"%s\""
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: mail/folder-browser.c:236 mail/mail-display.c:281
+#: mail/folder-browser.c:229 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/folder-browser.c:909
-#, fuzzy
+#: mail/folder-browser.c:905
 msgid "Create vFolder from Search"
-msgstr "Filter aus Nachricht _erzeugen"
+msgstr "vOrdner aus Suche erzeugen"
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1250
 msgid "VFolder on _Subject"
 msgstr "VOrdner über _Betreff"
 
-#: mail/folder-browser.c:1257
+#: mail/folder-browser.c:1253
 msgid "VFolder on Se_nder"
 msgstr "VOrdner über Absender"
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1256
 msgid "VFolder on _Recipients"
 msgstr "VOrdner über Empfänger"
 
-#: mail/folder-browser.c:1263
+#: mail/folder-browser.c:1259
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner über Mailing_liste"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1265
 msgid "Filter on Sub_ject"
 msgstr "Filter über _Betreff"
 
-#: mail/folder-browser.c:1272
+#: mail/folder-browser.c:1268
 msgid "Filter on Sen_der"
 msgstr "Filter über _Absender"
 
-#: mail/folder-browser.c:1275
+#: mail/folder-browser.c:1271
 msgid "Filter on Re_cipients"
 msgstr "Filter über _Empfänger"
 
-#: mail/folder-browser.c:1278
+#: mail/folder-browser.c:1274
 msgid "Filter on _Mailing List"
 msgstr "Filter über _Mailingliste"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
-#, fuzzy
+#: mail/folder-browser.c:1285 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
-msgstr "Nachricht drucken..."
+msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1287 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: mail/folder-browser.c:1293
+#: mail/folder-browser.c:1289
 msgid "_Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1294 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1296 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1300
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1303 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1305 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: mail/folder-browser.c:1311
+#: mail/folder-browser.c:1307
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1309
 msgid "Mark as Unim_portant"
 msgstr "Als _unwichtig markieren"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1314
 msgid "_Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: mail/folder-browser.c:1320
+#: mail/folder-browser.c:1316
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1320 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "Löschen rückgängig"
 
-#: mail/folder-browser.c:1329
+#: mail/folder-browser.c:1325
 msgid "Add Sender to Address Book"
 msgstr "Absender zu Adressbuch hinzufügen"
 
-#: mail/folder-browser.c:1334
+#: mail/folder-browser.c:1330
 msgid "Apply Filters"
 msgstr "Filter anwenden"
 
-#: mail/folder-browser.c:1338
+#: mail/folder-browser.c:1334
 msgid "Create Ru_le From Message"
 msgstr "_Regel aus Nachricht erzeugen"
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1492
 msgid "Filter on Mailing List"
 msgstr "Filter über Mailingliste"
 
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1493
 msgid "VFolder on Mailing List"
 msgstr "VOrdner über Mailingliste"
 
-#: mail/folder-browser.c:1499
+#: mail/folder-browser.c:1495
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter über Mailingliste (%s)"
 
-#: mail/folder-browser.c:1500
+#: mail/folder-browser.c:1496
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VOrdner über Mailingliste (%s)"
 
 #: mail/folder-info.c:64
-#, fuzzy
 msgid "Getting Folder Information"
-msgstr "Optionale Information"
+msgstr "Ordner-Informationen werden entnommen"
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
@@ -8137,11 +8026,11 @@ msgstr "Evolution-News-Editor"
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-account-gui.c:999
+#: mail/mail-account-gui.c:1010
 msgid "Save signature"
 msgstr "Signatur speichern"
 
-#: mail/mail-account-gui.c:1005
+#: mail/mail-account-gui.c:1016
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8151,9 +8040,9 @@ msgstr ""
 "\n"
 "Möchten Sie Ihre Änderungen speichern?"
 
-#: mail/mail-account-gui.c:1585
+#: mail/mail-account-gui.c:1597
 msgid "You may not create two accounts with the same name."
-msgstr ""
+msgstr "Sie können keine zwei Zugänge mit demselben Namen anlegen."
 
 #: mail/mail-accounts.c:145
 msgid " (default)"
@@ -8167,27 +8056,26 @@ msgstr "Deaktivieren"
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: mail/mail-accounts.c:280
+#: mail/mail-accounts.c:279
 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:284
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Nicht löschen"
 
-#: mail/mail-accounts.c:287
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Account wirklich löschen?"
 
-#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
+#: 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 Close button and title
-#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
-#, fuzzy
+#: mail/mail-accounts.c:758 mail/mail-config.glade.h:42
 msgid "Mail Settings"
-msgstr "_Mail-Einstellungen..."
+msgstr "Mail-Einstellungen"
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -8253,49 +8141,60 @@ msgstr ""
 "Diese Nachricht hat keinen Betreff.\n"
 "Wirklich verschicken?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:262
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+"Da die Kontaktliste, an die Sie verschicken, konfiguriert ist, die Adressen "
+"der Liste zu verbergen, wird die Nachricht nur BCC-Empfängeradressen "
+"enthalten."
+
+#: mail/mail-callbacks.c:266
+msgid "This message contains only Bcc recipients."
+msgstr "Diese Nachricht enthält ausschließlich BCC-Empfänger."
+
+#: mail/mail-callbacks.c:270
 msgid ""
-"This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"Diese Nachricht enthält nur BCC-Empfänger.\n"
 "Es ist möglich, dass der Mailserver die Empfänger kenntlich macht, indem er "
 "eine Apparently-To-Kopfzeile hinzufügt.\n"
 "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:339
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Sie müssen Empfänger angeben, um diese Nachricht zu verschicken."
 
-#: mail/mail-callbacks.c:390
+#: mail/mail-callbacks.c:424
 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:632
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr ""
+#: mail/mail-callbacks.c:666
+msgid "an unknown sender"
+msgstr "ein unbekannter Absender"
 
-#: mail/mail-callbacks.c:895
-msgid "Forwarded message:\n"
-msgstr "Weitergeleitete Nachricht:\n"
+#: mail/mail-callbacks.c:671
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr "Am %a, %Y-%m-%d um %H.%M schrieb %s:"
 
-#: mail/mail-callbacks.c:995
+#: mail/mail-callbacks.c:1029
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:997
+#: mail/mail-callbacks.c:1031
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:1366
+#: mail/mail-callbacks.c:1400
 #, 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:1388
+#: mail/mail-callbacks.c:1422
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8303,7 +8202,7 @@ msgstr ""
 "Sie können nur im Entwürfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:1422
+#: mail/mail-callbacks.c:1456
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8311,42 +8210,46 @@ msgstr ""
 "Sie können nur Nachrichten im\n"
 "Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:1434
+#: mail/mail-callbacks.c:1468
 #, 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:1455
+#: mail/mail-callbacks.c:1489
 msgid "No Message Selected"
 msgstr "Keine Nachricht ausgewählt"
 
-#: mail/mail-callbacks.c:1540
+#: mail/mail-callbacks.c:1574
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:1542
+#: mail/mail-callbacks.c:1576
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1721 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Warnung"
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1726
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
+"Dieser Vorgang wird alle als gelöscht markierten Nachrichten auf Dauer "
+"entfernen. Falls Sie fortfahren, werden Sie diese Nachrichten nie "
+"wiederherstellen können.\n"
+"\n"
+"Nachrichten wirklich entfernen?"
 
-#: mail/mail-callbacks.c:1721
-#, fuzzy
+#: mail/mail-callbacks.c:1733
 msgid "Do not ask me again."
-msgstr "Mich nicht mehr fragen"
+msgstr "Mich nicht mehr fragen."
 
-#: mail/mail-callbacks.c:1826
+#: mail/mail-callbacks.c:1838
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8355,19 +8258,19 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1836
+#: mail/mail-callbacks.c:1848
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:1882
+#: mail/mail-callbacks.c:1894
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:1928
+#: mail/mail-callbacks.c:1940
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:2012
+#: mail/mail-callbacks.c:2024
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8375,44 +8278,42 @@ msgstr ""
 "wollen?"
 
 #: mail/mail-config-druid.c:135
-#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
 msgstr ""
 "Bitte geben Sie unten Ihren Namen und Ihre E-Mail-Adresse an. Die "
-"\"optionalen\" Felder unten müssen nicht ausgefüllt werden, falls Sie diese "
-"Information nicht in der E-Mail, die Sie verschicken, einschließen wollen."
+"\"optionalen\" Felder unten müssen nicht\n"
+"ausgefüllt werden, sofern Sie diese Informationen nicht in den E-Mails, die "
+"Sie verschicken, einschließen wollen."
 
 #: mail/mail-config-druid.c:137
-#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
 "Bitte geben Sie unten Informationen über Ihren Server für eingehende Mail "
-"an. Falls Sie nicht wissen, was für einen Server Sie verwenden, wenden Sie "
-"sich an Ihren Systemadministrator oder Internetprovider."
+"an. Falls Sie nicht sicher sind,\n"
+"wenden Sie sich an Ihren Systemadministrator oder Internetprovider."
 
 #: mail/mail-config-druid.c:139
 msgid "Please select among the following options"
-msgstr ""
+msgstr "Bitte wählen Sie aus den folgenden Optionen"
 
 #: mail/mail-config-druid.c:141
-#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"Bitte geben Sie unten Informationen über Ihr Protokoll für ausgehende Mail "
-"an. Falls Sie nicht wissen, welches Protokoll Sie verwenden, wenden Sie sich "
-"an Ihren Systemadministrator oder Internetprovider."
+"Bitte geben Sie unten Informationen über die Art ein, auf die Sie Mail "
+"verschicken werden. Falls Sie\n"
+"nicht sicher sind, wenden Sie sich an Ihren Systemadministrator oder "
+"Internetprovider."
 
 #: mail/mail-config-druid.c:143
-#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and\n"
@@ -8423,32 +8324,33 @@ msgid ""
 "This name will be used for display purposes only."
 msgstr ""
 "Sie haben Ihre Mailkonfiguration fast abgeschlossen. Die Identität, der "
-"Server für eingehende und das Protokoll für ausgehende Mail, die sie "
-"angegeben haben, werden zu einem Evolution-Mailzugang zusammengefasst. Bitte "
-"geben Sie in dem Feld unten einen Namen für diesen Zugang ein. Dieser Name "
-"wird nur für die Bildschirmanzeige verwendet."
+"Server für eingehende und die\n"
+"Transportmethode für ausgehende Mail, die sie angegeben haben, werden zu "
+"einem Evolution-\n"
+"Mailzugang zusammengefasst. Bitte geben Sie in dem Feld unten einen Namen "
+"für diesen Zugang ein.\n"
+"Dieser Name wird nur für die Bildschirmanzeige verwendet."
 
 #. set window title
-#: mail/mail-config-druid.c:558
-#, fuzzy
+#: mail/mail-config-druid.c:570
 msgid "Evolution Account Assistant"
-msgstr "Evolution-Account-Druide"
+msgstr "Evolution-Zugangsdruide"
 
 #. right now, the URL always works basically as a matter of luck...
 #. * both IMAP and mbox spool stores have INBOX as their inbox folder
 #. * name. I don't think this will work with maildir. How can we figure out
 #. * what shortcut to insert?
 #.
-#: mail/mail-config.c:1579
-#, fuzzy, c-format
+#: mail/mail-config.c:1587
+#, c-format
 msgid "%s: Inbox"
-msgstr "Inbox"
+msgstr "%s: Posteingang"
 
-#: mail/mail-config.c:1809
+#: mail/mail-config.c:1829
 msgid "Checking Service"
-msgstr ""
+msgstr "Dienst wird überprüft"
 
-#: mail/mail-config.c:1880 mail/mail-config.c:1883
+#: mail/mail-config.c:1900 mail/mail-config.c:1903
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
@@ -8462,15 +8364,15 @@ msgstr "(SSL wird von dieser Binärversion von Evolution nicht unterstützt)"
 
 #: mail/mail-config.glade.h:3
 msgid "Account"
-msgstr "Account"
+msgstr "Zugang"
 
 #: mail/mail-config.glade.h:4
 msgid "Account Information"
-msgstr "Account-Information"
+msgstr "Zugangsinformation"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
-msgstr "Accountverwaltung"
+msgstr "Zugangsverwaltung"
 
 #: mail/mail-config.glade.h:6
 msgid "Accounts"
@@ -8488,7 +8390,7 @@ msgstr ""
 
 #: mail/mail-config.glade.h:9
 msgid "Always sign outgoing messages when using this account"
-msgstr ""
+msgstr "Bei Verwendung dieses Zugangs ausgehende Nachrichten immer signieren"
 
 #: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
 msgid "Attachment"
@@ -8537,9 +8439,8 @@ msgid "Default Forward style is: "
 msgstr "Vorgegebener Weiterleitungsstil ist: "
 
 #: mail/mail-config.glade.h:24
-#, fuzzy
 msgid "Default character encoding: "
-msgstr "Vorgegebener Zeichensatz: "
+msgstr "Vorgegebene Zeichenkodierung: "
 
 #: mail/mail-config.glade.h:25
 msgid "Digital IDs..."
@@ -8549,11 +8450,11 @@ msgstr "Digitale Kennungen..."
 msgid "Display"
 msgstr "Anzeige"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
+#: mail/mail-config.glade.h:28
 msgid "Drafts"
 msgstr "Entwürfe"
 
@@ -8562,14 +8463,12 @@ msgid "Drafts folder:"
 msgstr "Entwürfe-Ordner:"
 
 #: mail/mail-config.glade.h:30
-#, fuzzy
 msgid "E_nable"
-msgstr "Aktivieren"
+msgstr "_Aktivieren"
 
 #: mail/mail-config.glade.h:31
-#, fuzzy
 msgid "Each account must have a different name."
-msgstr "Die aktuelle Datei unter anderem Namen speichern"
+msgstr "Alle Zugänge brauchen unterschiedliche Namen."
 
 #: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
@@ -8585,15 +8484,14 @@ msgid "Get Digital ID..."
 msgstr "Digitale Kennung erhalten..."
 
 #: mail/mail-config.glade.h:35
-#, fuzzy
 msgid "HTML signature file:"
-msgstr "HTML-Signatur:"
+msgstr "HTML-Signaturdatei:"
 
 #: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identität"
 
@@ -8618,19 +8516,16 @@ msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
 #: mail/mail-config.glade.h:44
-#, fuzzy
 msgid "Make this my _default account"
-msgstr "Dies zu meinem Standardaccount machen"
+msgstr "Dies zu meinem _Vorgabezugang machen"
 
 #: mail/mail-config.glade.h:45
-#, fuzzy
 msgid "Message _preview should be displayed by default"
-msgstr "Nachrichtenvorschau sollte per Vorgabe angezeigt werden"
+msgstr "Nachrichten_vorschau sollte per Vorgabe angezeigt werden"
 
 #: mail/mail-config.glade.h:46
-#, fuzzy
 msgid "Message list should display in a _threaded fashion by default"
-msgstr "Nachrichtenliste sollte per Vorgabe zu Threads geordnet sein"
+msgstr "Nachrichtenliste sollte per Vorgabe zu _Threads geordnet sein"
 
 #: mail/mail-config.glade.h:47
 msgid "NNTP Server:"
@@ -8657,15 +8552,13 @@ msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
 #: mail/mail-config.glade.h:57
-#, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
-msgstr "Beim Abschicken von Nachrichten ohne Betreff nachfragen"
+msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
 
 #: mail/mail-config.glade.h:58
-#, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
-"Beim Abschicken von Nachrichten mit ausschließlich BCC-Empfängern nachfragen"
+"Beim Abschicken von Nachrichten mit ausschließlich _BCC-Empfängern nachfragen"
 
 #: mail/mail-config.glade.h:59
 msgid "Qmail maildir "
@@ -8675,7 +8568,7 @@ msgstr "Qmail-maildir "
 msgid "Quoted"
 msgstr "Umschrieben"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Erhalten von E-Mail"
 
@@ -8700,15 +8593,14 @@ msgid "Security"
 msgstr "Sicherheit"
 
 #: mail/mail-config.glade.h:68
-#, fuzzy
 msgid "Select Filter Log file..."
-msgstr "Eine Datei wählen"
+msgstr "Eine Filterprotokoll-Datei wählen..."
 
 #: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "PGP-Binärdatei wählen"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Verschicken von E-Mail"
 
@@ -8717,7 +8609,6 @@ msgid "Sending Mail"
 msgstr "Verschicken von Mail"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:179
 msgid "Sent"
 msgstr "Verschickt"
 
@@ -8738,9 +8629,8 @@ msgid "Server Type: "
 msgstr "Servertyp: "
 
 #: mail/mail-config.glade.h:78
-#, fuzzy
 msgid "Server requires _authentication"
-msgstr "Server benötigt Legitimation"
+msgstr "Server benötigt _Legitimation"
 
 #: mail/mail-config.glade.h:79
 msgid "Signature file:"
@@ -8767,12 +8657,10 @@ msgid "Standard Unix mbox"
 msgstr "Standard-Unix-mbox"
 
 #: mail/mail-config.glade.h:86
-#, fuzzy
 msgid "Use secure connection (_SSL)"
-msgstr "Sichere Verbindung (SSL) verwenden"
+msgstr "Sichere Verbindung (_SSL) verwenden"
 
 #: mail/mail-config.glade.h:87
-#, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8783,123 +8671,106 @@ msgstr ""
 "Klicken Sie \"Weiter\" zum Beginnen."
 
 #: mail/mail-config.glade.h:91
-#, fuzzy
 msgid "_Always load images off the net"
-msgstr "Bilder immer aus dem Netz laden"
+msgstr "Bilder _immer aus dem Netz laden"
 
 #: mail/mail-config.glade.h:92
-#, fuzzy
 msgid "_Automatically check for new mail every"
-msgstr "Automatisch nach neuer Mail sehen alle"
+msgstr "_Automatisch nach neuer Mail sehen alle"
 
 #: mail/mail-config.glade.h:93
-#, fuzzy
 msgid "_Check for supported types"
-msgstr " Prüfen, welche Typen unterstützt werden "
+msgstr "_Prüfen, welche Typen unterstützt werden "
 
 #: mail/mail-config.glade.h:96
-#, fuzzy
 msgid "_Email Address:"
-msgstr "E-Mail-Adresse:"
+msgstr "_E-Mail-Adresse:"
 
 #: mail/mail-config.glade.h:97
-#, fuzzy
 msgid "_Empty trash folders on exit"
-msgstr "Müllordner beim Beenden leeren"
+msgstr "Müllordner beim Beenden _leeren"
 
 #: mail/mail-config.glade.h:98
-#, fuzzy
 msgid "_Full Name:"
-msgstr "Voller Name:"
+msgstr "_Voller Name:"
 
 #: mail/mail-config.glade.h:99
-#, fuzzy
 msgid "_HTML Signature:"
-msgstr "HTML-Signatur:"
+msgstr "_HTML-Signatur:"
 
 #: mail/mail-config.glade.h:100
-#, fuzzy
 msgid "_Highlight citations with"
-msgstr "Zitate hervorheben mit"
+msgstr "Zitate _hervorheben mit"
 
 #: mail/mail-config.glade.h:101
-#, fuzzy
 msgid "_Host:"
-msgstr "Host-Rechner:"
+msgstr "_Rechner:"
 
 #: mail/mail-config.glade.h:102
-#, fuzzy
 msgid "_Load images if sender is in addressbook"
-msgstr "Bilder laden, falls Absender im Adressbuch ist"
+msgstr "Bilder _laden, falls Absender im Adressbuch ist"
 
 #: mail/mail-config.glade.h:103
 msgid "_Log filter actions to:"
-msgstr ""
+msgstr "Filteraktionen mit_protokollieren in:"
 
 #: mail/mail-config.glade.h:104
-#, fuzzy
 msgid "_Mark messages as Read after"
-msgstr "Nachrichten als gelesen markieren nach"
+msgstr "_Nachrichten als gelesen markieren nach"
 
 #: mail/mail-config.glade.h:105
-#, fuzzy
 msgid "_Name:"
-msgstr "Name:"
+msgstr "_Name:"
 
 #: mail/mail-config.glade.h:106
-#, fuzzy
 msgid "_Never load images off the net"
-msgstr "Bilder nie aus dem Netz laden"
+msgstr "Bilder _nie aus dem Netz laden"
 
 #: mail/mail-config.glade.h:107
-#, fuzzy
 msgid "_Organization:"
-msgstr "Organisation:"
+msgstr "_Organisation:"
 
 #: mail/mail-config.glade.h:108
-#, fuzzy
 msgid "_PGP binary path:"
-msgstr "Pfad zur PGP-Binärdatei:"
+msgstr "Pfad zur _PGP-Binärdatei:"
 
 #: mail/mail-config.glade.h:109
-#, fuzzy
 msgid "_Path:"
-msgstr "Pfad:"
+msgstr "_Pfad:"
 
 #: mail/mail-config.glade.h:110
-#, fuzzy
 msgid "_Remember PGP Passphrase until exit"
-msgstr "PGP-Passphrase bis zum Beenden behalten"
+msgstr "_PGP-Passphrase bis zum Beenden behalten"
 
 #: mail/mail-config.glade.h:111
-#, fuzzy
 msgid "_Remember this password"
-msgstr "Dieses Passwort speichern"
+msgstr "Dieses Passwort _behalten"
 
 #: mail/mail-config.glade.h:112
-#, fuzzy
 msgid "_Send mail in HTML format by default."
-msgstr "Mail normalerweise im HTML-Format verschicken."
+msgstr "Mail normalerweise im HTML-Format ver_schicken."
 
 #: mail/mail-config.glade.h:113
-#, fuzzy
 msgid "_Signature file:"
-msgstr "Signaturdatei:"
+msgstr "_Signaturdatei:"
 
 #: mail/mail-config.glade.h:114
-#, fuzzy
 msgid "_Username:"
-msgstr "Benutzername:"
+msgstr "_Benutzername:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
+msgid "description"
+msgstr "Beschreibung"
+
+#: mail/mail-config.glade.h:117
 msgid "newswindow1"
 msgstr "newsfenster1"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "placeholder"
 msgstr "Platzhalter"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "seconds."
 msgstr "Sekunden."
 
@@ -8939,82 +8810,82 @@ msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME-Entschlüsselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-display.c:222
+#: mail/mail-display.c:223
 msgid "Save Attachment"
 msgstr "Anlage speichern"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:327
 msgid "Save to Disk..."
 msgstr "Auf Platte speichern..."
 
-#: mail/mail-display.c:343
+#: mail/mail-display.c:329
 msgid "View Inline"
 msgstr "An Ort und Stelle betrachten"
 
-#: mail/mail-display.c:345
+#: mail/mail-display.c:331
 #, c-format
 msgid "Open in %s..."
 msgstr "Öffnen in %s..."
 
-#: mail/mail-display.c:406
+#: mail/mail-display.c:392
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "An Ort und Stelle betrachten (über %s)"
 
-#: mail/mail-display.c:410
+#: mail/mail-display.c:396
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:417
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:1055
+#: mail/mail-display.c:1053
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-display.c:1411
+#: mail/mail-display.c:1512
 msgid "Open Link in Browser"
 msgstr "Link in Browser öffnen"
 
-#: mail/mail-display.c:1413
+#: mail/mail-display.c:1514
 msgid "Copy Link Location"
 msgstr "Linkziel kopieren"
 
-#: mail/mail-display.c:1415
+#: mail/mail-display.c:1516
 msgid "Save Link as (FIXME)"
 msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:1417
+#: mail/mail-display.c:1518
 msgid "Save Image as..."
 msgstr "Bild speichern unter..."
 
-#: mail/mail-folder-cache.c:147
+#: mail/mail-folder-cache.c:151
 #, c-format
 msgid "%d new"
 msgstr "%d neu"
 
-#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
-#: mail/mail-folder-cache.c:167
+#: mail/mail-folder-cache.c:157 mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:171
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:154
+#: mail/mail-folder-cache.c:158
 #, c-format
 msgid "%d hidden"
 msgstr "%d verborgen"
 
-#: mail/mail-folder-cache.c:161
-#, fuzzy, c-format
+#: mail/mail-folder-cache.c:165
+#, c-format
 msgid "%d selected"
-msgstr "Gelöscht"
+msgstr "%d ausgewählt"
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:174
 #, c-format
 msgid "%d unsent"
 msgstr "%d nicht verschickt"
 
-#: mail/mail-folder-cache.c:172
+#: mail/mail-folder-cache.c:176
 #, c-format
 msgid "%d total"
 msgstr "%d insgesamt"
@@ -9034,9 +8905,8 @@ msgid "Date"
 msgstr "Datum"
 
 #: mail/mail-format.c:856
-#, fuzzy
 msgid "Bad Address"
-msgstr "E-Mail-Adresse:"
+msgstr "Ungültige Adresse"
 
 #: mail/mail-format.c:878 mail/message-list.etspec.h:3
 msgid "From"
@@ -9054,78 +8924,78 @@ msgstr "An"
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1306
+#: mail/mail-format.c:1307
 msgid "No GPG/PGP program configured."
 msgstr "Kein GPG/PGP-Programm konfiguriert."
 
-#: mail/mail-format.c:1322
+#: mail/mail-format.c:1323
 msgid "Encrypted message not displayed"
 msgstr "Verschlüsselte Nachricht nicht angezeigt"
 
-#: mail/mail-format.c:1333
+#: mail/mail-format.c:1334
 msgid "Encrypted message"
 msgstr "Verschlüsselte Nachricht"
 
-#: mail/mail-format.c:1334
+#: mail/mail-format.c:1335
 msgid "Click icon to decrypt."
 msgstr "Zum Entschlüsseln Icon klicken."
 
-#: mail/mail-format.c:1392
+#: mail/mail-format.c:1390
 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:1403
+#: mail/mail-format.c:1401
 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:2061
+#: mail/mail-format.c:2076
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:2075
+#: mail/mail-format.c:2090
 #, 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:2080
+#: mail/mail-format.c:2095
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:2109
-#, fuzzy, c-format
+#: mail/mail-format.c:2124
+#, c-format
 msgid "Pointer to remote data (%s)"
-msgstr "Zeiger auf FTP-Site (%s)"
+msgstr "Zeiger auf Daten im Netz (%s)"
 
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2132
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:2122
+#: mail/mail-format.c:2137
 msgid "Malformed external-body part."
 msgstr "Ungültiger external-body-Teil."
 
 #: mail/mail-local.c:330
-#, fuzzy, c-format
+#, c-format
 msgid "No such folder /%s"
-msgstr "Ordner %s gibt es nicht"
+msgstr "Ordner /%s gibt es nicht"
 
 #: mail/mail-local.c:460
-#, fuzzy, c-format
+#, c-format
 msgid "Registering '%s'"
-msgstr "Öffnen von '%s'..."
+msgstr "Registrieren von '%s'"
 
-#: mail/mail-local.c:748
+#: 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:869
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9134,17 +9004,17 @@ msgstr ""
 "Metainformationen zu Ordner können nicht gespeichert werden; Sie\n"
 "werden ihn wahrscheinlich nie mehr öffnen können: %s"
 
-#: mail/mail-local.c:909
+#: mail/mail-local.c:908
 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:1002
+#: mail/mail-local.c:1001
 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:1013
+#: mail/mail-local.c:1012
 #, c-format
 msgid "Reconfigure %s"
 msgstr "%s neu konfigurieren"
@@ -9176,120 +9046,113 @@ msgstr "Dieses Passwort speichern"
 msgid "Working"
 msgstr "In Arbeit"
 
-#: mail/mail-ops.c:84
-#, fuzzy
+#: mail/mail-ops.c:85
 msgid "Filtering Folder"
-msgstr "Ordner wird aktualisiert"
+msgstr "Ordner wird gefiltert"
 
-#: mail/mail-ops.c:227
-#, fuzzy
+#: mail/mail-ops.c:228
 msgid "Fetching Mail"
-msgstr "ERhalten von Mail"
+msgstr "Abrufen von Mail"
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:598
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:709
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:728
+#: mail/mail-ops.c:736
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
+#: mail/mail-ops.c:738 mail/mail-send-recv.c:500
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:823
+#: mail/mail-ops.c:831
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:910
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Machrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:910
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:927
 msgid "Moving"
 msgstr "Verschiebe"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:930
 msgid "Copying"
 msgstr "Kopiere"
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
-msgid "Trash"
-msgstr "Müll"
-
-#: mail/mail-ops.c:1211
+#: mail/mail-ops.c:1219
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1253
+#: mail/mail-ops.c:1261
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s öffnen"
 
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1330
 #, c-format
 msgid "Opening store %s"
-msgstr "Öffnen des Speichers %s"
+msgstr "Speichers %s wird geöffnet"
 
-#: mail/mail-ops.c:1395
-#, fuzzy, c-format
+#: mail/mail-ops.c:1403
+#, c-format
 msgid "Creating folder %s"
-msgstr "Ordner %s öffnen"
+msgstr "Ordner %s wird angelegt"
 
-#: mail/mail-ops.c:1465
+#: mail/mail-ops.c:1473
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1552
-#, fuzzy, c-format
-msgid "Synchronizing '%s'"
-msgstr "Ordner wird synchronisiert"
+#: mail/mail-ops.c:1569
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "Ordner '%s' wird gespeichert"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1620
 msgid "Refreshing folder"
 msgstr "Ordner wird aktualisiert"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1656
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: mail/mail-ops.c:1688
+#: mail/mail-ops.c:1705
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s abrufen"
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1772
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d Nachricht(en) werden/wird abgerufen"
 
-#: mail/mail-ops.c:1841
+#: mail/mail-ops.c:1858
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d Nachricht(en) werden/wird gespeichert"
 
-#: mail/mail-ops.c:1921
+#: mail/mail-ops.c:1938
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9298,7 +9161,7 @@ msgstr ""
 "Ausgabedatei konnte nicht erstellt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1964
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9307,11 +9170,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:2038
 msgid "Saving attachment"
 msgstr "Speichern der Anlage"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2054
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9320,12 +9183,12 @@ msgstr ""
 "Ausgabedatei kann nicht erstellt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2085
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2154
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
@@ -9338,31 +9201,31 @@ msgstr "_Suchen"
 msgid "(Untitled Message)"
 msgstr "(Unbenannte Nachricht)"
 
-#: mail/mail-search.c:237
+#: mail/mail-search.c:241
 msgid "Untitled Message"
 msgstr "Unbenannte Nachricht"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:245
 msgid "Empty Message"
 msgstr "Leere Nachricht"
 
-#: mail/mail-search.c:288
+#: mail/mail-search.c:292
 msgid "Find in Message"
 msgstr "In Nachricht suchen"
 
-#: mail/mail-search.c:318
+#: mail/mail-search.c:322
 msgid "Case Sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: mail/mail-search.c:320
+#: mail/mail-search.c:324
 msgid "Search Forward"
 msgstr "Vorwärts suchen"
 
-#: mail/mail-search.c:340
+#: mail/mail-search.c:344
 msgid "Find:"
 msgstr "Suchen:"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:347
 msgid "Matches:"
 msgstr "Passt auf:"
 
@@ -9370,19 +9233,19 @@ msgstr "Passt auf:"
 msgid "Cancelling..."
 msgstr "Stornieren..."
 
-#: mail/mail-send-recv.c:257
-msgid "Send & Receive mail"
-msgstr "Mail erhalten & verschicken"
+#: mail/mail-send-recv.c:258
+msgid "Send & Receive Mail"
+msgstr "Mail erhalten und verschicken"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
+#: mail/mail-send-recv.c:313 mail/mail-send-recv.c:366
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-send-recv.c:494
+#: mail/mail-send-recv.c:496
 msgid "Cancelled."
 msgstr "Storniert"
 
@@ -9395,99 +9258,91 @@ msgstr "Benutzer hat Aktion abgebrochen."
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Temporäre Mbox `%s' konnte nicht angelegt werden: %s"
 
-#: mail/mail-tools.c:241
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:245
-#, fuzzy
+#: mail/mail-tools.c:294
 msgid "Forwarded message"
-msgstr "Weitergeleitete Nachrichten"
+msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-tools.c:471
-#, fuzzy
+#: mail/mail-tools.c:442
 msgid "Forwarded Message"
-msgstr "Weitergeleitete Nachrichten"
-
-#: mail/mail-vfolder.c:278
-msgid "VFolders"
-msgstr "VOrdner"
+msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-vfolder.c:498
+#: mail/mail-vfolder.c:500
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-browser.c:125
-#, fuzzy
+#: mail/message-browser.c:121
 msgid "(No subject)"
-msgstr "Nach Betreff"
+msgstr "(Kein Betreff)"
 
-#: mail/message-browser.c:127
-#, fuzzy, c-format
+#: mail/message-browser.c:123
+#, c-format
 msgid "%s - Message"
-msgstr "Meldung"
+msgstr "%s - Nachricht"
 
-#: mail/message-list.c:636
+#: mail/message-list.c:640
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:637
+#: mail/message-list.c:641
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:642
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:643
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:644
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:648
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:645
+#: mail/message-list.c:649
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:653
 msgid "Higher"
 msgstr "Höher"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:654
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:911
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:920
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:932
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:938
+#: mail/message-list.c:942
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2312
-#, fuzzy
+#: mail/message-list.c:2316
 msgid "Generating message list"
-msgstr "Aktualisieren der Nachrichtenliste"
+msgstr "Erzeugen der Nachrichtenliste"
 
 #: mail/message-list.etspec.h:2
 msgid "Flagged"
@@ -9502,14 +9357,14 @@ msgid "Size"
 msgstr "Größe"
 
 #: mail/subscribe-dialog.c:174
-#, fuzzy, c-format
+#, c-format
 msgid "Scanning folders under %s on \"%s\""
-msgstr "Taste Ordner in \"%s\" ab"
+msgstr "Ordner unter %s auf \"%s\" werden abgetastet"
 
 #: mail/subscribe-dialog.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "Scanning root-level folders on \"%s\""
-msgstr "Taste Ordner in \"%s\" ab"
+msgstr "Ordner der obersten Ebene auf \"%s\" werden abgetastet"
 
 #: mail/subscribe-dialog.c:275
 #, c-format
@@ -9527,32 +9382,28 @@ msgid "Folder"
 msgstr "Ordner"
 
 #: mail/subscribe-dialog.c:1490
-#, fuzzy
 msgid "No server has been selected"
-msgstr "Dieses Ereignis wurde gelöscht."
+msgstr "Es wurde kein Server gewählt"
 
 #: mail/subscribe-dialog.c:1547
 msgid "Please select a server."
-msgstr ""
+msgstr "Bitte wählen Sie einen Server."
 
 #: mail/subscribe-dialog.glade.h:1
-#, fuzzy
 msgid " _Refresh List "
-msgstr "Liste aktualisieren"
+msgstr "Liste _aktualisieren"
 
 #: mail/subscribe-dialog.glade.h:2
-#, fuzzy
 msgid "All folders"
-msgstr "Alle Ordner:"
+msgstr "_Alle Ordner"
 
 #: mail/subscribe-dialog.glade.h:3
-#, fuzzy
 msgid "Display options"
-msgstr "Sender anzeigen:"
+msgstr "Anzeige-Optionen"
 
 #: mail/subscribe-dialog.glade.h:4
 msgid "Folders whose names begin with:"
-msgstr ""
+msgstr "Ordner, deren Namen beginnen mit:"
 
 #: mail/subscribe-dialog.glade.h:5
 msgid "Manage Subscriptions"
@@ -9560,52 +9411,46 @@ msgstr "Abonnements verwalten"
 
 #: mail/subscribe-dialog.glade.h:6
 msgid "Show _folders from server: "
-msgstr ""
+msgstr "_Ordner zeigen von Server:"
 
 #: mail/subscribe-dialog.glade.h:7
-#, fuzzy
 msgid "_Subscribe"
-msgstr "Abonnieren"
+msgstr "_Abonnieren"
 
 #: mail/subscribe-dialog.glade.h:8
-#, fuzzy
 msgid "_Unsubscribe"
-msgstr "Abonnement kündigen"
+msgstr "Ab_bestellen"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Evolution-Komponente für die Chefsesselansicht"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Factory für Evolutions Chefsesselansichts-Komponente."
-
 #: my-evolution/component-factory.c:30
 msgid "Folder containing the Evolution Summary"
-msgstr ""
+msgstr "Ordner mit der Evolution-Übersicht"
 
 #: my-evolution/component-factory.c:141
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 "Evolutions Chefsesselansichts-Komponente kann nicht initialisiert werden."
 
-#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
+#: my-evolution/e-summary-calendar.c:188 my-evolution/e-summary-calendar.c:206
 msgid "Appointments"
 msgstr "Termine"
 
-#: my-evolution/e-summary-calendar.c:183
+#: my-evolution/e-summary-calendar.c:189
 msgid "No appointments"
 msgstr "Keine Termine"
 
-#: my-evolution/e-summary-calendar.c:236
-msgid "%l:%M%p"
-msgstr "%H.%M"
-
 #: my-evolution/e-summary-calendar.c:238
-msgid "%a %l:%M%p"
-msgstr "%a %H.%M"
+msgid "%k%M %d %B"
+msgstr "%k%M %d. %B"
+
+#: my-evolution/e-summary-calendar.c:240
+msgid "%l:%M %d %B"
+msgstr "%l.%M %d. %B"
 
-#: my-evolution/e-summary-mail.c:111
+#: my-evolution/e-summary-mail.c:113
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
@@ -9616,46 +9461,43 @@ msgstr "Mail-Zusammenfassung"
 #: my-evolution/e-summary-preferences.c:65
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS:ZSAM:EGAA"
-msgstr ""
+msgstr "EDDI:EDDH:EDDK:EDDM"
 
-#: my-evolution/e-summary-preferences.c:428
+#: my-evolution/e-summary-preferences.c:427
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com: Wort des Tages"
 
-#: my-evolution/e-summary-preferences.c:450
+#: my-evolution/e-summary-preferences.c:448
 msgid "Quotes of the Day"
 msgstr "Zitate des Tages"
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:876
 msgid "Add a news feed"
 msgstr "Einen Newsstrom hinzufügen"
 
-#: my-evolution/e-summary-preferences.c:885
+#: my-evolution/e-summary-preferences.c:884
 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:889
+#: my-evolution/e-summary-preferences.c:888
 msgid "Name:"
 msgstr "Name:"
 
-#: my-evolution/e-summary-preferences.c:1421
-#, fuzzy
+#: my-evolution/e-summary-preferences.c:1423
 msgid "Summary Settings"
-msgstr "_Aufgaben-Einstellungen..."
+msgstr "Einstellungen der Zusammenfassung"
 
 #: my-evolution/e-summary-rdf.c:281
-#, fuzzy
 msgid "There was an error downloading news feed"
-msgstr "Beim Herunterladen des Newsstromes ist ein Fehler aufgetreten</b></dt>"
+msgstr "Beim Herunterladen des Newsstromes ist ein Fehler aufgetreten"
 
 #: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Fehler beim Herunterladen von RDF</b>"
 
 #: my-evolution/e-summary-rdf.c:479
-#, fuzzy
 msgid "News Feed"
-msgstr "Newsströme"
+msgstr "Nachrichtenkanal"
 
 #: my-evolution/e-summary-tasks.c:213
 msgid "No tasks"
@@ -9680,19 +9522,16 @@ msgid "Regions"
 msgstr "Regionen"
 
 #: my-evolution/e-summary.c:145
-#, fuzzy
 msgid "%A, %B %e %Y"
-msgstr "%a, %d. %B %Y"
+msgstr "%A, %e. %B %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
-#, fuzzy
 msgid "Print Summary"
-msgstr "Zusammenfassung"
+msgstr "Zusammenfassung drucken"
 
 #: my-evolution/e-summary.c:518
-#, fuzzy
 msgid "Printing of Summary failed"
-msgstr "Drucken der Nachricht fehlgeschlagen"
+msgstr "Drucken der Übersicht fehlgeschlagen"
 
 #: my-evolution/main.c:52
 msgid "Executive summary component could not initialize Bonobo.\n"
@@ -10881,171 +10720,134 @@ msgid "Drifting dust whirls"
 msgstr "Abtreibende Staubteufel"
 
 #: my-evolution/my-evolution.glade.h:1
-#, fuzzy
 msgid " _Remove"
-msgstr "_Entfernen"
+msgstr " _Entfernen"
 
 #: my-evolution/my-evolution.glade.h:2
-#, fuzzy
 msgid "Add n_ew feed"
-msgstr "Neuen Strom hinzufügen"
+msgstr "_Neuen Strom hinzufügen"
 
 #: my-evolution/my-evolution.glade.h:3
-#, fuzzy
 msgid "Al_l stations:"
-msgstr "Alle Sender:"
+msgstr "Alle _Sender:"
 
 #: my-evolution/my-evolution.glade.h:4
-#, fuzzy
 msgid "All _folders:"
-msgstr "Alle Ordner:"
+msgstr "Alle _Ordner:"
 
 #: my-evolution/my-evolution.glade.h:5
-#, fuzzy
 msgid "All news _feeds:"
-msgstr "Alle Newsströme:"
+msgstr "_Alle Newsströme:"
 
 #: my-evolution/my-evolution.glade.h:7
 msgid "How many days should the calendar display at once?"
 msgstr "Wie viele Tage soll der Kalender auf einmal anzeigen?"
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
 msgid "Ma_x number of items shown:"
-msgstr "Maximale Anzahl angezeigter Einträge:"
+msgstr "Ma_ximale Anzahl angezeigter Einträge:"
 
 #: my-evolution/my-evolution.glade.h:9
 msgid "News Feed Settings"
 msgstr "Newsstrom-Einstellungen"
 
 #: my-evolution/my-evolution.glade.h:10
-#, fuzzy
 msgid "One mont_h"
-msgstr "Ein Monat"
+msgstr "Ein _Monat"
 
 #: my-evolution/my-evolution.glade.h:11
-#, fuzzy
 msgid "One w_eek"
-msgstr "Eine Woche"
+msgstr "Eine _Woche"
 
 #: my-evolution/my-evolution.glade.h:12
-#, fuzzy
-msgid "Refresh _time (seconds):"
-msgstr "Aktualisierungszeit (Sekunden):"
+msgid "R_efresh time (seconds):"
+msgstr "Aktualisierungs_zeit (Sekunden):"
 
 #: my-evolution/my-evolution.glade.h:13
-#, fuzzy
-msgid "Show _all tasks"
-msgstr "Alle Aufgaben anzeigen"
+msgid "Refresh _time (seconds):"
+msgstr "Aktualisierungs_zeit (Sekunden):"
 
 #: my-evolution/my-evolution.glade.h:14
-#, fuzzy
-msgid "Show _today's tasks"
-msgstr "Heutige Aufgaben anzeigen"
+msgid "S_how full path for folders"
+msgstr "_Vollen Pfad für Ordner anzeigen"
 
 #: my-evolution/my-evolution.glade.h:15
+msgid "Show _all tasks"
+msgstr "_Alle Aufgaben anzeigen"
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "Show _today's tasks"
+msgstr "_Heutige Aufgaben anzeigen"
+
+#: my-evolution/my-evolution.glade.h:17
 msgid "Tasks "
 msgstr "Aufgaben "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:18
 msgid "Units: "
 msgstr "Einheiten: "
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:19
 msgid "Weather settings"
 msgstr "Wetter-Einstellungen"
 
-#: my-evolution/my-evolution.glade.h:19
-#, fuzzy
-msgid "_Display folders:"
-msgstr "Ordner anzeigen:"
-
-#: my-evolution/my-evolution.glade.h:20
-#, fuzzy
-msgid "_Display stations:"
-msgstr "Sender anzeigen:"
-
 #: my-evolution/my-evolution.glade.h:21
-#, fuzzy
-msgid "_Displayed feeds:"
-msgstr "angezeigte Ströme:"
+msgid "_Display folders:"
+msgstr "_Ordner anzeigen:"
 
 #: my-evolution/my-evolution.glade.h:22
-#, fuzzy
-msgid "_Five days"
-msgstr "Fünf Tage"
+msgid "_Display stations:"
+msgstr "_Sender anzeigen:"
 
 #: my-evolution/my-evolution.glade.h:23
-#, fuzzy
-msgid "_Mail"
-msgstr "Mail"
+msgid "_Displayed feeds:"
+msgstr "_Angezeigte Ströme:"
 
 #: my-evolution/my-evolution.glade.h:24
-#, fuzzy
-msgid "_News Feeds"
-msgstr "Newsströme"
+msgid "_Five days"
+msgstr "_Fünf Tage"
 
 #: my-evolution/my-evolution.glade.h:25
-#, fuzzy
-msgid "_One day"
-msgstr "Ein Tag"
+msgid "_Mail"
+msgstr "_Mail"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "_Refresh time (seconds):"
-msgstr "Aktualisierungszeit (Sekunden):"
+msgid "_News Feeds"
+msgstr "_Newsströme"
 
 #: my-evolution/my-evolution.glade.h:27
-#, fuzzy
-msgid "_Schedule"
-msgstr "Ansetzen"
+msgid "_One day"
+msgstr "_Ein Tag"
 
 #: my-evolution/my-evolution.glade.h:28
-#, fuzzy
-msgid "_Show full path for folders"
-msgstr "Vollen Pfad für Ordner anzeigen"
+msgid "_Schedule"
+msgstr "_Ansetzen"
 
 #: my-evolution/my-evolution.glade.h:29
-#, fuzzy
 msgid "_Weather"
-msgstr "Wetter"
+msgstr "_Wetter"
 
 #: my-evolution/my-evolution.glade.h:30
-#, fuzzy
 msgid "_imperial"
-msgstr "englisch"
+msgstr "_englisch"
 
 #: my-evolution/my-evolution.glade.h:31
-#, fuzzy
 msgid "m_etric"
-msgstr "metrisch"
+msgstr "_metrisch"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "Die Evolution-Shell."
 
-#: shell/e-activity-handler.c:198
+#: shell/e-activity-handler.c:199
 msgid "Show Details"
 msgstr "Details anzeigen"
 
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:201
 msgid "Cancel Operation"
 msgstr "Aktion abbrechen"
 
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
-msgid "Inbox"
-msgstr "Inbox"
-
-#: shell/e-local-storage.c:178
-#, fuzzy
-msgid "Outbox"
-msgstr "mbox"
-
-#: shell/e-local-storage.c:593
-msgid "Local Folders"
-msgstr "Lokale Ordner"
-
-#: shell/e-setup.c:125 shell/e-setup.c:196
+#: shell/e-setup.c:125
 msgid "Evolution installation"
 msgstr "Installation von Evolution"
 
@@ -11067,17 +10869,7 @@ msgstr ""
 msgid "Could not update files correctly"
 msgstr "Dateien konnte nicht korrekt aktualisiert werden"
 
-#: 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: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:220
+#: shell/e-setup.c:193
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11089,7 +10881,7 @@ msgstr ""
 "kann nicht angelegt werden.\n"
 "Fehler: %s"
 
-#: shell/e-setup.c:235
+#: shell/e-setup.c:208
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11098,7 +10890,7 @@ msgstr ""
 "Ein Fehler trat auf beim Kopieren von Dateien nach\n"
 "'%s'."
 
-#: shell/e-setup.c:309
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11109,7 +10901,7 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:323
+#: shell/e-setup.c:296
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11124,7 +10916,7 @@ msgstr ""
 "Möchten Sie, dass dieses Verzeichnis\n"
 "entfernt wird?"
 
-#: shell/e-setup.c:348
+#: shell/e-setup.c:321
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11148,58 +10940,58 @@ msgstr "Ordner kann nicht in sich selbst kopiert werden."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Ein Ordner kann nicht in eines seiner Kinder verschoben werden."
 
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:289
 #, 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:290
+#: shell/e-shell-folder-commands.c:294
 msgid "Copy folder"
 msgstr "Ordner kopieren"
 
-#: shell/e-shell-folder-commands.c:328
+#: shell/e-shell-folder-commands.c:332
 #, 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:333
+#: shell/e-shell-folder-commands.c:337
 msgid "Move folder"
 msgstr "Ordner verschieben"
 
-#: shell/e-shell-folder-commands.c:358
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:362
+#, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
-"Ordner `%s' konnte nicht gelöscht werden:\n"
+"Ordner kann nicht gelöscht werden:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:374
+#: shell/e-shell-folder-commands.c:378
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Ordner '%s' löschen"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:384
+#: shell/e-shell-folder-commands.c:388
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Sind Sie sicher, dass Sie den Ordner '%s' entfernen wollen?"
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:459
+#: shell/e-shell-folder-commands.c:463
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Ordner '%s' umbenennen"
 
-#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:467
 msgid "Rename"
 msgstr "Umbenennen"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:471
+#: shell/e-shell-folder-commands.c:475
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Ordnername:"
@@ -11213,11 +11005,28 @@ msgstr ""
 "Der angegebene Ordner kann nicht erstellt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:168
-msgid "The specified folder name is not valid."
-msgstr "Der angegebene Ordnername ist nicht gültig"
+#: shell/e-shell-folder-creation-dialog.c:126
+msgid "No folder name specified."
+msgstr "Kein Ordnername angegeben."
+
+#: shell/e-shell-folder-creation-dialog.c:132
+msgid "Folder name cannot contain the Return character."
+msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
+
+#: shell/e-shell-folder-creation-dialog.c:137
+msgid "Folder cannot contain the directory separator."
+msgstr "Ordner darf das Verzeichnistrennzeichen nicht enthalten."
+
+#: shell/e-shell-folder-creation-dialog.c:142
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' und '..' sind reservierte Ordnernamen."
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:180
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Der angegebene Ordnername ist nicht gültig: %s"
+
+#: shell/e-shell-folder-creation-dialog.c:300
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Neuen Ordner anlegen"
 
@@ -11237,7 +11046,7 @@ msgstr "Neu..."
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
-#: shell/e-shell-importer.c:97
+#: shell/e-shell-importer.c:101
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11253,7 +11062,7 @@ msgstr ""
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:192
+#: shell/e-shell-importer.c:196
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11264,7 +11073,7 @@ msgstr ""
 "Importeur nicht bereit.\n"
 "Es wird 5 Sekunden bis zum nächsten Versuch gewartet"
 
-#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#: shell/e-shell-importer.c:216 shell/e-shell-importer.c:247
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11273,7 +11082,12 @@ msgstr ""
 "Importieren von %s\n"
 "Importiert wird Objekt %d."
 
-#: shell/e-shell-importer.c:350
+#: shell/e-shell-importer.c:348
+#, c-format
+msgid "File %s does not exist"
+msgstr "Datei %s existiert nicht"
+
+#: shell/e-shell-importer.c:365
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11283,11 +11097,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/e-shell-importer.c:362
+#: shell/e-shell-importer.c:377
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:370
+#: shell/e-shell-importer.c:385
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11296,17 +11110,17 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/e-shell-importer.c:383
+#: shell/e-shell-importer.c:398
 #, c-format
 msgid "Error starting %s"
 msgstr "Fehler beim Starten von %s"
 
-#: shell/e-shell-importer.c:402
+#: shell/e-shell-importer.c:417
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:417
+#: shell/e-shell-importer.c:434
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11315,55 +11129,75 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:505
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:538
+#: shell/e-shell-importer.c:555
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:543
+#: shell/e-shell-importer.c:560
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: shell/e-shell-importer.c:553
+#: shell/e-shell-importer.c:570
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:639
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: shell/e-shell-importer.c:624
+#: shell/e-shell-importer.c:640
 msgid "Select a destination folder for importing this data"
 msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
 
+#: shell/e-shell-importer.c:701 shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importieren"
+
 #: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr "Verbindungen werden geschlossen..."
 
-#: shell/e-shell-startup-wizard.c:144
+#: shell/e-shell-startup-wizard.c:161
 #, c-format
 msgid ""
 "Could not start the Evolution Mailer Wizard interface\n"
 "%s"
 msgstr ""
+"Das Evolution-Mailerdruiden-Interface konnte nicht gestartet werden\n"
+"%s"
 
-#: shell/e-shell-startup-wizard.c:153
-#, fuzzy
+#: shell/e-shell-startup-wizard.c:170
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
-msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
+msgstr "Evolution-Mailerdruiden-Interface kann nicht initialisiert werden"
 
-#: shell/e-shell-startup-wizard.c:558
+#: shell/e-shell-startup-wizard.c:584
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
+"Bitte warten...\n"
+"Suche nach existierenden Einstellungen"
 
-#: shell/e-shell-startup-wizard.c:561
+#: shell/e-shell-startup-wizard.c:587
 msgid "Starting Intelligent Importers"
+msgstr "Intelligente Importeure werden gestartet"
+
+#: shell/e-shell-startup-wizard.c:705
+#, c-format
+msgid "From %s:"
+msgstr "Von %s:"
+
+#: shell/e-shell-startup-wizard.c:747
+msgid ""
+"Please select the information\n"
+"that you would like to import"
 msgstr ""
+"Bitte wählen Sie die Informationen,\n"
+"die Sie importieren wollen"
 
 #: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
@@ -11373,19 +11207,23 @@ msgstr "Der Fehlermelder kann nicht gefunden werden"
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
+#: shell/e-shell-view-menu.c:217
+msgid "Ximian Evolution"
+msgstr "Ximian Evolution"
+
 #: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
 #: shell/e-shell-view-menu.c:221
 msgid ""
-"Evolution is a suite of groupware applications\n"
+"Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
-"Evolution ist eine Suite von Groupware-Anwendungen\n"
-"für Mail sowie Termin- und Kontaktverwaltung\n"
-"in der GNOME-Desktopumgebung."
+"Ximian Evolution ist eine Suite von Groupware- Anwendungen\n"
+"für Mail sowie Termin- und Kontaktverwaltung in der\n"
+"GNOME-Desktopumgebung."
 
 #: shell/e-shell-view-menu.c:423
 msgid "Go to folder..."
@@ -11408,85 +11246,90 @@ msgid "Work Online"
 msgstr "Online arbeiten"
 
 #: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: shell/e-shell-view.c:184
+#: shell/e-shell-view.c:214
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:1459
+#: shell/e-shell-view.c:1495
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:1497
+msgid "(None)"
+msgstr "(keine)"
 
-#: shell/e-shell-view.c:1461
+#: shell/e-shell-view.c:1502
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid "%s - Ximian Evolution %s"
+msgstr "%s - Ximian Evolution %s"
 
-#: shell/e-shell-view.c:1499
-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:1504
+#, c-format
+msgid "%s - Ximian Evolution %s [%s]"
+msgstr "%s - Ximian Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1506
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution geht gerade offline."
+#: shell/e-shell-view.c:1544
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr "Ximian Evolution ist zur Zeit online. Klicken Sie diesen Knopf, um offline zu arbeiten."
 
-#: shell/e-shell-view.c:1512
-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.c:1551
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution geht gerade offline."
+
+#: shell/e-shell-view.c:1557
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr "Ximian Evolution ist gerade offline. Klicken Sie auf diesen Knopf, um online zu arbeiten."
 
 #: shell/e-shell.c:509
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
 
-#: shell/e-shell.c:1438
-#, fuzzy, c-format
+#: shell/e-shell.c:1440
+#, c-format
 msgid ""
 "Ooops!  The views 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"
+"Hoppla! Die Ansichten für `%s' sind unerwartet gestorben.  :-(\n"
 "Das heißt wahrscheinlich, dass die %s-Komponente abgestürzt ist."
 
-#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1644 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1644
-#, fuzzy
+#: shell/e-shell.c:1646
 msgid "Invalid arguments"
-msgstr "Ungültiger Inhalt der Nachricht"
+msgstr "Ungültige Argumente"
 
-#: shell/e-shell.c:1646
-#, fuzzy
+#: shell/e-shell.c:1648
 msgid "Cannot register on OAF"
-msgstr "Speicher kann nicht bei der Shell registriert werden"
+msgstr "Registrierung bei OAF kann nicht stattfinden"
 
-#: shell/e-shell.c:1648
+#: shell/e-shell.c:1650
 msgid "Configuration Database not found"
-msgstr ""
+msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: shell/e-shell.c:1650 shell/e-storage.c:491
+#: shell/e-shell.c:1652 shell/e-storage.c:491
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: shell/e-shortcuts-view.c:72
+#: shell/e-shortcuts-view.c:75
 msgid "Create new shortcut group"
 msgstr "Neue Verknüpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:73
+#: shell/e-shortcuts-view.c:76
 msgid "Group name:"
 msgstr "Gruppenname:"
 
-#: shell/e-shortcuts-view.c:171
+#: shell/e-shortcuts-view.c:176
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11495,103 +11338,115 @@ msgstr ""
 "Wollen Sie wirklich Gruppe `%s' aus\n"
 "der Verknüpfungsleiste entfernen?"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:181
 msgid "Don't remove"
 msgstr "Nicht entfernen"
 
-#: shell/e-shortcuts-view.c:204
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Verknüpfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:205
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Ausgewählte Verknüpfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:218
+#: shell/e-shortcuts-view.c:223
 msgid "_Small Icons"
 msgstr "Kleine Icons"
 
-#: shell/e-shortcuts-view.c:219
+#: shell/e-shortcuts-view.c:224
 msgid "Show the shortcuts as small icons"
 msgstr "Die Verknüpfungen als kleine Icons anzeigen"
 
-#: shell/e-shortcuts-view.c:221
+#: shell/e-shortcuts-view.c:226
 msgid "_Large Icons"
 msgstr "Große Icons"
 
-#: shell/e-shortcuts-view.c:222
+#: shell/e-shortcuts-view.c:227
 msgid "Show the shortcuts as large icons"
 msgstr "Die Verknüpfungen als große Icons zeigen"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:238
 msgid "_New Group..."
 msgstr "Neue Gruppe..."
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:239
 msgid "Create a new shortcut group"
 msgstr "Eine neue Verknüpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:241
 msgid "_Remove this Group..."
 msgstr "Diese Gruppe _entfernen..."
 
-#: shell/e-shortcuts-view.c:237
+#: shell/e-shortcuts-view.c:242
 msgid "Remove this shortcut group"
 msgstr "Diese Verknüpfungsgruppe entfernen"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:244
 msgid "Re_name this Group..."
 msgstr "Diese Gruppe _umbenennen..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:245
 msgid "Rename this shortcut group"
 msgstr "Diese Verknüpfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:250
 msgid "_Hide the Shortcut Bar"
 msgstr "Die Verknüpfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:251
 msgid "Hide the shortcut bar"
 msgstr "Die Verknüpfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:365
+#: shell/e-shortcuts-view.c:370
 msgid "Rename shortcut"
 msgstr "Verknüpfung umbenennen"
 
-#: shell/e-shortcuts-view.c:366
+#: shell/e-shortcuts-view.c:371
 msgid "Rename selected shortcut to:"
 msgstr "Ausgewählte Verknüpfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:378
+#: shell/e-shortcuts-view.c:383
 msgid "Open the folder linked to this shortcut"
 msgstr "Den mit dieser Verknüpfung verbundenen Ordner öffnen"
 
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
-msgid "Open in New Window"
-msgstr "In neuem Fenster öffnen"
+#: shell/e-shortcuts-view.c:385 ui/evolution.xml.h:19
+msgid "Open in New _Window"
+msgstr "In neuem _Fenster öffnen"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:385
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 "Den mit dieser Verknüpfung verbundenen Ordner in einem neuen Fenster öffnen"
 
-#: shell/e-shortcuts-view.c:383
+#: shell/e-shortcuts-view.c:388
+msgid "_Rename"
+msgstr "_Umbenennen"
+
+#: shell/e-shortcuts-view.c:388
 msgid "Rename this shortcut"
 msgstr "Diese Verknüpfung umbenennen"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:390
+msgid "Re_move"
+msgstr "_Entfernen"
+
+#: shell/e-shortcuts-view.c:390
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:642
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von Verknüpfungen."
 
-#: shell/e-shortcuts.c:1040
+#: shell/e-shortcuts.c:1045
 msgid "Shortcuts"
 msgstr "Verknüpfungen"
 
+#: shell/e-shortcuts.c:1054
+msgid "Inbox"
+msgstr "Inbox"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Kein Name)"
@@ -11633,14 +11488,12 @@ msgid "The specified type is not supported in this storage"
 msgstr "Der angegebene Typ wird für diese Speicherweise nicht unterstützt"
 
 #: shell/e-storage.c:511
-#, fuzzy
 msgid "The specified folder cannot be modified or removed"
-msgstr "Der angegebene Ordner wurde nicht gefunden"
+msgstr "Der angegebene Ordner kann nicht geändert oder entfernt werden"
 
 #: shell/e-storage.c:513
-#, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Ein Ordner kann nicht in eines seiner Kinder verschoben werden."
+msgstr "Ein Ordner kann nicht das Kinder eines seiner Nachkommen werden"
 
 #: shell/e-task-widget.c:170
 #, c-format
@@ -11648,7 +11501,6 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:175
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
@@ -11677,6 +11529,36 @@ msgstr "Ordnertyp:"
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner erstellt werden soll:"
 
+#: shell/glade/evolution-startup-wizard.glade.h:3
+msgid "First Run Setup Assistant"
+msgstr "Einrichtungsdruide für den ersten Start"
+
+#: shell/glade/evolution-startup-wizard.glade.h:5
+msgid "Importing Data"
+msgstr "Daten importieren"
+
+#: shell/glade/evolution-startup-wizard.glade.h:8
+msgid "Setup Assistant"
+msgstr "Einrichtungs-Druide"
+
+#: shell/glade/evolution-startup-wizard.glade.h:9
+msgid "Timezone "
+msgstr "Zeitzone "
+
+#: shell/glade/evolution-startup-wizard.glade.h:10
+msgid ""
+"Welcome to the Evolution first run setup assistant\n"
+"\n"
+"This assistant will help you get started"
+msgstr ""
+"Willkommen zu Evolutions Einführungsdruiden für den ersten Start!\n"
+"\n"
+"Dieser Assistent wird Ihnen helfen, in die Gänge zu kommen."
+
+#: shell/glade/evolution-startup-wizard.glade.h:13
+msgid "Your configuration is complete."
+msgstr "Ihre Konfiguration ist abgeschlossen."
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -11684,33 +11566,29 @@ msgstr ""
 "beginnen."
 
 #: shell/importer/import.glade.h:2
-#, fuzzy
 msgid "Evolution Import Assistant"
-msgstr "Evolution-Importwerkzeug"
+msgstr "Evolution-Importdruide"
 
 #: shell/importer/import.glade.h:3
-#, fuzzy
 msgid "Evolution Importer Assistant"
-msgstr "Evolution-Importeur-Werkzeug"
+msgstr "Evolution-Importeur-Druide"
 
 #: shell/importer/import.glade.h:4
 msgid "Import File (Step 2 of 2)"
-msgstr ""
+msgstr "Datei importieren (Schritt 2 von 2)"
 
 #: shell/importer/import.glade.h:5
-#, fuzzy
 msgid "Select a File (step 1 of 2)"
-msgstr "Eine Datei wählen"
+msgstr "Eine Datei wählen (Schritt 1 von 2)"
 
 #: shell/importer/import.glade.h:6
-#, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
-"Willkommen zum Evolution-Importwerkzeug.\n"
-"Dieser Druide führt Sie durch das Importieren interner\n"
+"Willkommen zum Evolution-Importdruiden.\n"
+"Dieser Druide führt Sie durch das Importieren externer\n"
 "Dateien in Evolution."
 
 #: shell/importer/intelligent.c:191
@@ -11726,17 +11604,16 @@ msgid "Don't ask me again"
 msgstr "Mich nicht mehr fragen"
 
 #: shell/importer/intelligent.c:209
-#, fuzzy
 msgid "Evolution can import data from the following files:"
-msgstr "Evolution hat die folgenden Datenquellen gefunden:"
+msgstr "Evolution kann Daten aus den folgenden Dateien importieren:"
 
 #: shell/main.c:95
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
+"of the Ximian Evolution groupware suite.\n"
 "\n"
-"Evolution is not yet complete. It's getting close, but there are\n"
+"Ximian Evolution is not yet complete. It's getting close, but there are\n"
 "places where features are either missing or only half working. \n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
@@ -11747,9 +11624,9 @@ 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 Groupware-Suite Ximian Evolution herunterzuladen.\n"
 "\n"
-"Evolution ist noch nicht fertig. Es ist nahe dran, aber es gibt noch\n"
+"Ximian Evolution ist noch nicht fertig. Es ist nahe dran, aber es gibt noch\n"
 "Stellen, wo Funktionen entweder fehlen oder nur halbwegs arbeiten.\n"
 "\n"
 "Falls Sie Fehler finden, melden Sie sie uns bitte auf bugzilla.ximian.com.\n"
@@ -11762,19 +11639,19 @@ msgstr ""
 #: shell/main.c:116
 msgid ""
 "Thanks\n"
-"The Evolution Team\n"
+"The Ximian Evolution Team\n"
 msgstr ""
 "Danke.\n"
-"das Evolution-Team\n"
+"das Ximian-Evolution-Team\n"
 
 #: shell/main.c:173
-msgid "Cannot access the Evolution shell."
-msgstr "Auf Evolution-Shell kann nicht zugegriffen werden."
+msgid "Cannot access the Ximian Evolution shell."
+msgstr "Auf die Ximian-Evolution-Shell kann nicht zugegriffen werden."
 
 #: shell/main.c:184
-#, fuzzy, c-format
-msgid "Cannot initialize the Evolution shell: %s"
-msgstr "Auf Evolution-Shell kann nicht zugegriffen werden."
+#, c-format
+msgid "Cannot initialize the Ximian Evolution shell: %s"
+msgstr "Die Ximian-Evolution-Shell kann nicht initialisiert werden: %s"
 
 #: shell/main.c:228
 msgid "Disable splash screen"
@@ -11818,7 +11695,6 @@ msgid "Delete selected contacts"
 msgstr "Ausgewählte Kontakte löschen"
 
 #: ui/evolution-addressbook.xml.h:12
-#, fuzzy
 msgid "New List"
 msgstr "Neue Liste"
 
@@ -11839,9 +11715,8 @@ msgid "Print selected contacts"
 msgstr "Ausgewählte Kontakte drucken"
 
 #: ui/evolution-addressbook.xml.h:20
-#, fuzzy
 msgid "Save selected contacts as a VCard."
-msgstr "Ausgewählte Kontakte löschen"
+msgstr "Ausgewählte Kontakte als VCard speichern"
 
 #: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
@@ -11852,23 +11727,20 @@ msgid "Select all contacts"
 msgstr "Alle Kontakte auswählen"
 
 #: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#, fuzzy
 msgid "Send _Message to Contact..."
 msgstr "_Nachricht an Kontakt schicken..."
 
 #: ui/evolution-addressbook.xml.h:24
-#, fuzzy
 msgid "Send a mess to the selected contacts."
-msgstr "Ausgewählte Kontakte löschen"
+msgstr "Eine Nachricht an die ausgewählten Kontakte schicken."
 
 #: ui/evolution-addressbook.xml.h:25
 msgid "Send message to contact"
 msgstr "Nachricht an Kontakt schicken"
 
 #: ui/evolution-addressbook.xml.h:26
-#, fuzzy
 msgid "Send selected contacts to another person."
-msgstr "Kontakt an anderen schicken"
+msgstr "Ausgewählte Kontakte an jemand anderen schicken."
 
 #: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
@@ -11896,38 +11768,34 @@ msgid "_Contact"
 msgstr "_Kontakt"
 
 #: ui/evolution-addressbook.xml.h:32
-#, fuzzy
 msgid "_Contact List"
-msgstr "_Kontakt"
+msgstr "_Kontaktliste"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
-#, fuzzy
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
-msgstr "Kontakte..."
+msgstr "_Kontakt weiterleiten..."
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: ui/evolution-addressbook.xml.h:37
-#, fuzzy
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Save as VCard"
-msgstr "Als VCard speichern"
+msgstr "Als VCard _speichern"
 
-#: ui/evolution-addressbook.xml.h:38
-#, fuzzy
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Search for Contacts"
 msgstr "Nach Kontakten _suchen"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Select All"
 msgstr "Alle auswählen"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
 #: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "Werkzeuge"
@@ -11937,14 +11805,12 @@ msgid "Configure the calendar's settings"
 msgstr "Einstellungen des Kalenders konfigurieren"
 
 #: ui/evolution-calendar.xml.h:4
-#, fuzzy
 msgid "Create a New All Day _Event"
 msgstr "Ein neues ganztägiges _Ereignis anlegen"
 
 #: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a New _Task"
-msgstr "Eine neue Aufgabe anlegen"
+msgstr "Eine neue _Aufgabe anlegen"
 
 #: ui/evolution-calendar.xml.h:6
 msgid "Create a _New Appointment"
@@ -11955,12 +11821,10 @@ msgid "Create an event for the whole day"
 msgstr "Ein ganztägiges Ereignis anlegen"
 
 #: ui/evolution-calendar.xml.h:11
-#, fuzzy
 msgid "Day"
-msgstr "_Tag"
+msgstr "Tag"
 
 #: ui/evolution-calendar.xml.h:12
-#, fuzzy
 msgid "Delete the appointment"
 msgstr "Diesen Termin löschen"
 
@@ -11969,14 +11833,12 @@ msgid "Go To"
 msgstr "Gehe zu"
 
 #: ui/evolution-calendar.xml.h:14
-#, fuzzy
 msgid "Go back"
-msgstr "In der Zeit zurückgehen"
+msgstr "Zurückgehen"
 
 #: ui/evolution-calendar.xml.h:15
-#, fuzzy
 msgid "Go forward"
-msgstr "In der Zeit vorangehen"
+msgstr "Vorangehen"
 
 #: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
@@ -11987,14 +11849,12 @@ msgid "Go to a specific date"
 msgstr "Zu bestimmtem Datum gehen"
 
 #: ui/evolution-calendar.xml.h:19
-#, fuzzy
 msgid "Go to today"
 msgstr "Zum heutigen Tag"
 
 #: ui/evolution-calendar.xml.h:20
-#, fuzzy
 msgid "Month"
-msgstr "_Monat"
+msgstr "Monat"
 
 #: ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
@@ -12013,7 +11873,6 @@ msgid "Print Pre_view"
 msgstr "Druckvorschau"
 
 #: ui/evolution-calendar.xml.h:26
-#, fuzzy
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
@@ -12022,28 +11881,24 @@ msgid "Publish Free/Busy information for this calendar"
 msgstr "Verfügbarkeitsinformationen für diesen Kalender veröffentlichen"
 
 #: ui/evolution-calendar.xml.h:28
-#, fuzzy
 msgid "Show one day"
 msgstr "Einen Tag zeigen"
 
 #: ui/evolution-calendar.xml.h:29
-#, fuzzy
 msgid "Show one month"
-msgstr "1 Monat zeigen"
+msgstr "Einen Monat zeigen"
 
 #: ui/evolution-calendar.xml.h:30
-#, fuzzy
 msgid "Show one week"
-msgstr "1 Woche zeigen"
+msgstr "Eine Woche zeigen"
 
 #: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Die Werkwoche zeigen"
 
 #: ui/evolution-calendar.xml.h:32
-#, fuzzy
 msgid "Week"
-msgstr "_Woche"
+msgstr "Woche"
 
 #: ui/evolution-calendar.xml.h:35
 msgid "_Appointment..."
@@ -12053,15 +11908,13 @@ msgstr "_Termin..."
 msgid "_Calendar Settings..."
 msgstr "_Kalender-Einstellungen..."
 
-#: ui/evolution-calendar.xml.h:41
-#, fuzzy
+#: ui/evolution-calendar.xml.h:42
 msgid "_Publish Free/Busy Information"
-msgstr "Verfügbarkeitsinformationen veröffentlichen"
+msgstr "Verfügbarkeitsinformationen _veröffentlichen"
 
-#: ui/evolution-calendar.xml.h:42
-#, fuzzy
+#: ui/evolution-calendar.xml.h:43
 msgid "_Task..."
-msgstr "Aufgabe"
+msgstr "_Aufgabe..."
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -12072,16 +11925,15 @@ msgid "Close"
 msgstr "Schließen"
 
 #: ui/evolution-comp-editor.xml.h:3
-#, fuzzy
 msgid "Close this item"
-msgstr "Diesen Eintrag löschen"
+msgstr "Diesen Eintrag schließen"
 
 #: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Diesen Eintrag löschen"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Hauptwerkzeugleiste"
 
@@ -12097,21 +11949,19 @@ msgstr "Diesen Eintrag drucken"
 msgid "Print..."
 msgstr "Drucken..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:19
 #: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
 msgid "Save"
 msgstr "Speichern"
 
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
 #: ui/evolution-comp-editor.xml.h:15
-#, fuzzy
 msgid "Save the item and close the dialog box"
-msgstr "Die Liste speichern und das Dialogfenster schließen"
+msgstr "Den Eintrag speichern und das Dialogfenster schließen"
 
 #: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
@@ -12122,7 +11972,7 @@ msgstr "Diesen Eintrag auf Platte speichern"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Datei"
 
@@ -12130,7 +11980,7 @@ msgstr "_Datei"
 msgid "Print En_velope..."
 msgstr "Umschlag drucken..."
 
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
@@ -12217,7 +12067,7 @@ msgstr "_Neue Nachricht erstellen"
 
 #: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit mail accounts and other preferences"
-msgstr "Mailaccounts anlegen und bearbeiten sowie andere Vorlieben"
+msgstr "Mailzugänge anlegen und bearbeiten sowie andere Vorlieben"
 
 #: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
@@ -12241,9 +12091,8 @@ msgstr ""
 "Erinnerte Passwörter vergessen, so dass Sie wieder nach ihnen gefragt werden"
 
 #: ui/evolution-mail-global.xml.h:10
-#, fuzzy
 msgid "New Message"
-msgstr "Meldung"
+msgstr "Neue Nachricht"
 
 #: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
@@ -12294,9 +12143,8 @@ msgid "_Send / Receive"
 msgstr "_Verschicken / Empfangen"
 
 #: ui/evolution-mail-global.xml.h:24
-#, fuzzy
 msgid "_Subscribe to Folders..."
-msgstr "Ordner \"%s\" wird abonniert"
+msgstr "Ordner _abonnieren..."
 
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
@@ -12307,9 +12155,8 @@ msgid "Copy selected messages"
 msgstr "Ausgewählte Nachrichten kopieren"
 
 #: ui/evolution-mail-list.xml.h:3
-#, fuzzy
 msgid "Cu_t"
-msgstr "Ausschneiden"
+msgstr "_Ausschneiden"
 
 #: ui/evolution-mail-list.xml.h:4
 msgid "Cut selected messages"
@@ -12355,7 +12202,7 @@ msgstr "_Alle auswählen"
 
 #: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
-msgstr "_Strang auswählen"
+msgstr "_Thread auswählen"
 
 #: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
@@ -12365,16 +12212,15 @@ msgstr ""
 #: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
-"Alle Nachrichten im selben Strang wie die ausgewählte Nachricht auswählen"
+"Alle Nachrichten im selben Thread wie die ausgewählte Nachricht auswählen"
 
 #: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Alle sichtbaren Nachrichten wählen"
 
 #: ui/evolution-mail-list.xml.h:18
-#, fuzzy
 msgid "Sh_ow Hidden Messages"
-msgstr "Ge_lesene Nachrichten verbergen"
+msgstr "Verborgene Nachrichten _zeigen"
 
 #: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
@@ -12392,25 +12238,25 @@ msgstr "Die gewählten Nachrichten zeitweilig verbergen"
 msgid "Threaded Message list"
 msgstr "Nachrichtenliste in Stränge geordnet"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-list.xml.h:26
 msgid "_Expunge"
 msgstr "_Säubern"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 msgid "_Folder"
 msgstr "_Ordner"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Auswahl _umkehren"
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "Eigenschaften..."
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
-msgstr "Nachrichtenliste in _Strangordnung"
+msgstr "Nachrichtenliste in _Thread-Ordnung"
 
 #: ui/evolution-mail-message.xml.h:1
 msgid "Apply filter rules to the selected messages"
@@ -12482,7 +12328,7 @@ msgstr "Die nächste ungelesene Nachricht anzeigen"
 
 #: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread thread"
-msgstr "Den nächsten ungelesenen Strang anzeigen"
+msgstr "Den nächsten ungelesenen Thread anzeigen"
 
 #: ui/evolution-mail-message.xml.h:21
 msgid "Display the previous important message"
@@ -12597,24 +12443,20 @@ msgid "Next"
 msgstr "Weiter"
 
 #: ui/evolution-mail-message.xml.h:52
-#, fuzzy
 msgid "Next Important Message"
-msgstr "Die nächste wichtige Nachricht anzeigen"
+msgstr "Nächste wichtige Nachricht"
 
 #: ui/evolution-mail-message.xml.h:53
-#, fuzzy
 msgid "Next Message"
-msgstr "Meldung"
+msgstr "Nächste Nachricht"
 
 #: ui/evolution-mail-message.xml.h:54
-#, fuzzy
 msgid "Next Thread"
-msgstr "_Strang auswählen"
+msgstr "Nächster Thread"
 
 #: ui/evolution-mail-message.xml.h:55
-#, fuzzy
 msgid "Next Unread Message"
-msgstr "Unbenannte Nachricht"
+msgstr "Nächste ungelesene Nachricht"
 
 #: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
@@ -12626,28 +12468,24 @@ msgstr ""
 "Die gewählte Nachrichten im Maileditor öffnen, um sie nochmals zu verschicken"
 
 #: ui/evolution-mail-message.xml.h:58
-#, fuzzy
 msgid "Preview the message to be printed"
-msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
+msgstr "Eine Vorschau der zu druckenden Nachricht zeigen"
 
 #: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Zurück"
 
 #: ui/evolution-mail-message.xml.h:60
-#, fuzzy
 msgid "Previous Important Message"
-msgstr "Die letzte wichtige Nachricht anzeigen"
+msgstr "Letzte wichtige Nachricht"
 
 #: ui/evolution-mail-message.xml.h:61
-#, fuzzy
 msgid "Previous Message"
-msgstr "Nachricht drucken"
+msgstr "Vorige Nachricht"
 
 #: ui/evolution-mail-message.xml.h:62
-#, fuzzy
 msgid "Previous Unread Message"
-msgstr "Die letzte ungelesene Nachricht anzeigen"
+msgstr "Letzte ungelesene Nachricht"
 
 #: ui/evolution-mail-message.xml.h:65
 msgid "Print this message"
@@ -12662,8 +12500,8 @@ msgid "Reply to All"
 msgstr "Allen antworten"
 
 #: ui/evolution-mail-message.xml.h:70
-msgid "S_earch Message"
-msgstr "Nachricht durch_suchen"
+msgid "S_earch Message..."
+msgstr "Nachricht durch_suchen..."
 
 #: ui/evolution-mail-message.xml.h:71
 msgid "Save the message as a text file"
@@ -12761,7 +12599,7 @@ msgid "_Close"
 msgstr "Schließen"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_Ansicht"
 
@@ -12953,7 +12791,7 @@ msgstr "Antwort-an-Feld"
 msgid "_Security"
 msgstr "_Sicherheit"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Hilfe"
 
@@ -12986,36 +12824,32 @@ msgid "Unsubscribe"
 msgstr "Abonnement kündigen"
 
 #: ui/evolution-task-editor.xml.h:1
-#, fuzzy
 msgid "Assign Task"
-msgstr "Zugewiesen"
+msgstr "Aufgabe zuweisen"
 
 #: ui/evolution-task-editor.xml.h:2
 msgid "Assign this task to others"
-msgstr ""
+msgstr "Diese Aufgabe an andere vergeben"
 
 #: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
 msgstr "Aufgabe stornieren"
 
 #: ui/evolution-task-editor.xml.h:4
-#, fuzzy
 msgid "Cancel this task"
-msgstr "Aufgabe stornieren"
+msgstr "Diese Aufgabe stornieren"
 
 #: ui/evolution-task-editor.xml.h:7
-#, fuzzy
 msgid "Obtain the latest task information"
-msgstr "Die letzten Besprechungsinformationen erhalten"
+msgstr "Die letzten Aufgabeninformationen erhalten"
 
 #: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
 msgstr "Aufgabe _aktualisieren"
 
 #: ui/evolution-tasks.xml.h:2
-#, fuzzy
 msgid "Configure the task view's settings"
-msgstr "Einstellungen des Kalenders konfigurieren"
+msgstr "Einstellungen der Aufgabenansicht konfigurieren"
 
 #: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
@@ -13034,17 +12868,16 @@ msgid "Paste task from the clipboard"
 msgstr "Aufgabe aus der Zwischenablage einfügen"
 
 #: ui/evolution-tasks.xml.h:13
-#, fuzzy
 msgid "Tasks Settings..."
-msgstr "_Aufgaben-Einstellungen..."
+msgstr "Aufgaben-Einstellungen..."
 
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-tasks.xml.h:18
 msgid "_Task"
 msgstr "Aufgabe"
 
 #: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Über Evolution..."
+msgid "About Ximian Evolution..."
+msgstr "Über Ximian Evolution..."
 
 #: ui/evolution.xml.h:2
 msgid "Add to _Shortcut Bar"
@@ -13083,142 +12916,136 @@ msgid "E_xit"
 msgstr "Beenden"
 
 #: ui/evolution.xml.h:13
-msgid "Evolution _FAQ"
-msgstr "Evolution-_FAQ"
-
-#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "Evolution-_Fenster"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Exit the program"
 msgstr "Das Programm verlassen"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "Import an external file format"
 msgstr "Ein externes Dateiformat importieren"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
 msgstr "Diesen Ordner an einen anderen Ort verschieben"
 
-#: ui/evolution.xml.h:20
-msgid "Open in New _Window"
-msgstr "In neuem _Fenster öffnen"
+#: ui/evolution.xml.h:18
+msgid "Open in New Window"
+msgstr "In neuem Fenster öffnen"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Open this folder in an other window"
 msgstr "Diesen Ordner in einem anderen Fenster öffnen"
 
-#: ui/evolution.xml.h:22
-msgid "Show information about Evolution"
-msgstr "Information über Evolution anzeigen"
+#: ui/evolution.xml.h:21
+msgid "Show information about Ximian Evolution"
+msgstr "Informationen über Ximian Evolution anzeigen"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Submit Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit _Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:25
-#, fuzzy
+#: ui/evolution.xml.h:24
 msgid "Submit a bug report using Bug Buddy"
-msgstr "Einen Fehlerbericht mit dem Fehlermelder (Bug Buddy) einschicken"
+msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Toggle"
 msgstr "Ein/Aus"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle whether to show the folder bar"
 msgstr "Anzeige der Ordnerleiste an/aus"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Anzeige der Verknüpfungsleiste an/aus"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
 msgstr "Offline-Arbeitsmodus an/aus."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "View the selected folder"
 msgstr "Den gewählten Ordner betrachten"
 
+#: ui/evolution.xml.h:31
+msgid "Ximian Evolution _FAQ"
+msgstr "Ximian-Evolution-_FAQ"
+
 #: ui/evolution.xml.h:32
-msgid "_About Evolution..."
-msgstr "Über Evolution..."
+msgid "_About Ximian Evolution..."
+msgstr "Über Ximian Evolution..."
 
 #: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "_Kopieren..."
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:38
 msgid "_Folder Bar"
 msgstr "Ordnerleiste"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:39
 msgid "_Go to Folder..."
 msgstr "_Gehe zu Ordner..."
 
-#: ui/evolution.xml.h:42
-#, fuzzy
+#: ui/evolution.xml.h:41
 msgid "_Import File..."
 msgstr "Datei _importieren..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:42
 msgid "_Move..."
 msgstr "_Verschieben..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:43
 msgid "_New"
 msgstr "_Neu"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:44
 msgid "_New Folder"
 msgstr "Neuer Ordner"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:45
 msgid "_Rename..."
 msgstr "_Umbenennen..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:46
 msgid "_Shortcut"
 msgstr "_Verknüpfung"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:47
 msgid "_Shortcut Bar"
 msgstr "Verknüpfungsleiste"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:49
 msgid "_Work Offline"
 msgstr "Offline _arbeiten"
 
 #: ui/my-evolution.xml.h:1
-#, fuzzy
 msgid "Change the settings for the summary"
-msgstr "Die Eigenschaften von My Evolution ändern"
+msgstr "Die Eigenschaften für die Übersicht ändern"
 
 #: ui/my-evolution.xml.h:4
-#, fuzzy
 msgid "Print summary"
-msgstr "Mail-Zusammenfassung"
+msgstr "Übersicht drucken"
 
 #: ui/my-evolution.xml.h:5
-#, fuzzy
 msgid "Reload"
-msgstr "Gelesen"
+msgstr "Neu laden"
 
 #: ui/my-evolution.xml.h:6
 msgid "Reload the view"
-msgstr ""
+msgstr "Die Ansicht neu laden"
 
 #: ui/my-evolution.xml.h:8
-#, fuzzy
 msgid "_Summary Settings..."
-msgstr "_Mail-Einstellungen..."
+msgstr "Einstellungen der _Übersicht..."
 
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
@@ -13467,14 +13294,12 @@ msgid "Save Search"
 msgstr "Suche speichren"
 
 #: widgets/misc/e-filter-bar.h:94
-#, fuzzy
 msgid "Add to Saved Searches"
-msgstr "Suche speichren"
+msgstr "Zu gespeicherten Suchen hinzufügen"
 
 #: widgets/misc/e-filter-bar.h:95
-#, fuzzy
 msgid "Clear"
-msgstr "Kalender"
+msgstr "Löschen"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
@@ -13506,9 +13331,8 @@ msgid "Sear_ch"
 msgstr "Su_chen"
 
 #: widgets/misc/e-search-bar.c:460
-#, fuzzy
 msgid "Find Now"
-msgstr "DN binden:"
+msgstr "Jetzt suchen"
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
@@ -13530,347 +13354,47 @@ msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 
-#, fuzzy
-#~ msgid "RDF Summary"
-#~ msgstr "Zusammenfassung"
-
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP-Server"
-
-#~ msgid "File"
-#~ msgstr "Datei"
-
-#~ msgid "Unknown addressbook type"
-#~ msgstr "Unbekannter Adressbuch-Typ"
-
-#~ msgid "None (anonymous mode)"
-#~ msgstr "Kein (Anonymer Modus)"
-
-#~ msgid "Unknown auth type"
-#~ msgstr "Unbekannter Legitimationstyp"
-
-#~ msgid "Subtree"
-#~ msgstr "Unterbaum"
-
-#~ msgid "Unknown scope type"
-#~ msgstr "Unbekannter Bereichstyp"
-
-#~ msgid "FIXME Bind DN Help text here"
-#~ msgstr "FIXME DN-Bindungs-Hilfetext hier"
-
-#~ msgid "FIXME Host help text here."
-#~ msgstr "FIXME Host-Rechner-Hilfetext hier."
-
-#~ msgid "Root DN:"
-#~ msgstr "Root-DN:"
-
-#~ msgid "FIXME Root DN help text here."
-#~ msgstr "FIXME Root-DN-Hilfetext hier."
-
-#~ msgid "FIXME Port help text here."
-#~ msgstr "FIXME Port-Hilfetext hier."
-
-#~ msgid "Authentication:"
-#~ msgstr "Legitimation:"
-
-#~ msgid "Advanced LDAP Options"
-#~ msgstr "Komplexe LDAP-Optionen"
-
-#~ msgid "FIXME Path Help text here"
-#~ msgstr "FIXME Pfad-Hilfetext hier"
-
-#~ msgid "Create path if it doesn't exist."
-#~ msgstr "Pfad erstellen wenn er noch nicht existiert."
-
-#~ 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."
-
-#~ msgid "FIXME Name help text here"
-#~ msgstr "FIXME Hilfetext zum Namen hier"
-
-#~ msgid "FIXME Description help text here"
-#~ msgstr "FIXME Hilfetext zur Beschreibung hier"
-
-#~ msgid "Name"
-#~ msgstr "Name"
-
-#~ msgid "URI"
-#~ msgstr "URI"
-
-#~ msgid "Enter password for %s"
-#~ msgstr "Bitte geben Sie das Passwort für %s ein"
-
-#~ msgid "Category contains"
-#~ msgstr "Kategorie enthält"
-
-#~ msgid "Select name from _folder:"
-#~ msgstr "Name aus _Ordner wählen:"
-
-#~ msgid "USA"
-#~ msgstr "USA"
-
-#~ msgid "Canceled"
-#~ msgstr "Abgebrochen"
-
-#~ msgid "Transparent"
-#~ msgstr "Transparent"
-
-#~ msgid "Opaque"
-#~ msgstr "Opak"
-
-#~ msgid ""
-#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-#~ msgstr ""
-#~ "Die Klassifizierung muss 'Öffentlich', 'Privat', 'Vertraulich' oder "
-#~ "'Keine' sein"
-
-#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-#~ msgstr "Die Transparenz muss 'Transparent', 'Opak' oder 'Keine' sein."
-
-#~ msgid "Beep when alarm windows appear."
-#~ msgstr "Piepsen, wenn Alarmfenster erscheinen."
-
-#~ msgid "Calendar Preferences"
-#~ msgstr "Kalender-Vorlieben"
-
-#~ msgid "Colors for Tasks"
-#~ msgstr "Farben für Aufgaben"
-
-#~ msgid "Date Navigator"
-#~ msgstr "Datumsnavigator"
-
-#~ msgid "Defaults"
-#~ msgstr "Voreinstellungen"
-
-#~ msgid "Notification Options"
-#~ msgstr "Benachrichtigungsoptionen"
-
-#~ msgid "Remind me of all appointments"
-#~ msgstr "Mich an alle Termine erinnern,"
-
-#~ msgid "minutes before they occur."
-#~ msgstr "Minuten bevor sie auftreten."
-
-#~ msgid "Delegated From:"
-#~ msgstr "Delegiert durch:"
-
-#~ msgid "No one"
-#~ msgstr "Niemanden"
-
-#~ msgid "Task"
-#~ msgstr "Aufgabe"
-
-#~ msgid "% Comp_lete:"
-#~ msgstr "% abgeschlossen:"
-
-#~ msgid "Transparency"
-#~ msgstr "Transparenz"
-
-#~ 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."
-
-#~ msgid "This is a meeting request."
-#~ msgstr "Dies ist eine Besprechungsanfrage."
-
-#~ msgid "This is one or more additions to a current meeting."
-#~ msgstr ""
-#~ "Dies sind ein oder mehrere Nachträge zu einer aktuellen Besprechung."
-
-#~ msgid "This is a request for the latest event information."
-#~ msgstr "Dies ist eine Anfrage zu den neuesten Ereignisinformationen."
-
-#~ msgid "This is an event cancellation."
-#~ msgstr "Dies ist eine Ereignisstornierung."
-
-#~ msgid "The message is not understandable."
-#~ msgstr "Diese Nachricht ist unverständlich."
-
-#~ 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."
-
-#~ msgid "This is a task request."
-#~ msgstr "Dies ist eine Aufgabenanfrage."
-
-#~ msgid "This is a reply to a task request."
-#~ msgstr "Dies ist eine Antwort auf eine Aufgabenanfrage."
-
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "Diese Nachricht schein formell ungültig zu sein"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Die Nachricht enthält keine unterstützten Anfragen."
-
-#~ msgid "The information contained in this attachment was not valid"
-#~ msgstr "Die in diesem Anhang enthaltene Information war ungültig."
-
-#~ msgid "All"
-#~ msgstr "Alle"
-
-#~ msgid "Edit"
-#~ msgstr "Bearbeiten"
-
-#~ msgid "Store search as vFolder"
-#~ msgstr "Suche als VOrdner speichern"
-
-#~ msgid "Resend"
-#~ msgstr "Nochmals schicken"
-
-#~ msgid "Evolution Account Manager"
-#~ msgstr "Evolution-Accountverwaltung"
-
-#~ msgid "On %s, %s wrote:"
-#~ msgstr "Am %s schrieb %s:"
-
-#~ msgid "Receiving"
-#~ msgstr "Erhalten"
-
-#~ msgid "Store"
-#~ msgstr "Speicher"
-
-#~ msgid "Display folders starting with:"
-#~ msgstr "Ordner anzeigen, die beginnen mit:"
-
-#~ msgid "Getting store for \"%s\""
-#~ msgstr "Erhalte Speicher für \"%s\""
-
-#~ msgid "My Evolution Settings"
-#~ msgstr "Einstellungen von My Evolution"
-
-#~ msgid "%A, %d %B %Y"
-#~ msgstr "%A, %d. %B %Y"
-
-#~ msgid "Print My Evolution"
-#~ msgstr "My Evolution Drucken"
-
-#~ msgid "Printing of My Evolution failed"
-#~ msgstr "Drucken von My Evolution fehlgeschlagen"
-
-#~ msgid "My Evolution"
-#~ msgstr "My Evolution"
-
-#~ msgid "New contact"
-#~ msgstr "Neuer Kontakt"
-
-#~ msgid "_Contact Group"
-#~ msgstr "_Kontaktgruppe"
-
-#~ msgid "Go to present time"
-#~ msgstr "Zur aktuellen Zeit gehen"
-
-#~ msgid "W_ork Week"
-#~ msgstr "_Werkwoche"
-
-#~ msgid "Close this appointment"
-#~ msgstr "Diesen Termin abschließen"
-
-#~ msgid "Print S_etup"
-#~ msgstr "Druck_einstellungen"
-
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Den Termin speichern und das Dialogfenster schließen"
-
-#~ msgid "_Action"
-#~ msgstr "_Aktion"
-
-#~ msgid "Help"
-#~ msgstr "Hilfe"
-
-#~ msgid "Se_nd contact to other..."
-#~ msgstr "Kontakt an anderen schicken..."
-
-#~ msgid "See online help"
-#~ msgstr "Online-Hilfe einsehen"
-
-#~ msgid "Manage _Subscriptions..."
-#~ msgstr "_Abonnements verwalten..."
-
-#~ msgid "Show _All"
-#~ msgstr "_Alle anzeigen"
-
-#~ msgid "Print Preview..."
-#~ msgstr "Druckvorschau..."
-
-#~ msgid "_Re-send Message"
-#~ msgstr "Nachricht _nochmals verschicken"
-
-#~ msgid "Customi_ze Toolbars..."
-#~ msgstr "Werkzeugleisten anpassen..."
-
-#~ msgid "Customize"
-#~ msgstr "Anpassen"
-
-#~ msgid "Customize toolbars"
-#~ msgstr "Werkzeugleisten anpassen"
-
-#~ msgid "Delegate Task"
-#~ msgstr "Aufgabe delegieren"
-
-#~ msgid "Save task as something else"
-#~ msgstr "Aufgabe als etwas anderes speichern"
-
-#~ msgid "Getting _Started"
-#~ msgstr "Erste Schritte"
-
-#~ msgid "Using the C_ontact Manager"
-#~ msgstr "Die Kontaktverwaltung benutzen"
-
-#~ msgid "Using the _Calendar"
-#~ msgstr "Den Kalender benutzen"
-
-#~ msgid "Using the _Mailer"
-#~ msgstr "Den _Mailer benutzen"
-
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "Termin (FIXME)"
+#~ msgid "Factory for the Evolution addressbook component."
+#~ msgstr "Factory für die Evolution-Adressbuch-Komponente."
 
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "Kontakt (FIXME)"
+#~ msgid "Done."
+#~ msgstr "Fertig."
 
-#~ msgid "_Index"
-#~ msgstr "_Index"
+#~ msgid "Removing cards..."
+#~ msgstr "Karten werden entfernt..."
 
-#~ msgid "_Mail message"
-#~ msgstr "_Mailnachricht"
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Factory für die Evolution-Kalender-Komponente."
 
-#~ msgid "_Task (FIXME)"
-#~ msgstr "Aufgabe (FIXME)"
+#~ msgid "Synchronising folder"
+#~ msgstr "Ordner wird synchronisiert"
 
-#~ msgid "_My Evolution Settings..."
-#~ msgstr "Einstellungen von _My Evolution..."
+#~ msgid "Could not open folder to summarize: %s: %s"
+#~ msgstr "Ordner konnte nicht zum Zusammenfassen geöffnet werden: %s: %s"
 
-#~ msgid "Set task view preferences"
-#~ msgstr "Aufgaben-Ansichtseinstellungen ändern"
+#~ msgid "Could not open folder to summarise: %s: %s"
+#~ msgstr "Ordner konnte nicht zum Zusammenfassen geöffnet werden: %s: %s"
 
-#~ msgid "TasksPreferences"
-#~ msgstr "Aufgaben-Vorlieben"
+#~ msgid "Elm mail"
+#~ msgstr "Elm-Mail"
 
-#~ msgid "Edit this task"
-#~ msgstr "Diese Aufgabe bearbeiten"
+#~ msgid "Pine mail"
+#~ msgstr "Pine-Mail"
 
-#~ msgid "Delete all Occurrences"
-#~ msgstr "Jedes Auftreten löschen"
+#~ msgid "Factory for the Evolution mail component."
+#~ msgstr "Factory für die Evolution-Mail-Komponente."
 
-#~ msgid "Forward to Address"
-#~ msgstr "Weiterleiten an Adresse"
+#~ msgid "Forwarded message:\n"
+#~ msgstr "Weitergeleitete Nachricht:\n"
 
-#~ msgid "[Fwd: No Subject]"
-#~ msgstr "[Fwd: (kein Betreff)]"
+#~ msgid "Synchronizing '%s'"
+#~ msgstr "Ordner '%s' wird synchronisiert"
 
-#~ msgid "Forwarded message (no subject)"
-#~ msgstr "Weitergeleitete Nachricht (kein Betreff)"
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "Factory für Evolutions Chefsesselansichts-Komponente."
 
-#~ msgid ""
-#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-#~ "s<br><b>Subject:</b> %s<br>"
-#~ msgstr ""
-#~ "-----Weitergeleitete Nachricht-----<br><b>Von:</b> %s<br><b>An:</b> %"
-#~ "s<br><b>Betreff:</b> %s<br>"
+#~ msgid "%l:%M%p"
+#~ msgstr "%H.%M"
 
-#~ msgid "Wipe trackers"
-#~ msgstr "Verfolgungen auswischen"
+#~ msgid "%a %l:%M%p"
+#~ msgstr "%a %H.%M"