Huge update to German translation

svn path=/trunk/; revision=10972
author: Matthias Warkus <mawarkus@src.gnome.org> 2001-07-11 05:03:31 +0800
committer: Matthias Warkus <mawarkus@src.gnome.org> 2001-07-11 05:03:31 +0800
commit: b2716b04c952a71d385a07c32c36269024a57ea4 (patch)
tree: f04e26b7fec1dcbe429bfc6566e3b0473419dcd3 /po
parent: 371e544118a2d43c011405ac905bb82e941a3eb2 (diff)
download: gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.tar
gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.tar.gz
gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.tar.bz2
gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.tar.lz
gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.tar.xz
gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.tar.zst
gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.zip
2 files changed, 4797 insertions, 2957 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index ad8b2b1d9c..184ddeb5d7 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-10  Matthias Warkus  <mawarkus@gnome.org>
+
+	* de.po: Huge update to German translation.
+
 2001-07-10  Zbigniew Chyla  <chyla@gnome.pl>
 
 	* pl.po: Updated Polish translation.
diff --git a/po/de.po b/po/de.po
index 2e03f0e843..d9fba5e78f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,19 +10,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.8cvs\n"
-"POT-Creation-Date: 2001-05-18 15:40+0200\n"
-"PO-Revision-Date: 2001-05-18 16:18+02:00\n"
+"POT-Creation-Date: 2001-07-08 23:15+0200\n"
+"PO-Revision-Date: 2001-07-08 23:39+02:00\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3314
+#: addressbook/backend/ebook/e-card.c:3606
 msgid "Card: "
 msgstr "Karte: "
 
-#: addressbook/backend/ebook/e-card.c:3316
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "Name: "
@@ -30,7 +30,7 @@ msgstr ""
 "\n"
 "Name: "
 
-#: addressbook/backend/ebook/e-card.c:3317
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Prefix:     "
@@ -38,7 +38,7 @@ msgstr ""
 "\n"
 "  Präfix:     "
 
-#: addressbook/backend/ebook/e-card.c:3318
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Given:      "
@@ -46,7 +46,7 @@ msgstr ""
 "\n"
 "  Vorname:     "
 
-#: addressbook/backend/ebook/e-card.c:3319
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Additional: "
@@ -54,7 +54,7 @@ msgstr ""
 "\n"
 "  Zusätzlich: "
 
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Family:     "
@@ -62,7 +62,7 @@ msgstr ""
 "\n"
 "  Familienname:     "
 
-#: addressbook/backend/ebook/e-card.c:3321
+#: addressbook/backend/ebook/e-card.c:3613
 msgid ""
 "\n"
 "  Suffix:     "
@@ -70,7 +70,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3335
+#: addressbook/backend/ebook/e-card.c:3627
 msgid ""
 "\n"
 "Birth Date: "
@@ -78,7 +78,7 @@ msgstr ""
 "\n"
 "Geburtsdatum: "
 
-#: addressbook/backend/ebook/e-card.c:3346
+#: addressbook/backend/ebook/e-card.c:3638
 msgid ""
 "\n"
 "Address:"
@@ -86,7 +86,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3348
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -94,7 +94,7 @@ msgstr ""
 "\n"
 "  Postfach:  "
 
-#: addressbook/backend/ebook/e-card.c:3349
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Ext:         "
@@ -102,7 +102,7 @@ msgstr ""
 "\n"
 "  Suffix:        "
 
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  Street:      "
@@ -110,7 +110,7 @@ msgstr ""
 "\n"
 "  Straße:     "
 
-#: addressbook/backend/ebook/e-card.c:3351
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  City:        "
@@ -118,7 +118,7 @@ msgstr ""
 "\n"
 "  Ort:     "
 
-#: addressbook/backend/ebook/e-card.c:3352
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Region:      "
@@ -126,7 +126,7 @@ msgstr ""
 "\n"
 "  Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Postal Code: "
@@ -134,7 +134,7 @@ msgstr ""
 "\n"
 "  Postleitzahl: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3646
 msgid ""
 "\n"
 "  Country:     "
@@ -142,7 +142,7 @@ msgstr ""
 "\n"
 "  Land:     "
 
-#: addressbook/backend/ebook/e-card.c:3367
+#: addressbook/backend/ebook/e-card.c:3659
 msgid ""
 "\n"
 "Delivery Label: "
@@ -150,7 +150,7 @@ msgstr ""
 "\n"
 "Postvermerk: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3671
 msgid ""
 "\n"
 "Telephones:\n"
@@ -158,7 +158,7 @@ msgstr ""
 "\n"
 "Telefone:\n"
 
-#: addressbook/backend/ebook/e-card.c:3382
+#: addressbook/backend/ebook/e-card.c:3674
 msgid ""
 "\n"
 "Telephone:"
@@ -166,7 +166,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3406
+#: addressbook/backend/ebook/e-card.c:3698
 msgid ""
 "\n"
 "E-mail:\n"
@@ -174,7 +174,7 @@ msgstr ""
 "\n"
 "E-Mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3701
 msgid ""
 "\n"
 "E-mail:"
@@ -182,7 +182,7 @@ msgstr ""
 "\n"
 "E-Mail:"
 
-#: addressbook/backend/ebook/e-card.c:3428
+#: addressbook/backend/ebook/e-card.c:3720
 msgid ""
 "\n"
 "Mailer: "
@@ -190,7 +190,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3434
+#: addressbook/backend/ebook/e-card.c:3726
 msgid ""
 "\n"
 "Time Zone: "
@@ -198,7 +198,7 @@ msgstr ""
 "\n"
 "Zeitzone: "
 
-#: addressbook/backend/ebook/e-card.c:3442
+#: addressbook/backend/ebook/e-card.c:3734
 msgid ""
 "\n"
 "Geo Location: "
@@ -206,7 +206,7 @@ msgstr ""
 "\n"
 "Geographischer Ort: "
 
-#: addressbook/backend/ebook/e-card.c:3446
+#: addressbook/backend/ebook/e-card.c:3738
 msgid ""
 "\n"
 "Business Role: "
@@ -214,7 +214,7 @@ msgstr ""
 "\n"
 "Berufsbezeichnung: "
 
-#: addressbook/backend/ebook/e-card.c:3458
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "Org: "
@@ -222,7 +222,7 @@ msgstr ""
 "\n"
 "Firma: "
 
-#: addressbook/backend/ebook/e-card.c:3459
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Name:  "
@@ -230,7 +230,7 @@ msgstr ""
 "\n"
 "  Name:  "
 
-#: addressbook/backend/ebook/e-card.c:3460
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit:  "
@@ -238,7 +238,7 @@ msgstr ""
 "\n"
 "  Einheit:  "
 
-#: addressbook/backend/ebook/e-card.c:3461
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit2: "
@@ -246,7 +246,7 @@ msgstr ""
 "\n"
 "  Einheit2: "
 
-#: addressbook/backend/ebook/e-card.c:3462
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit3: "
@@ -254,7 +254,7 @@ msgstr ""
 "\n"
 "  Einheit3: "
 
-#: addressbook/backend/ebook/e-card.c:3463
+#: addressbook/backend/ebook/e-card.c:3755
 msgid ""
 "\n"
 "  Unit4: "
@@ -262,7 +262,7 @@ msgstr ""
 "\n"
 "  Einheit4: "
 
-#: addressbook/backend/ebook/e-card.c:3467
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Categories: "
@@ -270,7 +270,7 @@ msgstr ""
 "\n"
 "Kategorien: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3760
 msgid ""
 "\n"
 "Comment: "
@@ -288,7 +288,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3481
+#: addressbook/backend/ebook/e-card.c:3773
 msgid ""
 "\n"
 "Unique String: "
@@ -296,7 +296,7 @@ msgstr ""
 "\n"
 "Eindeutige Zeichenkette: "
 
-#: addressbook/backend/ebook/e-card.c:3484
+#: addressbook/backend/ebook/e-card.c:3776
 msgid ""
 "\n"
 "Public Key: "
@@ -304,19 +304,15 @@ msgstr ""
 "\n"
 "Öffentlicher Schlüssel: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:4038
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:4046
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard für %s"
 
-#: addressbook/backend/ebook/e-destination.c:244
-msgid "???"
-msgstr "???"
-
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Factory, um VCard-Dateien in Evolution zu importieren."
@@ -331,9 +327,9 @@ msgstr "Importiert VCard-Dateien in Evolution."
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
 #: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/calendar/calendar-conduit.c:1150
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
@@ -346,13 +342,13 @@ msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:730
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
@@ -362,408 +358,435 @@ msgstr "Wombat konnte nicht gestartet werden"
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
 #: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "Anni_versary:"
 msgstr "Jahrestag:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "B_usiness"
 msgstr "Geschäftlich"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Business _Fax"
 msgstr "Geschäftliches Fax"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "C_ontacts..."
 msgstr "Kontakte..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Kategorien..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Details"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr "Einsortieren unter:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Allgemein"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid "New phone type"
 msgstr "Neuer Telefon-Typ"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "No_tes:"
 msgstr "Notizen:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Phone Types"
 msgstr "Telefon-Typen"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/e-contact-editor.c:1476
+#, fuzzy
 msgid "Primary Email"
-msgstr "Primäre E-Mail"
+msgstr "Teils Hagel"
 
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr "Will HTML-Mail erhalten"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Web page address:"
 msgstr "Adresse der Webseite:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:84
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: mail/mail-config.glade.h:101
 msgid "_Add"
 msgstr "Hinzufügen"
 
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Address..."
 msgstr "Adresse..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Assistant's name:"
 msgstr "Name des Assistenten:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Birthday:"
 msgstr "Geburtstag:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Business"
 msgstr "Geschäftlich"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr "Firma:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:715 mail/mail-config.glade.h:85
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:103
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: mail/folder-browser.c:1293 mail/mail-config.glade.h:102
+#: ui/evolution-mail-message.xml.h:78 ui/evolution-tasks.xml.h:15
+#: ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Löschen"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr "Abteilung:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Full Name..."
 msgstr "Voller Name..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Home"
 msgstr "Zu Hause"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Job title:"
 msgstr "Stellenbezeichnung:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Manager's Name:"
 msgstr "Name des Vorgesetzten:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Nickname:"
 msgstr "Spitzname:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Office:"
 msgstr "Büro:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Profession:"
 msgstr "Beruf:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Spouse:"
 msgstr "Partner:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_This is the mailing address"
 msgstr "Dies ist die Postadresse"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:663
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt gehört in folgende Kategorien:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1434
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1435
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1436
 msgid "Business 2"
 msgstr "Geschäftlich 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1437
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Business Fax"
 msgstr "Geschäftliches Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1438
 msgid "Callback"
 msgstr "Rückruf"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1439
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1440
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1441
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
 msgid "Home"
 msgstr "Zu Hause"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1442
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/contact-editor/e-contact-editor.c:1443
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/contact-editor/e-contact-editor.c:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1445
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
+#: addressbook/gui/contact-editor/e-contact-editor.c:1446
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: mail/mail-config.glade.h:59
 msgid "Other"
 msgstr "Andere"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1447
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1448
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1449
 msgid "Primary"
 msgstr "Primär"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1450
+#: addressbook/gui/widgets/e-addressbook-view.c:723
+#, fuzzy
 msgid "Radio"
-msgstr "Radio"
+msgstr "Regen"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1451
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1452
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1477
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Email 2"
 msgstr "E-Mail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1478
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Email 3"
 msgstr "E-Mail 3"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Kontakt löschen?"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufügen"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Voll bearbeiten"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "Full Name"
 msgstr "Voller Name"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#, fuzzy
 msgid "E-mail"
-msgstr "E-Mail"
+msgstr "Hagel"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
 msgid "Canada"
-msgstr "Kanada"
+msgstr "Sand"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Adresse prüfen"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Land:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finnland"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "USA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "Ort:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Postfach:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Staat/Bundesland:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "Postleitzahl/_ZIP:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Vollen Namen prüfen"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
+#, fuzzy
 msgid "Miss"
-msgstr "Fräulein"
+msgstr "Nebel"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Herr"
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Frau"
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Frl."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "Vorname:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "Nachname:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "Mittelname:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "Suffix:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "Titel:"
 
-#: addressbook/gui/component/addressbook.c:244
-msgid "As _Minicards"
-msgstr "Als _Minikarten"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "List _name:"
+msgstr "Listen_name:"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+msgid "Members"
+msgstr "Mitglieder"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
+msgstr ""
+"Geben Sie eine E-Mail-Adresse ein oder ziehen Sie einen Kontakt auf die "
+"Liste unten:"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr "Adressen _verbergen, when Mail an diese Liste gesendet wird"
 
-#: addressbook/gui/component/addressbook.c:250
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Als Tabelle"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "_Remove"
+msgstr "_Entfernen"
 
-#: addressbook/gui/component/addressbook.c:410
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "contact-list-editor"
+msgstr "contact-list-editor"
+
+#: addressbook/gui/component/addressbook.c:345
 #, c-format
 msgid "Enter password for %s"
 msgstr "Bitte geben Sie das Passwort für %s ein"
 
-#: addressbook/gui/component/addressbook.c:438
+#: addressbook/gui/component/addressbook.c:373
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch kann nicht geöffnet werden"
 
-#: addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/component/addressbook.c:380
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -773,7 +796,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:450
+#: addressbook/gui/component/addressbook.c:385
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -786,7 +809,7 @@ msgstr ""
 "nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
 "haben.\n"
 
-#: addressbook/gui/component/addressbook.c:458
+#: addressbook/gui/component/addressbook.c:393
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -794,19 +817,23 @@ 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:618 calendar/gui/gnome-cal.c:233
+#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
 msgid "Any field contains"
 msgstr "Irgend ein Feld enthält"
 
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:555
 msgid "Name contains"
 msgstr "Name enthält"
 
-#: addressbook/gui/component/addressbook.c:620
+#: addressbook/gui/component/addressbook.c:556
 msgid "Email contains"
 msgstr "E-Mail enthält"
 
-#: addressbook/gui/component/addressbook.c:763
+#: addressbook/gui/component/addressbook.c:557
+msgid "Category contains"
+msgstr "Kategorie enthält"
+
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -828,14 +855,15 @@ msgstr "Kein (Anonymer Modus)"
 
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
 msgid "Password"
 msgstr "Passwort"
 
 #: addressbook/gui/component/addressbook-config.c:168
+#, fuzzy
 msgid "Unknown auth type"
-msgstr "Unbekannter Legitimationstyp"
+msgstr "Unbekannte Beobachtungszeit"
 
 #: addressbook/gui/component/addressbook-config.c:177
 msgid "Base"
@@ -850,8 +878,9 @@ msgid "Subtree"
 msgstr "Unterbaum"
 
 #: addressbook/gui/component/addressbook-config.c:184
+#, fuzzy
 msgid "Unknown scope type"
-msgstr "Unbekannter Gültigkeitsbereichstyp"
+msgstr "Unbekannte Beobachtungszeit"
 
 #: addressbook/gui/component/addressbook-config.c:349
 msgid "Bind DN:"
@@ -862,69 +891,69 @@ msgid "FIXME Bind DN Help text here"
 msgstr "FIXME DN-Bindungs-Hilfetext hier"
 
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:73
 msgid "Remember this password"
 msgstr "Dieses Passwort speichern"
 
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:33
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:42
 msgid "Host:"
 msgstr "Host-Rechner:"
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:404
 msgid "FIXME Host help text here."
 msgstr "FIXME Host-Rechner-Hilfetext hier."
 
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:406
 msgid "Root DN:"
 msgstr "Root-DN:"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Root DN help text here."
 msgstr "FIXME Root-DN-Hilfetext hier."
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:411
 msgid "Port:"
 msgstr "Port:"
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:412
 msgid "FIXME Port help text here."
 msgstr "FIXME Port-Hilfetext hier."
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:432
 msgid "Search Scope:"
 msgstr "Suche-Bereich:"
 
-#: addressbook/gui/component/addressbook-config.c:477
+#: addressbook/gui/component/addressbook-config.c:479
 msgid "Authentication:"
 msgstr "Legitimation:"
 
-#: addressbook/gui/component/addressbook-config.c:499
+#: addressbook/gui/component/addressbook-config.c:501
 msgid "Advanced LDAP Options"
 msgstr "Komplexe LDAP-Optionen"
 
-#: addressbook/gui/component/addressbook-config.c:520
-#: mail/mail-config.glade.h:53
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:64
 msgid "Path:"
 msgstr "Pfad:"
 
-#: addressbook/gui/component/addressbook-config.c:521
+#: addressbook/gui/component/addressbook-config.c:523
 msgid "FIXME Path Help text here"
 msgstr "FIXME Pfad-Hilfetext hier"
 
-#: addressbook/gui/component/addressbook-config.c:526
+#: addressbook/gui/component/addressbook-config.c:528
 msgid "Create path if it doesn't exist."
 msgstr "Pfad erstellen wenn er noch nicht existiert."
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/component/addressbook-config.c:662
 msgid "Edit Addressbook"
 msgstr "Adressbuch bearbeiten"
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:664
 msgid "Add Addressbook"
 msgstr "Adressbuch hinzufügen"
 
-#: addressbook/gui/component/addressbook-config.c:680
+#: addressbook/gui/component/addressbook-config.c:682
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -932,22 +961,22 @@ msgstr ""
 "Wählen Sie den Typ ihres Adressbuches und geben Sie die relevanten "
 "Informationen ein."
 
-#: addressbook/gui/component/addressbook-config.c:686
-#: mail/mail-config.glade.h:43
+#: addressbook/gui/component/addressbook-config.c:688
+#: mail/mail-config.glade.h:53
 msgid "Name:"
 msgstr "Name:"
 
-#: addressbook/gui/component/addressbook-config.c:687
+#: addressbook/gui/component/addressbook-config.c:689
 msgid "FIXME Name help text here"
 msgstr "FIXME Hilfetext zum Namen hier"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:691
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
+#: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: addressbook/gui/component/addressbook-config.c:690
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Description help text here"
 msgstr "FIXME Hilfetext zur Beschreibung hier"
 
@@ -957,19 +986,17 @@ msgstr "Adressbuch-Quellen"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:616
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:23
-#: mail/message-browser.c:202 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
-#: ui/evolution-task-editor-dialog.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-view.c:606
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
 msgid "Delete"
 msgstr "Löschen"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:28
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -985,24 +1012,57 @@ msgstr "URI"
 msgid "Other Contacts"
 msgstr "Andere Kontakte"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Abfragen deaktivieren"
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(keine)"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Abfragen aktivieren (gefährlich!)"
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
+msgstr "Eine Aktion wählen"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Einen neuen Kontakt \"%s\" anlegen"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Adresse zu bestehendem Kontakt \"%s\" hinzufügen"
 
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
+msgstr "Anfrage beim Adressbuch..."
+
+#: addressbook/gui/component/e-address-popup.c:916
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:281
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
 msgid "Edit Contact Info"
 msgstr "Kontaktinfo bearbeiten"
 
+#: addressbook/gui/component/e-address-popup.c:946
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:347
+#: addressbook/gui/component/select-names/e-select-names-popup.c:339
 msgid "Add to Contacts"
 msgstr "Zu Kontakten hinzufügen"
 
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
+msgstr "E-Mail-Adresse einfließen lassen"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Abfragen deaktivieren"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Abfragen aktivieren (gefährlich!)"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
 msgid "A Bonobo control for an address popup."
 msgstr "Eine Bonobo-Control für ein Adress-Popup."
@@ -1047,20 +1107,20 @@ msgstr "Factory für die Evolution-Adressbuch-Komponente."
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory für die beispielhafte Adressbuch-Kontrolle"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:161
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:272 shell/e-shortcuts-view.c:475
 msgid "Remove"
 msgstr "Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:176
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
 msgid "Remove All"
 msgstr "Alle Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
 msgid "Send HTML Mail?"
-msgstr "HTML-Mail senden?"
+msgstr "HTML-Mail verschicken?"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
@@ -1071,20 +1131,71 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory für die Namenauswahl-Schnittstelle des Adressbuchs"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Suchen..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Message Recipients"
 msgstr "Nachrichtenempfänger"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Select Names"
 msgstr "Namen wählen"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select name from _folder:"
+msgstr "Name aus _Ordner wählen:"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Name wählen aus:"
+msgid "_Category:"
+msgstr "_Kategorie:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Suchen"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr "Trotzdem hinzufügen"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid "Duplicate Contact Detected"
+msgstr "Doppelt vorhandener Kontakt entdeckt"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+msgid "New Contact:"
+msgstr "Neuer Kontakt:"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+msgid "Original Contact:"
+msgstr "Ursprünglicher Kontakt:"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Den Namen oder die E-Mail-Adresse dieses Kontakts gibt es\n"
+"bereits in diesem Ordner. Möchten Sie ihn trotzdem hinzufügen?"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+msgid "Change Anyway"
+msgstr "Trotzdem ändern"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Changed Contact:"
+msgstr "Geänderter Kontakt:"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Conflicting Contact:"
+msgstr "Kontakt in Konflikt:"
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Die geänderte E-Mail-Adresse bzw. den geänderten Namen dieses\n"
+"Kontakts gibt es bereits in diesem Ordner. Möchten Sie ihn\n"
+"trotzdem hinzufügen?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
 #: mail/mail-search.c:242
@@ -1201,154 +1312,172 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:551
-#: addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:612
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
-msgstr "Kontakt an anderen senden"
+msgstr "Kontakt an anderen schicken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
-msgstr "Nachricht an Kontakt senden"
+msgstr "Nachricht an Kontakt schicken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:614 mail/message-browser.c:199
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:65 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
+#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Drucken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Umschlag drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:698
+#: addressbook/gui/widgets/e-addressbook-view.c:700
 msgid "* Click here to add a contact *"
 msgstr "* Hier klicken, um einen Kontakt hinzuzufügen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "File As"
 msgstr "Einsortieren unter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:703
+#, fuzzy
 msgid "Email"
-msgstr "E-Mail"
+msgstr "Hagel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Primary Phone"
 msgstr "Primäres Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Assistant Phone"
 msgstr "Telefon des Assistenten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Business Phone"
 msgstr "Geschäftliches Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Callback Phone"
 msgstr "Rückruf-Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Company Phone"
 msgstr "Firmentelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Home Phone"
 msgstr "Telefon zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Business Address"
 msgstr "Geschäftliche Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Home Address"
 msgstr "Adresse zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Business Phone 2"
 msgstr "Geschäftliches Telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Home Phone 2"
 msgstr "Telefon zu Hause 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "Other Phone"
 msgstr "Anderes Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "TTY"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "Other Address"
 msgstr "Andere Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Department"
 msgstr "Abteilung"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Office"
 msgstr "Büro"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Profession"
 msgstr "Beruf"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Spouse"
 msgstr "Lebenspartner"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Note"
 msgstr "Notiz"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Free-busy URL"
 msgstr "Frei/beschäftigt-URL"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
+msgid "Done."
+msgstr "Fertig."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+msgid "Error removing card"
+msgstr "Fehler beim Entfernen einer Karte"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1114
+msgid "Removing cards..."
+msgstr "Karten werden entfernt..."
+
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr "Fehler beim Ändern einer Karte"
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
 
-#: addressbook/gui/widgets/e-minicard-view.c:216
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1407,8 +1536,9 @@ msgid "Format"
 msgstr "Format"
 
 #: addressbook/printing/e-contact-print.glade.h:11
+#, fuzzy
 msgid "Header"
-msgstr "Kopfzeile"
+msgstr "Dunst"
 
 #: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
@@ -1451,7 +1581,6 @@ msgid "Margins"
 msgstr "Ränder"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Anzahl Spalten:"
 
@@ -1480,8 +1609,9 @@ msgid "Paper source:"
 msgstr "Papierquelle:"
 
 #: addressbook/printing/e-contact-print.glade.h:29
+#, fuzzy
 msgid "Portrait"
-msgstr "Hochformat"
+msgstr "Teils Nebel"
 
 #: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
@@ -1531,17 +1661,13 @@ msgstr "Typ:"
 msgid "Width:"
 msgstr "Breite:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/calendar/calendar-conduit.c:686
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -1550,20 +1676,21 @@ msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
+#: calendar/gui/alarm-notify/alarm-queue.c:623
+#: calendar/gui/alarm-notify/alarm-queue.c:922
+#: calendar/gui/alarm-notify/alarm-queue.c:978
 msgid "Reminder of your appointment at "
 msgstr "Erinnerung für Ihren Termin um "
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: calendar/gui/alarm-notify/alarm-queue.c:914
+#, fuzzy
 msgid "Snooze"
-msgstr "Weiterschlafen"
+msgstr "Schneefall"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
+#: calendar/gui/alarm-notify/alarm-queue.c:927
+#: calendar/gui/alarm-notify/alarm-queue.c:982
 msgid "Ok"
 msgstr "OK"
 
@@ -1575,7 +1702,89 @@ msgstr "Alarm-Benachrichtigungsdienst"
 msgid "Factory for the alarm notification service"
 msgstr "Factory für den Alarm-Benachrichtigungsdienst."
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Hinweis auf Ihren Termin von %s bis %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:157
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Hinweis auf Ihren Termin um %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:162
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Hinweis auf Ihren um %s endenden Termin"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:166
+msgid "Notification about your appointment"
+msgstr "Hinweis auf Ihren Termin"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Hinweis auf Ihre Aufgabe von %s bis %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:177
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Hinweis auf Ihre um %s beginnende Aufgabe"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:182
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Hinweis auf Ihre um %s endende Aufgabe"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:186
+msgid "Notification about your task"
+msgstr "Hinweis über Ihre Aufgabe"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:193
+#, c-format
+msgid "Notification about your journal entry starting on %s and ending on %s"
+msgstr "Hinweis auf Ihren Journaleintrag von %s bis %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:197
+#, c-format
+msgid "Notification about your journal entry starting on %s"
+msgstr "Hinweis auf Ihren Journaleintrag beginnend um %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:202
+#, c-format
+msgid "Notification about your journal entry ending on %s"
+msgstr "Hinweis auf Ihren Journaleintrag endend um %s"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:206
+msgid "Notification about your journal entry"
+msgstr "Hinweis auf Ihren Journaleintrag"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
+#, fuzzy
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "%a, %b %d / %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:301
+msgid "No summary available."
+msgstr "Keine Zusammenfassung verfügbar."
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Schließen"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Edit appointment"
+msgstr "Termin bearbeiten"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr "Weiterschlaf-Zeit (Minuten)"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
@@ -1584,135 +1793,142 @@ 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:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "GNOME konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+msgid "Could not initialize gnome-vfs"
+msgstr "gnome-vfs konnte nicht initialisiert werden"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "Factory für Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/calendar-commands.c:266
+#: calendar/gui/calendar-commands.c:278
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
-#: calendar/gui/calendar-commands.c:290
+#: calendar/gui/calendar-commands.c:302
 msgid "Open calendar"
 msgstr "Kalender öffnen"
 
-#: calendar/gui/calendar-commands.c:332
+#: calendar/gui/calendar-commands.c:344
 msgid "Save calendar"
 msgstr "Kalender speichern"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:596
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Die Kalender-Ansicht konnte nicht erstellt werden. Bitte überprüfen Sie Ihre "
 "ORBit und OAF Einstellungen. "
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:974
+#: calendar/gui/e-calendar-table.c:426
 msgid "Public"
 msgstr "Öffentlich"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:382 calendar/gui/calendar-model.c:976
+#: calendar/gui/e-calendar-table.c:427
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:978
+#: calendar/gui/e-calendar-table.c:428
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
-#: calendar/gui/event-editor.c:1628
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:388 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:479
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:479
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:481
 msgid "E"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:481
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:519 calendar/gui/calendar-model.c:1150
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:625
 msgid "High"
 msgstr "Hoch"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:688
+#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1152
+#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:687
+#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1154
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:623
 msgid "Low"
 msgstr "Niedrig"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:559 calendar/gui/calendar-model.c:1206
+#: calendar/gui/e-calendar-table.c:502
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:562 calendar/gui/calendar-model.c:1208
+#: calendar/gui/e-calendar-table.c:501
 msgid "Opaque"
 msgstr "Opak"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:711 calendar/gui/calendar-model.c:1260
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:522
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:714 calendar/gui/calendar-model.c:1262
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:523
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1264
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:524
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1266
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:525 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Storniert"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:870 e-util/e-time-utils.c:267
+#, fuzzy
 msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a, %d.%m.%Y %H:%M:%S"
+msgstr "%a, %b %d / %H:%M"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:873 e-util/e-time-utils.c:276
+#, fuzzy
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+msgstr "%a, %b %d / %H:%M"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:878
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1723,7 +1939,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:958
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1731,17 +1947,17 @@ msgstr ""
 "sein"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:976
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1198
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:972 calendar/gui/calendar-model.c:1204
+#: calendar/gui/calendar-model.c:1258 calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:500 mail/mail-account-gui.c:1295
+#: mail/mail-accounts.c:129 mail/mail-accounts.c:380
+#: mail/mail-config.glade.h:56 shell/e-shell-view.c:1397
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-dateedit.c:1369 widgets/misc/e-dateedit.c:1484
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1054
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1751,117 +1967,259 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1094
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschließlich) sein"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1135
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Die Priorität muss 'Hoch', 'Normal', 'Niedrig' oder 'Undefiniert' sein."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1148
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:451
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1189
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Die Transparenz muss 'Transparent', 'Opak' oder 'Keine' sein."
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1677
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1679
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1685
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1685
 msgid "No"
 msgstr "Nein"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "Der URI, den der Kalender anzeigen wird"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Termine"
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
+msgstr "Audio-Alarmoptionen"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/dialogs/alarm-options.c:363
+msgid "Message Alarm Options"
+msgstr "Nachrichten-Alarmoptionen"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Aufträge"
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
+msgstr "Mail-Alarmoptionen"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Fehler beim Laden des Kalenders</b>"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr "Programm-Alarmoptionen"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Fehler beim Laden des Kalenders:<br>Methode wird nicht unterstützt"
+#: calendar/gui/dialogs/alarm-options.c:390
+#, fuzzy
+msgid "Unknown Alarm Options"
+msgstr "Unbekannte Niederschläge"
 
-#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:24
-msgid "Display"
-msgstr "Anzeige"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr "Alarmwiederholung"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Termine anzeigen"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr "FIXME: Mail-Alarmoptionen"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Aufgaben zeigen"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+msgid "Message to Display"
+msgstr "Anzuzeigende Nachricht"
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "Zu erledigen"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
+msgstr "Klang abspielen:"
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Kalender laden"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr "Den Alarm wiederholen"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "Der URI, den der Kalender anzeigen wird"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
+msgstr "Programm ausführen:"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm am %A, %d. %b %Y um %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr "Mit diesen Argumenten:"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Hinweis auf Ihren Termin am %A, %d. %b %Y um %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:81
+#, fuzzy
+msgid "days"
+msgstr "Sprühregen"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Keine Zusammenfassung verfügbar."
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Aktualisieren alle "
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Schließen"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:82
+#, fuzzy
+msgid "hours"
+msgstr "Schauer"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Termin bearbeiten"
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:83
+msgid "minutes"
+msgstr "Minuten"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Weiterschlaf-Zeit (Minuten)"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, c-format
+msgid "%d days"
+msgstr "%d Tage"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+msgid "1 day"
+msgstr "1 Tag"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, c-format
+msgid "%d weeks"
+msgstr "%d Wochen"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+msgid "1 week"
+msgstr "1 Woche"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, c-format
+msgid "%d hours"
+msgstr "%d Stunden"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+msgid "1 hour"
+msgstr "1 Stunde"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, c-format
+msgid "%d minutes"
+msgstr "%d Minuten"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+msgid "1 minute"
+msgstr "1 Minute"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, c-format
+msgid "%d seconds"
+msgstr "%d Sekunden"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+msgid "1 second"
+msgstr "1 Sekunde"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Play a sound"
+msgstr "Einen Klang abspielen"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#, fuzzy
+msgid "Show a dialog"
+msgstr "Geringfügiger Hagel"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+msgid "Send an email"
+msgstr "Eine E-Mail verschicken"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+msgid "Run a program"
+msgstr "Ein Programm ausführen"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+msgid " before start of appointment"
+msgstr " vor Terminbeginn"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+msgid " after start of appointment"
+msgstr " nach Terminbeginn"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+msgid " before end of appointment"
+msgstr " vor Terminende"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+msgid " after end of appointment"
+msgstr " nach Terminende"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
+msgstr "Grundlagen"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:293
+msgid "Date/Time:"
+msgstr "Datum/Zeit:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+msgid "Display a message"
+msgstr "Eine Nachricht anzeigen"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Options..."
+msgstr "Optionen..."
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Erinnerungen"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Zusammenfassung:"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:223
+msgid "after"
+msgstr "nach"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:224
+msgid "before"
+msgstr "vor"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "Tag(e)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "Ende des Termins"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "Stunde(n)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:104
+msgid "minute(s)"
+msgstr "Minute(n)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "Beginn des Termins"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1892,547 +2250,686 @@ msgid "60 minutes"
 msgstr "60 Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarme schweigen nach"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Audio-Alarme"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Piepsen, wenn Alarmfenster erscheinen."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1001
+#: ui/evolution-calendar.xml.h:4
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Kalender-Vorlieben"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr "Farbe für überfällige Aufgaben"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr "Farbe für heute fällige Aufgaben"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Farben"
+msgid "Colors for Tasks"
+msgstr "Farben für Aufgaben"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
-msgstr "Wochenenden komprimieren"
+msgid "Compress weekends in month view"
+msgstr "Wochenenden in Monatsansicht komprimieren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Optionen zum Datumsnavigator"
+msgid "Date Navigator"
+msgstr "Datumsnavigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Defaults"
 msgstr "Voreinstellungen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Anzeigeoptionen"
+#: mail/mail-config.glade.h:29
+msgid "Display"
+msgstr "Anzeige"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Fällig am"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Weiterschlafen aktivieren für "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Ende des Tages:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Erster Tag der Woche:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Fr"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:985
 msgid "Friday"
 msgstr "Freitag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Markieren"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Heute fällige Einträge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Heute fällige Einträge:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Noch nicht fällige Einträge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Noch nicht fällige Einträge:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Mo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "Monday"
 msgstr "Montag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Überfällige Einträge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Überfällige Einträge:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:54
-msgid "Pick a color"
-msgstr "Eine Farbe auswählen"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr "Benachrichtigungsoptionen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165 filter/libfilter-i18n.h:45
-#: filter/libfilter-i18n.h:185
-msgid "Priority"
-msgstr "Priorität"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
+msgstr "Überfällige Aufgaben"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Mich an alle Termine erinnern,"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Erinnerungen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Sa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:986
 msgid "Saturday"
 msgstr "Samstag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Anzeigen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "Endzeiten von Terminen anzeigen"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "Show appointment end times in week and month views"
+msgstr "Endzeiten von Terminen in Wochen- und Monatsansichten zeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Wochennummern zeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Anfang des Tages:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "So"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:987
+#, fuzzy
 msgid "Sunday"
-msgstr "Sonntag"
+msgstr "Sand"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Aufgabenblock"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Dichter Nebel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Heute fällige Einträge"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Do"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:984
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Zeit bis Fälligkeit"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Titel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Zeit-Unterteilungen:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Zeitzone: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Di"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Visuelle Alarme"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Mi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:983
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Arbeitswoche"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Work Week"
+msgstr "Werkwoche"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "Minuten bevor sie auftreten."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:88
-msgid "seconds."
-msgstr "Sekunden."
-
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sind Sie sicher, dass Sie den Termin \"%s\" löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sind Sie sicher, dass Sie diesen unbenannten Termin löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sind Sie sicher, dass Sie die Aufgabe `%s' löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sind Sie sicher, dass Sie diese unbenannte Aufgabe löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sind Sie sicher, dass Sie den Journaleintrag `%s' löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Sind Sie sicher, dass Sie diesen unbenannten Journaleintrag löschen wollen?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Wollen Sie die Änderungen speichern?"
-
-#: calendar/gui/dialogs/task-editor.c:709
-msgid "Edit Task"
-msgstr "Aufgabe bearbeiten"
-
-#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
+#: calendar/gui/dialogs/delete-comp.c:120
 #, c-format
-msgid "Appointment - %s"
-msgstr "Termin - %s"
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Sind Sie sicher, dass Sie %d Termine löschen wollen?"
 
-#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
+#: calendar/gui/dialogs/delete-comp.c:125
 #, c-format
-msgid "Task - %s"
-msgstr "Aufgabe - %s"
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Sind Sie sicher, dass Sie %d Aufgaben löschen wollen?"
 
-#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/delete-comp.c:130
 #, c-format
-msgid "Journal entry - %s"
-msgstr "Journal-Eintrag  - %s"
+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/task-editor.c:734 calendar/gui/event-editor.c:402
-msgid "No summary"
-msgstr "Keine Zusammenfassung"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Eine Datei wählen"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% abgeschlossen:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Abschnitte:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Zeitzone: "
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+"Benutzen Sie die linke Maustaste, um an einen Bereich der Karte "
+"heranzuzoomen, und wählen Sie eine Zeitzone.\n"
+" Mit der rechten Maustaste können Sie wegzoomen."
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Termin"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Erinnerung"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Wiederholung"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Einstellungen"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Ganztägiges Ereignis"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:248
 msgid "Classification"
 msgstr "Klassifikation"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Datum & Zeit"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Abgeschlossen am:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Privat"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Fortschritt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Öffentlich"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Anfangsdatum:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Zusammenfassung:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Aufgabe"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
 msgid "_Contacts..."
 msgstr "Kontakte..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "_Endzeit:"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Anfangszeit:"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+msgid "Custom recurrence"
+msgstr "Benutzerdefinierte Wiederholung"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "Every"
+msgstr "Alle"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Exceptions"
+msgstr "Ausnahmen"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Modify"
+msgstr "Ändern"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "No recurrence"
+msgstr "Keine Wiederholung"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+msgid "Preview"
+msgstr "Vorschau"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "Recurrence Rule"
+msgstr "Wiederholungsregel"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
+msgid "Simple recurrence"
+msgstr "Einfache Wiederholung"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "für"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "für immer"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "Monat(e)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "bis"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "Woche(n)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "Jahr(e)"
+
+#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1978
+#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
+#, fuzzy
+msgid "%a %b %d %Y"
+msgstr "%a, %b %d / %H:%M"
+
+#: calendar/gui/dialogs/recurrence-page.c:582
+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:954
+msgid "on"
+msgstr "bei"
+
+#: calendar/gui/dialogs/recurrence-page.c:980 filter/filter-datespec.c:81
+msgid "day"
+msgstr "Tag"
+
+#: calendar/gui/dialogs/recurrence-page.c:1110
+msgid "on the"
+msgstr "am"
+
+#: calendar/gui/dialogs/recurrence-page.c:1118
+msgid "th"
+msgstr "."
+
+#: calendar/gui/dialogs/recurrence-page.c:1288
+msgid "occurrences"
+msgstr "Auftreten"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Wollen Sie die Änderungen speichern?"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Abgeschlossen am:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Diese Aufgabe löschen"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Diese Aufgabe löschen"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Keine"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organisator:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Aufgabe"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% abgeschlossen:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Fortschritt"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Anfangsdatum:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
 msgid "_Due Date:"
 msgstr "Fällig am:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-page.glade.h:22
 msgid "_Priority:"
 msgstr "_Priorität:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-page.glade.h:23
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:247
 msgid "Categories"
 msgstr "Kategorien"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:249
 msgid "Completion Date"
 msgstr "Abschlussdatum"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:250
 msgid "End Date"
 msgstr "Enddatum"
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:251
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:252
+msgid "Due Date"
+msgstr "Fällig am"
+
+#: calendar/gui/e-calendar-table.c:253
 msgid "Geographical Position"
 msgstr "Geographische Lage"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:254
 msgid "Percent complete"
 msgstr "Fertigstellung in Prozent"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:255 filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:185
+msgid "Priority"
+msgstr "Priorität"
+
+#: calendar/gui/e-calendar-table.c:256
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:257
 msgid "Transparency"
 msgstr "Transparenz"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:258
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:259
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.c:170
+#: calendar/gui/e-calendar-table.c:260
 msgid "Click here to add a task"
 msgstr "Hier klicken, um eine Aufgabe hinzuzufügen"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:470
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:471
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:472
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:473
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:474
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:475
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:476
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:477
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:478
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:479
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:480
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Als abgeschlossen markieren"
+#: calendar/gui/e-calendar-table.c:957
+msgid "Edit this task"
+msgstr "Diese Aufgabe bearbeiten"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Die Aufgabe als abgeschlossen markieren"
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-calendar-table.c:968
+#: calendar/gui/e-day-view.c:3315 calendar/gui/e-week-view.c:3158
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
+#: ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Ausschneiden"
+
+#: calendar/gui/e-calendar-table.c:959 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3317 calendar/gui/e-week-view.c:3160
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Diese Aufgabe bearbeiten..."
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-day-view.c:3290 calendar/gui/e-day-view.c:3319
+#: calendar/gui/e-week-view.c:3134 calendar/gui/e-week-view.c:3162
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
+#: ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Einfügen"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Die Aufgabe bearbeiten"
+#: calendar/gui/e-calendar-table.c:962
+msgid "Mark as complete"
+msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
+#: calendar/gui/e-calendar-table.c:963
 msgid "Delete this task"
 msgstr "Diese Aufgabe löschen"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
-msgstr "Diese Aufgabe löschen"
+#: calendar/gui/e-calendar-table.c:972
+msgid "Mark tasks as complete"
+msgstr "Als abgeschlossen markieren"
+
+#: calendar/gui/e-calendar-table.c:973 ui/evolution-tasks.xml.h:6
+msgid "Delete selected tasks"
+msgstr "Ausgewählte Aufgaben löschen"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
+#: calendar/gui/e-day-view.c:574 calendar/gui/e-week-view.c:307
+#: calendar/gui/print.c:785
+#, fuzzy
 msgid "am"
-msgstr "AM"
+msgstr "Ruhig"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
+#: calendar/gui/e-day-view.c:577 calendar/gui/e-week-view.c:310
+#: calendar/gui/print.c:787
 msgid "pm"
 msgstr "PM"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1327
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
+#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1341
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1354
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3295 ui/evolution-calendar.xml.h:21
 msgid "New Appointment"
 msgstr "Neuer Termin"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3279
+#: calendar/gui/e-day-view.c:3297 calendar/gui/e-week-view.c:3141
 msgid "New All Day Event"
 msgstr "Neues ganztägiges Ereignis"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3284
+#: calendar/gui/e-day-view.c:3302 calendar/gui/e-week-view.c:3146
 msgid "Go to Today"
 msgstr "Zum heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3286
+#: calendar/gui/e-day-view.c:3304 calendar/gui/e-week-view.c:3148
 msgid "Go to Date..."
 msgstr "Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3292
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:11
+#: calendar/gui/e-day-view.c:3311 calendar/gui/e-week-view.c:3154
+#: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
+#: ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "Öffnen"
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3294
+#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3156
 msgid "Delete this Appointment"
 msgstr "Diesen Termin löschen"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3296
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Besprechung ansetzen"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3309
+#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3176
 msgid "Make this Occurrence Movable"
 msgstr "Dieses Auftreten beweglich machen"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3311
+#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3178
 msgid "Delete this Occurrence"
 msgstr "Dieses Auftreten löschen"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/e-day-view.c:3332
 msgid "Delete all Occurrences"
 msgstr "Jedes Auftreten löschen"
 
@@ -2441,73 +2938,113 @@ msgstr "Jedes Auftreten löschen"
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "Ihre Kalenderdatei konnte nicht aktualisiert werden!\n"
+#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
+msgid " to "
+msgstr " an "
+
+#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
+#, fuzzy
+msgid " (Completed "
+msgstr "Abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "Komponente erfolgreich aktualisiert."
+#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
+#, fuzzy
+msgid "Completed "
+msgstr "Abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "Beim Laden der Kalenderdatei ist ein Fehler aufgetreten."
+#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
+msgid " (Due "
+msgstr " (Fällig am "
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "Ihre Kalenderdatei konnte nicht geöffnet werden!\n"
+#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
+#, fuzzy
+msgid "Due "
+msgstr "Fällig am"
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "Ihre Kalenderdatei konnte nicht geladen werden!\n"
+#: calendar/gui/e-itip-control.c:613
+msgid "This is an event that can be added to your calendar."
+msgstr "Dies ist ein Ereignis, das zu Ihrem Kalender hinzugefügt werden kann."
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Ihre Kalenderdatei konnte nicht gelesen werden!\n"
+#: calendar/gui/e-itip-control.c:616
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "Dies ist die Postadresse"
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Dies ist eine Antwort von einem Uneingeladenen!"
+#: calendar/gui/e-itip-control.c:619
+msgid "This is one or more additions to a current meeting."
+msgstr "Dies sind ein oder mehrere Nachträge zu einer aktuellen Besprechung."
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "Ihr Kalenderspeicher konnte nicht aktualisiert werden."
+#: calendar/gui/e-itip-control.c:622
+msgid "This is a request for the latest event information."
+msgstr "Dies ist eine Anfrage zu den neuesten Ereignisinformationen."
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Die Kalenderkomponente konnte nicht gelöscht werden!\n"
+#: calendar/gui/e-itip-control.c:625
+msgid "This is a reply to a meeting request."
+msgstr "Dies ist eine Antwort auf eine Besprechungsanfrage."
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Komponente erfolgreich gelöscht."
+#: calendar/gui/e-itip-control.c:628
+msgid "This is an event cancellation."
+msgstr "Dies ist eine Ereignisstornierung."
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Dieser Typ Kalenderkomponente ist unbekannt."
+#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:698
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Diese Nachricht ist derzei nicht verfügbar"
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Zum Kalender hinzufügen"
+#: calendar/gui/e-itip-control.c:655
+msgid "This is an task that can be added to your calendar."
+msgstr "Dies ist eine Aufgabe, die zu Ihrem Kalender hinzugefügt werden kann."
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " Annehmen "
+#: calendar/gui/e-itip-control.c:658
+msgid "This is a task request."
+msgstr "Dies ist eine Aufgabenanfrage."
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Ablehnen "
+#: calendar/gui/e-itip-control.c:661
+msgid "This is a request for the latest task information."
+msgstr "Dies ist eine Anfrage zur neuesten Aufgabeninformation."
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
-msgstr " Vorläufig "
+#: calendar/gui/e-itip-control.c:664
+msgid "This is a reply to a task request."
+msgstr "Dies ist eine Antwort auf eine Aufgabenanfrage."
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Kalender aktualisieren"
+#: calendar/gui/e-itip-control.c:667
+msgid "This is an task cancellation."
+msgstr "Dies ist eine Aufgabenstornierung."
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Besprechung absagen"
+#: calendar/gui/e-itip-control.c:689
+msgid "This is freebusy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:692
+msgid "This is a request for freebusy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:695
+msgid "This is a reply to a freebusy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
+
+#: calendar/gui/e-itip-control.c:737
+msgid "The message contains only unsupported requests."
+msgstr "Die Nachricht enthält keine unterstützten Anfragen."
+
+#: calendar/gui/e-itip-control.c:753
+msgid "The information contained in this attachment was not valid"
+msgstr "Die in diesem Anhang enthaltene Information war ungültig."
+
+#: calendar/gui/e-itip-control.c:869
+msgid "I couldn't update your calendar file!\n"
+msgstr "Ihre Kalenderdatei konnte nicht aktualisiert werden!\n"
+
+#: calendar/gui/e-itip-control.c:894
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Ihre Kalenderdatei konnte nicht gelesen werden!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2526,22 +3063,18 @@ msgstr "Kalendermitteilung"
 msgid "Date:"
 msgstr "Datum:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Kalender laden"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Kalender wird geladen..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organisator:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Server-Nachricht:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Zusammenfassung:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "datum-ende"
@@ -2550,391 +3083,64 @@ msgstr "datum-ende"
 msgid "date-start"
 msgstr "datum-anfang"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Anwesender"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Adresse des Anwesenden"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Anwesende:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Besprechung\n"
-"absagen"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Vorsitzender"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Besprechungseinladungen"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Nicht-Teilnehmer"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Eventueller Teilnehmer"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organisator:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Ereignis\n"
-"bekanntmachen"
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr "UAwg"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Besprechung\n"
-"beantragen"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "Benötigter Teilnehmer"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "Funktion"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Termin\n"
-"ansetzen"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:81
-#: filter/libfilter-i18n.h:214 mail/message-list.c:1081
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:184 calendar/gui/e-tasks.c:521
+#: calendar/gui/e-tasks.c:554
 msgid "All"
 msgstr "Alle"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:190
 msgid "Category:"
 msgstr "Kategorie:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:329
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Die Aufgaben in `%s' konnten nicht geladen werden"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:341
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 "Die Methode, die zum Laden von `%s' benötigt wird, ist nicht unterstützt"
 
-#: calendar/gui/event-editor.c:377
-msgid "Edit Appointment"
-msgstr "Termin bearbeiten"
-
-#: calendar/gui/event-editor.c:449
-msgid "on"
-msgstr "bei"
-
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
-msgid "day"
-msgstr "Tag"
-
-#: calendar/gui/event-editor.c:601
-msgid "on the"
-msgstr "am"
-
-#: calendar/gui/event-editor.c:608
-msgid "th"
-msgstr "."
-
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
-msgstr "Auftreten"
-
-#: calendar/gui/event-editor.c:871
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Dieser Termin enthält Wiederholungsregeln, die Evolution nicht bearbeiten "
-"kann."
-
-#: calendar/gui/event-editor.c:1543
-#, c-format
-msgid " %d days"
-msgstr " %d Tage"
-
-#: calendar/gui/event-editor.c:1545
-msgid " 1 day"
-msgstr " 1 Tag"
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d weeks"
-msgstr " %d Wochen"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 week"
-msgstr " 1 Woche"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d hours"
-msgstr " %d Stunden"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 hour"
-msgstr " 1 Stunde"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d minutes"
-msgstr " %d Minuten"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 minute"
-msgstr " 1 Minute"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d seconds"
-msgstr " %d Sekunden"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 second"
-msgstr " 1 Sekunde"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1588
-msgid "Play a sound"
-msgstr "Einen Klang abspielen"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1591
-msgid "Show a dialog"
-msgstr "Ein Dialogfenster anzeigen"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1594
-msgid "Send an email"
-msgstr "Eine E-Mail senden"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1597
-msgid "Run a program"
-msgstr "Ein Programm ausführen"
-
-#: calendar/gui/event-editor.c:1612
-msgid " before start of appointment"
-msgstr " vor Terminbeginn"
-
-#: calendar/gui/event-editor.c:1614
-msgid " after start of appointment"
-msgstr " nach Terminbeginn"
-
-#: calendar/gui/event-editor.c:1622
-msgid " before end of appointment"
-msgstr " vor Terminende"
-
-#: calendar/gui/event-editor.c:1624
-msgid " after end of appointment"
-msgstr " nach Terminende"
-
-#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a, %d. %b %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Ganztägiges Ereignis"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Termin"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Termin-Grundeinstellungen"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Benutzerdefinierte Wiederholung"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Alle"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Ausnahmen"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Ändern"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Keine Wiederholung"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Vorschau"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Wiederholung"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Wiederholungsregel"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Erinnerung"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Einstellungen..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Einfache Wiederholung"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "_Endzeit:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Anfangszeit:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Anfangsdatum:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-#: filter/libfilter-i18n.h:87 filter/libfilter-i18n.h:219
-msgid "after"
-msgstr "nach"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-#: filter/libfilter-i18n.h:88 filter/libfilter-i18n.h:220
-msgid "before"
-msgstr "vor"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "Tag(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "Ende des Termins"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "für"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "für immer"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "Stunde(n)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42 mail/mail-config.glade.h:87
-msgid "minute(s)"
-msgstr "Minute(n)"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "Monat(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "Beginn des Termins"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "bis"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "Woche(n)"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "Jahr(e)"
-
-#: calendar/gui/e-week-view.c:3277 calendar/gui/e-week-view.c:3300
+#: calendar/gui/e-week-view.c:3139 calendar/gui/e-week-view.c:3167
 msgid "New Appointment..."
 msgstr "Neuer Termin..."
 
-#: calendar/gui/e-week-view.c:3313
+#: calendar/gui/e-week-view.c:3180
 msgid "Delete All Occurrences"
 msgstr "Jedes Auftreten löschen"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1586
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/gnome-cal.c:234
+#: calendar/gui/gnome-cal.c:219
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: calendar/gui/gnome-cal.c:235
+#: calendar/gui/gnome-cal.c:220
+#, fuzzy
 msgid "Description contains"
-msgstr "Beschreibung enthält"
+msgstr "Abtreibender Regen"
 
-#: calendar/gui/gnome-cal.c:236
+#: calendar/gui/gnome-cal.c:221
 msgid "Comment contains"
 msgstr "Kommentar enthält"
 
-#: calendar/gui/gnome-cal.c:237
+#: calendar/gui/gnome-cal.c:222
 msgid "Has category"
 msgstr "Hat Kategorie"
 
-#: calendar/gui/gnome-cal.c:840
+#: calendar/gui/gnome-cal.c:1054
 #, 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:851
+#: calendar/gui/gnome-cal.c:1065
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -2977,8 +3183,9 @@ msgid "April"
 msgstr "April"
 
 #: calendar/gui/goto-dialog.glade.h:2
+#, fuzzy
 msgid "August"
-msgstr "August"
+msgstr "Staub"
 
 #: calendar/gui/goto-dialog.glade.h:3
 msgid "December"
@@ -3028,196 +3235,213 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:451
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:451
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:451
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:451
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:451
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:452
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:452
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:452
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:452
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:452
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:453
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:453
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:453
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:453
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:453
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:454
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:454
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:454
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:454
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:454
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:455
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:455
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:455
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:455
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:455
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:456
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:456
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:456
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:456
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:456
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:457
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:516
 msgid "Su"
 msgstr "So"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:516
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:516
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:516
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:517
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:517
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:517
+#, fuzzy
 msgid "Sa"
-msgstr "Sa"
+msgstr "Sand"
+
+#: calendar/gui/print.c:1847 shell/e-shortcuts.c:1002
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Aufgaben"
 
 #. Day
-#: calendar/gui/print.c:1078
+#: calendar/gui/print.c:1954
 msgid "Current day (%a %b %d %Y)"
 msgstr "Aktueller Tag (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1973 calendar/gui/print.c:1977
+#, fuzzy
 msgid "%a %b %d"
-msgstr "%a, %d. %b"
+msgstr "%a, %b %d / %H:%M"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1974
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1985
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Aktuelle Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1993
 msgid "Current month (%b %Y)"
 msgstr "Aktueller Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
+#: calendar/gui/print.c:2000
 msgid "Current year (%Y)"
 msgstr "Aktuelles Jahr (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2321
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1447
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
+#: calendar/gui/print.c:2409 calendar/gui/print.c:2501
+#: mail/mail-callbacks.c:1798 my-evolution/e-summary.c:452
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2438
+msgid "Print Item"
+msgstr "Eintrag drucken"
+
+#: calendar/gui/print.c:2519
+msgid "Print Setup"
+msgstr "Druckeinstellungen"
+
+#: calendar/gui/tasks-control.c:122
 msgid "The URI of the tasks folder to display"
 msgstr "Der URI, den der Aufgabenordner anzeigen wird"
 
@@ -3277,7 +3501,9 @@ msgstr "make-time erwartet, dass Argument 1 eine Zeichenkette ist"
 
 #: calendar/pcs/query.c:255
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr "Argument 1 von make-time muss eine Datum-/Zeit-Zeichenkette nach ISO 8601 sein"
+msgstr ""
+"Argument 1 von make-time muss eine Datum-/Zeit-Zeichenkette nach ISO 8601 "
+"sein"
 
 #: calendar/pcs/query.c:281
 msgid "time-add-day expects 2 arguments"
@@ -3311,45 +3537,47 @@ msgstr "time-day-end erwartet, dass Argument 1 ein time_t ist"
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:472
+#: calendar/pcs/query.c:485
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:477
+#: calendar/pcs/query.c:490
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? erwartet, dass Argument 1 ein time_t ist"
 
-#: calendar/pcs/query.c:484
+#: calendar/pcs/query.c:497
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? erwartet, dass Argument 2 ein time_t ist"
 
-#: calendar/pcs/query.c:611
+#: calendar/pcs/query.c:627
 msgid "contains? expects 2 arguments"
 msgstr "contains? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:616
+#: calendar/pcs/query.c:632
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? erwartet, dass Argument 1 eine Zeichenkette ist"
 
-#: calendar/pcs/query.c:623
+#: calendar/pcs/query.c:639
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? erwartet, dass Argument 2 eine Zeichenkette is"
 
-#: calendar/pcs/query.c:640
+#: calendar/pcs/query.c:656
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
-msgstr "contains? erwartet, dass Argument 2 entweder \"any\", \"summary\" oder \"description\" ist"
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr ""
+"contains? erwartet, dass Argument 2 entweder \"any\", \"summary\" oder "
+"\"description\" ist"
 
-#: calendar/pcs/query.c:678
+#: calendar/pcs/query.c:694
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? erwartet mindestens ein Argument"
 
-#: calendar/pcs/query.c:684
+#: calendar/pcs/query.c:700
 msgid "has-categories? expects all arguments to be strings"
 msgstr "has-categories? erwartet, dass alle Argumente Zeichenketten sin"
 
-#: calendar/pcs/query.c:932
+#: calendar/pcs/query.c:948
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Die Auswertung des Suchausdrucks ergab keinen Wahrheitswert"
 
@@ -3373,64 +3601,65 @@ msgstr "Verschlüsseln wird von dieser Verschlüsselung nicht unterstützt"
 msgid "Decryption is not supported by this cipher"
 msgstr "Entziffern wird von dieser Verschlüsselung nicht unterstützt"
 
-#: camel/camel-disco-store.c:271
+#: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "Sie müssen online arbeiten, um diesen Vorgang zu Ende zu bringen"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-filter-driver.c:526 camel/camel-filter-driver.c:535
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:635
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner kann nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:644
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner kann nicht verarbeitet werden"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:658
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:662 camel/camel-filter-driver.c:672
 #, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:663
 msgid "Cannot open message"
 msgstr "Nachricht kann nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:683 camel/camel-filter-driver.c:794
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:799
 msgid "Complete"
 msgstr "Abgeschlossen"
 
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:753
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:758 camel/camel-filter-driver.c:776
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:876
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:882
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausführen des Filters: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
@@ -3467,13 +3696,12 @@ msgid "Invalid type in body-contains, expecting string"
 msgstr "Ungültiger Typ in body-contains, Zeichenkette wurde erwartet"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Lockdatei für %s konnte nicht angelegt werden: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3490,61 +3718,57 @@ msgstr "fcntl(2)-Sperre konnte nicht erhalten werden: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:104
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Maildatei %s konnte nicht überprüft werden: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:118
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Maildatei %s konnte nicht geöffnet werden: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:126
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Temporäre Maildatei %s konnte nicht geöffnet werden: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Lockdatei für %s konnte nicht getestet werden: %s"
-
-#: camel/camel-movemail.c:245
+#: camel/camel-movemail.c:151
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fehler beim Lesen der Maildatei: %s"
 
-#: camel/camel-movemail.c:256
+#: camel/camel-movemail.c:162
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fehler beim Schreiben der temporären Maildatei: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:181
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:211
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Pipe konnte nicht angelegt werden: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:223
 #, c-format
 msgid "Could not fork: %s"
 msgstr "forK() konnte nicht durchgeführt werden: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-Programm fehlgeschlagen: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:262
+#, fuzzy
 msgid "(Unknown error)"
-msgstr "(Unbekannter Fehler)"
+msgstr "Unbekanntes Gewitter"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:492
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Fehler beim Kopieren der temporären Maildatei: %s"
@@ -3559,44 +3783,44 @@ msgstr "Bitte geben Sie Ihre %s-Passphrase für %s ein."
 msgid "Please enter your %s passphrase"
 msgstr "Bitte geben Sie Ihre %s-Passphrase ein."
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:515
 msgid "No plaintext to sign."
 msgstr "Kein Klartext zum Signieren."
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
+#: camel/camel-pgp-context.c:1064 camel/camel-pgp-context.c:1276
 msgid "No password provided."
 msgstr "Kein Passwort angegeben."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:528 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:883 camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1283
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Pipe zu GPG/PGP konnte nicht angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:687
 msgid "No plaintext to clearsign."
 msgstr "Kein Klartext zum Klarsignieren."
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:877
 msgid "No plaintext to verify."
 msgstr "Kein Klartext zum Prüfen."
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:894
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Temporäre Datei konnte nicht angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1054
 msgid "No plaintext to encrypt."
 msgstr "Kein Klartext zum Verschlüsseln."
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1080
 msgid "No recipients specified"
 msgstr "Keine Empfänger angegeben"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1268
 msgid "No ciphertext to decrypt."
 msgstr "Kein codierter Text zum Entziffern."
 
@@ -3632,7 +3856,7 @@ msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
@@ -3643,7 +3867,7 @@ msgstr "(unbekannter Rechner)"
 
 #: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
 #: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
@@ -3759,7 +3983,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:433
+#: camel/providers/imap/camel-imap-store.c:438
 msgid "Bad authentication response from server."
 msgstr "Ungültige Legitimationsantwort vom Server."
 
@@ -3772,8 +3996,9 @@ msgid "This option will connect to the server using a simple password."
 msgstr "Diese Option verbindet zum Server mit einem einfachen Passwort."
 
 #: camel/camel-sasl-login.c:127
+#, fuzzy
 msgid "Unknown authentication state."
-msgstr "Unbekannter Legitimationszustand."
+msgstr "Unbekannte Beobachtungszeit"
 
 #: camel/camel-search-private.c:111
 #, c-format
@@ -3837,64 +4062,47 @@ msgstr ""
 "Verzeichnis %s konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/camel-smime-context.c:194
+#: camel/camel-smime-context.c:173
 #, c-format
 msgid "Please enter your password for %s"
 msgstr "Bitte geben Sie Ihr Passwort für %s ein"
 
-#: camel/camel-smime-context.c:210
-msgid "Error hashing password."
-msgstr "Fehler beim Hashen des Passworts."
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr "Bitte geben Sie den Spitznamen eines Zertifikates zum Signieren ein."
 
-#: camel/camel-smime-context.c:219
-msgid "Invalid password."
-msgstr "Ungültiges Passwort."
-
-#: camel/camel-smime-context.c:327
+#: camel/camel-smime-context.c:209
 #, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Signieren nicht möglich: kein Zertifikat gefunden für \"%s\""
-
-#: camel/camel-smime-context.c:343
-msgid "Could not sign: failed to create content info."
-msgstr "Signieren nicht möglich: Inhaltsinformation konnte nicht erzeugt werden."
-
-#: camel/camel-smime-context.c:350
-msgid "Could not sign: failed to create signing context."
-msgstr "Signieren nicht möglich: Signierkontext konnte nicht angelegt werden."
-
-#: camel/camel-smime-context.c:356
-msgid "Could not sign: failed to create signature."
-msgstr "Signieren nicht möglich: Signatur konnte nicht erzeugt werden."
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Das Signaturzertifikat für \"%s\" existiert nicht."
 
-#: camel/camel-smime-context.c:383
-msgid "'clearsign' is not supported by S/MIME."
-msgstr "'Klarsignieren' wird von S/MIME nicht unterstützt."
-
-#: camel/camel-smime-context.c:528
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "Verschlüsseln nicht möglich: umhüllte Daten konnten nicht angelegt werden."
+#: camel/camel-smime-context.c:249
+#, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Das Verschlüsselungszertifikat für \"%s\" existiert nicht."
 
-#: camel/camel-smime-context.c:535
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Verschlüsseln nicht möglich: Verschlüsselungskontext konnte nicht angelegt werden."
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Fehler beim Holen der Met-Office-Vorhersagedaten.\n"
 
-#: camel/camel-smime-context.c:570
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Verschlüsseln nicht möglich: ungültiger Benutzerschlüssel: \"%s\"."
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr "Es konnte kein allgemeiner Bulk-Algorithmus gefunden werden."
 
-#: camel/camel-smime-context.c:576
-msgid "Could not encrypt: encoding failed."
-msgstr "Verschlüsseln nicht möglich: Kodieren schlug fehl."
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Fehler beim Holen der Radarkarte.\n"
 
-#: camel/camel-smime-context.c:626
-msgid "Failed to decrypt: Unknown"
-msgstr "Entschlüsseln nicht möglich: Unbekannt"
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr "Zertifikate konnten nicht verifiziert werden."
 
 #. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
+#: camel/camel-store.c:378 mail/mail-ops.c:987 mail/mail-ops.c:994
+#: mail/mail-ops.c:1012 mail/mail-ops.c:1013
 msgid "Trash"
 msgstr "Müll"
 
@@ -3918,7 +4126,7 @@ msgstr ""
 "Land: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:431 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3933,7 +4141,7 @@ msgstr ""
 "\n"
 "Möchten Sie trotzdem akzeptieren?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-openssl.c:426
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -3961,64 +4169,68 @@ msgstr "Nachricht gibt es nicht: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Sie können keine Nachrichten aus diesem Müllordner kopieren."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Cache-Verzeichnis konnte nicht geöffnet werden: %s"
 
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unerwartete Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
+#, fuzzy
 msgid "Unknown error"
-msgstr "Unbekannter Fehler"
+msgstr "Unbekanntes Gewitter"
 
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:297
 msgid "Server response ended too soon."
 msgstr "Antwort des Servers endete zu früh."
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:493
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:530
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung für %s konnte nicht geladen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:364
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr "Der Ordner wurde zerstört und auf dem Server neu erstellt."
+
+#: camel/providers/imap/camel-imap-folder.c:430
 msgid "Scanning IMAP folder"
 msgstr "IMAP-Ordner wird abgetastet"
 
-#: camel/providers/imap/camel-imap-folder.c:1047
-#: camel/providers/imap/camel-imap-folder.c:1281
+#: camel/providers/imap/camel-imap-folder.c:1483
+#: camel/providers/imap/camel-imap-folder.c:1763
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzei nicht verfügbar"
 
-#: camel/providers/imap/camel-imap-folder.c:1075
-#: camel/providers/imap/camel-imap-folder.c:1314
+#: camel/providers/imap/camel-imap-folder.c:1796
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
 msgid "Checking for new mail"
 msgstr "Nach neuer Mail sehen"
 
@@ -4026,7 +4238,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:552
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:642
 msgid "Folders"
 msgstr "Ordner"
 
@@ -4060,29 +4272,29 @@ msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschlüsselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:461
 #, 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:466
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:471
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterstützung für Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/imap/camel-imap-store.c:495
 #, 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:505
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:411
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:531
+#: camel/providers/imap/camel-imap-store.c:536
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4093,36 +4305,44 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:334
+#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Mailverzeichnisse im MH-Format"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: 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"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Standard-Unix-Postfachdatei"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: 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"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: 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:60
+#: 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"
 
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr "Maildateien im Unix-mbox-Spool-Format"
+
+#: 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"
+
 #: camel/providers/local/camel-local-store.c:127
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -4168,20 +4388,18 @@ msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Nachricht kann nicht zur Zusammenfassung hinzugefügt werden: Grund unbekannt"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nachricht kann nicht an maildir-Ordner angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4190,18 +4408,18 @@ msgstr ""
 "Nachricht kann nicht erhalten werden: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
 msgid "No such message"
 msgstr "Keine solche Nachricht"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Ungültiger Inhalt der Nachricht"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4211,14 +4429,14 @@ msgstr ""
 "Ordner `%s' konnte nicht geöffnet werden:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Ordner `%s' existiert nicht."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4228,22 +4446,27 @@ msgstr ""
 "Ordner `%s' konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ist kein maildir-Verzeichnis."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ordner `%s' konnte nicht gelöscht werden: %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "kein maildir-Verzeichnis"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr "Ordner `%s' konnte nicht abgetastet werden: %s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
@@ -4265,9 +4488,9 @@ msgstr "Postfach kann nicht geöffnet werden: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nachricht kann nicht an mbox-Datei angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4276,11 +4499,11 @@ msgstr ""
 "Nachricht kann nicht erhalten werden: %s aus Ordner %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nachrichtenerstellung fehlgeschlagen: Defektes Postfach?"
 
@@ -4347,7 +4570,7 @@ msgid "Cannot summarise folder: %s: %s"
 msgstr "Zusammenfassung von Ordner kann nicht erstellt werden: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1461
 msgid "Synchronising folder"
 msgstr "Ordner wird synchronisiert"
 
@@ -4397,12 +4620,11 @@ msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:879
-#, c-format
+#, fuzzy, c-format
 msgid "Unknown error: %s"
-msgstr "Unbekannter Fehler: %s"
+msgstr "Unbekanntes Gewitter"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nachricht kann nicht an mh-Ordner angehängt werden: %s: %s"
@@ -4422,34 +4644,34 @@ msgstr "MH-Verzeichnispfad kann nicht geöffnet werden: %s: %s"
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Bitte geben Sie das NNTP-Passwort für %s@%s ein"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Server rejected username"
 msgstr "Server lehnte Benutzername ab"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:78
 msgid "Failed to send username to server"
 msgstr "Benutzername konnte nicht an Server gesendet werden"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:87
 msgid "Server rejected username/password"
 msgstr "Server lehnte Benutzername/Passwort ab"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Nachricht %s nicht gefunden."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Gruppenliste konnte nicht vom Server abgerufen werden."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "grouplist-Datei für %s konnte nicht geladen werden: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "grouplist-Datei für %s konnte nicht gespeichert werden: %s"
@@ -4463,17 +4685,17 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Dies ist eine Quelle zum Lesen von und zum Posten in USENET-Newsgroups."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Verzeichnis für Newsserver konnte nicht geöffnet werden: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-News über %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4481,8 +4703,8 @@ msgstr ""
 "Diese Option führt die Legitimation am NNTP-Server mit einem "
 "unverschlüsselten Passwort durch."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ".newsrc-Datei für %s konnte nicht geöffnet oder erstellt werden: %s"
@@ -4534,7 +4756,7 @@ msgstr "Mail auf Server belassen"
 msgid "Delete after %s day(s)"
 msgstr "Nach %s Tag(en) löschen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
 msgid "POP"
 msgstr "POP"
 
@@ -4603,8 +4825,9 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:382
 #: camel/providers/pop3/camel-pop3-store.c:419
+#, fuzzy
 msgid "(Unknown)"
-msgstr "(Unbekannt)"
+msgstr "Unbekannt"
 
 #: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
@@ -4629,7 +4852,7 @@ msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:82
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4644,32 +4867,33 @@ msgstr ""
 #: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Pipe zu sendmail konnte nicht angelegt werden: %s: Mail nicht gesendet"
+msgstr ""
+"Pipe zu sendmail konnte nicht angelegt werden: %s: Mail nicht verschickt"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "sendmail konnte nicht geforkt werden: %s: Mail nicht gesendet"
+msgstr "sendmail konnte nicht geforkt werden: %s: Mail nicht verschickt"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
-msgstr "Nachricht konnte nicht gesendet werden: %s"
+msgstr "Nachricht konnte nicht verschickt werden: %s"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail brach mit Signal %s ab: Mail nicht gesendet."
+msgstr "sendmail brach mit Signal %s ab: Mail nicht verschickt."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr "%s konnte nicht ausgeführt werden: Mail nicht gesendet."
+msgstr "%s konnte nicht ausgeführt werden: Mail nicht verschickt."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail gab Status %d zurück: Mail nicht gesendet."
+msgstr "sendmail gab Status %d zurück: Mail nicht verschickt."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not find 'From' address in message"
@@ -4683,7 +4907,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mailauslieferung über das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:62
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:75
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4691,124 +4915,124 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Zum Ausliefern von Mail über einen Mailknotenpunkt im Netz per SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfehler, Befehl nicht erkannt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfehler in Parametern oder Argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Befehl nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Befehlsparameter nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Systemstatus- oder Systemhilfe-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Hilfemeldung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Dienst ist bereit"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Dienst schließt Übertragungskanal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst nicht verfügbar, Übertragungskanal wird geschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Angeforderte Mailaktion in Ordnung, abgeschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Benutzer nicht lokal; Weiterleitung erfolgt zu <weiterleitungspfad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Angeforderte Mailaktion nicht ausgeführt: Postfach nicht verfügbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Angeforderte Aktion nicht ausgeführt: Postfach nicht verfügbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Angeforderte Aktion abgebrochen: Fehler bei Verarbeitung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Benutzer nicht lokal; probieren Sie es mit <weiterleitungspfad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Angeforderte Aktion nicht ausgeführt: unzureichender Systemspeicher"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Angeforderte Aktion nicht ausgeführt: Speicherzuteilung überschritten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Angeforderte Aktion nicht ausgeführt: Postfachname nicht erlaubt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Maileingabe beginnen; Ende mit <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Transaktion fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Ein Passwordübergang ist notwendig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Legitimationsmechanismus ist zu schwach"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "Für den verlangten Legitimationsmechanismus ist Verschlüsselung erforderlich."
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Zeitweiliger Legitimationsfehlschlag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Legitimation benötigt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Willkommen-Antwortfehler: %s: vielleicht nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 "SMTP-Server %s unterstützt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:396
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sBitte geben Sie das SMTP-Passwort für %s@%s ein"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:419
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4819,235 +5043,219 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:535
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-Server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:537
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-Mailauslieferung über %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:562
 msgid "Cannot send message: sender address not defined."
-msgstr "Nachricht konnte nicht gesendet werden: Absenderadresse nicht angegeben."
+msgstr ""
+"Nachricht konnte nicht verschickt werden: Absenderadresse nicht angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:569
 msgid "Cannot send message: sender address not valid."
-msgstr "Nachricht konnte nicht gesendet werden: Absenderadresse nicht gültig."
+msgstr ""
+"Nachricht konnte nicht verschickt werden: Absenderadresse nicht gültig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:583
 msgid "Cannot send message: no recipients defined."
-msgstr "Nachricht konnte nicht gesendet werden: Keine Empfänger angegeben."
+msgstr "Nachricht konnte nicht verschickt werden: Keine Empfänger angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Zeitüberschreitung bei HELO-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:696
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO-Antwortfehler: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:744
+#: camel/providers/smtp/camel-smtp-transport.c:756
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zeitüberschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:765
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Bad authentication response from server.\n"
 msgstr "Ungültige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:835
+#: camel/providers/smtp/camel-smtp-transport.c:836
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "Zeitüberschreitung bei MAIL-FROM-Anfrage: %s: Mail nicht gesendet"
+msgstr "Zeitüberschreitung bei MAIL-FROM-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:854
+#: camel/providers/smtp/camel-smtp-transport.c:855
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
-msgstr "MAIL-FROM-Antwortfehler: %s: Mail nicht gesendet"
+msgstr "MAIL-FROM-Antwortfehler: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Zeitüberschreitung bei RCPT-TO-Anfrage: %s: Mail nicht gesendet"
+msgstr "Zeitüberschreitung bei RCPT-TO-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:899
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
-msgstr "RCPT-TO-Antwortfehler: %s: Mail nicht gesendet."
+msgstr "RCPT-TO-Antwortfehler: %s: Mail nicht verschickt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:930
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
-msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: Mail nicht gesendet."
+msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, c-format
 msgid "DATA response error: %s: mail not sent"
-msgstr "DATA-Antwortfehler: %s: Mail nicht gesendet"
+msgstr "DATA-Antwortfehler: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:966
+#: camel/providers/smtp/camel-smtp-transport.c:984
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zeitüberschreitung beim Senden von DATA: Nachrichtenabschluss: %s Mail nicht "
-"gesendet"
+"verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1003
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "DATA-Antwortfehler: Nachrichtenabschluss: %s: Mail nicht gesendet"
+msgstr "DATA-Antwortfehler: Nachrichtenabschluss: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1027
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeitüberschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1046
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET-Antwort-Fehler: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1069
 #, 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:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1088
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT-Antwortfehler: %s: nicht fatal"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 Byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u Bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1f kB"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1f MB"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1f GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:122
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Eine Datei beilegen"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Entferne das gewählte Element aus der Anlagenliste"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Anlage hinzufügen..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Der Nachricht eine Datei beilegen"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:9
-#: mail/message-list.c:1081
-msgid "Attachment"
-msgstr "Anlage"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Anlagen-Eigenschaften"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Dateiname:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Eingebettete Anlage"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME-Typ:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Senden als:"
+#: composer/e-msg-composer-attachment.glade.h:5
+msgid "Suggest automatic display of attachment"
+msgstr "Automatische Anzeige der Anlage vorschlagen"
 
-#: composer/e-msg-composer.c:546
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"This version of Evolution was not built with support for S/MIME.\n"
-"You may wish to instead use PGP to %s your document."
+"Could not open file %s:\n"
+"%s"
 msgstr ""
-"Diese Version von Evolution wurde ohne Unterstützung für S/MIME gebaut.\n"
-"Statt dessen könnten Sie PGP benutzen, um Ihr Dokument zu %s."
-
-#: composer/e-msg-composer.c:548
-msgid "sign and encrypt"
-msgstr "signieren und zu verschlüssen"
-
-#: composer/e-msg-composer.c:549
-msgid "sign"
-msgstr "signieren"
-
-#: composer/e-msg-composer.c:549
-msgid "encrypt"
-msgstr "verschlüsseln"
+"Datei %s konnte nicht geöffnet werden:\n"
+"%s"
 
-#: composer/e-msg-composer.c:601
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Error while reading file %s:\n"
 "%s"
 msgstr ""
-"Signaturdatei %s konnte nicht geöffnet werden:\n"
+"Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:869
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: composer/e-msg-composer.c:785
+#: composer/e-msg-composer.c:878
+msgid "Warning!"
+msgstr "Warnung!"
+
+#: composer/e-msg-composer.c:880
+msgid "File exists, overwrite?"
+msgstr "Datei existiert, überschreiben?"
+
+#: composer/e-msg-composer.c:902
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:922
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:877
+#: composer/e-msg-composer.c:993
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5055,12 +5263,56 @@ msgstr ""
 "Der Entwürfe-Ordner für diesen Zugang konnte nicht geöffnet werden.\n"
 "Möchten Sie den vorgegebenen Entwürfe-Ordner verwenden?"
 
-#: composer/e-msg-composer.c:935 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:224
+#: composer/e-msg-composer.c:1043
+#, c-format
+msgid "Error accessing file: %s"
+msgstr "Fehler beim Zugriff auf Datei: %s"
+
+#: composer/e-msg-composer.c:1051
+msgid "Unable to retrieve message from editor"
+msgstr "Nachricht konnte nicht vom Editor erhalten werden"
+
+#: composer/e-msg-composer.c:1057
+#, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"In Datei konnte nicht gesucht werden: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1063
+#, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Datei konnte nicht verkürzt werden: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1072
+#, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Fehler beim automatischen Speichern der Nachricht: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1164
+msgid ""
+"Evolution has detected an editor buffer from a previous session.\n"
+"Would you like to recover this buffer?"
+msgstr ""
+"Evolution hat einen Editorpuffer aus einer vorhergehenden Sitzung entdeckt.\n"
+"Möchten Sie diesen Puffer wiederherstellen?"
+
+#: composer/e-msg-composer.c:1316 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:231
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:941
+#: composer/e-msg-composer.c:1322
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5070,92 +5322,68 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre Änderungen speichern?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:1347
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:1092
-msgid "That file does not exist."
-msgstr "Diese Datei existiert nicht."
-
-#: composer/e-msg-composer.c:1102
-msgid "That is not a regular file."
-msgstr "Diese Datei ist keine normale Datei."
-
-#: composer/e-msg-composer.c:1112
-msgid "That file exists but is not readable."
-msgstr "Diese Datei existiert, ist aber nicht lesbar."
-
-#: composer/e-msg-composer.c:1122
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Diese Datei scheint lesbar zu sein, aber open(2) schlug fehl."
+#: composer/e-msg-composer.c:1496
+msgid "Insert File"
+msgstr "Datei einfügen"
 
-#: composer/e-msg-composer.c:1144
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Diese Datei ist sehr groß (mehr als 100 kB).\n"
-"Sind Sie sicher, dass Sie sie einfügen wollen?"
-
-#: composer/e-msg-composer.c:1165
-msgid "An error occurred while reading the file."
-msgstr "Ein Fehler trat beim Lesen der Datei auf."
-
-#: composer/e-msg-composer.c:1526 composer/e-msg-composer.c:1871
+#: composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2230
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:1962
+#: composer/e-msg-composer.c:2324
 msgid "Could not create composer window."
 msgstr "Erstellungsfenster konnte nicht erzeugt werden."
 
-#: composer/e-msg-composer-hdrs.c:324
+#: composer/e-msg-composer-hdrs.c:325
 msgid "Click here for the address book"
 msgstr "Für das Adressbuch hier klicken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:355
+#: composer/e-msg-composer-hdrs.c:356
 msgid "From:"
 msgstr "Von:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:361
+#: composer/e-msg-composer-hdrs.c:362
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:372
+#: composer/e-msg-composer-hdrs.c:373
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:387
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:388
 msgid "Enter the recipients of the message"
 msgstr "Gebe die Empfänger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:392
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Gebe die Adressen ein, die eine Kopie der Nachricht erhalten"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:396
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5163,7 +5391,7 @@ msgstr ""
 "Gebe die Adressen ein, die eine Kopie erhalten, dienicht in der "
 "Empfängerliste auftaucht."
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -5172,7 +5400,7 @@ msgstr ""
 "in der Mailkomponente noch keine Identität konfiguriert\n"
 "haben."
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutions Maileditor kann nicht initialisiert werden."
 
@@ -5189,36 +5417,40 @@ msgid "calendar information"
 msgstr "Kalender-Information"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr ""
+#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:312
+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:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:80 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:304
+msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
+#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
+#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
+#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
+msgid "%H:%M"
+msgstr "%H:%M"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:258
 #: 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"
@@ -5226,214 +5458,17 @@ 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:274
+#: e-util/e-time-utils.c:263
+#, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a, %d.%m.%Y %H:%M"
+msgstr "%a, %b %d / %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:272
+#, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a, %d.%m.%Y %I.%M %p"
-
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-"Evolutions Chefsesselansichts-Komponente kann nicht initialisiert werden."
-
-#: executive-summary/component/e-summary.c:926
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML-Datei kann nicht geöffnet werden:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:940
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Fehler beim Lesen von Daten:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr "Datei hat keinen Platz für die Dienste.\n"
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "Einen Dienst wählen"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Sie können eine andere HTML-Seite als Hintergrund für die Chefsesselansicht "
-"auswählen.\n"
-"\n"
-"Um die Vorgabe einzustellen, lassen Sie den Eintrag einfach frei."
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "%s mit der in GNOME voreingestellten Anwendung öffnen"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "%s mit dem in GNOME voreingestellten Web-Browser öffnen"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "E-Mail wird an %s gesendet"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Die Ansicht auf %s ändern"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "%s ausführen"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "%s schließen"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "%s nach links verschieben"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "%s nach rechts verschieben"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "%s in die vorige Zeile verschieben"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "%s in die nächste Zeile verschieben"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "%s konfigurieren"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Aussehen"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Hintergrund:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Chefsesselansichts-Komponente konnte Bonobo nicht initialisieren.\n"
-"Falls es eine Warnungsmeldung über den RootPOA gegeben hat, bedeutet das\n"
-"wahrscheinlich, dass Sie Bonobo gegen GOAD statt gegen OAF compiliert\n"
-"haben."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolution-Komponente für die Chefsesselansicht"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Factory für Evolutions Chefsesselansichts-Komponente."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Factory für die RDF-Zusammenfassung."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF-Zusammenfassung"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Factory für die Test-Bonobo-Komponente."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Factory für die Test-Komponente."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Test-Bonobo-Dienst"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Test-Dienst"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Fehler"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Automatisch aktualisieren"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Jetzt aktualisieren"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Aktualisieren alle "
-
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "Minuten"
+msgstr "%a, %b %d / %H:%M"
 
 #: filter/filter-datespec.c:78
 msgid "year"
@@ -5459,18 +5494,10 @@ msgstr "Woche"
 msgid "weeks"
 msgstr "Wochen"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "Tage"
-
 #: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "Stunde"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "Stunden"
-
 #: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "Minute"
@@ -5538,8 +5565,9 @@ msgid "Compare against"
 msgstr "Vergleichen mit"
 
 #: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#, fuzzy
 msgid "now"
-msgstr "jetzt"
+msgstr "Schneefall"
 
 #: filter/filter-datespec.c:707
 msgid "<click here to select a date>"
@@ -5567,8 +5595,8 @@ msgstr ""
 "Bitte gehen Sie zurück und wählen Sie einen gültigen Ordner zum Ausliefern "
 "der Mail."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
+#: mail/mail-account-gui.c:701
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
@@ -5641,23 +5669,23 @@ msgstr "Regelname: "
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:647
 msgid "If"
 msgstr "Wenn"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:665
 msgid "Execute actions"
 msgstr "Aktionen ausführen"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:669
 msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:674
 msgid "if any criteria are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:685
 msgid "Add criterion"
 msgstr "Kriterium hinzufügen"
 
@@ -5670,7 +5698,7 @@ msgid "outgoing"
 msgstr "Ausgang"
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+msgid "Assign Color"
 msgstr "Farbe zuweisen"
 
 #: filter/libfilter-i18n.h:4
@@ -5682,7 +5710,7 @@ msgid "Attachments"
 msgstr "Anlagen"
 
 #: filter/libfilter-i18n.h:7 filter/libfilter-i18n.h:89
-#: filter/libfilter-i18n.h:221
+#: filter/libfilter-i18n.h:225
 msgid "contains"
 msgstr "enthält"
 
@@ -5711,14 +5739,15 @@ msgid "Draft"
 msgstr "Entwurf"
 
 #: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:112
+#, fuzzy
 msgid "Exist"
-msgstr "Existieren"
+msgstr "Nebel"
 
 #: filter/libfilter-i18n.h:30 filter/libfilter-i18n.h:130
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:31 mail/message-list.c:1081
+#: filter/libfilter-i18n.h:31 mail/message-list.etspec.h:3
 msgid "Flagged"
 msgstr "Markiert"
 
@@ -5731,8 +5760,9 @@ msgid "Important"
 msgstr "Wichtig"
 
 #: filter/libfilter-i18n.h:37 filter/libfilter-i18n.h:161
+#, fuzzy
 msgid "Mailing list"
-msgstr "Mailingliste"
+msgstr "Abtreibender Nebel"
 
 #: filter/libfilter-i18n.h:38 filter/libfilter-i18n.h:163
 msgid "Message Body"
@@ -5748,7 +5778,7 @@ msgstr "Nachricht wurde empfangen"
 
 #: filter/libfilter-i18n.h:41 filter/libfilter-i18n.h:166
 msgid "Message was sent"
-msgstr "Nachricht wurde gesendet"
+msgstr "Nachricht wurde verschickt"
 
 #: filter/libfilter-i18n.h:42 filter/libfilter-i18n.h:167
 msgid "Move to Folder"
@@ -5766,18 +5796,22 @@ msgstr "Empfänger"
 msgid "Regex Match"
 msgstr "Regex-Treffer"
 
-#: filter/libfilter-i18n.h:54 mail/message-list.c:678
+#: filter/libfilter-i18n.h:54 mail/message-list.c:614
 msgid "Seen"
 msgstr "Gelesen"
 
 #: filter/libfilter-i18n.h:56 filter/libfilter-i18n.h:198
-#: filter/score-rule.c:204 filter/score-rule.c:206 mail/message-list.c:1081
+#: filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:6
+#, fuzzy
 msgid "Score"
-msgstr "Bewertung"
+msgstr "Rauch"
 
 #: filter/libfilter-i18n.h:58 filter/libfilter-i18n.h:199
+#: mail/mail-callbacks.c:1062
+#, fuzzy
 msgid "Sender"
-msgstr "Absender"
+msgstr "Sand"
 
 #: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:67
 msgid "Set Flag"
@@ -5788,96 +5822,105 @@ msgstr "Marke setzen"
 msgid "Set Status"
 msgstr "Status setzen:"
 
-#: filter/libfilter-i18n.h:62 filter/libfilter-i18n.h:202
-#: filter/libfilter-i18n.h:204 filter/libfilter-i18n.h:235
+#: filter/libfilter-i18n.h:62 filter/libfilter-i18n.h:206
+#: filter/libfilter-i18n.h:208 filter/libfilter-i18n.h:239
 msgid "sounds like"
 msgstr "klingt wie"
 
 #: filter/libfilter-i18n.h:63 filter/libfilter-i18n.h:72
+#: mail/mail-config.glade.h:90
 msgid "Source"
 msgstr "Quelle"
 
 #: filter/libfilter-i18n.h:64 filter/libfilter-i18n.h:75
-#: filter/libfilter-i18n.h:207
+#: filter/libfilter-i18n.h:211
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:83 filter/libfilter-i18n.h:215
+#: filter/libfilter-i18n.h:81 filter/libfilter-i18n.h:218
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Status"
+
+#: filter/libfilter-i18n.h:83 filter/libfilter-i18n.h:219
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:84 filter/libfilter-i18n.h:216
-#: mail/mail-format.c:767 mail/message-list.c:1082
+#: filter/libfilter-i18n.h:84 filter/libfilter-i18n.h:220
+#: mail/mail-format.c:785 mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Betreff"
 
 #: filter/libfilter-i18n.h:97 filter/libfilter-i18n.h:103
-#: filter/libfilter-i18n.h:117 filter/libfilter-i18n.h:222
+#: filter/libfilter-i18n.h:117 filter/libfilter-i18n.h:226
 msgid "does not contain"
 msgstr "enthält nicht"
 
 #: filter/libfilter-i18n.h:98 filter/libfilter-i18n.h:104
-#: filter/libfilter-i18n.h:118 filter/libfilter-i18n.h:223
+#: filter/libfilter-i18n.h:118 filter/libfilter-i18n.h:227
 msgid "does not end with"
 msgstr "endet nicht mit"
 
 #: filter/libfilter-i18n.h:99 filter/libfilter-i18n.h:105
-#: filter/libfilter-i18n.h:119 filter/libfilter-i18n.h:224
+#: filter/libfilter-i18n.h:119 filter/libfilter-i18n.h:228
 msgid "does not exist"
 msgstr "existiert nicht"
 
 #: filter/libfilter-i18n.h:100 filter/libfilter-i18n.h:106
-#: filter/libfilter-i18n.h:120 filter/libfilter-i18n.h:225
+#: filter/libfilter-i18n.h:120 filter/libfilter-i18n.h:229
 msgid "does not sound like"
 msgstr "klingt nicht wie"
 
 #: filter/libfilter-i18n.h:101 filter/libfilter-i18n.h:107
-#: filter/libfilter-i18n.h:121 filter/libfilter-i18n.h:226
+#: filter/libfilter-i18n.h:121 filter/libfilter-i18n.h:230
 msgid "does not start with"
 msgstr "beginnt nicht mit"
 
 #: filter/libfilter-i18n.h:111 filter/libfilter-i18n.h:122
-#: filter/libfilter-i18n.h:227
+#: filter/libfilter-i18n.h:231
 msgid "ends with"
 msgstr "endet mit"
 
 #: filter/libfilter-i18n.h:114 filter/libfilter-i18n.h:123
-#: filter/libfilter-i18n.h:128 filter/libfilter-i18n.h:228
+#: filter/libfilter-i18n.h:128 filter/libfilter-i18n.h:232
+#, fuzzy
 msgid "exists"
-msgstr "existiert"
+msgstr "Nebel"
 
 #: filter/libfilter-i18n.h:139 filter/libfilter-i18n.h:148
 #: filter/libfilter-i18n.h:156 filter/libfilter-i18n.h:172
-#: filter/libfilter-i18n.h:232
+#: filter/libfilter-i18n.h:236
+#, fuzzy
 msgid "is"
-msgstr "ist"
+msgstr "Nebel"
 
 #: filter/libfilter-i18n.h:140 filter/libfilter-i18n.h:149
-#: filter/libfilter-i18n.h:157 filter/libfilter-i18n.h:229
+#: filter/libfilter-i18n.h:157 filter/libfilter-i18n.h:233
 msgid "is greater than"
 msgstr "ist größer als"
 
 #: filter/libfilter-i18n.h:141 filter/libfilter-i18n.h:150
-#: filter/libfilter-i18n.h:158 filter/libfilter-i18n.h:230
+#: filter/libfilter-i18n.h:158 filter/libfilter-i18n.h:234
 msgid "is less than"
 msgstr "ist kleiner als"
 
 #: filter/libfilter-i18n.h:142 filter/libfilter-i18n.h:151
-#: filter/libfilter-i18n.h:159 filter/libfilter-i18n.h:231
+#: filter/libfilter-i18n.h:159 filter/libfilter-i18n.h:235
+#, fuzzy
 msgid "is not"
-msgstr "ist nicht"
+msgstr "Nebel"
 
 #: filter/libfilter-i18n.h:144
 msgid "matches regex"
 msgstr "passt auf Regex"
 
 #: filter/libfilter-i18n.h:174 filter/libfilter-i18n.h:180
-#: filter/libfilter-i18n.h:190 filter/libfilter-i18n.h:233
+#: filter/libfilter-i18n.h:190 filter/libfilter-i18n.h:237
 msgid "on or after"
 msgstr "am oder nach"
 
 #: filter/libfilter-i18n.h:175 filter/libfilter-i18n.h:181
-#: filter/libfilter-i18n.h:191 filter/libfilter-i18n.h:234
+#: filter/libfilter-i18n.h:191 filter/libfilter-i18n.h:238
 msgid "on or before"
 msgstr "am oder vor"
 
@@ -5885,20 +5928,24 @@ msgstr "am oder vor"
 msgid "Replied to"
 msgstr "Beantwortet an"
 
-#: filter/libfilter-i18n.h:205
+#: filter/libfilter-i18n.h:204
+msgid "Size (kB)"
+msgstr "Größe (kB)"
+
+#: filter/libfilter-i18n.h:209
 msgid "Source Account"
 msgstr "Herkunfts-Account"
 
-#: filter/libfilter-i18n.h:209 filter/libfilter-i18n.h:212
-#: filter/libfilter-i18n.h:236
+#: filter/libfilter-i18n.h:213 filter/libfilter-i18n.h:216
+#: filter/libfilter-i18n.h:240
 msgid "starts with"
 msgstr "beginnt mit"
 
-#: filter/libfilter-i18n.h:240
+#: filter/libfilter-i18n.h:244
 msgid "was after"
 msgstr "war nach"
 
-#: filter/libfilter-i18n.h:241
+#: filter/libfilter-i18n.h:245
 msgid "was before"
 msgstr "war vor"
 
@@ -5918,27 +5965,30 @@ msgstr "Regel bearbeiten"
 msgid "Score Rules"
 msgstr "Bewertungsregeln"
 
-#: importers/elm-importer.c:512 importers/netscape-importer.c:780
-#: importers/pine-importer.c:646 shell/e-shell-importer.c:655
-#: shell/importer/import.glade.h:4
+#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:224
+#: importers/netscape-importer.c:769 importers/pine-importer.c:638
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importieren"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:506 importers/netscape-importer.c:774
+#: importers/pine-importer.c:643 my-evolution/my-evolution.glade.h:12
+#, fuzzy
 msgid "Mail"
-msgstr "Mail"
+msgstr "Hagel"
 
-#: importers/elm-importer.c:521
+#: importers/elm-importer.c:510
 msgid "Elm Aliases"
 msgstr "Elm-Aliase"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:807
-#: importers/pine-importer.c:668
+#: importers/elm-importer.c:517 importers/evolution-gnomecard-importer.c:236
+#: importers/netscape-importer.c:796 importers/pine-importer.c:660
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Mich nicht mehr fragen"
 
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:550
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5950,19 +6000,31 @@ msgstr ""
 msgid "Elm mail"
 msgstr "Elm-Mail"
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:653
+msgid "Addressbook"
+msgstr "Adressbuch"
+
+#: importers/evolution-gnomecard-importer.c:261
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution hat GnomeCard-Dateien gefunden.\n"
+"Möchten Sie sie in Evolution importieren?"
+
+#: importers/netscape-importer.c:779 importers/pine-importer.c:648
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1359
+#: importers/netscape-importer.c:784 mail/mail-callbacks.c:1710
 msgid "Filters"
 msgstr "Filter"
 
-#: importers/netscape-importer.c:800
+#: importers/netscape-importer.c:789
 msgid "Addressbooks"
 msgstr "Adressbücher"
 
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:836
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5970,11 +6032,7 @@ msgstr ""
 "Evolution hat Netscape-Maildateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/pine-importer.c:661
-msgid "Addressbook"
-msgstr "Adressbuch"
-
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:697
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5982,141 +6040,152 @@ msgstr ""
 "Evolution hat Pine-Maildateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:725
 msgid "Pine mail"
 msgstr "Pine-Mail"
 
-#: mail/component-factory.c:337
+#: mail/component-factory.c:679
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:410
+#: mail/component-factory.c:813
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser.c:329
+#: mail/folder-browser.c:227 mail/mail-display.c:268
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
+
+#: mail/folder-browser.c:884
 msgid "Store search as vFolder"
 msgstr "Suche als VOrdner speichern"
 
-#: mail/folder-browser.c:653
+#: mail/folder-browser.c:1227
 msgid "VFolder on _Subject"
 msgstr "VOrdner über _Betreff"
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:1230
 msgid "VFolder on Se_nder"
 msgstr "VOrdner über Absender"
 
-#: mail/folder-browser.c:659
+#: mail/folder-browser.c:1233
 msgid "VFolder on _Recipients"
 msgstr "VOrdner über Empfänger"
 
-#: mail/folder-browser.c:662
+#: mail/folder-browser.c:1236
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner über Mailing_liste"
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:1242
 msgid "Filter on Sub_ject"
 msgstr "Filter über _Betreff"
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:1245
 msgid "Filter on Sen_der"
 msgstr "Filter über _Absender"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:1248
 msgid "Filter on Re_cipients"
 msgstr "Filter über _Empfänger"
 
-#: mail/folder-browser.c:677
+#: mail/folder-browser.c:1251
 msgid "Filter on _Mailing List"
 msgstr "Filter über _Mailingliste"
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:1260
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: mail/folder-browser.c:688
+#: mail/folder-browser.c:1262
 msgid "Resend"
-msgstr "Nochmals senden"
+msgstr "Nochmals schicken"
 
-#: mail/folder-browser.c:690 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:118 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1264 ui/evolution-calendar.xml.h:54
+#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: mail/folder-browser.c:692 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1266 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:697 ui/evolution-mail.xml.h:117
+#: mail/folder-browser.c:1271 ui/evolution-mail-message.xml.h:85
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:699 ui/evolution-mail.xml.h:72
+#: mail/folder-browser.c:1273 ui/evolution-mail-message.xml.h:61
+msgid "Reply to _List"
+msgstr "_Liste antworten"
+
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:60
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/folder-browser.c:701
+#: mail/folder-browser.c:1277
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:1280
 msgid "Mar_k as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:706
+#: mail/folder-browser.c:1282
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: mail/folder-browser.c:711
+#: mail/folder-browser.c:1284
+msgid "Mark as _Important"
+msgstr "Als _wichtig markieren"
+
+#: mail/folder-browser.c:1289
 msgid "_Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: mail/folder-browser.c:713
+#: mail/folder-browser.c:1291
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:717 ui/evolution-mail.xml.h:121
+#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:87
 msgid "_Undelete"
 msgstr "Löschen rückgängig"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:727
+#: mail/folder-browser.c:1300
+msgid "Add Sender to Address Book"
+msgstr "Absender zu Adressbuch hinzufügen"
+
+#: mail/folder-browser.c:1305
 msgid "Apply Filters"
 msgstr "Filter anwenden"
 
-#: mail/folder-browser.c:731
+#: mail/folder-browser.c:1309
 msgid "Create Ru_le From Message"
 msgstr "_Regel aus Nachricht erzeugen"
 
-#: mail/folder-browser.c:870
+#: mail/folder-browser.c:1448
 msgid "Filter on Mailing List"
 msgstr "Filter über Mailingliste"
 
-#: mail/folder-browser.c:871
+#: mail/folder-browser.c:1449
 msgid "VFolder on Mailing List"
 msgstr "VOrdner über Mailingliste"
 
-#: mail/folder-browser.c:873
+#: mail/folder-browser.c:1451
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter über Mailingliste (%s)"
 
-#: mail/folder-browser.c:874
+#: mail/folder-browser.c:1452
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VOrdner über Mailingliste (%s)"
 
-#: mail/folder-browser-factory.c:196
+#: mail/folder-browser-ui.c:253
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschaften von \"%s\""
 
-#: mail/folder-browser-factory.c:198 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:255
 msgid "Properties"
 msgstr "Eigenschaften"
 
@@ -6212,32 +6281,46 @@ msgid "You have not filled in all of the required information."
 msgstr "Sie haben nicht alle benötigten Felder ausgefüllt."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor.c:154
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:891
+msgid "Save signature"
+msgstr "Signatur speichern"
+
+#: mail/mail-account-gui.c:897
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Diese Signatur wurde geändert, aber nicht gespeichert.\n"
+"\n"
+"Möchten Sie Ihre Änderungen speichern?"
+
+#: mail/mail-accounts.c:130
 msgid " (default)"
 msgstr " (voreingestellt)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:169
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:30
+#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
 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:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
 msgid "Are you sure you want to delete this news account?"
 msgstr "Sind Sie sicher, dass Sie diesen News-Account löschen wollen?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:568
+#: mail/mail-accounts.c:703
 msgid "Evolution Account Manager"
 msgstr "Evolution-Accountverwaltung"
 
@@ -6265,7 +6348,7 @@ msgstr "Mailingliste %s"
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6273,11 +6356,11 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 "Sie haben den Mailclient nicht konfiguriert.\n"
-"Sie müssen dies tun, bevor Sie Mail senden,\n"
+"Sie müssen dies tun, bevor Sie Mail verschicken,\n"
 "empfangen oder erstellen können.\n"
 "Möchten Sie ihn jetzt konfigurieren?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6285,7 +6368,7 @@ msgstr ""
 "Sie müssen eine Identität einrichten,\n"
 "bevor Sie Mail erstellen können."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6293,50 +6376,62 @@ msgstr ""
 "Sie müssen einen Mailtransport einrichten,\n"
 "bevor Sie Mail erstellen können."
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Mailtransport-Methode eingestellt"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 "Diese Nachricht hat keinen Betreff.\n"
-"Wirklich senden?"
+"Wirklich verschicken?"
+
+#: mail/mail-callbacks.c:273
+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:308
+#: 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 senden."
+msgstr "Sie müssen Empfänger angeben, um diese Nachricht zu verschicken."
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
-"Sie müssen einen Account einrichten, bevor Sie diese Mail senden können."
+"Sie müssen einen Account einrichten, bevor Sie diese Mail verschicken können."
 
-#: mail/mail-callbacks.c:594
+#: mail/mail-callbacks.c:656
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Am %s schrieb %s:"
 
-#: mail/mail-callbacks.c:756
+#: mail/mail-callbacks.c:888
 msgid "Forwarded message:\n"
 msgstr "Weitergeleitete Nachricht:\n"
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:982
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:852
+#: mail/mail-callbacks.c:984
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:1017
+#: mail/mail-callbacks.c:1339
 #, 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:1039
+#: mail/mail-callbacks.c:1361
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6344,28 +6439,29 @@ msgstr ""
 "Sie können nur im Entwürfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:1073
+#: mail/mail-callbacks.c:1395
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 "Sie können nur Nachrichten im\n"
-"Gesendet-Ordner neu senden."
+"Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:1085
+#: mail/mail-callbacks.c:1407
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
-msgstr "Sind Sie sicher, dass Sie alle %d Nachrichten nochmals senden wollen?"
+msgstr ""
+"Sind Sie sicher, dass Sie alle %d Nachrichten nochmals verschicken wollen?"
 
-#: mail/mail-callbacks.c:1106
+#: mail/mail-callbacks.c:1428
 msgid "No Message Selected"
 msgstr "Keine Nachricht ausgewählt"
 
-#: mail/mail-callbacks.c:1140 mail/mail-display.c:92
+#: mail/mail-callbacks.c:1462 mail/mail-display.c:98
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
-#: mail/mail-callbacks.c:1144 mail/mail-display.c:96
+#: mail/mail-callbacks.c:1466 mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -6373,15 +6469,15 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits.\n"
 "Überschreiben?"
 
-#: mail/mail-callbacks.c:1188
+#: mail/mail-callbacks.c:1510
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:1190
+#: mail/mail-callbacks.c:1512
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1700
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6390,22 +6486,22 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1407
+#: mail/mail-callbacks.c:1758
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:1454
+#: mail/mail-callbacks.c:1805
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:1549
+#: mail/mail-callbacks.c:1900
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle %d Nachrichten in getrennten Fenstern öffnen "
 "wollen?"
 
-#: mail/mail-config.c:1213 mail/mail-config.c:1216
+#: mail/mail-config.c:1561 mail/mail-config.c:1564
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
@@ -6483,26 +6579,44 @@ msgid "Accounts"
 msgstr "Zugänge"
 
 #: mail/mail-config.glade.h:8
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+"Beim Verschicken verschlüsselter Mail immer vor mir selber verschlüsseln"
+
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+"Beim Verschicken verschlüsselter Mail immer vor mir selber verschlüsseln"
+
+#: mail/mail-config.glade.h:10
 msgid "Always load images off the net"
 msgstr "Bilder immer aus dem Netz laden"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Anlage"
+
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "Automatically check for new mail every"
 msgstr "Automatisch nach neuer Mail sehen alle"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
+msgid "Certificate ID:"
+msgstr "Kennung des Zertifikats:"
+
+#: mail/mail-config.glade.h:17
 msgid "Composer"
 msgstr "Maileditor"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:18
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6514,197 +6628,256 @@ msgstr ""
 "Herzlichen Glückwunsch! Ihre Mailkonfiguration ist \n"
 "abgeschlossen.\n"
 "\n"
-"Sie können jetzt mit Evolution Mail senden und\n"
+"Sie können jetzt mit Evolution Mail verschicken und\n"
 "empfangen.\n"
 "\n"
 "Klicken Sie auf \"Beenden\", um Ihre Einstellungen zu\n"
 "speichern."
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:24
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "Default \"Forward\" style is: "
 msgstr "Vorgegebener Weiterleitungsstil ist: "
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
+msgid "Default character set: "
+msgstr "Vorgegebener Zeichensatz: "
+
+#: mail/mail-config.glade.h:28
+msgid "Digital IDs..."
+msgstr "Digitale Kennungen..."
+
+#: mail/mail-config.glade.h:30
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:31
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:32
 msgid "Drafts folder:"
 msgstr "Entwürfe-Ordner:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Bearbeiten..."
+
+#: mail/mail-config.glade.h:35
 msgid "Email Address:"
 msgstr "E-Mail-Adresse:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:36
+msgid "Empty trash folders on exit"
+msgstr "Müllordner beim Beenden leeren"
+
+#: mail/mail-config.glade.h:38
 msgid "Full Name:"
 msgstr "Voller Name:"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:39
+msgid "Get Digital ID..."
+msgstr "Digitale Kennung erhalten..."
+
+#: mail/mail-config.glade.h:40
+msgid "HTML Signature:"
+msgstr "HTML-Signatur:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
 msgid "Highlight citations with"
-msgstr "Zitate markieren mit"
+msgstr "Leichte Niederschläge"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:43
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:44
 msgid "Identity"
 msgstr "Identität"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:45
 msgid "In HTML mail"
 msgstr "In HTML-Mail"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:46
 msgid "Inline"
 msgstr "An Ort und Stelle"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:48
 msgid "Load images if sender is in addressbook"
 msgstr "Bilder laden, falls Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:49
 msgid "Mail Configuration"
 msgstr "Mailkonfiguration"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:50
 msgid "Make this my default account"
 msgstr "Dies zu meinem Standardaccount machen"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:51
 msgid "Mark messages as \"Read\" after:"
 msgstr "Nachrichten als \"Gelesen\" markieren nach:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:52
+msgid "NNTP Server:"
+msgstr "NNTP-Server:"
+
+#: mail/mail-config.glade.h:54
 msgid "Never load images off the net"
 msgstr "Bilder nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:55
 msgid "News"
 msgstr "Nachrichten"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:57
 msgid "Optional Information"
 msgstr "Optionale Information"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:58
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:49
-msgid "PGP"
-msgstr "PGP"
+#: mail/mail-config.glade.h:60
+msgid "PGP Key ID:"
+msgstr "PGP-Schlüsselkennung:"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:61
 msgid "PGP binary path:"
 msgstr "Pfad zur PGP-Binärdatei:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:65
+msgid "Pick a color"
+msgstr "Eine Farbe auswählen"
+
+#: mail/mail-config.glade.h:66
+msgid "Pretty Good Privacy"
+msgstr "Pretty Good Privacy"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Eine Regel erstellen, um Nachrichten mit diesem Betreff zu filtern"
+
+#: mail/mail-config.glade.h:68
 msgid "Qmail maildir "
 msgstr "Qmail-maildir "
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:69
 msgid "Quoted"
 msgstr "Umschrieben"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:70
+#, fuzzy
 msgid "Receiving Email"
-msgstr "Mail erhalten"
+msgstr "Eisiger Hagel"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:71
+#, fuzzy
 msgid "Receiving Mail"
-msgstr "Mail erhalten"
+msgstr "Eisiger Hagel"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:72
 msgid "Receiving Options"
 msgstr "Empfangs-Optionen"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:74
 msgid "Required Information"
 msgstr "Benötigte Information"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:76
+msgid "Secure MIME"
+msgstr "Sichere MIME"
+
+#: mail/mail-config.glade.h:77
+msgid "Security"
+msgstr "Sicherheit"
+
+#: mail/mail-config.glade.h:78
 msgid "Select PGP binary"
 msgstr "PGP-Binärdatei wählen"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:79
 msgid "Send mail in HTML format by default."
-msgstr "Mail normalerweise im HTML-Format senden."
+msgstr "Mail normalerweise im HTML-Format verschicken."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:80
+#, fuzzy
 msgid "Sending Email"
-msgstr "E-Mail senden"
+msgstr "Eisiger Hagel"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:81
+#, fuzzy
 msgid "Sending Mail"
-msgstr "Mail senden"
+msgstr "Eisiger Hagel"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:83
 msgid "Sent"
-msgstr "Gesendet"
+msgstr "Verschickt"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:84
 msgid "Sent and Draft Messages"
-msgstr "Nachrichten in \"Gesendet\" und \"Entwürfe\""
+msgstr "Nachrichten in \"Verschickt\" und \"Entwürfe\""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:85
 msgid "Sent messages folder:"
-msgstr "Ordner für gesendete Nachrichten:"
+msgstr "Ordner für verschickte Nachrichten:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:86
 msgid "Server Configuration"
 msgstr "Server-Konfiguration"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:87
 msgid "Server Type: "
 msgstr "Servertyp: "
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:88
 msgid "Server requires authentication"
 msgstr "Server benötigt Legitimation"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:89
 msgid "Signature file:"
 msgstr "Signaturdatei:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:91
+msgid "Source Information"
+msgstr "Quellinformation"
+
+#: mail/mail-config.glade.h:92
 msgid "Sources"
 msgstr "Quellen"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:93
 msgid "Special Folders"
 msgstr "Besondere Ordner"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:94
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix-mbox"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:95
 msgid "Type"
 msgstr "Typ"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:96
 msgid "Use secure connection (SSL)"
 msgstr "Sichere Verbindung (SSL) verwenden"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:97
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:98
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6714,12 +6887,25 @@ msgstr ""
 "\n"
 "Klicken Sie \"Weiter\" zum Beginnen."
 
-#: mail/mail-config.glade.h:86 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:45 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:36
+#: mail/mail-config.glade.h:103 ui/evolution-comp-editor.xml.h:20
+#: ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
+#: mail/mail-config.glade.h:105
+msgid "newswindow1"
+msgstr "newsfenster1"
+
+#: mail/mail-config.glade.h:106
+msgid "placeholder"
+msgstr "Platzhalter"
+
+#: mail/mail-config.glade.h:107
+msgid "seconds."
+msgstr "Sekunden."
+
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "PGP-Signaturkontext konnte nicht angelegt werden."
@@ -6736,191 +6922,213 @@ msgstr "PGP-Verschlüsselungskontext konnte nicht angelegt werden."
 msgid "Could not create a PGP decryption context."
 msgstr "PGP-Entschlüsselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:169
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME-Signaturkontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:195
-msgid "Could not create a S/MIME verification context."
-msgstr "S/MIME-Überprüfungskontext konnte nicht angelegt werden."
+#: mail/mail-crypto.c:205
+msgid "Could not create a S/MIME certsonly context."
+msgstr "S/MIME-certsonly-Kontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:225
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME-Verschlüsselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:251
-msgid "Could not create a S/MIME decryption context."
+#: mail/mail-crypto.c:267
+msgid "Could not create a S/MIME envelope context."
+msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
+
+#: mail/mail-crypto.c:297
+msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME-Entschlüsselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-display.c:196
+#: mail/mail-display.c:220
 msgid "Save Attachment"
 msgstr "Anlage speichern"
 
-#: mail/mail-display.c:236
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
-
-#: mail/mail-display.c:297
+#: mail/mail-display.c:330
 msgid "Save to Disk..."
 msgstr "Auf Platte speichern..."
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:332
 #, c-format
 msgid "Open in %s..."
 msgstr "Öffnen in %s..."
 
-#: mail/mail-display.c:301
+#: mail/mail-display.c:334
 msgid "View Inline"
 msgstr "An Ort und Stelle betrachten"
 
-#: mail/mail-display.c:336
+#: mail/mail-display.c:369
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:359
+#: mail/mail-display.c:392
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "An Ort und Stelle betrachten (über %s)"
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:396
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:962
+#: mail/mail-display.c:1028
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-display.c:1256
-msgid "Open link in browser"
+#: mail/mail-display.c:1371
+msgid "Open Link in Browser"
 msgstr "Link in Browser öffnen"
 
-#: mail/mail-display.c:1258
-msgid "Save as (FIXME)"
-msgstr "Speichern unter (FIXME)"
+#: mail/mail-display.c:1373
+msgid "Copy Link Location"
+msgstr "Linkziel kopieren"
+
+#: mail/mail-display.c:1375
+msgid "Save Link as (FIXME)"
+msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:1260
-msgid "Copy location (FIXME)"
-msgstr "Ort kopieren (FIXME)"
+#: mail/mail-display.c:1377
+msgid "Save Image as"
+msgstr "Bild speichern unter"
 
-#: mail/mail-format.c:527
+#: mail/mail-folder-cache.c:166
+#, c-format
+msgid "%d new"
+msgstr "%d neu"
+
+#: mail/mail-folder-cache.c:172 mail/mail-folder-cache.c:179
+msgid ", "
+msgstr ", "
+
+#: mail/mail-folder-cache.c:173
+#, c-format
+msgid "%d hidden"
+msgstr "%d verborgen"
+
+#: mail/mail-folder-cache.c:180
+#, c-format
+msgid "%d total"
+msgstr "%d insgesamt"
+
+#: mail/mail-format.c:532
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:573
+#: mail/mail-format.c:580
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "MIME-Nachricht konnte nicht geparst werden. Wird als Quellcode angezeigt."
 
-#: mail/mail-format.c:640 mail/message-list.c:1082
+#: mail/mail-format.c:658 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:756 mail/message-list.c:1082
+#: mail/mail-format.c:774 mail/message-list.etspec.h:4
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:759
+#: mail/mail-format.c:777
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:762 mail/message-list.c:1083
+#: mail/mail-format.c:780 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:783
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1075
+#: mail/mail-format.c:1105
 msgid "No GPG/PGP program configured."
 msgstr "Kein GPG/PGP-Programm konfiguriert."
 
-#: mail/mail-format.c:1090
+#: mail/mail-format.c:1120
 msgid "Encrypted message not displayed"
 msgstr "Verschlüsselte Nachricht nicht angezeigt"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1126
 msgid "Encrypted message"
 msgstr "Verschlüsselte Nachricht"
 
-#: mail/mail-format.c:1097
+#: mail/mail-format.c:1127
 msgid "Click icon to decrypt."
 msgstr "Zum Entschlüsseln Icon klicken."
 
-#: mail/mail-format.c:1153
+#: mail/mail-format.c:1183
 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:1161
+#: mail/mail-format.c:1191
 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:1787
+#: mail/mail-format.c:1842
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:1799
+#: mail/mail-format.c:1854
 #, 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:1803
+#: mail/mail-format.c:1858
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:1837
+#: mail/mail-format.c:1892
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:1842
+#: mail/mail-format.c:1897
 msgid "Malformed external-body part."
 msgstr "Ungültiger external-body-Teil."
 
-#: mail/mail-local.c:505
+#: mail/mail-local.c:455
 #, c-format
 msgid "Opening '%s'"
 msgstr "Öffnen von '%s'..."
 
-#: mail/mail-local.c:785
+#: mail/mail-local.c:755
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:789
+#: mail/mail-local.c:759
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Ordner \"%s\" in \"%s\"-Format umwandeln"
 
-#: mail/mail-local.c:812
+#: mail/mail-local.c:782
 msgid "Reconfiguring folder"
 msgstr "Ordner wird neu konfiguriert"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:841
+#: mail/mail-local.c:811
 msgid "Closing current folder"
 msgstr "Aktueller Ordner wird geschlossen"
 
-#: mail/mail-local.c:873
+#: mail/mail-local.c:838
 msgid "Renaming old folder and opening"
 msgstr "Alter Ordner wird umbenannt und geöffnet"
 
-#: mail/mail-local.c:891
+#: mail/mail-local.c:856
 msgid "Creating new folder"
 msgstr "Neuer Ordner wird angelegt"
 
-#: mail/mail-local.c:905
+#: mail/mail-local.c:870
 msgid "Copying messages"
 msgstr "Nachrichten werden kopiert"
 
-#: mail/mail-local.c:922
+#: mail/mail-local.c:887
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6929,12 +7137,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:961
+#: mail/mail-local.c:926
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr "Datei %s konnte nicht geladen werden"
 
+#: mail/mail-local.c:1012
+#, c-format
+msgid "Reconfigure %s"
+msgstr "%s neu konfigurieren"
+
 #: mail/mail-mt.c:190
 #, c-format
 msgid ""
@@ -6953,101 +7166,110 @@ msgstr ""
 "Fehler beim Ausführen eines Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
 msgid "Working"
 msgstr "In Arbeit"
 
-#: mail/mail-mt.c:862
+#: mail/mail-mt.c:867
 msgid "Evolution progress"
 msgstr "Evolution-Fortschritt"
 
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:556
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:560
 msgid "Sending message"
-msgstr "Nachricht senden"
+msgstr "Nachricht verschicken"
 
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:676
 #, c-format
 msgid "Sending message %d of %d"
-msgstr "Nachricht %d von %d wird gesendet"
+msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:695
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:697 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:783
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:862
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Machrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:862
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:879
 msgid "Moving"
 msgstr "Verschiebe"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:882
 msgid "Copying"
 msgstr "Kopiere"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:972
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
-#: mail/mail-ops.c:1154
+#: mail/mail-ops.c:1134
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1175 mail/mail-ops.c:1313
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s öffnen"
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1242
 #, c-format
 msgid "Opening store %s"
 msgstr "Öffnen des Speichers %s"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1381
+#, c-format
+msgid "Removing folder %s"
+msgstr "Ordner %s wird entfernt"
+
+#: mail/mail-ops.c:1513
+msgid "Refreshing folder"
+msgstr "Ordner wird aktualisiert"
+
+#: mail/mail-ops.c:1549
 msgid "Expunging folder"
-msgstr "Säubere Ordner"
+msgstr "Ordner wird gesäubert"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1598
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s abrufen"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1665
 msgid "Retrieving messages"
 msgstr "Nachrichten abrufen"
 
-#: mail/mail-ops.c:1575
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Rufe Nachricht Nummer %d von %d ab (UID \"%s\")"
 
-#: mail/mail-ops.c:1649
+#: mail/mail-ops.c:1749
 msgid "Saving messages"
 msgstr "Nachrichten speichern"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1828
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7056,12 +7278,12 @@ msgstr ""
 "Ausgabedatei konnte nicht erstellt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Nachricht %d von %d (UID \"%s\") speichern"
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1855
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7070,11 +7292,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1929
 msgid "Saving attachment"
 msgstr "Speichern der Anlage"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:1944
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7083,12 +7305,12 @@ msgstr ""
 "Ausgabedatei kann nicht erstellt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:1972
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:1939
+#: mail/mail-ops.c:2039
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
@@ -7117,215 +7339,153 @@ msgstr "Suchen:"
 msgid "Matches:"
 msgstr "Passt auf:"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Suchen"
-
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Stornieren..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
-msgstr "Mail erhalten & senden"
+msgstr "Mail erhalten & verschicken"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Erhalten"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
-msgstr "Senden"
+msgstr "Verschicken"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Storniert"
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "Unvollständige Nachricht auf Pipe geschrieben!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "Mail-Zusammenfassung"
-
-#: mail/mail-tools.c:145
+#: mail/mail-tools.c:159
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Temporäre Mbox `%s' konnte nicht angelegt werden: %s"
 
-#: mail/mail-tools.c:192
+#: mail/mail-tools.c:207
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (weitergeleitete Nachricht)"
 
-#: mail/mail-tools.c:202
+#: mail/mail-tools.c:217
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (kein Betreff)"
 
-#: mail/mail-tools.c:219
+#: mail/mail-tools.c:234
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:221
+#: mail/mail-tools.c:236
 msgid "Forwarded message (no subject)"
 msgstr "Weitergeleitete Nachricht (kein Betreff)"
 
-#: mail/mail-tools.c:428
+#: mail/mail-tools.c:457
 #, c-format
 msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
+"-----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>"
+"-----Weitergeleitete Nachricht-----<br><b>Von:</b> %s<br><b>An:</b> %"
+"s<br><b>Betreff:</b> %s<br>"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:250
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:442
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:188 ui/evolution-mail.xml.h:70
-msgid "Reply"
-msgstr "Antworten"
-
-#: mail/message-browser.c:188
-msgid "Reply to the sender of this message"
-msgstr "An den Absender der Nachricht antworten"
-
-#: mail/message-browser.c:191 ui/evolution-mail.xml.h:71
-msgid "Reply to All"
-msgstr "Allen antworten"
-
-#: mail/message-browser.c:191
-msgid "Reply to all recipients of this message"
-msgstr "allen Empfängern der Nachricht antworten"
-
-#: mail/message-browser.c:194 ui/evolution-mail.xml.h:33
-msgid "Forward"
-msgstr "Weiterleiten"
-
-#: mail/message-browser.c:194
-msgid "Forward this message"
-msgstr "Die Nachricht weiterleiten"
-
-#: mail/message-browser.c:199
-msgid "Print the selected message"
-msgstr "Die gewählte Nachricht drucken"
-
-#: mail/message-browser.c:202
-msgid "Delete this message"
-msgstr "Die Nachricht löschen"
-
-#: mail/message-browser.c:207 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:64 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Zurück"
-
-#: mail/message-browser.c:207
-msgid "Previous message"
-msgstr "Vorige Nachricht"
-
-#: mail/message-browser.c:210 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:57
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Weiter"
-
-#: mail/message-browser.c:210
-msgid "Next message"
-msgstr "Nächste Nachricht"
-
-#: mail/message-list.c:677
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:679
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:621
+#, fuzzy
 msgid "Lowest"
-msgstr "Am niedrigsten"
+msgstr "Schauer"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:622
+#, fuzzy
 msgid "Lower"
-msgstr "Niedriger"
+msgstr "Schauer"
 
-#: mail/message-list.c:690
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Höher"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:957
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:969
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:977
+#: mail/message-list.c:913
+#, fuzzy
 msgid "%b %d %l:%M %p"
-msgstr "%a %d %l:%M %p"
+msgstr "%a, %b %d / %H:%M"
 
-#: mail/message-list.c:979
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1082
+#: mail/message-list.etspec.h:5
 msgid "Received"
-msgstr "Empfangen"
+msgstr "Erhalten"
 
-#: mail/message-list.c:1083
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Größe"
 
-#: mail/mail-session.c:161
+#: mail/mail-session.c:170
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:48
-#: ui/evolution.xml.h:13
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Ordner"
 
 #: mail/subscribe-dialog.c:77
+#, fuzzy
 msgid "Store"
-msgstr "Speicher"
+msgstr "Rauch"
 
 #: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
@@ -7347,15 +7507,1383 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Abonnements verwalten"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: 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:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+"Evolutions Chefsesselansichts-Komponente kann nicht initialisiert werden."
+
+#: my-evolution/e-summary-calendar.c:158 my-evolution/e-summary-calendar.c:176
+msgid "Appointments"
+msgstr "Termine"
+
+#: my-evolution/e-summary-calendar.c:159
+msgid "No appointments"
+msgstr "Keine Termine"
+
+#: my-evolution/e-summary-calendar.c:203 my-evolution/e-summary-calendar.c:209
+msgid "%I:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-mail.c:100
+msgid "Mail summary"
+msgstr "Mail-Zusammenfassung"
+
+#: my-evolution/e-summary-rdf.c:378 my-evolution/e-summary-rdf.c:404
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Fehler beim Herunterladen von RDF</b>"
+
+#: my-evolution/e-summary-weather.c:56
+msgid "My Weather"
+msgstr "Mein Wetter"
+
+#: my-evolution/e-summary-weather.c:296
+msgid "<b>Error downloading Metar</b>"
+msgstr "<b>Fehler beim Herunterladen von Metar</b>"
+
+#: my-evolution/e-summary-weather.c:612
+msgid "Regions"
+msgstr "Regionen"
+
+#: my-evolution/e-summary.c:413 ui/my-evolution.xml.h:3
+msgid "Print My Evolution"
+msgstr "My Evolution Drucken"
+
+#: my-evolution/e-summary.c:459
+msgid "Printing of My Evolution failed"
+msgstr "Drucken von My Evolution fehlgeschlagen"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
+
+#: my-evolution/metar.c:43
+msgid "Clear sky"
+msgstr "Wolkenloser Himmel"
+
+#: my-evolution/metar.c:44
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:45
+msgid "Scattered clouds"
+msgstr "Verstreute Wolken"
+
+#: my-evolution/metar.c:46
+#, fuzzy
+msgid "Few clouds"
+msgstr "Gewitterwolken"
+
+#: my-evolution/metar.c:47
+msgid "Overcast"
+msgstr "Bedeckt"
+
+#: my-evolution/metar.c:55 my-evolution/metar.c:73 my-evolution/metar.c:136
+#, fuzzy
+msgid "Invalid"
+msgstr "An Ort und Stelle"
+
+#: my-evolution/metar.c:62
+#, fuzzy
+msgid "Variable"
+msgstr "Teils Dunst"
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "North"
+msgstr "Notiz"
+
+#: my-evolution/metar.c:63
+msgid "North - NorthEast"
+msgstr "Nord - Nordost"
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Northeast"
+msgstr "Notizen:"
+
+#: my-evolution/metar.c:63
+msgid "East - NorthEast"
+msgstr "Ost - Nordost"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "East"
+msgstr "Existieren"
+
+#: my-evolution/metar.c:64
+msgid "East - Southeast"
+msgstr "Ost - Südost"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Southeast"
+msgstr "Quellen"
+
+#: my-evolution/metar.c:64
+msgid "South - Southeast"
+msgstr "Süd - Südost"
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "South"
+msgstr "Monat"
+
+#: my-evolution/metar.c:65
+msgid "South - Southwest"
+msgstr "Süd - Südwest"
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southwest"
+msgstr "Schauer"
+
+#: my-evolution/metar.c:65
+msgid "West - Southwest"
+msgstr "West - Südwest"
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "West"
+msgstr "Test"
+
+#: my-evolution/metar.c:66
+msgid "West - Northwest"
+msgstr "West - Nordwest"
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Northwest"
+msgstr "Am niedrigsten"
+
+#: my-evolution/metar.c:66
+msgid "North - Northwest"
+msgstr "Nord - Nordwest"
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:99
+msgid "Drizzle"
+msgstr "Nieselregen"
+
+#: my-evolution/metar.c:99
+msgid "Drizzle in the vicinity"
+msgstr "Nieselregen in der Umgebung"
+
+#: my-evolution/metar.c:99
+msgid "Light drizzle"
+msgstr "Leichter Nieselregen"
+
+#: my-evolution/metar.c:99
+msgid "Moderate drizzle"
+msgstr "Mäßiger Nieselregen"
+
+#: my-evolution/metar.c:99
+msgid "Heavy drizzle"
+msgstr "Starker Nieselregen"
+
+#: my-evolution/metar.c:99
+msgid "Shallow drizzle"
+msgstr "Geringfügiger Nieselregen"
+
+#: my-evolution/metar.c:99
+msgid "Patches of drizzle"
+msgstr "Vereinzelt Nieselregen"
+
+#: my-evolution/metar.c:99
+msgid "Partial drizzle"
+msgstr "Teils Nieselregen"
+
+#: my-evolution/metar.c:99 my-evolution/metar.c:100
+msgid "Thunderstorm"
+msgstr "Gewitter"
+
+#: my-evolution/metar.c:99
+msgid "Windy drizzle"
+msgstr "Windiger Nieselregen"
+
+#: my-evolution/metar.c:99
+msgid "Showers"
+msgstr "Schauer"
+
+#: my-evolution/metar.c:99
+msgid "Drifting drizzle"
+msgstr "Abtreibender Nieselregen"
+
+#: my-evolution/metar.c:99
+msgid "Freezing drizzle"
+msgstr "Eisiger Nieselregen"
+
+#. RAIN
+#: my-evolution/metar.c:100
+msgid "Rain"
+msgstr "Regen"
+
+#: my-evolution/metar.c:100
+msgid "Rain in the vicinity"
+msgstr "Regen in der Umgebung"
+
+#: my-evolution/metar.c:100
+msgid "Light rain"
+msgstr "Leichter Regen"
+
+#: my-evolution/metar.c:100
+msgid "Moderate rain"
+msgstr "Mäßiger Regen"
+
+#: my-evolution/metar.c:100
+msgid "Heavy rain"
+msgstr "Starker Regen"
+
+#: my-evolution/metar.c:100
+msgid "Shallow rain"
+msgstr "Geringfügiger Regen"
+
+#: my-evolution/metar.c:100
+msgid "Patches of rain"
+msgstr "Vereinzelt Regen"
+
+#: my-evolution/metar.c:100
+msgid "Partial rainfall"
+msgstr "Teils Regen"
+
+#: my-evolution/metar.c:100
+msgid "Blowing rainfall"
+msgstr "Stürmischer Regen"
+
+#: my-evolution/metar.c:100
+msgid "Rain showers"
+msgstr "Regenschauer"
+
+#: my-evolution/metar.c:100
+msgid "Drifting rain"
+msgstr "Abtreibender Regen"
+
+#: my-evolution/metar.c:100
+msgid "Freezing rain"
+msgstr "Eisregen"
+
+#. SNOW
+#: my-evolution/metar.c:101
+msgid "Snow"
+msgstr "Schneefall"
+
+#: my-evolution/metar.c:101
+msgid "Snow in the vicinity"
+msgstr "Schneefall in der Umgebung"
+
+#: my-evolution/metar.c:101
+msgid "Light snow"
+msgstr "Leichter Schneefall"
+
+#: my-evolution/metar.c:101
+msgid "Moderate snow"
+msgstr "Mäßiger Schneefall"
+
+#: my-evolution/metar.c:101
+msgid "Heavy snow"
+msgstr "Schwerer Schneefall"
+
+#: my-evolution/metar.c:101
+msgid "Shallow snow"
+msgstr "Geringfügiger Schneefall"
+
+#: my-evolution/metar.c:101
+msgid "Patches of snow"
+msgstr "Vereinzelt Schneefall"
+
+#: my-evolution/metar.c:101
+msgid "Partial snowfall"
+msgstr "Teils Schneefall"
+
+#: my-evolution/metar.c:101 my-evolution/metar.c:102
+msgid "Snowstorm"
+msgstr "Schneesturm"
+
+#: my-evolution/metar.c:101
+msgid "Blowing snowfall"
+msgstr "Stürmischer Schneefall"
+
+#: my-evolution/metar.c:101
+msgid "Snow showers"
+msgstr "Schneeschauer"
+
+#: my-evolution/metar.c:101
+msgid "Drifting snow"
+msgstr "Abtreibender Schneefall"
+
+#: my-evolution/metar.c:101
+msgid "Freezing snow"
+msgstr "Gefrierender Schneefall"
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:102
+msgid "Snow grains"
+msgstr "Kornschnee"
+
+#: my-evolution/metar.c:102
+msgid "Snow grains in the vicinity"
+msgstr "Kornschnee in der Umgebung"
+
+#: my-evolution/metar.c:102
+msgid "Light snow grains"
+msgstr "Leichter Kornschnee"
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow grains"
+msgstr "Mäßiger Kornschnee"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow grains"
+msgstr "Starker Kornschnee"
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow grains"
+msgstr "Geringfügiger Kornschnee"
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow grains"
+msgstr "Vereinzelt Kornschnee"
+
+#: my-evolution/metar.c:102
+msgid "Partial snow grains"
+msgstr "Teils Kornschnee"
+
+#: my-evolution/metar.c:102
+msgid "Blowing snow grains"
+msgstr "Stürmischer Kornschnee"
+
+#: my-evolution/metar.c:102
+msgid "Snow grain showers"
+msgstr "Kornschneeschauer"
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow grains"
+msgstr "Abtreibender Kornschnee"
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow grains"
+msgstr "Eisiger Kornschnee"
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:103
+msgid "Ice crystals"
+msgstr "Eiskristalle"
+
+#: my-evolution/metar.c:103
+msgid "Ice crystals in the vicinity"
+msgstr "Eiskristalle in der Umgebung"
+
+#: my-evolution/metar.c:103
+msgid "Few ice crystals"
+msgstr "Wenige Eiskristalle"
+
+#: my-evolution/metar.c:103
+msgid "Moderate ice crystals"
+msgstr "Mäßige Eiskristalle"
+
+#: my-evolution/metar.c:103
+msgid "Heavy ice crystals"
+msgstr "Starke Eiskristalle"
+
+#: my-evolution/metar.c:103
+msgid "Patches of ice crystals"
+msgstr "Vereinzelt Eiskristalle"
+
+#: my-evolution/metar.c:103
+msgid "Partial ice crystals"
+msgstr "Teils Eiskristalle"
+
+#: my-evolution/metar.c:103
+msgid "Ice crystal storm"
+msgstr "Eiskristallsturm"
+
+#: my-evolution/metar.c:103
+msgid "Blowing ice crystals"
+msgstr "Stürmische Eiskristalle"
+
+#: my-evolution/metar.c:103
+msgid "Showers of ice crystals"
+msgstr "Schauer von Eiskristallen"
+
+#: my-evolution/metar.c:103
+msgid "Drifting ice crystals"
+msgstr "Abtreibende Eiskristalle"
+
+#: my-evolution/metar.c:103
+msgid "Freezing ice crystals"
+msgstr "Eisige Eiskristalle"
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:104
+msgid "Ice pellets"
+msgstr "Eiskörner"
+
+#: my-evolution/metar.c:104
+msgid "Ice pellets in the vicinity"
+msgstr "Eiskörner in der Umgebung"
+
+#: my-evolution/metar.c:104
+msgid "Few ice pellets"
+msgstr "Wenige Eiskörner"
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice pellets"
+msgstr "Mäßige Eiskörner"
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice pellets"
+msgstr "Viele Eiskörner"
+
+#: my-evolution/metar.c:104
+msgid "Shallow ice pellets"
+msgstr "Geringfügige Eiskörner"
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice pellets"
+msgstr "Vereinzelt Eiskörner"
+
+#: my-evolution/metar.c:104
+msgid "Partial ice pellets"
+msgstr "Teils Eiskörner"
+
+#: my-evolution/metar.c:104
+msgid "Ice pellet storm"
+msgstr "Eiskornsturm"
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice pellets"
+msgstr "Wind mit Eiskörnern"
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice pellets"
+msgstr "Eiskornschauer"
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice pellets"
+msgstr "Abtreibende Eiskörner"
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice pellets"
+msgstr "Eisige Eiskörner"
+
+#. HAIL
+#: my-evolution/metar.c:105
+msgid "Hail"
+msgstr "Hagel"
+
+#: my-evolution/metar.c:105
+msgid "Hail in the vicinity"
+msgstr "Hagel in der Umgebung"
+
+#: my-evolution/metar.c:105 my-evolution/metar.c:106
+msgid "Light hail"
+msgstr "Leichter Hagel"
+
+#: my-evolution/metar.c:105
+msgid "Moderate hail"
+msgstr "Mäßiger Hagel"
+
+#: my-evolution/metar.c:105
+msgid "Heavy hail"
+msgstr "Starker Hagel"
+
+#: my-evolution/metar.c:105
+msgid "Shallow hail"
+msgstr "Geringfügiger Hagel"
+
+#: my-evolution/metar.c:105
+msgid "Patches of hail"
+msgstr "Vereinzelt Hagel"
+
+#: my-evolution/metar.c:105
+msgid "Partial hail"
+msgstr "Teils Hagel"
+
+#: my-evolution/metar.c:105
+msgid "Hailstorm"
+msgstr "Hagelsturm"
+
+#: my-evolution/metar.c:105
+msgid "Blowing hail"
+msgstr "Wind und Hagel"
+
+#: my-evolution/metar.c:105
+msgid "Hail showers"
+msgstr "Hagelschauer"
+
+#: my-evolution/metar.c:105
+msgid "Drifting hail"
+msgstr "Abtreibender Hagel"
+
+#: my-evolution/metar.c:105
+msgid "Freezing hail"
+msgstr "Eisiger Hagel"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:106
+msgid "Small hail"
+msgstr "Leichter Graupel"
+
+#: my-evolution/metar.c:106
+msgid "Small hail in the vicinity"
+msgstr "Graupel in der Umgebung"
+
+#: my-evolution/metar.c:106
+msgid "Moderate small hail"
+msgstr "Mäßiger Graupel"
+
+#: my-evolution/metar.c:106
+msgid "Heavy small hail"
+msgstr "Starker Graupel"
+
+#: my-evolution/metar.c:106
+msgid "Shallow small hail"
+msgstr "Geringfügiger Graupel"
+
+#: my-evolution/metar.c:106
+msgid "Patches of small hail"
+msgstr "Vereinzelt Graupel"
+
+#: my-evolution/metar.c:106
+msgid "Partial small hail"
+msgstr "Teils Graupel"
+
+#: my-evolution/metar.c:106
+msgid "Small hailstorm"
+msgstr "Graupelsturm"
+
+#: my-evolution/metar.c:106
+msgid "Blowing small hail"
+msgstr "Windiger Graupel"
+
+#: my-evolution/metar.c:106
+msgid "Showers of small hail"
+msgstr "Graupelschauer"
+
+#: my-evolution/metar.c:106
+msgid "Drifting small hail"
+msgstr "Abtreibender Graupel"
+
+#: my-evolution/metar.c:106
+msgid "Freezing small hail"
+msgstr "Eisiger Graupel"
+
+#. PRECIPITATION
+#: my-evolution/metar.c:107
+msgid "Unknown precipitation"
+msgstr "Unbekannte Niederschläge"
+
+#: my-evolution/metar.c:107
+msgid "Precipitation in the vicinity"
+msgstr "Niederschläe in der Umgebung"
+
+#: my-evolution/metar.c:107
+msgid "Light precipitation"
+msgstr "Leichte Niederschläge"
+
+#: my-evolution/metar.c:107
+msgid "Moderate precipitation"
+msgstr "Mäßige Niederschläge"
+
+#: my-evolution/metar.c:107
+msgid "Heavy precipitation"
+msgstr "Starke Niederschläge"
+
+#: my-evolution/metar.c:107
+msgid "Shallow precipitation"
+msgstr "Geringfügige Niederschläge"
+
+#: my-evolution/metar.c:107
+msgid "Patches of precipitation"
+msgstr "Vereinzelt Niederschläge"
+
+#: my-evolution/metar.c:107
+msgid "Partial precipitation"
+msgstr "Teils Niederschläge"
+
+#: my-evolution/metar.c:107
+msgid "Unknown thunderstorm"
+msgstr "Unbekanntes Gewitter"
+
+#: my-evolution/metar.c:107
+msgid "Blowing precipitation"
+msgstr "Windige Niederschläge"
+
+#: my-evolution/metar.c:107
+msgid "Showers, type unknown"
+msgstr "Unbekannte Schauer"
+
+#: my-evolution/metar.c:107
+msgid "Drifting precipitation"
+msgstr "Abtreibende Niederschläge"
+
+#: my-evolution/metar.c:107
+msgid "Freezing precipitation"
+msgstr "Eisige Niederschläge"
+
+#. MIST
+#: my-evolution/metar.c:108
+msgid "Mist"
+msgstr "Nebel"
+
+#: my-evolution/metar.c:108
+msgid "Mist in the vicinity"
+msgstr "Nebel in der Umgebung"
+
+#: my-evolution/metar.c:108
+msgid "Light mist"
+msgstr "Leichter Nebel"
+
+#: my-evolution/metar.c:108
+msgid "Moderate mist"
+msgstr "Mäßiger Nebel"
+
+#: my-evolution/metar.c:108
+msgid "Thick mist"
+msgstr "Dichter Nebel"
+
+#: my-evolution/metar.c:108
+msgid "Shallow mist"
+msgstr "Geringfügiger Nebel"
+
+#: my-evolution/metar.c:108
+msgid "Patches of mist"
+msgstr "Vereinzelt Nebel"
+
+#: my-evolution/metar.c:108
+msgid "Partial mist"
+msgstr "Teils Nebel"
+
+#: my-evolution/metar.c:108
+msgid "Mist with wind"
+msgstr "Nebel mit Wind"
+
+#: my-evolution/metar.c:108
+msgid "Drifting mist"
+msgstr "Abtreibender Nebel"
+
+#: my-evolution/metar.c:108
+msgid "Freezing mist"
+msgstr "Eisiger Nebel"
+
+#. FOG
+#: my-evolution/metar.c:109
+msgid "Fog"
+msgstr "Dichter Nebel"
+
+#: my-evolution/metar.c:109
+msgid "Fog in the vicinity"
+msgstr "Dichter Nebel in der Umgebung"
+
+#: my-evolution/metar.c:109
+msgid "Light fog"
+msgstr "Leichter dichter Nebel"
+
+#: my-evolution/metar.c:109
+msgid "Moderate fog"
+msgstr "Mäßiger dichter Nebel"
+
+#: my-evolution/metar.c:109
+msgid "Thick fog"
+msgstr "Sehr dichter Nebel"
+
+#: my-evolution/metar.c:109
+msgid "Shallow fog"
+msgstr "Geringfügiger dichter Nebel"
+
+#: my-evolution/metar.c:109
+msgid "Patches of fog"
+msgstr "Vereinzelt dichter Nebel"
+
+#: my-evolution/metar.c:109
+msgid "Partial fog"
+msgstr "Teils dichter Nebel"
+
+#: my-evolution/metar.c:109
+msgid "Fog with wind"
+msgstr "Dichter Nebel und Wind"
+
+#: my-evolution/metar.c:109
+msgid "Drifting fog"
+msgstr "Abtreibender dichter Nebel"
+
+#: my-evolution/metar.c:109
+msgid "Freezing fog"
+msgstr "Eisiger Nebel"
+
+#. SMOKE
+#: my-evolution/metar.c:110
+msgid "Smoke"
+msgstr "Rauch"
+
+#: my-evolution/metar.c:110
+msgid "Smoke in the vicinity"
+msgstr "Rauch in der Umgebung"
+
+#: my-evolution/metar.c:110
+msgid "Thin smoke"
+msgstr "Dünner Rauch"
+
+#: my-evolution/metar.c:110
+msgid "Moderate smoke"
+msgstr "Mäßiger Rauch"
+
+#: my-evolution/metar.c:110
+msgid "Thick smoke"
+msgstr "Dichter Rauch"
+
+#: my-evolution/metar.c:110
+msgid "Shallow smoke"
+msgstr "Geringfügiger Rauch"
+
+#: my-evolution/metar.c:110
+msgid "Patches of smoke"
+msgstr "Vereinzelt Rauch"
+
+#: my-evolution/metar.c:110
+msgid "Partial smoke"
+msgstr "Teils Rauch"
+
+#: my-evolution/metar.c:110
+msgid "Smoke w/ thunders"
+msgstr "Gewittriger Rauch"
+
+#: my-evolution/metar.c:110
+msgid "Smoke with wind"
+msgstr "Rauch mit Wind"
+
+#: my-evolution/metar.c:110
+msgid "Drifting smoke"
+msgstr "Abtreibender Rauch"
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:111
+msgid "Volcanic ash"
+msgstr "Vulkanasche"
+
+#: my-evolution/metar.c:111
+msgid "Volcanic ash in the vicinity"
+msgstr "Vulkanasche in der Umgebung"
+
+#: my-evolution/metar.c:111
+msgid "Moderate volcanic ash"
+msgstr "Mäßige Vulkanasche"
+
+#: my-evolution/metar.c:111
+msgid "Thick volcanic ash"
+msgstr "Dichte Vulkanasche"
+
+#: my-evolution/metar.c:111
+msgid "Shallow volcanic ash"
+msgstr "Geringfügige Vulkanasche"
+
+#: my-evolution/metar.c:111
+msgid "Patches of volcanic ash"
+msgstr "Vereinzelt Vulkanasche"
+
+#: my-evolution/metar.c:111
+msgid "Partial volcanic ash"
+msgstr "Teils Vulkanasche"
+
+#: my-evolution/metar.c:111
+msgid "Volcanic ash w/ thunders"
+msgstr "Gewittrige Vulkanasche"
+
+#: my-evolution/metar.c:111
+msgid "Blowing volcanic ash"
+msgstr "Stürmische Vulkanasche"
+
+#: my-evolution/metar.c:111
+msgid "Showers of volcanic ash "
+msgstr "Vulkanasche-Schauer"
+
+#: my-evolution/metar.c:111
+msgid "Drifting volcanic ash"
+msgstr "Abtreibende Vulkanasche"
+
+#: my-evolution/metar.c:111
+msgid "Freezing volcanic ash"
+msgstr "Eisige Vulkanasche"
+
+#. SAND
+#: my-evolution/metar.c:112
+msgid "Sand"
+msgstr "Sand"
+
+#: my-evolution/metar.c:112
+msgid "Sand in the vicinity"
+msgstr "Sand in der Umgebung"
+
+#: my-evolution/metar.c:112
+msgid "Light sand"
+msgstr "Leichter Sand"
+
+#: my-evolution/metar.c:112
+msgid "Moderate sand"
+msgstr "Mäßiger Sand"
+
+#: my-evolution/metar.c:112
+msgid "Heavy sand"
+msgstr "Starker Sand"
+
+#: my-evolution/metar.c:112
+msgid "Patches of sand"
+msgstr "Vereinzelt Sand"
+
+#: my-evolution/metar.c:112
+msgid "Partial sand"
+msgstr "Teils Sand"
+
+#: my-evolution/metar.c:112
+msgid "Blowing sand"
+msgstr "Stürmischer Sand"
+
+#: my-evolution/metar.c:112
+msgid "Drifting sand"
+msgstr "Abtreibender Sand"
+
+#. HAZE
+#: my-evolution/metar.c:113
+msgid "Haze"
+msgstr "Dunst"
+
+#: my-evolution/metar.c:113
+msgid "Haze in the vicinity"
+msgstr "Dunst in der Umgebung"
+
+#: my-evolution/metar.c:113
+msgid "Light haze"
+msgstr "Leichter Dunst"
+
+#: my-evolution/metar.c:113
+msgid "Moderate haze"
+msgstr "Mäßiger Dunst"
+
+#: my-evolution/metar.c:113
+msgid "Thick haze"
+msgstr "Dichter Dunst"
+
+#: my-evolution/metar.c:113
+msgid "Shallow haze"
+msgstr "Geringfügiger Dunst"
+
+#: my-evolution/metar.c:113
+msgid "Patches of haze"
+msgstr "Vereinzelt Dunst"
+
+#: my-evolution/metar.c:113
+msgid "Partial haze"
+msgstr "Teils Dunst"
+
+#: my-evolution/metar.c:113
+msgid "Haze with wind"
+msgstr "Stürmischer Dunst"
+
+#: my-evolution/metar.c:113
+msgid "Drifting haze"
+msgstr "Abtreibender Dunst"
+
+#: my-evolution/metar.c:113
+msgid "Freezing haze"
+msgstr "Eisiger Dunst"
+
+#. SPRAY
+#: my-evolution/metar.c:114
+msgid "Sprays"
+msgstr "Sprühregen"
+
+#: my-evolution/metar.c:114
+msgid "Sprays in the vicinity"
+msgstr "Sprühregen in der Umgebung"
+
+#: my-evolution/metar.c:114
+msgid "Light sprays"
+msgstr "Leichter Sprühregen"
+
+#: my-evolution/metar.c:114
+msgid "Moderate sprays"
+msgstr "Mäßiger Sprühregen"
+
+#: my-evolution/metar.c:114
+msgid "Heavy sprays"
+msgstr "Starker Sprühregen"
+
+#: my-evolution/metar.c:114
+msgid "Shallow sprays"
+msgstr "Geringfügiger Sprühregen"
+
+#: my-evolution/metar.c:114
+msgid "Patches of sprays"
+msgstr "Vereinzelt Sprühregen"
+
+#: my-evolution/metar.c:114
+msgid "Partial sprays"
+msgstr "Teils Sprühregen"
+
+#: my-evolution/metar.c:114
+msgid "Blowing sprays"
+msgstr "Stürmischer Sprühregen"
+
+#: my-evolution/metar.c:114
+msgid "Drifting sprays"
+msgstr "Abtreibender Sprühregen"
+
+#: my-evolution/metar.c:114
+msgid "Freezing sprays"
+msgstr "Eisiger Sprühregen"
+
+#. DUST
+#: my-evolution/metar.c:115
+msgid "Dust"
+msgstr "Staub"
+
+#: my-evolution/metar.c:115
+msgid "Dust in the vicinity"
+msgstr "Staub in der Umgebung"
+
+#: my-evolution/metar.c:115
+msgid "Light dust"
+msgstr "Leichter Staub"
+
+#: my-evolution/metar.c:115
+msgid "Moderate dust"
+msgstr "Mäßiger Staub"
+
+#: my-evolution/metar.c:115
+msgid "Heavy dust"
+msgstr "Starker Staub"
+
+#: my-evolution/metar.c:115
+msgid "Patches of dust"
+msgstr "Vereinzelt Staub"
+
+#: my-evolution/metar.c:115
+msgid "Partial dust"
+msgstr "Teils Staub"
+
+#: my-evolution/metar.c:115
+msgid "Blowing dust"
+msgstr "Stürmischer Staub"
+
+#: my-evolution/metar.c:115
+msgid "Drifting dust"
+msgstr "Abtreibender Staub"
+
+#. SQUALL
+#: my-evolution/metar.c:116
+msgid "Squall"
+msgstr "Windböen"
+
+#: my-evolution/metar.c:116
+msgid "Squall in the vicinity"
+msgstr "Windböen in der Umgebung"
+
+#: my-evolution/metar.c:116
+msgid "Light squall"
+msgstr "Leichte Windböen"
+
+#: my-evolution/metar.c:116
+msgid "Moderate squall"
+msgstr "Mäßige Windböen"
+
+#: my-evolution/metar.c:116
+msgid "Heavy squall"
+msgstr "Heftige Windböen"
+
+#: my-evolution/metar.c:116
+msgid "Partial squall"
+msgstr "Teils Windböen"
+
+#: my-evolution/metar.c:116
+msgid "Thunderous squall"
+msgstr "Gewittrige Windböen"
+
+#: my-evolution/metar.c:116
+msgid "Blowing squall"
+msgstr "Stürmische Windböen"
+
+#: my-evolution/metar.c:116
+msgid "Drifting squall"
+msgstr "Abtreibende Windböen"
+
+#: my-evolution/metar.c:116
+msgid "Freezing squall"
+msgstr "Eisige Windböen"
+
+#. SANDSTORM
+#: my-evolution/metar.c:117
+msgid "Sandstorm"
+msgstr "Sandsturm"
+
+#: my-evolution/metar.c:117
+msgid "Sandstorm in the vicinity"
+msgstr "Sandsturm in der Umgebung"
+
+#: my-evolution/metar.c:117
+msgid "Light standstorm"
+msgstr "Leichter Sandsturm"
+
+#: my-evolution/metar.c:117
+msgid "Moderate sandstorm"
+msgstr "Mäßiger Sandsturm"
+
+#: my-evolution/metar.c:117
+msgid "Heavy sandstorm"
+msgstr "Schwerer Sandsturm"
+
+#: my-evolution/metar.c:117
+msgid "Shallow sandstorm"
+msgstr "Geringfügiger Sandsturm"
+
+#: my-evolution/metar.c:117
+msgid "Partial sandstorm"
+msgstr "Teils Sandsturm"
+
+#: my-evolution/metar.c:117
+msgid "Thunderous sandstorm"
+msgstr "Gewittriger Sandsturm"
+
+#: my-evolution/metar.c:117
+msgid "Blowing sandstorm"
+msgstr "Stürmischer Sandsturm"
+
+#: my-evolution/metar.c:117
+msgid "Drifting sandstorm"
+msgstr "Abtreibender Sandsturm"
+
+#: my-evolution/metar.c:117
+msgid "Freezing sandstorm"
+msgstr "Eisiger Sandsturm"
+
+#. DUSTSTORM
+#: my-evolution/metar.c:118
+msgid "Duststorm"
+msgstr "Staubsturm"
+
+#: my-evolution/metar.c:118
+msgid "Duststorm in the vicinity"
+msgstr "Staubsturm in der Umgebung"
+
+#: my-evolution/metar.c:118
+msgid "Light duststorm"
+msgstr "Leichter Staubsturm"
+
+#: my-evolution/metar.c:118
+msgid "Moderate duststorm"
+msgstr "Mäßiger Staubsturm"
+
+#: my-evolution/metar.c:118
+msgid "Heavy duststorm"
+msgstr "Heftiger Staubsturm"
+
+#: my-evolution/metar.c:118
+msgid "Shallow duststorm"
+msgstr "Geringfügiger Staubsturm"
+
+#: my-evolution/metar.c:118
+msgid "Partial duststorm"
+msgstr "Teils Staubsturm"
+
+#: my-evolution/metar.c:118
+msgid "Thunderous duststorm"
+msgstr "Gewittriger Staubsturm"
+
+#: my-evolution/metar.c:118
+msgid "Blowing duststorm"
+msgstr "Stürmischer Staubsturm"
+
+#: my-evolution/metar.c:118
+msgid "Drifting duststorm"
+msgstr "Abtreibender Staubsturm"
+
+#: my-evolution/metar.c:118
+msgid "Freezing duststorm"
+msgstr "Eisiger Staubsturm"
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:119
+msgid "Funnel cloud"
+msgstr "Gewitterwolken"
+
+#: my-evolution/metar.c:119
+msgid "Funnel cloud in the vicinity"
+msgstr "Gewitterwolken in der Umgebung"
+
+#: my-evolution/metar.c:119
+msgid "Light funnel cloud"
+msgstr "Leichte Gewitterbewölkung"
+
+#: my-evolution/metar.c:119
+msgid "Moderate funnel cloud"
+msgstr "Mäßige Gewitterbewölkung"
+
+#: my-evolution/metar.c:119
+msgid "Thick funnel cloud"
+msgstr "Dichte Gewitterwolken"
+
+#: my-evolution/metar.c:119
+msgid "Shallow funnel cloud"
+msgstr "Geringfügige Gewitterbewölkung"
+
+#: my-evolution/metar.c:119
+msgid "Patches of funnel clouds"
+msgstr "Vereinzelt Gewitterwolken"
+
+#: my-evolution/metar.c:119
+msgid "Partial funnel clouds"
+msgstr "Teils Gewitterbewölkung"
+
+#: my-evolution/metar.c:119
+msgid "Funnel cloud w/ wind"
+msgstr "Gewitterwolken mit Wind"
+
+#: my-evolution/metar.c:119
+msgid "Drifting funnel cloud"
+msgstr "Abtreibende Gewitterbewölkung"
+
+#. TORNADO
+#: my-evolution/metar.c:120
+msgid "Tornado"
+msgstr "Tornado"
+
+#: my-evolution/metar.c:120
+msgid "Tornado in the vicinity"
+msgstr "Tornado in der Umgebung"
+
+#: my-evolution/metar.c:120
+msgid "Moderate tornado"
+msgstr "Mäßiger Tornado"
+
+#: my-evolution/metar.c:120
+msgid "Raging tornado"
+msgstr "Wütender Tornado"
+
+#: my-evolution/metar.c:120
+msgid "Partial tornado"
+msgstr "Teils Tornado"
+
+#: my-evolution/metar.c:120
+msgid "Thunderous tornado"
+msgstr "Gewittriger Tornado"
+
+#: my-evolution/metar.c:120
+msgid "Drifting tornado"
+msgstr "Abtreibender Tornado"
+
+#: my-evolution/metar.c:120
+msgid "Freezing tornado"
+msgstr "Eisiger Tornado"
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:121
+msgid "Dust whirls"
+msgstr "Staubteufel"
+
+#: my-evolution/metar.c:121
+msgid "Dust whirls in the vicinity"
+msgstr "Staubteufel in der Umgebung"
+
+#: my-evolution/metar.c:121
+msgid "Light dust whirls"
+msgstr "Leichte Staubteufel"
+
+#: my-evolution/metar.c:121
+msgid "Moderate dust whirls"
+msgstr "Mäßige Staubteufel"
+
+#: my-evolution/metar.c:121
+msgid "Heavy dust whirls"
+msgstr "Starke Staubteufel"
+
+#: my-evolution/metar.c:121
+msgid "Shallow dust whirls"
+msgstr "Geringfügige Staubteufel"
+
+#: my-evolution/metar.c:121
+msgid "Patches of dust whirls"
+msgstr "Vereinzelt Staubteufel"
+
+#: my-evolution/metar.c:121
+msgid "Partial dust whirls"
+msgstr "Teils Staubteufel"
+
+#: my-evolution/metar.c:121
+msgid "Blowing dust whirls"
+msgstr "Stürmische Staubteufel"
+
+#: my-evolution/metar.c:121
+msgid "Drifting dust whirls"
+msgstr "Abtreibende Staubteufel"
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add ->"
+msgstr "Hinzufügen"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "Add new feed"
+msgstr "Beantwortet"
+
+#: my-evolution/my-evolution.glade.h:3
+#, fuzzy
+msgid "All folders:"
+msgstr "Ordner wählen"
+
+#: my-evolution/my-evolution.glade.h:4
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:5
+#, fuzzy
+msgid "All stations:"
+msgstr "Alle Anwesenden"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display folders:"
+msgstr "Ordner anzeigen, die beginnen mit:"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Display stations:"
+msgstr "Anzeigeoptionen"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Anzeige"
+
+#: my-evolution/my-evolution.glade.h:10
+#, fuzzy
+msgid "Five days"
+msgstr "Freitag"
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "Einstellungen"
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One day"
+msgstr "1 Tag"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One month"
+msgstr "Monat"
+
+#: my-evolution/my-evolution.glade.h:18
+#, fuzzy
+msgid "One week"
+msgstr "1 Woche"
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Remove <-"
+msgstr "Entfernen"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Termin\n"
+"ansetzen"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Geringfügiger Graupel"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "Alle _Kopfzeilen anzeigen"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Show today's tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+msgid "Tasks "
+msgstr "Aufgaben "
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  Einheit:  "
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "Weather"
+msgstr "nach"
+
+#: my-evolution/my-evolution.glade.h:28
+#, fuzzy
+msgid "Weather settings"
+msgstr "Die Auswahl löschen"
+
+#: my-evolution/my-evolution.glade.h:29
+msgid "Wipe trackers"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:30
+#, fuzzy
+msgid "imperial"
+msgstr "April"
+
+#: my-evolution/my-evolution.glade.h:31
+msgid "metric"
+msgstr ""
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Geringfügiger Hagel"
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr "Aktion abbrechen"
+
+#: shell/e-setup.c:125 shell/e-setup.c:195
 msgid "Evolution installation"
 msgstr "Installation von Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7363,31 +8891,27 @@ msgstr ""
 "Diese neue Version von Evolution muss zusätzliche Dateien in Ihr\n"
 "persönliches Evolution-Verzeichnis installieren"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Bitte klicken Sie \"OK\", um die Dateien zu installieren, oder \"Abbrechen\" "
 "zum Beenden."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Dateien konnte nicht korrekt aktualisiert werden"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Evolutions Dateien erfolgreich installiert."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:199
 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:196
+#: shell/e-setup.c:200
 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:215
+#: shell/e-setup.c:219
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7399,17 +8923,14 @@ msgstr ""
 "kann nicht angelegt werden.\n"
 "Fehler: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:234
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Dateien können nicht in\n"
-"`%s'\n"
-"kopiert werden."
+msgstr "Ein Fehler trat beim Lesen der Datei auf."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:299
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7420,7 +8941,22 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:313
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+"Evolution hat ein altes Verzeichnis\n"
+"\"Executive-Summary\" gefunden. Dies\n"
+"muss entfernt werden, bevor Evolution\n"
+"starten kann.\n"
+"Möchten Sie, dass dieses Verzeichnis\n"
+"entfernt wird?"
+
+#: shell/e-setup.c:338
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7432,12 +8968,12 @@ msgstr ""
 "es, damit Evolution seine Benutzerdateien\n"
 "installieren kann."
 
-#: shell/e-shell.c:388
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
 
-#: shell/e-shell.c:1268
+#: shell/e-shell.c:1308
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7446,6 +8982,59 @@ msgstr ""
 "Hoppla! Die Ansicht für `%s' ist unerwartet gestorben.  :-(\n"
 "Das heißt wahrscheinlich, dass die %s-Komponente abgestürzt ist."
 
+#: shell/e-shell-folder-commands.c:159
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Ordner kann nicht abgerufen werden: %s: %s"
+
+#: shell/e-shell-folder-commands.c:161
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Dateien können nicht in\n"
+"`%s'\n"
+"kopiert werden."
+
+#: shell/e-shell-folder-commands.c:175
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:269
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr "Geben Sie einen Ordner an, in den Ordner \"%s\" kopiert werden soll:"
+
+#: shell/e-shell-folder-commands.c:274
+msgid "Copy folder"
+msgstr "Ordner kopieren"
+
+#: shell/e-shell-folder-commands.c:312
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+"Geben Sie einen Ordner an, in den Ordner \"%s\" verschoben werden soll:"
+
+#: shell/e-shell-folder-commands.c:317
+msgid "Move folder"
+msgstr "Ordner verschieben"
+
+#. Popup a dialog asking if they are sure they want to delete
+#. the folder
+#: shell/e-shell-folder-commands.c:351
+#, c-format
+msgid "Delete folder '%s'"
+msgstr "Ordner '%s' löschen"
+
+#: shell/e-shell-folder-commands.c:359
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Sind Sie sicher, dass Sie die Aufgabe `%s' löschen wollen?"
+
+#: shell/e-shell-folder-commands.c:417
+#, c-format
+msgid "Rename folder '%s'"
+msgstr "Ordner '%s' umbenennen"
+
 #: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
@@ -7463,7 +9052,7 @@ msgstr "Der angegebene Ordnername ist nicht gültig"
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Neuen Ordner anlegen"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7471,11 +9060,11 @@ msgstr ""
 "Der Typ des ausgewählten Ordners ist für die \n"
 "gewählte Operation nicht gültig."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:332
 msgid "New..."
 msgstr "Neu..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
@@ -7515,7 +9104,7 @@ msgstr ""
 "Importieren von %s\n"
 "Importiert wird Objekt %d."
 
-#: shell/e-shell-importer.c:353
+#: shell/e-shell-importer.c:352
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -7525,11 +9114,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:362
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:371
+#: shell/e-shell-importer.c:370
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -7538,17 +9127,17 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/e-shell-importer.c:384
+#: shell/e-shell-importer.c:383
 #, c-format
 msgid "Error starting %s"
 msgstr "Fehler beim Starten von %s"
 
-#: shell/e-shell-importer.c:404
+#: shell/e-shell-importer.c:402
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:419
+#: shell/e-shell-importer.c:417
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -7557,57 +9146,82 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:488
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:538
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:545 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:553
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:601
+#: shell/e-shell-importer.c:599
 msgid "Select folder"
 msgstr "Ordner wählen"
 
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
+
 #: shell/e-shell-offline-handler.c:554
 msgid "Closing connections..."
 msgstr "Verbindungen werden geschlossen..."
 
-#: shell/e-shell-view.c:149
+#: shell/e-shell-view.c:173
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:1203
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1386 shell/e-storage-set-view.c:1441
+msgid "My Evolution"
+msgstr "My Evolution"
+
+#: shell/e-shell-view.c:1403
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1205
+#: shell/e-shell-view.c:1405
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view-menu.c:175
+#: shell/e-shell-view.c:1443
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution ist zur Zeit online. Klicken Sie diesen Knopf, um offline zu "
+"arbeiten."
+
+#: shell/e-shell-view.c:1450
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution geht gerade offline."
+
+#: shell/e-shell-view.c:1456
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution ist gerade offline. Klicken Sie auf diesen Knopf, um online zu "
+"arbeiten."
+
+#: shell/e-shell-view-menu.c:182
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Der Fehlermelder kann nicht gefunden werden"
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-view-menu.c:188
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
-#: shell/e-shell-view-menu.c:226
+#: shell/e-shell-view-menu.c:233
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:228
+#: shell/e-shell-view-menu.c:235
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7617,31 +9231,57 @@ msgstr ""
 "für Mail sowie Termin- und Kontaktverwaltung\n"
 "in der GNOME-Desktopumgebung."
 
-#: shell/e-shell-view-menu.c:392
+#: shell/e-shell-view-menu.c:453
 msgid "Go to folder..."
 msgstr "Gehe zu Ordner..."
 
-#: shell/e-shell-view-menu.c:576
+#: shell/e-shell-view-menu.c:454
+msgid "Select the folder that you want to open"
+msgstr "Wählen Sie den Ordner, den Sie öffnen wollen"
+
+#: shell/e-shell-view-menu.c:599
+msgid "Create a new shortcut"
+msgstr "Eine neue Verknüpfung anlegen"
+
+#: shell/e-shell-view-menu.c:600
+#, fuzzy
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "Wählen Sie den Ordner, den Sie öffnen wollen"
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work online"
 msgstr "Online arbeiten"
 
-#: shell/e-shell-view-menu.c:588 shell/e-shell-view-menu.c:600
+#: shell/e-shell-view-menu.c:717 shell/e-shell-view-menu.c:729
 msgid "Work offline"
 msgstr "Offline arbeiten"
 
-#: shell/e-shortcuts.c:381
+#: shell/e-shortcuts.c:601
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von Verknüpfungen."
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts.c:998
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Schauer"
+
+#: shell/e-shortcuts.c:1000
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-shortcuts.c:1003
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Neue Verknüpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Gruppenname:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7650,59 +9290,97 @@ msgstr ""
 "Wollen Sie wirklich Gruppe `%s' aus\n"
 "der Verknüpfungsleiste entfernen?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Nicht entfernen"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:297
+msgid "Rename Shortcut Group"
+msgstr "Verknüpfungsgruppe umbenennen"
+
+#: shell/e-shortcuts-view.c:298
+msgid "Rename selected shortcut group to:"
+msgstr "Ausgewählte Verknüpfungsgruppe umbenennen in:"
+
+#: shell/e-shortcuts-view.c:308
 msgid "_Small Icons"
 msgstr "Kleine Icons"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:309
 msgid "Show the shortcuts as small icons"
 msgstr "Die Verknüpfungen als kleine Icons anzeigen"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:311
 msgid "_Large Icons"
 msgstr "Große Icons"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:312
 msgid "Show the shortcuts as large icons"
 msgstr "Die Verknüpfungen als große Icons zeigen"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:323
 msgid "_New Group..."
 msgstr "Neue Gruppe..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:324
 msgid "Create a new shortcut group"
 msgstr "Eine neue Verknüpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
-msgstr "Diese Gruppe entfernen..."
+#: shell/e-shortcuts-view.c:326
+msgid "_Remove this Group..."
+msgstr "Diese Gruppe _entfernen..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:327
 msgid "Remove this shortcut group"
 msgstr "Diese Verknüpfungsgruppe entfernen"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:329
+msgid "Re_name this Group..."
+msgstr "Diese Gruppe _umbenennen..."
+
+#: shell/e-shortcuts-view.c:330
+msgid "Rename this shortcut group"
+msgstr "Diese Verknüpfungsgruppe umbenennen"
+
+#: shell/e-shortcuts-view.c:335
 msgid "_Hide the Shortcut Bar"
 msgstr "Die Verknüpfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:336
 msgid "Hide the shortcut bar"
 msgstr "Die Verknüpfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Aktivieren"
+#: shell/e-shortcuts-view.c:455
+msgid "Rename shortcut"
+msgstr "Verknüpfung umbenennen"
+
+#: shell/e-shortcuts-view.c:456
+msgid "Rename selected shortcut to:"
+msgstr "Ausgewählte Verknüpfungsgruppe umbenennen in:"
+
+#: shell/e-shortcuts-view.c:468
+#, fuzzy
+msgid "Open the folder linked to this shortcut"
+msgstr "Diesen Ordner in einem anderen Fenster öffnen"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Diese Verknüpfung aktivieren"
+#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "In neuem Fenster öffnen"
+
+#: shell/e-shortcuts-view.c:470
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Die ausgewählte Nachricht in einem neuen Fenster öffnen"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:473
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: shell/e-shortcuts-view.c:473
+msgid "Rename this shortcut"
+msgstr "Diese Verknüpfung umbenennen"
+
+#: shell/e-shortcuts-view.c:475
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
 
@@ -7754,6 +9432,16 @@ msgstr "Operation nicht unterstützt"
 msgid "The specified type is not supported in this storage"
 msgstr "Der angegebene Typ wird für diese Speicherweise nicht unterstützt"
 
+#: shell/e-task-widget.c:167
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:172
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (zu %d%% abgeschlossen)"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Ordnername:"
@@ -7794,26 +9482,26 @@ msgstr ""
 "Dieser Druide führt Sie durch das Importieren interner\n"
 "Dateien in Evolution."
 
-#: shell/importer/intelligent.c:186
+#: shell/importer/intelligent.c:191
 msgid "Importers"
 msgstr "Importeure"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:197
+msgid "Don't import"
+msgstr "Nicht importieren"
+
+#: shell/main.c:89
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7837,7 +9525,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
 "werden, und wir hoffen auf Ihre Mitarbeit!\n"
 
-#: shell/main.c:107
+#: shell/main.c:110
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7845,86 +9533,121 @@ msgstr ""
 "Danke.\n"
 "das Evolution-Team\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
-msgstr "Evolution-Shell kann nicht initialisiert werden."
+#: shell/main.c:148
+msgid "Cannot access the Evolution shell."
+msgstr "Auf Evolution-Shell kann nicht zugegriffen werden."
 
-#: shell/main.c:184
+#: shell/main.c:208
 msgid "Disable splash screen"
 msgstr "Splashscreen deaktivieren"
 
-#: shell/main.c:185
+#: shell/main.c:209
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: shell/main.c:217
+#: shell/main.c:244
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Das Bonobo-Komponentensystem kann nicht initialisiert werden."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
+#: ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Ausschneiden"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+msgid "Copy the selection"
+msgstr "Die Auswahl kopieren"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Einen Kontakt löschen"
+#: ui/evolution-addressbook.xml.h:5
+msgid "Create new contact list"
+msgstr "Neuen Kontaktliste anlegen"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Suchen"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+msgid "Cut the selection"
+msgstr "Die Auswahl ausschneiden"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Einen Kontakt suchen"
+#: ui/evolution-addressbook.xml.h:9
+msgid "Delete selected contacts"
+msgstr "Ausgewählte Kontakte löschen"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Neuer Kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:63
-msgid "Previews the message to be printed"
-msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
-msgstr "Kontakte drucken"
+msgid "New list"
+msgstr "Neue Liste"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+msgid "Paste the clipboard"
+msgstr "Inhalt der Zwischenablage einfügen"
+
+#: ui/evolution-addressbook.xml.h:14
+msgid "Previews the contacts to be printed"
+msgstr "Zeigt eine Vorschau der zu druckenden Kontakte"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:17
+msgid "Print selected contacts"
+msgstr "Ausgewählte Kontakte drucken"
+
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Alle auswählen"
+
+#: ui/evolution-addressbook.xml.h:19
+msgid "Select all contacts"
+msgstr "Alle Kontakte auswählen"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Laden abbrechen"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Alle betrachten"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Alle Kontakte betrachten"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_Adressbuch-Quellen..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:24
+msgid "_Contact Group"
+msgstr "_Kontaktgruppe"
+
+#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
+#: ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "Kopieren"
+
+#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
+#: ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "Einfügen"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
 #: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "Nach Kontakten _suchen"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
-#: ui/evolution.xml.h:50
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "Alle auswählen"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "Werkzeuge"
 
@@ -7932,149 +9655,243 @@ msgstr "Werkzeuge"
 msgid "5 Days"
 msgstr "5 Tage"
 
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+#: ui/evolution-calendar.xml.h:2
 msgid "Alter preferences"
 msgstr "Einstellungen ändern"
 
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:7
 msgid "Create a new all day Event"
 msgstr "Ein neues ganztägiges Ereignis anlegen"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:8
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:9
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Tag"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:13
 msgid "Go To"
 msgstr "Gehe zu"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back in time"
 msgstr "In der Zeit zurückgehen"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward in time"
 msgstr "In der Zeit vorangehen"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "Gehe zu _Datum"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "Zu bestimmtem Datum gehen"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to present time"
 msgstr "Zur aktuellen Zeit gehen"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "Monat"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:22
 msgid "New _Event"
 msgstr "Neues _Ereignis"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
+msgid "Next"
+msgstr "Weiter"
+
+#: ui/evolution-calendar.xml.h:25
 msgid "Open Calendar"
 msgstr "Kalender öffnen"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:28
 msgid "Prev"
 msgstr "Zurück"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:29
 msgid "Previews the calendar to be printed"
 msgstr "Zeigt eine Vorschau des zu druckenden Kalenders"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:32
 msgid "Print calendar"
 msgstr "Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:33
 msgid "Print this Calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:18
+#: ui/evolution-calendar.xml.h:34
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Benötigte Information"
+
+#: ui/evolution-calendar.xml.h:35
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
 msgid "Save As"
 msgstr "Speichern _unter"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:37
 msgid "Save calendar as something else"
 msgstr "Kalender als etwas anderes speichern"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:38
+msgid "Settings..."
+msgstr "Einstellungen..."
+
+#: ui/evolution-calendar.xml.h:39
 msgid "Show 1 day"
 msgstr "Einen Tag zeigen"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:40
 msgid "Show 1 month"
 msgstr "1 Monat zeigen"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:41
 msgid "Show 1 week"
 msgstr "1 Woche zeigen"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:42
 msgid "Show the working week"
-msgstr "Die Arbeitswoche zeigen"
+msgstr "Die Werkwoche zeigen"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
+#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
+#: widgets/misc/e-dateedit.c:431
 msgid "Today"
 msgstr "Heute"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:44
 msgid "W_ork Week"
-msgstr "_Arbeitswoche"
+msgstr "_Werkwoche"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:45
 msgid "Week"
 msgstr "Woche"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:46
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:48
 msgid "_Day"
 msgstr "_Tag"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:49
 msgid "_Month"
 msgstr "_Monat"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:45
+#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:56
 msgid "_New"
 msgstr "_Neu"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:51
 msgid "_Open Calendar"
 msgstr "Kalender öffnen"
 
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:56
 msgid "_Week"
 msgstr "_Woche"
 
+#: ui/evolution-comp-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Schließen"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Diesen Termin abschließen"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Diesen Termin löschen"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Hauptwerkzeugleiste"
+
+#: ui/evolution-comp-editor.xml.h:7
+msgid "Preview the printed item"
+msgstr "Eine Vorschau des zu druckenden Objektes zeigen"
+
+#: ui/evolution-comp-editor.xml.h:9
+msgid "Print Pre_view"
+msgstr "Druckvorschau"
+
+#: ui/evolution-comp-editor.xml.h:11
+msgid "Print S_etup"
+msgstr "Druck_einstellungen"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Print this item"
+msgstr "Diesen Eintrag drucken"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Print..."
+msgstr "Drucken..."
+
+#: ui/evolution-comp-editor.xml.h:14 widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Speichern unter..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Save and Close"
+msgstr "Speichern und schließen"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Den Termin speichern und das Dialogfenster schließen"
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr "Diesen Eintrag auf Platte speichern"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker einrichten"
+
+#: ui/evolution-comp-editor.xml.h:19
+msgid "_Action"
+msgstr "_Aktion"
+
+#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Datei"
+
+#: ui/evolution-comp-editor.xml.h:22 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Hilfe"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Diesen Eintrag löschen"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Löschen..."
 
@@ -8083,37 +9900,23 @@ msgid "Help"
 msgstr "Hilfe"
 
 #: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Print En_velope..."
 msgstr "Umschlag drucken..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Diesen Eintrag drucken"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Drucken..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save _As..."
 msgstr "Speichern _unter..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Speichern und schließen"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Den Kontakt speichern und das Dialogfenster schließen"
 
 #: ui/evolution-contact-editor.xml.h:11
 msgid "Se_nd contact to other..."
-msgstr "Kontakt an anderen senden..."
+msgstr "Kontakt an anderen schicken..."
 
 #: ui/evolution-contact-editor.xml.h:12
 msgid "See online help"
@@ -8121,873 +9924,797 @@ msgstr "Online-Hilfe einsehen"
 
 #: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
-msgstr "_Nachricht an Kontakt senden..."
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:46 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:37
-msgid "_File"
-msgstr "_Datei"
+msgstr "_Nachricht an Kontakt schicken..."
 
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Über diese Anwendung"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Info..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Aktio_nen"
+#: ui/evolution-contact-list-editor.xml.h:2
+msgid "Delete this group"
+msgstr "Diese Gruppe löschen"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "Adress_buch... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:9
+#, fuzzy
+msgid "Save the group and close the dialog box"
+msgstr "Die Aufgabe speichern und das Dialogfenster schließen"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Löschen"
+#: ui/evolution-contact-list-editor.xml.h:10
+msgid "Se_nd group to other..."
+msgstr "Gruppe an anderen _schicken..."
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Ausschneiden"
+#: ui/evolution-contact-list-editor.xml.h:11
+msgid "Send _message to group..."
+msgstr "_Nachricht an Gruppe schicken..."
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Namen prüfen (FIXME)"
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
+msgstr "Besprechung _absagen"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Löschen"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Die Auswahl löschen"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+msgid "Forward as i_Calendar"
+msgstr "Als i_Calendar weiterleiten"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Diesen Termin abschließen"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+msgid "Forward this item via email"
+msgstr "Diesen Eintrag per E-Mail weiterleiten"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "In Ordner kopieren... (FIXME)"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:8
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopieren"
+#: ui/evolution-event-editor.xml.h:6
+msgid "Re_fresh Meeting"
+msgstr "Besprechung _aktualisieren"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Die Auswahl kopieren"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "Besprechung ansetzen"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Ausschneiden"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Besprechung ansetzen"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Die Auswahl ausschneiden"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "Aktio_nen"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Diesen Termin löschen"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customise My Evolution"
+msgstr "My Evolution anpassen"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "XML auswerfen"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Ruhig"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Die XML-UI-Beschreibung auswerfen"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "Den aktuellen Mailvorgang abbrechen"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Erster Eintrag im Ordner (FIXME)"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Erstellen"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Weiterleiten (FIXME)"
+#: ui/evolution-mail-global.xml.h:4
+msgid "Create or edit mail accounts and other preferences"
+msgstr "Mailaccounts anlegen und bearbeiten sowie andere Vorlieben"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Als vCalendar weiterleiten (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit rules for filtering new mail"
+msgstr "Regeln zum Filtern neuer Mail anlegen oder bearbeiten"
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Zum nächsten Eintrag gehen"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit virtual folder definitions"
+msgstr "Definitionen virtueller Ordner anlegen oder bearbeiten"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Zum vorigen Eintrag gehen"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Empty _Trash"
+msgstr "_Müll leeren"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Unvollständige Aufgabe (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Forget _Passwords"
+msgstr "Passwörter vergessen"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Eigenschaften der Datei ändern"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
+"Erinnerte Passwörter vergessen, so dass Sie wieder nach ihnen gefragt werden"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "Weiter"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Manage _Subscriptions..."
+msgstr "_Abonnements verwalten..."
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Einfügen"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Open a window for composing a mail message"
+msgstr "Ein Fenster zum Erstellen einer Mailnachricht öffnen"
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Inhalt der Zwischenablage einfügen"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Zurück"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Send / Receive"
+msgstr "Verschicken / Empfangen"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Druckvorschau"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send queued mail and retrieve new mail"
+msgstr "Mail in der Warteschlange verschicken und neue Mail abholen"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Druckeinstellungen..."
+#: ui/evolution-mail-global.xml.h:15
+msgid "Show message preview window"
+msgstr "Nachrichten-Vorschaufenster zeigen"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Druckeinstellungen"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Ordner auf entfernten Servern abonnieren oder abbestellen"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:17
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
-msgid "Save"
-msgstr "Speichern"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Virtual Folder _Editor..."
+msgstr "_Editor für virtuelle Ordner..."
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Den Termin speichern und das Dialogfenster schließen"
+#: ui/evolution-mail-global.xml.h:18
+msgid "_Filters..."
+msgstr "_Filter..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:23
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Die aktuelle Datei speichern"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Mail Message"
+msgstr "Nachricht _verschicken"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Besprechung ansetzen"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Settings..."
+msgstr "_Mail-Einstellungen..."
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Eine Besprechung ansetzen"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Preview Pane"
+msgstr "_Vorschaufläche"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Alle auswählen"
+#: ui/evolution-mail-global.xml.h:22
+msgid "_Send / Receive"
+msgstr "_Verschicken / Empfangen"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Alles auswählen"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker einrichten"
+#: ui/evolution-mail-list.xml.h:3
+msgid "Copy selected messages"
+msgstr "Ausgewählte Nachrichten kopieren"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Aufgabenanfrage (FIXME)"
+#: ui/evolution-mail-list.xml.h:5
+msgid "Cut selected messages"
+msgstr "Ausgewählte Nachrichten ausschneiden"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "Info..."
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "_Ausgewählte Nachrichten verbergen"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:43
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:34
-msgid "_Close"
-msgstr "Schließen"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "_Gelöschte Nachrichten verbergen"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:35
-msgid "_Contact (FIXME)"
-msgstr "Kontakt (FIXME)"
+#: ui/evolution-mail-list.xml.h:8
+msgid "Hide _Read messages"
+msgstr "Ge_lesene Nachrichten verbergen"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "Kopieren"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Verborgene Nachrichten verbergen, statt sie durchgestrichen darzustellen"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Diagnose"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Alle als gelesen markieren"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:48
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:41
-msgid "_Help"
-msgstr "_Hilfe"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr "Alle sichtbaren Nachrichten als gelesen markieren"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "Eintrag (FIXME)"
+#: ui/evolution-mail-list.xml.h:13
+msgid "Paste message in the clipboard"
+msgstr "Nachricht in der Zwischenablage einfügen"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Journaleintrag (FIXME)"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Alle gelöschten Nachrichten auf Dauer aus diesem Ordner entfernen"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Letzter Eintrag im Ordner (FIXME)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "_Alle auswählen"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Mailnachricht (FIXME)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "_Strang auswählen"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "In Ordner verschieben... (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+"Alle momentan nicht ausgewählten Nachrichten und keine anderen auswählen"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Notiz (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+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"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "Einfügen"
+#: ui/evolution-mail-list.xml.h:19
+msgid "Select all visible messages"
+msgstr "Alle sichtbaren Nachrichten wählen"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:115
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "Eigenschaften..."
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "_Alle anzeigen"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Alle auswählen"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr "Nachrichten zeigen, die zeitweilig verborgen wurden"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:49
-msgid "_Task (FIXME)"
-msgstr "Aufgabe (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Alle bereits gelesenen Nachrichten zeitweilig verbergen"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Ungelesener Eintrag (FIXME)"
+#: ui/evolution-mail-list.xml.h:23
+msgid "Temporarily hide the selected messages"
+msgstr "Die gewählten Nachrichten zeitweilig verbergen"
 
-#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:55
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:51
-msgid "_View"
-msgstr "_Ansicht"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Nachrichtenliste in Stränge geordnet"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Dienst hinzufügen"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Säubern"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Einen neuen Dienst zur Chefsesselansicht hinzufügen"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Ordner"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Einen neue E-Mail erzeugen"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "Auswahl _umkehren"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Einstellungen der Chefsesselansicht..."
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "Eigenschaften..."
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Neue Mail"
+#: ui/evolution-mail-list.xml.h:29
+msgid "_Threaded Message List"
+msgstr "Nachrichtenliste in _Strangordnung"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail-message.xml.h:1
 msgid "Apply filter rules to the selected messages"
 msgstr "Filterregeln auf die gewählten Nachrichten anwenden"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: ui/evolution-mail.xml.h:3
-msgid "Cancel the current mail operation"
-msgstr "Den aktuellen Mailvorgang abbrechen"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Change the properties of this folder"
-msgstr "Die Eigenschaften dieses Ordners ändern"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Compose"
-msgstr "Erstellen"
-
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Eine Antwort an alle Empfängern der gewählten Nachricht erstellen"
 
-#: ui/evolution-mail.xml.h:7
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Eine Antwort an die Mailingliste der gewählten Nachricht erstellen"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Eine Antwort an den Absender der gewählten Nachricht erstellen"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Ausgewählte Nachrichten in einen anderen Ordner kopieren"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "_Virtuellen Ordner aus Nachricht erzeugen"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr "Eine Regel erstellen, um Nachrichten von diesem Absender zu filtern"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Eine Regel erstellen, um Nachrichten an diese Empfänger zu filtern"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Eine Regel erstellen, um Nachrichten an diese Mailingliste zu filtern"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
 msgstr "Eine Regel erstellen, um Nachrichten mit diesem Betreff zu filtern"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
 msgstr "Einen virtuellen Ordner für diese Empfänger anlegen"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
 msgstr "Einen virtuellen Ordner für diese Mailingliste anlegen"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
 msgstr "Einen virtuellen Ordner für diesen Absender anlegen"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this subject"
 msgstr "Einen virtuellen Ordner für diesen Betreff anlegen"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Mailaccounts anlegen und bearbeiten sowie andere Vorlieben"
+#: ui/evolution-mail-message.xml.h:17
+msgid "Display the next important message"
+msgstr "Die nächste wichtige Nachricht anzeigen"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Create or edit rules for filtering new mail"
-msgstr "Regeln zum Filtern neuer Mail anlegen oder bearbeiten"
-
-#: ui/evolution-mail.xml.h:21
-msgid "Create or edit virtual folder definitions"
-msgstr "Definitionen virtueller Ordner anlegen oder bearbeiten"
-
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next message"
 msgstr "Die nächste Nachricht anzeigen"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:19
+msgid "Display the next unread message"
+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"
+
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr "Die letzte wichtige Nachricht anzeigen"
+
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous message"
 msgstr "Die vorige Nachricht anzeigen"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Empty _Trash"
-msgstr "_Müll leeren"
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr "Die letzte ungelesene Nachricht anzeigen"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:24
 msgid "Filter on Mailing _List"
 msgstr "Filter über Mailing_liste"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Se_nder"
 msgstr "Filter über Absender"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on _Recipients"
 msgstr "Filter über Empfänger"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Subject"
 msgstr "Filter über _Betreff"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-Mail erzwingen"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Forget _Passwords"
-msgstr "Passwörter vergessen"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Erinnerte Passwörter vergessen, so dass Sie wieder nach ihnen gefragt werden"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Weiterleiten"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Weiterleiten als"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward _Attached"
 msgstr "Als _Anlage weiterleiten"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
 msgstr "An _Ort und Stelle weiterleiten"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
 msgstr "Als _Zitat weiterleiten"
 
-#: ui/evolution-mail.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward the selected message in the body of a new message"
 msgstr "Die ausgewählte Nachricht im Rumpf einer neuen Nachricht weiterleiten"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message quoted like a reply"
 msgstr "Die ausgewählte Nachricht als Zitat wie in einer Antwort weiterleiten"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message to someone"
 msgstr "Die ausgewählte Nachricht an jemanden weiterleiten"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Die ausgewählte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Hide S_elected Messages"
-msgstr "Gewählte Nachrichten _verbergen"
-
-#: ui/evolution-mail.xml.h:43
-msgid "Hide _Deleted Messages"
-msgstr "Ge_löschte Nachrichten verbergen"
-
-#: ui/evolution-mail.xml.h:44
-msgid "Hide _Read messages"
-msgstr "_Gelesene Nachrichten verbergen"
-
-#: ui/evolution-mail.xml.h:45
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "Verborgene Nachrichten verbergen, statt sie durchgestrichen darzustellen"
-
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:38
 msgid "Load _Images"
 msgstr "_Bilder laden"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Manage _Subscriptions..."
-msgstr "_Abonnements verwalten..."
-
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail-message.xml.h:39
 msgid "Mar_k As Read"
 msgstr "Als _gelesen markieren"
 
-#: ui/evolution-mail.xml.h:49
-msgid "Mark All as R_ead"
-msgstr "Alle als gelesen markieren"
+#: ui/evolution-mail-message.xml.h:40
+msgid "Mark As I_mportant"
+msgstr "Als _wichtig markieren"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark As U_nread"
 msgstr "Als u_ngelesen markieren"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Mark all visible messages as read"
-msgstr "Alle sichtbaren Nachrichten als gelesen markieren"
-
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail-message.xml.h:42
 msgid "Mark the selected messages as having been read"
 msgstr "Die gewählten Nachrichten als gelesen markieren"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Alle sichtbaren Nachrichten zum Löschen vorsehen"
+
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as not having been read"
 msgstr "Die ausgewählten Nachrichten als ungelesen markieren"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages for deletion"
 msgstr "Alle sichtbaren Nachrichten zum Löschen vorsehen"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail-message.xml.h:46
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail-message.xml.h:47
 msgid "Move selected messages to another folder"
 msgstr "Ausgewählte Nachrichten in einen anderen Ordner kopieren"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Open a window for composing a mail message"
-msgstr "Ein Fenster zum Erstellen einer Mailnachricht öffnen"
-
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail-message.xml.h:49
 msgid "Open the selected message in a new window"
 msgstr "Die ausgewählte Nachricht in einem neuen Fenster öffnen"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail-message.xml.h:50
 msgid "Open the selected message in the composer to re-send it"
-msgstr "Die gewählte Nachrichten im Maileditor öffnen, um sie nochmals zu versenden"
+msgstr ""
+"Die gewählte Nachrichten im Maileditor öffnen, um sie nochmals zu verschicken"
 
-#: ui/evolution-mail.xml.h:61
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Previews the message to be printed"
+msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
 
-#: ui/evolution-mail.xml.h:62
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Alle gelöschten Nachrichten auf Dauer aus diesem Ordner entfernen"
+#: ui/evolution-mail-message.xml.h:52
+msgid "Previous"
+msgstr "Zurück"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail-message.xml.h:54
 msgid "Print Message..."
 msgstr "Nachricht drucken..."
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail-message.xml.h:55
 msgid "Print Preview..."
 msgstr "Druckvorschau..."
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail-message.xml.h:56
 msgid "Print message to the printer"
 msgstr "Nachricht auf dem Drucker drucken"
 
-#: ui/evolution-mail.xml.h:69
+#: ui/evolution-mail-message.xml.h:57
 msgid "Redirect (FIXME: implement me)"
 msgstr "Umleitung (FIXME: implementier mich)"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail-message.xml.h:58
+msgid "Reply"
+msgstr "Antworten"
+
+#: ui/evolution-mail-message.xml.h:59
+msgid "Reply to All"
+msgstr "Allen antworten"
+
+#: ui/evolution-mail-message.xml.h:62
 msgid "S_earch Message"
 msgstr "Nachricht durch_suchen"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail-message.xml.h:63
 msgid "Save the message as a text file"
 msgstr "Die Nachricht als Textdatei speichern"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail-message.xml.h:64
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach einem Text suchen"
 
-#: ui/evolution-mail.xml.h:76 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "_Alle auswählen"
-
-#: ui/evolution-mail.xml.h:77
-msgid "Select _Thread"
-msgstr "_Strang auswählen"
-
-#: ui/evolution-mail.xml.h:78
-msgid "Select all and only the messages that are not currently selected"
-msgstr "Alle momentan nicht ausgewählten Nachrichten und keine anderen auswählen"
-
-#: ui/evolution-mail.xml.h:79
-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"
-
-#: ui/evolution-mail.xml.h:80
-msgid "Select all visible messages"
-msgstr "Alle sichtbaren Nachrichten wählen"
-
-#: ui/evolution-mail.xml.h:81
-msgid "Send / Receive"
-msgstr "Senden / Empfangen"
-
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "Mail in der Warteschlange senden und neue Mail abholen"
-
-#: ui/evolution-mail.xml.h:83
+#: ui/evolution-mail-message.xml.h:65
 msgid "Show Email _Source"
-msgstr "E-Mail-_Quellcode anzeigen"
+msgstr "E-Mail-_Quellcode zeigen"
 
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail-message.xml.h:66
 msgid "Show Full _Headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: ui/evolution-mail.xml.h:85
-msgid "Show _All"
-msgstr "Alle zeigen"
-
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:67
 msgid "Show message in the normal style"
 msgstr "Nachricht im normalen Stil zeigen"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:68
 msgid "Show message with all email headers"
 msgstr "Nachricht mit allen E-Mail-Kopfzeilen zeigen"
 
-#: ui/evolution-mail.xml.h:88
-msgid "Show messages that have been temporarily hidden"
-msgstr "Nachrichten zeigen, die zeitweilig verborgen wurden"
-
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:69
 msgid "Show the raw email source of the message"
 msgstr "Den rohen E-Mail-Quellcode dieser Nachricht anzeigen"
 
-#: ui/evolution-mail.xml.h:90
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Ordner auf entfernten Servern abonnieren oder abbestellen"
-
-#: ui/evolution-mail.xml.h:91
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Alle bereits gelesenen Nachrichten zeitweilig verbergen"
-
-#: ui/evolution-mail.xml.h:92
-msgid "Temporarily hide the selected messages"
-msgstr "Die gewählten Nachrichten zeitweilig verbergen"
-
-#: ui/evolution-mail.xml.h:93
-msgid "Threaded Message list"
-msgstr "Nachrichtenliste in Stränge geordnet"
-
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:70
 msgid "Un-delete the selected messages"
 msgstr "Löschen für ausgewählte Nachrichten rückgängig machen"
 
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail-message.xml.h:71
 msgid "VFolder on Mailing _List..."
 msgstr "VOrdner über Mailing_liste..."
 
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail-message.xml.h:72
 msgid "VFolder on Se_nder..."
 msgstr "VOrdner über _Absender..."
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:73
 msgid "VFolder on _Recipients..."
 msgstr "VOrdner über _Empfänger..."
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:74
 msgid "VFolder on _Subject..."
 msgstr "VOrdner über _Betreff..."
 
-#: ui/evolution-mail.xml.h:99
-msgid "Virtual Folder _Editor..."
-msgstr "_Editor für virtuelle Ordner..."
-
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:75
 msgid "_Apply Filters"
 msgstr "Filter _anwenden"
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:76
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail-message.xml.h:77
 msgid "_Create Filter From Message"
 msgstr "Filter aus Nachricht _erzeugen"
 
-#: ui/evolution-mail.xml.h:104
-msgid "_Expunge"
-msgstr "_Säubern"
-
-#: ui/evolution-mail.xml.h:105
-msgid "_Filters..."
-msgstr "_Filter..."
-
-#: ui/evolution-mail.xml.h:106 ui/evolution.xml.h:38
-msgid "_Folder"
-msgstr "_Ordner"
-
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:79
 msgid "_Forward Message"
 msgstr "Nachricht _weiterleiten"
 
-#: ui/evolution-mail.xml.h:108 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Auswahl _umkehren"
-
-#: ui/evolution-mail.xml.h:109
-msgid "_Mail Message"
-msgstr "Nachricht _verschicken"
-
-#: ui/evolution-mail.xml.h:110
-msgid "_Mail Settings..."
-msgstr "_Mail-Einstellungen..."
-
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail-message.xml.h:80
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail.xml.h:112
+#: ui/evolution-mail-message.xml.h:81
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ui/evolution-mail.xml.h:113
+#: ui/evolution-mail-message.xml.h:82
 msgid "_Normal Display"
 msgstr "_Normale Anzeige"
 
-#: ui/evolution-mail.xml.h:114
+#: ui/evolution-mail-message.xml.h:83
 msgid "_Open Message"
 msgstr "Nachricht _öffnen"
 
-#: ui/evolution-mail.xml.h:116
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Re-send Message"
-msgstr "Nachricht _nochmals senden"
+msgstr "Nachricht _nochmals verschicken"
 
-#: ui/evolution-mail.xml.h:119
-msgid "_Send / Receive"
-msgstr "_Senden / Empfangen"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#, fuzzy
+msgid "Close this window"
+msgstr "Rauch mit Wind"
 
-#: ui/evolution-mail.xml.h:120
-msgid "_Threaded Message List"
-msgstr "Nachrichtenliste in _Stränge geordnet"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Werkzeugleisten anpassen..."
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Anpassen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Werkzeugleisten anpassen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "Schließen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Ansicht"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Beilegen"
 
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Eine Datei beilegen"
+
 #: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
 msgid "Close the current file"
 msgstr "Die aktuelle Datei schließen"
 
 #: ui/evolution-message-composer.xml.h:5
+msgid "Delete all but signature"
+msgstr "Alles außer Signatur löschen"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Diese Nachricht mit PGP verschlüsseln"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
+msgstr ""
+"Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "Format"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:10
 msgid "Insert a file as text into the message"
 msgstr "Eine Datei als Text in die Nachricht einfügen"
 
-#: ui/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert text file..."
 msgstr "Textdatei einfügen..."
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Eine Datei öffnen"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "PGP Encrypt"
 msgstr "Mit PGP verschlüsseln"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Sign"
 msgstr "Mit PGP signieren"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
 msgstr "Mit S/MIME verschlüsseln"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Sign"
 msgstr "Mit S/MIME signieren"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:240
+msgid "Save"
+msgstr "Speichern"
+
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _Draft"
 msgstr "Entwurf speichern"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "In Ordner speichern... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "In Ordner speichern..."
 
 #: ui/evolution-message-composer.xml.h:24
+msgid "Save the current file"
+msgstr "Die aktuelle Datei speichern"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Die aktuelle Datei unter anderem Namen speichern"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Die Nachricht in einem bestimmten Ordner speichern"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:27
+#, fuzzy
 msgid "Send"
-msgstr "Senden"
+msgstr "Sand"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
-msgstr "Später senden"
+msgstr "_Später verschicken"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
-msgstr "Später senden"
+msgstr "_Später verschicken"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
-msgstr "Die Mail im HTML-Format senden"
+msgstr "Die Mail im HTML-Format verschicken"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
-msgstr "Die Nachricht später senden"
+msgstr "Die Nachricht später verschicken"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
-msgstr "Diese Nachricht jetzt senden"
+msgstr "Diese Nachricht jetzt verschicken"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Anlagen anzeigen / verbergen"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Anlagen anzeigen"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Anlagen anzeigen"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Diese Nachricht mit PGP signieren"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Anzeige des BCC-Feldes an/aus"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Anzeige des CC-Feldes an/aus"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Anzeige des From-Wählers an/aus"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Anzeige des Antwort-an-Feldes an/aus"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
 msgstr "_BCC-Feld"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Cc Field"
 msgstr "_CC-Feld"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:45
+msgid "_Debug"
+msgstr "_Diagnose"
+
+#: ui/evolution-message-composer.xml.h:46
+msgid "_Delete all"
+msgstr "Alle _löschen"
+
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "_Von-Feld"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_Insert"
 msgstr "Einfügen"
 
-#: ui/evolution-message-composer.xml.h:50
-msgid "_Insert text file... (FIXME)"
-msgstr "Textdatei e_infügen... (FIXME)"
-
 #: ui/evolution-message-composer.xml.h:51
+msgid "_Insert text file..."
+msgstr "_Textdatei einfügen..."
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Öffnen..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Antwort-an-Feld"
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Sicherheit"
 
@@ -8995,119 +10722,79 @@ msgstr "_Sicherheit"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufügen"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Ordner"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Liste aktualisieren"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Liste von Ordnern aktualisieren"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Ordner aus Ihrer Liste abonnierter Ordner entfernen"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Abonnement kündigen"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Aufgabe zuweisen (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Weitersuchen"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Besprechungsanfrage (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Wiederherstellen"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Die rückgängig gemachte Aktion wiederherstellen"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Ersetzen"
+#: ui/evolution-task-editor.xml.h:1
+msgid "Cancel Task"
+msgstr "Aufgabe stornieren"
 
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Eine Zeichenkette ersetzen"
+#: ui/evolution-task-editor.xml.h:3
+msgid "Delegate Task"
+msgstr "Aufgabe delegieren"
 
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Allen antworten (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Statusbericht senden (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Auftreten überspringen (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Die Aufgabe speichern und das Dialogfenster schließen"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Noch einmal nach derselben Zeichenkette suchen"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Eine Zeichenkette suchen"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Rückgängig"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Die letzte Aktion rückgängig machen"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:33
-msgid "_Appointment (FIXME)"
-msgstr "Termin (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "Als abgeschlossen markieren (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "Antworten (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
+msgstr "Aufgabe _aktualisieren"
 
 #: ui/evolution-tasks.xml.h:2
+msgid "Copy selected task"
+msgstr "Ausgewählte Aufgabe kopieren"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
+msgid "Cut selected task"
+msgstr "Ausgewählte Aufgabe ausschneiden"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:8
+msgid "Paste task from the clipboard"
+msgstr "Aufgabe aus der Zwischenablage einfügen"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Save task as something else"
 msgstr "Aufgabe als etwas anderes speichern"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:11
+msgid "Set task view preferences"
+msgstr "Aufgaben-Ansichtseinstellungen ändern"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Tasks Preferences..."
 msgstr "Aufgaben-Vorlieben..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:13
+msgid "TasksPreferences"
+msgstr "Aufgaben-Vorlieben"
+
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "Aufgabe"
 
@@ -9115,160 +10802,200 @@ msgstr "Aufgabe"
 msgid "About Evolution..."
 msgstr "Über Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Dieses Fenster schließen"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Werkzeugleisten anpassen..."
+#: ui/evolution.xml.h:2
+msgid "Add to _Shortcut Bar"
+msgstr "Zu _Verknüpfungsleiste hinzufügen"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Anpassen"
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
+msgstr "Den Namen dieses Ordners ändern"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Werkzeugleisten anpassen"
+msgid "Copy this folder"
+msgstr "Diesen Ordner kopieren"
 
 #: ui/evolution.xml.h:7
+msgid "Create _New Folder..."
+msgstr "_Neuen Ordner anlegen..."
+
+#: ui/evolution.xml.h:8
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Eine Verknüpfung mit diesem Ordner in der Verknüpfungsleiste anlegen"
+
+#: ui/evolution.xml.h:9
+msgid "Create a new folder"
+msgstr "Einen neuen Ordner anlegen"
+
+#: ui/evolution.xml.h:13
+msgid "Delete this folder"
+msgstr "Diesen Ordner löschen"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Einen anderen Ordner anzeigen"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Beenden"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "Evolution-_FAQ"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution-_Fenster"
 
-#: ui/evolution.xml.h:11
-msgid "Evolution bar _shortcut"
-msgstr "Evolution-Leistenverknüpfung"
-
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Das Programm verlassen"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Erste Schritte"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Ein externes Dateiformat importieren"
 
-#: ui/evolution.xml.h:16
-msgid "Main toolbar"
-msgstr "Hauptwerkzeugleiste"
+#: ui/evolution.xml.h:22
+msgid "Move this folder to another place"
+msgstr "Diesen Ordner an einen anderen Ort verschieben"
 
-#: ui/evolution.xml.h:17
-msgid "Remove the selected folder"
-msgstr "Den gewählten Ordner entfernen"
+#: ui/evolution.xml.h:24
+msgid "Open in New _Window"
+msgstr "In neuem _Fenster öffnen"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
+msgstr "Diesen Ordner in einem anderen Fenster öffnen"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Information über Evolution anzeigen"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Einen Fehlerbericht mit dem Fehlermelder (Bug Buddy) einschicken"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "Ein/Aus"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Anzeige der Ordnerleiste an/aus"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Anzeige der Verknüpfungsleiste an/aus"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Offline-Arbeitsmodus an/aus."
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Die Kontaktverwaltung benutzen"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Den Kalender benutzen"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Den _Mailer benutzen"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "Den gewählten Ordner betrachten"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:38
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "Über Evolution..."
 
-#: ui/evolution.xml.h:32
-msgid "_Actions"
-msgstr "Aktio_nen"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "Termin (FIXME)"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "Kontakt (FIXME)"
+
+#: ui/evolution.xml.h:44
+msgid "_Copy..."
+msgstr "_Kopieren..."
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Ordnerleiste"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Gehe zu Ordner..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "Datei _importieren..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Mailnachricht"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:55
+msgid "_Move..."
+msgstr "_Verschieben..."
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "Neuer Ordner"
 
-#: ui/evolution.xml.h:47
-msgid "_Remove"
-msgstr "_Entfernen"
+#: ui/evolution.xml.h:58
+msgid "_Rename..."
+msgstr "_Umbenennen..."
+
+#: ui/evolution.xml.h:59
+msgid "_Shortcut"
+msgstr "_Verknüpfung"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "Verknüpfungsleiste"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "Aufgabe (FIXME)"
+
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "Offline _arbeiten"
 
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr "Die Eigenschaften von My Evolution ändern"
+
+#: ui/my-evolution.xml.h:4
+msgid "_My Evolution Settings..."
+msgstr "Einstellungen von _My Evolution..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+msgid "Address Cards"
 msgstr "Adresskarten"
 
 #: views/addressbook/galview.xml.h:2
@@ -9279,6 +11006,22 @@ msgstr "Nach Firma"
 msgid "Phone List"
 msgstr "Telefonliste"
 
+#: views/calendar/galview.xml.h:1
+msgid "Day View"
+msgstr "Tagesansicht"
+
+#: views/calendar/galview.xml.h:2
+msgid "Month View"
+msgstr "Monatsansicht"
+
+#: views/calendar/galview.xml.h:3
+msgid "Week View"
+msgstr "Wochenansicht"
+
+#: views/calendar/galview.xml.h:4
+msgid "Work Week View"
+msgstr "Werkwochenansicht"
+
 #: views/mail/galview.xml.h:1
 msgid "By Sender"
 msgstr "Nach Absender"
@@ -9379,66 +11122,140 @@ msgstr "Alle Anwesenden"
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+#, fuzzy
 msgid "%A, %B %d, %Y"
-msgstr "%A, %d. %B %Y"
+msgstr "%a, %b %d / %H:%M"
 
-#: widgets/menus/gal-view-menus.c:176
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "Aktuelle Ansicht"
 
-#: widgets/menus/gal-view-menus.c:202
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr "Ansichten definieren"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
+#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
 msgid "Now"
 msgstr "Jetzt"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+#, fuzzy
+msgid "Baltic"
+msgstr "Grundlagen"
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "Woche"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Müll"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Transaktion fehlgeschlagen"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "_Neu"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Vorgegebener Zeichensatz: "
+
+#: widgets/misc/e-charset-picker.c:202
+#, fuzzy
+msgid "Enter the character set to use"
+msgstr "Vorgegebener Zeichensatz: "
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Andere"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:167
 msgid "Save Search"
 msgstr "Suche speichren"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:238
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Speichern unter..."
-
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#, fuzzy
 msgid "Show All"
-msgstr "Alle anzeigen"
-
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Bearbeiten..."
+msgstr "Geringfügiger Hagel"
 
-#: widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Komplex..."
 
@@ -9450,6 +11267,10 @@ msgstr "Information"
 msgid "Warning"
 msgstr "Warnung"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Fehler"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Frage"
@@ -9486,3 +11307,18 @@ msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
+
+#~ msgid "WeatherInfo missing location"
+#~ msgstr "Fehlender Ort in WeatherInfo"
+
+#~ msgid "Failed to get METAR data.\n"
+#~ msgstr "Fehler beim Holen der METAR-Daten.\n"
+
+#~ msgid "Failed to get IWIN forecast data.\n"
+#~ msgstr "Fehler beim Holen der IWIN-Vorhersagedaten.\n"
+
+#~ msgid "Another update already in progress!\n"
+#~ msgstr "Eine andere Aktualisierung ist bereits im Gange!\n"
+
+#~ msgid "Retrieval failed"
+#~ msgstr "Empfang fehlgeschlagen"
author	Matthias Warkus <mawarkus@src.gnome.org>	2001-07-11 05:03:31 +0800
committer	Matthias Warkus <mawarkus@src.gnome.org>	2001-07-11 05:03:31 +0800
commit	b2716b04c952a71d385a07c32c36269024a57ea4 (patch)
tree	f04e26b7fec1dcbe429bfc6566e3b0473419dcd3 /po
parent	371e544118a2d43c011405ac905bb82e941a3eb2 (diff)
download	gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.tar gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.tar.gz gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.tar.bz2 gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.tar.lz gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.tar.xz gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.tar.zst gsoc2013-evolution-b2716b04c952a71d385a07c32c36269024a57ea4.zip