Major Update (as opposed to Sergeant Bugfix and General Rewrite).

svn path=/trunk/; revision=6593

2 files changed, 2469 insertions, 1506 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 7c30f38311..eba946e2b9 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-16  Matthias Warkus  <mawa@iname.com>
+
+	* de.po: Major update.
+
 2000-11-14  Jarkko Ranta  <jjranta@cc.joensuu.fi>
 
 	* fi.po: Updated Finnish translation.
diff --git a/po/de.po b/po/de.po
index c915917477..b5b09d6ca8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,22 +6,308 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.4\n"
-"POT-Creation-Date: 2000-10-29 14:15+0100\n"
-"PO-Revision-Date: 2000-10-29 14:19+01:00\n"
+"POT-Creation-Date: 2000-11-16 20:25+0100\n"
+"PO-Revision-Date: 2000-11-16 20:33+01: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:3046
+msgid "Card: "
+msgstr "Karte: "
+
+#: addressbook/backend/ebook/e-card.c:3048
+msgid ""
+"\n"
+"Name: "
+msgstr ""
+"\n"
+"Name: "
+
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+"\n"
+"  Präfix:     "
+
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+"\n"
+"  Vorname:     "
+
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+"\n"
+"  Zusätzlich: "
+
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+"\n"
+"  Familienname:     "
+
+#: addressbook/backend/ebook/e-card.c:3053
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr ""
+"\n"
+"  Suffix:     "
+
+#: addressbook/backend/ebook/e-card.c:3067
+msgid ""
+"\n"
+"Birth Date: "
+msgstr ""
+"\n"
+"Geburtsdatum: "
+
+#: addressbook/backend/ebook/e-card.c:3078
+msgid ""
+"\n"
+"Address:"
+msgstr ""
+"\n"
+"Adresse:"
+
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+"\n"
+"  Postfach:  "
+
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+"\n"
+"  Suffix:        "
+
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+"\n"
+"  Straße:     "
+
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+"\n"
+"  Ort:     "
+
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+"\n"
+"  Region:     "
+
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr ""
+"\n"
+"  Postleitzahl: "
+
+#: addressbook/backend/ebook/e-card.c:3086
+msgid ""
+"\n"
+"  Country:     "
+msgstr ""
+"\n"
+"  Land:     "
+
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
+"\n"
+"Postvermerk: "
+
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+"\n"
+"Telefone:\n"
+
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+"\n"
+"Telefon:"
+
+#: addressbook/backend/ebook/e-card.c:3138
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr ""
+"\n"
+"E-Mail:\n"
+
+#: addressbook/backend/ebook/e-card.c:3141
+msgid ""
+"\n"
+"E-mail:"
+msgstr ""
+"\n"
+"E-Mail:"
+
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+"\n"
+"Mailer: "
+
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+"\n"
+"Zeitzone: "
+
+#: addressbook/backend/ebook/e-card.c:3174
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+"\n"
+"Geographischer Ort: "
+
+#: addressbook/backend/ebook/e-card.c:3178
+msgid ""
+"\n"
+"Business Role: "
+msgstr ""
+"\n"
+"Berufsbezeichnung: "
+
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+"\n"
+"Firma: "
+
+#: addressbook/backend/ebook/e-card.c:3191
+msgid ""
+"\n"
+"  Name:  "
+msgstr ""
+"\n"
+"  Name:  "
+
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+"\n"
+"  Einheit:  "
+
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+"\n"
+"  Einheit2: "
+
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+"\n"
+"  Einheit3: "
+
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+"\n"
+"  Einheit4: "
+
+#: addressbook/backend/ebook/e-card.c:3199
+msgid ""
+"\n"
+"Categories: "
+msgstr ""
+"\n"
+"Kategorien: "
+
+#: addressbook/backend/ebook/e-card.c:3200
+msgid ""
+"\n"
+"Comment: "
+msgstr ""
+"\n"
+"Kommentar: "
+
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+"\n"
+"Eindeutige Zeichenkette: "
+
+#: addressbook/backend/ebook/e-card.c:3216
+msgid ""
+"\n"
+"Public Key: "
+msgstr ""
+"\n"
+"Öffentlicher Schlüssel: "
+
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1064
+#: addressbook/conduit/address-conduit.c:1012
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1058
-#: calendar/conduits/todo/todo-conduit.c:932 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1092
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Konnte Bonobo nicht initialisieren"
 
@@ -144,25 +430,28 @@ msgstr ""
 "Ein Fehler trat beim dem Versuch auf, die Pilot-\n"
 "Liste vom gnome-pilot-Dämon zu lesen"
 
-#: addressbook/conduit/address-conduit.c:194
-#: addressbook/conduit/address-conduit.c:208
-msgid "BLARG\n"
-msgstr "BLARG\n"
+#: addressbook/conduit/address-conduit.c:207
+msgid "Cursor could not be loaded\n"
+msgstr "Cursor konnte nicht geladen werden\n"
+
+#: addressbook/conduit/address-conduit.c:220
+msgid "EBook not loaded\n"
+msgstr "EBook nicht geladen\n"
 
-#: addressbook/conduit/address-conduit.c:638
-#: calendar/conduits/calendar/calendar-conduit.c:622
-#: calendar/conduits/todo/todo-conduit.c:495
+#: addressbook/conduit/address-conduit.c:579
+#: calendar/conduits/calendar/calendar-conduit.c:651
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat server"
 msgstr "Konnte den wombat-Server nicht starten"
 
-#: addressbook/conduit/address-conduit.c:639
-#: calendar/conduits/calendar/calendar-conduit.c:623
-#: calendar/conduits/todo/todo-conduit.c:496
+#: addressbook/conduit/address-conduit.c:580
+#: calendar/conduits/calendar/calendar-conduit.c:652
+#: calendar/conduits/todo/todo-conduit.c:525
 msgid "Could not start wombat"
 msgstr "Konnte wombat nicht starten"
 
-#: addressbook/conduit/address-conduit.c:665
-#: addressbook/conduit/address-conduit.c:668
+#: addressbook/conduit/address-conduit.c:613
+#: addressbook/conduit/address-conduit.c:616
 msgid "Could not read pilot's Address application block"
 msgstr "Konnte Address-Anwendungsblock des Pilot nicht lesen"
 
@@ -183,113 +472,105 @@ msgstr "Eintrag/Einträge gehört/gehören zu diesen Kategorien:"
 msgid "Available Categories:"
 msgstr "Verfügbare Kategorien:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
+#: addressbook/contact-editor/e-contact-editor.c:1266
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: addressbook/contact-editor/e-contact-editor.c:1220
+#: addressbook/contact-editor/e-contact-editor.c:1268
 msgid "Business 2"
 msgstr "Geschäftlich 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1221
+#: addressbook/contact-editor/e-contact-editor.c:1269
 msgid "Business Fax"
 msgstr "Geschäftliches Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:1270
 msgid "Callback"
 msgstr "Rückruf"
 
-#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:1272
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
 msgid "Home"
 msgstr "Zu Hause"
 
-#: addressbook/contact-editor/e-contact-editor.c:1226
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1227
+#: addressbook/contact-editor/e-contact-editor.c:1275
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
-#: addressbook/contact-editor/e-contact-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: mail/mail-config.glade.h:18
 msgid "Other"
 msgstr "Andere"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1281
 msgid "Primary"
 msgstr "Primär"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1328
 msgid "Primary Email"
 msgstr "Primäre E-Mail"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1329
 msgid "Email 2"
 msgstr "E-Mail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1330
 msgid "Email 3"
 msgstr "E-Mail 3"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Sind Sie sicher, dass Sie\n"
-"diesen Kontakt löschen wollen?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
 msgid "Delete Contact?"
 msgstr "Kontakt löschen?"
 
@@ -303,7 +584,7 @@ msgid "_Add"
 msgstr "Hinzufügen"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-mail.h:48
+#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "Löschen"
 
@@ -316,11 +597,14 @@ msgstr "Telefon-Typen"
 msgid "New phone type"
 msgstr "Neuer Telefon-Typ"
 
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:71 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:53 filter/filter.glade.h:7
+#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -373,7 +657,7 @@ msgid "C_ontacts..."
 msgstr "Kontakte..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Ca_tegories..."
 msgstr "Kategorien..."
 
@@ -435,59 +719,47 @@ msgid "No_tes:"
 msgstr "Notizen:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "Details"
 msgstr "Details"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "Address _2:"
+msgstr "Adresse _2"
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Adresse prüfen"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "Land:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "_City:"
 msgstr "Ort:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_PO Box:"
 msgstr "_Postfach:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Address _2:"
-msgstr "Adresse _2"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_State/Province:"
 msgstr "_Staat/Bundesland:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "USA"
-
 #: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "Finnland"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "Postleitzahl/_ZIP:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-msgid "Countr_y:"
-msgstr "Land:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -547,26 +819,25 @@ msgstr "Nachname:"
 msgid "_Suffix:"
 msgstr "Suffix:"
 
-#: addressbook/gui/component/addressbook.c:310
+#: addressbook/gui/component/addressbook.c:266
 msgid "As _Minicards"
 msgstr "Als _Minikarten"
 
 #.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:9
+#: addressbook/gui/component/addressbook.c:272
+#: ui/evolution-addressbook.xml.h:7
 msgid "As _Table"
 msgstr "Als Tabelle"
 
-#: addressbook/gui/component/addressbook.c:444
+#: addressbook/gui/component/addressbook.c:392
 msgid "Unable to open addressbook"
 msgstr "Kann das Adressbuch nicht öffnen"
 
-#: addressbook/gui/component/addressbook.c:449
+#: addressbook/gui/component/addressbook.c:397
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -588,7 +859,27 @@ msgstr ""
 "müssen Sie OpenLDAP herunterladen, installieren, und\n"
 "Evolution neu compilieren und installieren.\n"
 
-#: addressbook/gui/component/addressbook.c:584
+#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
+msgid "Show All"
+msgstr "Alle anzeigen"
+
+#: addressbook/gui/component/addressbook.c:509 mail/folder-browser.c:154
+msgid "Advanced..."
+msgstr "Komplex..."
+
+#: addressbook/gui/component/addressbook.c:539
+msgid "Any field contains"
+msgstr "Irgend ein Feld enthält"
+
+#: addressbook/gui/component/addressbook.c:540
+msgid "Name contains"
+msgstr "Name enthält"
+
+#: addressbook/gui/component/addressbook.c:541
+msgid "Email contains"
+msgstr "E-Mail enthält"
+
+#: addressbook/gui/component/addressbook.c:627
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -597,12 +888,12 @@ msgid "External Directories"
 msgstr "Externe Verzeichnisse"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -611,158 +902,54 @@ msgid "LDAP Server:"
 msgstr "LDAP-Server:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: mail/mail-config-druid.glade.h:37
+msgid "Name:"
+msgstr "Name:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:10
 msgid "Port Number:"
 msgstr "Portnummer:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/ldap-server-dialog.glade.h:11
 msgid "Root DN:"
 msgstr "Root-DN:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-msgid "Name:"
-msgstr "Name:"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Namen wählen"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Find..."
 msgstr "Suchen..."
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "Message Recipients"
+msgstr "Nachrichtenempfänger"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "Select name from List:"
-msgstr "Name aus Liste wählen:"
+msgid "Select Names"
+msgstr "Namen wählen"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "Nachrichtenempfänger"
+msgid "Select name from List:"
+msgstr "Name aus Liste wählen:"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "window2"
-msgstr "windows2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:33
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:34
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/alphabet.glade.h:8
+msgid "window2"
+msgstr "windows2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
 
@@ -784,191 +971,184 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:494
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "Suchen"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "Seite einrichten:"
+msgid "10 pt. Tahoma"
+msgstr "10 Punkt Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "Stilname:"
+msgid "8 pt. Tahoma"
+msgstr "8 Punkt Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "Vorschau:"
+msgid "Blank forms at end:"
+msgstr "Leere Formulare am Ende:"
 
 #: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "Optionen"
+msgid "Body"
+msgstr "Textkörper"
 
 #: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr "Dazunehmen:"
+msgid "Bottom:"
+msgstr "Unten:"
 
 #: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
-msgstr "Abschnitte:"
+msgid "Dimensions:"
+msgstr "Ausmaße:"
 
 #: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
-msgstr "Folgen einander unmittelbar"
+msgid "Font..."
+msgstr "Schrifart..."
 
 #: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
-msgstr "Buchstabenreiter an der Seite"
+msgid "Fonts"
+msgstr "Schrifarten"
 
 #: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
-msgstr "Überschriften für jeden Buchstaben"
+msgid "Footer:"
+msgstr "Fußzeile:"
 
 #: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr "Auf einer neuen Seite beginnen"
+msgid "Format"
+msgstr "Format"
 
 #: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "Anzahl Spalten:"
+msgid "Header"
+msgstr "Kopfzeile"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr "Leere Formulare am Ende:"
+msgid "Header/Footer"
+msgstr "Kopf-/Fußzeile"
 
 #: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
-msgstr "Schrifarten"
+msgid "Headings"
+msgstr "Überschriften"
 
 #: addressbook/printing/e-contact-print.glade.h:20
+msgid "Headings for each letter"
+msgstr "Überschriften für jeden Buchstaben"
+
 #: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "Schrifart..."
+msgid "Height:"
+msgstr "Höhe:"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-msgid "Headings"
-msgstr "Überschriften"
+msgid "Immediately follow each other"
+msgstr "Folgen einander unmittelbar"
 
 #: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
-msgstr "10 Punkt Tahoma"
+msgid "Include:"
+msgstr "Dazunehmen:"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "Textkörper"
+msgid "Landscape"
+msgstr "Querformat"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
-msgstr "8 Punkt Tahoma"
+msgid "Left:"
+msgstr "Links:"
 
 #: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
-msgstr "Schattierung"
+msgid "Letter tabs on side"
+msgstr "Buchstabenreiter an der Seite"
 
 #: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
-msgstr "Mit grauer Schattierung drucken"
+msgid "Margins"
+msgstr "Ränder"
 
 #: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "Format"
+msgid "Number of columns:"
+msgstr "Anzahl Spalten:"
 
 #: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "Papier"
+msgid "Options"
+msgstr "Optionen"
 
 #: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "Typ:"
+msgid "Orientation"
+msgstr "Ausrichtung"
 
 #: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "label26"
-msgstr "label26"
+msgid "Page"
+msgstr "Seite"
 
 #: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr "Ausmaße:"
+msgid "Page Setup:"
+msgstr "Seite einrichten:"
 
 #: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "Breite:"
+msgid "Paper"
+msgstr "Papier"
 
 #: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "Höhe:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Paper source:"
 msgstr "Papierquelle:"
 
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Portrait"
+msgstr "Hochformat"
+
 #: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "Ränder"
+msgid "Preview:"
+msgstr "Vorschau:"
 
 #: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "Oben:"
+msgid "Print using gray shading"
+msgstr "Mit grauer Schattierung drucken"
 
 #: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "Unten:"
+msgid "Reverse on even pages"
+msgstr "Auf geraden Seiten umkehren"
 
 #: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "Links:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Right:"
 msgstr "Rechts:"
 
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Sections:"
+msgstr "Abschnitte:"
+
 #: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "Seite"
+msgid "Shading"
+msgstr "Schattierung"
 
 #: addressbook/printing/e-contact-print.glade.h:42
 msgid "Size:"
 msgstr "Größe:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "Ausrichtung"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "Hochformat"
+#: addressbook/printing/e-contact-print.glade.h:43
+msgid "Start on a new page"
+msgstr "Auf einer neuen Seite beginnen"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "Querformat"
+#: addressbook/printing/e-contact-print.glade.h:44
+msgid "Style name:"
+msgstr "Stilname:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "Kopfzeile"
+#: addressbook/printing/e-contact-print.glade.h:45
+msgid "Top:"
+msgstr "Oben:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr "Fußzeile:"
+#: addressbook/printing/e-contact-print.glade.h:46
+#: mail/mail-config-druid.glade.h:66
+msgid "Type:"
+msgstr "Typ:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
-msgstr "Auf geraden Seiten umkehren"
+#: addressbook/printing/e-contact-print.glade.h:47
+msgid "Width:"
+msgstr "Breite:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr "Kopf-/Fußzeile"
+#: addressbook/printing/e-contact-print.glade.h:48
+msgid "label26"
+msgstr "label26"
 
 #: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
 msgid "am"
@@ -978,6 +1158,10 @@ msgstr "AM"
 msgid "pm"
 msgstr "PM"
 
+#: calendar/cal-util/timeutil.c:100
+msgid "h"
+msgstr "h"
+
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution-Kalender-Verbindung"
@@ -986,13 +1170,13 @@ msgstr "Evolution-Kalender-Verbindung"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Konfigurationswerkzeug für die Evolution-Kalender-Verbindung.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:451
+#: calendar/conduits/calendar/calendar-conduit.c:607
+#: calendar/conduits/todo/todo-conduit.c:480
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:676
-#: calendar/conduits/calendar/calendar-conduit.c:679
+#: calendar/conduits/calendar/calendar-conduit.c:706
+#: calendar/conduits/calendar/calendar-conduit.c:709
 msgid "Could not read pilot's Calendar application block"
 msgstr "Konnte Calendar-Anwendungsblock des Pilot nicht lesen"
 
@@ -1004,8 +1188,8 @@ msgstr "Evolution-ToDo-Verbindung"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Konfigurationswerkzeug für die Evolution-ToDo-Verbindung.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:549
-#: calendar/conduits/todo/todo-conduit.c:552
+#: calendar/conduits/todo/todo-conduit.c:579
+#: calendar/conduits/todo/todo-conduit.c:582
 msgid "Could not read pilot's ToDo application block"
 msgstr "Konnte den ToDo-Anwendungsblock des Pilot nicht lesen"
 
@@ -1049,15 +1233,15 @@ msgstr "Heute fälliger To-Do-Eintrag:"
 msgid "To-Do item that is overdue:"
 msgstr "Überfälliger To-Do-Eintrag:"
 
-#: calendar/gui/calendar-commands.c:386
+#: calendar/gui/calendar-commands.c:382
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
-#: calendar/gui/calendar-commands.c:410
+#: calendar/gui/calendar-commands.c:406
 msgid "Open calendar"
 msgstr "Kalender öffnen"
 
-#: calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:445
 msgid "Save calendar"
 msgstr "Kalender speichern"
 
@@ -1081,17 +1265,14 @@ msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
 #: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Public"
 msgstr "Öffentlich"
 
 #: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "Confidential"
 msgstr "Vertraulich"
 
@@ -1137,8 +1318,8 @@ msgstr ""
 #. strptime format for a date.
 #: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
-#: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
+#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
+#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -1199,393 +1380,302 @@ msgid "No summary available."
 msgstr "Keine Zusammenfassung verfügbar."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.h:14 ui/evolution-subscribe.h:10
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:10 ui/evolution-subscribe.xml.h:8
 msgid "Close"
 msgstr "Schließen"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "Weiterschlafen"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:8
 msgid "Edit appointment"
 msgstr "Termin bearbeiten"
 
+#: calendar/gui/dialogs/alarm-notify.glade.h:9 calendar/gui/gnome-cal.c:1466
+msgid "Snooze"
+msgstr "Weiterschlafen"
+
 #: calendar/gui/dialogs/alarm-notify.glade.h:10
 msgid "Snooze time (minutes)"
 msgstr "Weiterschlaf-Zeit (Minuten)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Calendar Preferences"
-msgstr "Kalender-Einstellungen"
+msgid "12 hour (am/pm)"
+msgstr "12 Stunden (am/pm)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Work week"
-msgstr "Arbeitswoche"
+msgid "24 hour"
+msgstr "24 Stunden"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Mo"
+msgid "Alarms timeout after"
+msgstr "Alarme schweigen nach"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Di"
+msgid "Audio Alarms"
+msgstr "Audio-Alarme"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Mi"
+msgid "Beep when alarm windows appear."
+msgstr "Piepsen, wenn Alarmfenster erscheinen."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Do"
+msgid "Calendar"
+msgstr "Kalender"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Fr"
+msgid "Calendar Preferences"
+msgstr "Kalender-Einstellungen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Sa"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14 calendar/gui/prop.c:528
+msgid "Colors"
+msgstr "Farben"
 
-#. Initialize by default to three-letter day names
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "So"
+msgid "Compress weekends"
+msgstr "Wochenenden komprimieren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "First day of week:"
-msgstr "Erster Tag der Woche:"
+msgid "Date navigator options"
+msgstr "Optionen zum Datumsnavigator"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:45 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Montag"
+#. populate default frame/box
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:842
+msgid "Defaults"
+msgstr "Voreinstellungen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Tuesday"
-msgstr "Dienstag"
+msgid "Display options"
+msgstr "Anzeigeoptionen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "Wednesday"
-msgstr "Mittwoch"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 calendar/gui/prop.c:610
+msgid "Due Date"
+msgstr "Fällig am"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:48
-msgid "Thursday"
-msgstr "Donnerstag"
+msgid "Enable snoozing for"
+msgstr "Weiterschlafen aktivieren für "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "Friday"
-msgstr "Freitag"
+msgid "End of day:"
+msgstr "Ende des Tages:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "Saturday"
-msgstr "Samstag"
+msgid "First day of week:"
+msgstr "Erster Tag der Woche:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:51 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Sonntag"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Start of day:"
-msgstr "Anfang des Tages:"
+msgid "Highlight"
+msgstr "Markieren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Ende des Tages:"
+msgid "Items Due Today"
+msgstr "Heute fällige Einträge"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Display options"
-msgstr "Anzeigeoptionen"
+msgid "Items Due Today:"
+msgstr "Heute fällige Einträge:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time divisions:"
-msgstr "Zeit-Unterteilungen:"
+msgid "Items Not Yet Due"
+msgstr "Noch nicht fällige Einträge"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time format:"
-msgstr "Zeitformat:"
+msgid "Items Not Yet Due:"
+msgstr "Noch nicht fällige Einträge:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Show appointment end times"
-msgstr "Endzeiten von Terminen anzeigen"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Mo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Compress weekends"
-msgstr "Wochenenden komprimieren"
+msgid "Overdue Items"
+msgstr "Überfällige Einträge"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "12 hour (am/pm)"
-msgstr "12 Stunden (am/pm)"
+msgid "Overdue Items:"
+msgstr "Überfällige Einträge:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "24 hour"
-msgstr "24 Stunden"
+msgid "Pick a color"
+msgstr "Eine Farbe auswählen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 Minuten"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 calendar/gui/prop.c:611
+#: filter/libfilter-i18n.h:18
+msgid "Priority"
+msgstr "Priorität"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 Minuten"
+msgid "Remind me of all appointments"
+msgstr "Mich an alle Termine erinnern,"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 Minuten"
+msgid "Reminders"
+msgstr "Erinnerungen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "Minuten"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Sa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 Minuten"
+msgid "Show"
+msgstr "Anzeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Date navigator options"
-msgstr "Optionen zum Datumsnavigator"
+msgid "Show appointment end times"
+msgstr "Endzeiten von Terminen anzeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Show week numbers"
 msgstr "Wochennummern zeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Calendar"
-msgstr "Kalender"
+msgid "Start of day:"
+msgstr "Anfang des Tages:"
 
+#. Initialize by default to three-letter day names
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show"
-msgstr "Anzeigen"
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "So"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "Fällig am"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "TaskPad"
+msgstr "Auftragsblock"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Do"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:612
 msgid "Time Until Due"
 msgstr "Zeit bis Fälligkeit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:14
-msgid "Priority"
-msgstr "Priorität"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Highlight"
-msgstr "Markieren"
+msgid "Time divisions:"
+msgstr "Zeit-Unterteilungen:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Overdue Items"
-msgstr "Überfällige Einträge"
+msgid "Time format:"
+msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Items Due Today"
-msgstr "Heute fällige Einträge"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Di"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Items Not Yet Due"
-msgstr "Noch nicht fällige Einträge"
+msgid "Visual Alarms"
+msgstr "Visuelle Alarme"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Farben"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Mi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "Pick a color"
-msgstr "Eine Farbe auswählen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Items Not Yet Due:"
-msgstr "Noch nicht fällige Einträge:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Items Due Today:"
-msgstr "Heute fällige Einträge:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Overdue Items:"
-msgstr "Überfällige Einträge:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "TaskPad"
-msgstr "Auftragsblock"
-
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "Voreinstellungen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Remind me of all appointments"
-msgstr "Mich an alle Termine erinnern,"
+msgid "Work week"
+msgstr "Arbeitswoche"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "minutes before they occur."
 msgstr "Minuten bevor sie auftreten."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-msgid "Visual Alarms"
-msgstr "Visuelle Alarme"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Beep when alarm windows appear."
-msgstr "Piepsen, wenn Alarmfenster erscheinen."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Audio Alarms"
-msgstr "Audio-Alarme"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "Alarms timeout after"
-msgstr "Alarme schweigen nach"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "seconds."
 msgstr "Sekunden."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-msgid "Enable snoozing for"
-msgstr "Weiterschlafen aktivieren für "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "Reminders"
-msgstr "Erinnerungen"
-
-#: calendar/gui/dialogs/task-editor.c:657
+#: calendar/gui/dialogs/task-editor.c:655
 msgid "Edit Task"
 msgstr "Auftrag bearbeiten"
 
-#: calendar/gui/dialogs/task-editor.c:663 calendar/gui/event-editor.c:303
+#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:316
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/task-editor.c:669 calendar/gui/event-editor.c:309
+#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:322
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/task-editor.c:672 calendar/gui/event-editor.c:312
+#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:325
 #, c-format
 msgid "Task - %s"
 msgstr "Auftrag - %s"
 
-#: calendar/gui/dialogs/task-editor.c:675 calendar/gui/event-editor.c:315
+#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:328
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journal-Eintrag  - %s"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
+msgid "% Comp_lete:"
+msgstr "% abgeschlossen:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "S_ummary"
-msgstr "Zusammenfassung"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Sta_rt Date:"
-msgstr "Anfangsdatum:"
+msgid "C_lassification:"
+msgstr "Klassifikation:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
-msgstr "Fällig am:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "% Comp_lete:"
-msgstr "% abgeschlossen:"
+msgid "Date Completed:"
+msgstr "Abgeschlossen am:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "_Status:"
-msgstr "Status:"
+msgid "S_ummary"
+msgstr "Zusammenfassung"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "Nicht begonnen"
+msgid "Sta_rt Date:"
+msgstr "Anfangsdatum:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "Unterwegs"
+msgid "Task"
+msgstr "Auftrag"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Completed"
-msgstr "Abgeschlossen"
+msgid "URL:"
+msgstr "URL:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "Storniert"
+msgid "_Contacts..."
+msgstr "Kontakte..."
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "_Priority:"
-msgstr "_Priorität:"
+msgid "_Due Date:"
+msgstr "Fällig am:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "High"
-msgstr "Hoch"
+msgid "_Priority:"
+msgstr "_Priorität:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "Normal"
+msgid "_Status:"
+msgstr "Status:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Low"
-msgstr "Niedrig"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "C_lassification:"
-msgstr "Klassifikation:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22 shell/e-shell-view.c:989
-#: widgets/misc/e-dateedit.c:337 widgets/misc/e-dateedit.c:709
-#: widgets/misc/e-dateedit.c:1171
-msgid "None"
-msgstr "Keine"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "Kontakte..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "Task"
-msgstr "Auftrag"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
-msgstr "Abgeschlossen am:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "URL:"
-msgstr "URL:"
+msgid "task-editor-dialog"
+msgstr "task-editor-dialog"
 
 #: calendar/gui/e-calendar-table.c:294
 msgid "Open..."
@@ -1604,12 +1694,11 @@ msgid "Mark the task complete"
 msgstr "Den Auftrag als abgeschlossen markieren"
 
 #: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:73 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/libfilter-i18n.h:7
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:163
-#: ui/evolution-addressbook.h:11 ui/evolution-contact-editor.h:12
-#: ui/evolution-contact-editor.h:19 ui/evolution-mail.h:13
+#: calendar/gui/event-editor-dialog.glade.h:55 filter/filter.glade.h:8
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:476
+#: mail/mail-config-druid.glade.h:23 mail/mail-config.glade.h:9
+#: mail/mail-view.c:165 ui/evolution-addressbook.xml.h:9
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:12
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1624,49 +1713,50 @@ msgstr "%02i Minuten-Unterteilungen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1173
 #: calendar/gui/e-week-view-main-item.c:325
 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:265 calendar/gui/e-day-view.c:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1187
 #: 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:269 calendar/gui/e-day-view.c:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1200
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: calendar/gui/e-day-view.c:2631 calendar/gui/e-day-view.c:2638
+#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2930
+#: calendar/gui/e-week-view.c:2937 calendar/gui/e-week-view.c:2946
 msgid "New appointment..."
 msgstr "Neuer Termin..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2635 calendar/gui/e-day-view.c:2642
+#: calendar/gui/e-week-view.c:2934 calendar/gui/e-week-view.c:2941
 msgid "Edit this appointment..."
 msgstr "Diesen Termin bearbeiten..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
+#: calendar/gui/e-day-view.c:2636 calendar/gui/e-week-view.c:2935
+#: ui/evolution-event-editor.xml.h:21
 msgid "Delete this appointment"
 msgstr "Diesen Termin löschen"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2643 calendar/gui/e-week-view.c:2942
 msgid "Make this appointment movable"
 msgstr "Diesen Termin beweglich machen"
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2943
 msgid "Delete this occurrence"
 msgstr "Dieses Auftreten löschen"
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2944
 msgid "Delete all occurrences"
 msgstr "Jedes Auftreten löschen"
 
@@ -1677,19 +1767,66 @@ msgstr "Jedes Auftreten löschen"
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/event-editor.c:297
+#: calendar/gui/event-editor.c:310
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/event-editor.c:342
+#: calendar/gui/event-editor.c:365
 msgid "on"
 msgstr "bei"
 
-#: calendar/gui/event-editor.c:470
-msgid "ocurrences"
-msgstr "maligem Auftreten"
+#: calendar/gui/event-editor.c:389 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "Tag"
+
+#: calendar/gui/event-editor.c:390 calendar/gui/prop.c:354
+msgid "Monday"
+msgstr "Montag"
+
+#: calendar/gui/event-editor.c:391
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: calendar/gui/event-editor.c:392
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: calendar/gui/event-editor.c:393
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: calendar/gui/event-editor.c:394
+msgid "Friday"
+msgstr "Freitag"
+
+#: calendar/gui/event-editor.c:395
+msgid "Saturday"
+msgstr "Samstag"
+
+#: calendar/gui/event-editor.c:396 calendar/gui/prop.c:353
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: calendar/gui/event-editor.c:514
+msgid "on the"
+msgstr "am"
+
+#: calendar/gui/event-editor.c:521
+msgid "th"
+msgstr "."
 
-#: calendar/gui/event-editor.c:2371 calendar/gui/print.c:1085
+#: calendar/gui/event-editor.c:675
+msgid "occurrences"
+msgstr "Auftreten"
+
+#: calendar/gui/event-editor.c:792
+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:2820 calendar/gui/print.c:1085
 #: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
@@ -1716,7 +1853,7 @@ msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
 #: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:56
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "Su_mmary:"
 msgstr "Zusammenfassung:"
 
@@ -1802,120 +1939,80 @@ msgid "Reminder"
 msgstr "Erinnerung"
 
 #: calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Recur on the"
-msgstr "Wiederholen am"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "th day of the month"
-msgstr ". Tag des Monats"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 calendar/gui/print.c:288
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/event-editor-dialog.glade.h:41 calendar/gui/print.c:288
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/event-editor-dialog.glade.h:42 calendar/gui/print.c:288
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/event-editor-dialog.glade.h:43 calendar/gui/print.c:288
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/event-editor-dialog.glade.h:44 calendar/gui/print.c:288
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Every"
-msgstr "Alle"
-
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/event-editor-dialog.glade.h:65
-msgid "month(s)"
-msgstr "Monat(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Recurrence"
-msgstr "Wiederholung"
-
-#: calendar/gui/event-editor-dialog.glade.h:55
 msgid "Appointment Basics"
 msgstr "Termin-Grundeinstellungen"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "_Starting date:"
 msgstr "Anfangsdatum:"
 
-#: calendar/gui/event-editor-dialog.glade.h:58
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "Recurrence Rule"
 msgstr "Wiederholungsregel"
 
-#: calendar/gui/event-editor-dialog.glade.h:59
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "No recurrence"
 msgstr "Keine Wiederholung"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "Simple recurrence"
 msgstr "Einfache Wiederholung"
 
-#: calendar/gui/event-editor-dialog.glade.h:61
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "Custom recurrence"
 msgstr "Benutzerdefinierte Wiederholung"
 
-#: calendar/gui/event-editor-dialog.glade.h:63
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "Every"
+msgstr "Alle"
+
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "day(s)"
 msgstr "Tag(e)"
 
-#: calendar/gui/event-editor-dialog.glade.h:64
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "Woche(n)"
 
-#: calendar/gui/event-editor-dialog.glade.h:66
+#: calendar/gui/event-editor-dialog.glade.h:47
+msgid "month(s)"
+msgstr "Monat(e)"
+
+#: calendar/gui/event-editor-dialog.glade.h:48
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: calendar/gui/event-editor-dialog.glade.h:67
+#: calendar/gui/event-editor-dialog.glade.h:49
 msgid "for"
 msgstr "für"
 
-#: calendar/gui/event-editor-dialog.glade.h:68
+#: calendar/gui/event-editor-dialog.glade.h:50
 msgid "until"
 msgstr "bis"
 
-#: calendar/gui/event-editor-dialog.glade.h:69
+#: calendar/gui/event-editor-dialog.glade.h:51
 msgid "forever"
 msgstr "für immer"
 
-#: calendar/gui/event-editor-dialog.glade.h:70
+#: calendar/gui/event-editor-dialog.glade.h:52
 msgid "Exceptions"
 msgstr "Ausnahmen"
 
-#: calendar/gui/event-editor-dialog.glade.h:72
+#: calendar/gui/event-editor-dialog.glade.h:54
 msgid "Modify"
 msgstr "Ändern"
 
-#: calendar/gui/event-editor-dialog.glade.h:74
+#: calendar/gui/event-editor-dialog.glade.h:56
 msgid "label21"
 msgstr "label21"
 
-#: calendar/gui/event-editor-dialog.glade.h:75
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution.\n"
-"\n"
-"However, the appointment will recur at the appropriate time and will be "
-"displayed properly in the calendar views."
-msgstr ""
-"Dieser Termin hat benutzerdefinierte Wiederholungsregeln, die von Evolution nicht bearbeitet werden können.\n"
-"\n"
-"Trotzdem wird der Termin sich auf die angebrachte Weise wiederholen und in den Kalenderansichten korrekt angezeigt werden."
+#: calendar/gui/event-editor-dialog.glade.h:57
+msgid "Preview"
+msgstr "Vorschau"
+
+#: calendar/gui/event-editor-dialog.glade.h:58
+msgid "Recurrence"
+msgstr "Wiederholung"
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -2013,11 +2110,11 @@ msgstr "Freitag"
 msgid "saturday"
 msgstr "Samstag"
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr "Jahr"
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr "Monat"
 
@@ -2025,19 +2122,15 @@ msgstr "Monat"
 msgid "fortnight"
 msgstr "14 Tage"
 
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr "Woche"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
-msgid "day"
-msgstr "Tag"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "Stunde"
 
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr "Minute"
 
@@ -2045,7 +2138,7 @@ msgstr "Minute"
 msgid "min"
 msgstr "min"
 
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr "Sekunde"
 
@@ -2065,8 +2158,8 @@ msgstr "gestern"
 msgid "today"
 msgstr "heute"
 
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
-#: filter/filter-datespec.c:664
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr "jetzt"
 
@@ -2155,29 +2248,30 @@ msgstr "Priorität:"
 msgid "Item Comments:"
 msgstr "Kommentar zum Eintrag:"
 
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
+#: calendar/gui/gnome-cal.c:1530
 msgid "Reminder of your appointment at "
 msgstr "Erinnerung an Ihren Termin am "
 
-#: calendar/gui/gnome-cal.c:1144
+#: calendar/gui/gnome-cal.c:1152
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Konnte den Kalender in `%s' nicht laden"
 
-#: calendar/gui/gnome-cal.c:1155
+#: calendar/gui/gnome-cal.c:1163
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Konnte keinen Kalender in `%s' anlegen"
 
-#: calendar/gui/gnome-cal.c:1166
+#: calendar/gui/gnome-cal.c:1174
 #, 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"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "OK"
 
@@ -2204,6 +2298,26 @@ msgstr ""
 msgid "Go to today"
 msgstr "Zum heutigen Tag"
 
+#: calendar/gui/print.c:288
+msgid "1st"
+msgstr "1."
+
+#: calendar/gui/print.c:288
+msgid "2nd"
+msgstr "2."
+
+#: calendar/gui/print.c:288
+msgid "3rd"
+msgstr "3."
+
+#: calendar/gui/print.c:288
+msgid "4th"
+msgstr "4."
+
+#: calendar/gui/print.c:288
+msgid "5th"
+msgstr "5."
+
 #: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6."
@@ -2372,7 +2486,7 @@ msgstr "Aktuelles Jahr (%Y)"
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:833
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:873
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
@@ -2485,69 +2599,79 @@ msgstr " Sekunden"
 msgid "Enable snoozing for "
 msgstr "Weiterschlafen aktivieren für "
 
-#: camel/camel-movemail.c:96
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: calendar/gui/weekday-picker.c:345 widgets/misc/e-calendar-item.c:416
+msgid "MTWTFSS"
+msgstr "MDMDFSS"
+
+#: calendar/gui/weekday-picker.c:347 calendar/gui/weekday-picker.c:437
+msgid "SMTWTFS"
+msgstr "SMDMDFS"
+
+#: camel/camel-movemail.c:97
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Maildatei %s konnte nicht überprüft werden: %s"
 
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#: camel/camel-movemail.c:134 camel/camel-movemail.c:181
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Lockdatei für %s konnte nicht angelegt werden: %s"
 
-#: camel/camel-movemail.c:143
+#: camel/camel-movemail.c:144
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Maildatei %s konnte nicht geöffnet werden: %s"
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:154
 #, 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:194
+#: camel/camel-movemail.c:195
 #, 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:214
+#: camel/camel-movemail.c:215
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Zeitüberschreitung beim Versuch, eine Lockdatei auf %s zu erhalten. "
 "Versuchen Sie es später noch einmal."
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:241
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fehler beim Lesen der Maildatei: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:252
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fehler beim Schreiben der temporären Maildatei: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:270
 #, 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:301
+#: camel/camel-movemail.c:302
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Pipe konnte nicht angelegt werden: %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:314
 #, c-format
 msgid "Could not fork: %s"
 msgstr "forK() konnte nicht durchgeführt werden: %s"
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:352
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-Programm fehlgeschlagen: %s"
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:353
 msgid "(Unknown error)"
 msgstr "(Unbekannter Fehler)"
 
@@ -2561,46 +2685,46 @@ msgstr "%s konnte nicht geladen werden: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul."
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:182
 #, c-format
 msgid "%s server %s"
 msgstr "%s-Server %s"
 
-#: camel/camel-remote-store.c:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-Dienst für %s auf %s"
 
-#: camel/camel-remote-store.c:230
+#: camel/camel-remote-store.c:227
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/camel-remote-store.c:231 camel/providers/imap/camel-imap-store.c:190
+#: camel/camel-remote-store.c:228
 msgid "(unknown host)"
 msgstr "(unbekannter Rechner)"
 
-#: camel/camel-service.c:119
+#: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' benötigt einen Benutzernamen-Teil"
 
-#: camel/camel-service.c:128
+#: camel/camel-service.c:129
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' braucht einen Rechnernamen-Teil"
 
-#: camel/camel-service.c:137
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%ss' braucht einen Pfad-Teil"
 
-#: camel/camel-service.c:516
+#: camel/camel-service.c:486
 #, c-format
 msgid "No such host %s."
 msgstr "Rechner %s gibt es nicht."
 
-#: camel/camel-service.c:519
+#: camel/camel-service.c:489
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Momentan ist es nicht möglich, Rechername %s aufzulösen."
@@ -2619,51 +2743,51 @@ msgstr ""
 "Verzeichnis %s konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/camel-url.c:77
+#: camel/camel-url.c:78
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL-Zeichenkette `%s' enthält kein Protokoll"
 
-#: camel/camel-url.c:92
+#: camel/camel-url.c:93
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL-Zeichenkette `%s' enthält ein ungültiges Protokoll"
 
-#: camel/camel-url.c:153
+#: camel/camel-url.c:154
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer in URL `%s' ist nicht numerisch"
 
-#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unerwartete Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:228
+#: camel/providers/imap/camel-imap-command.c:224
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:229 shell/e-storage.c:340
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: camel/providers/imap/camel-imap-command.c:370
+#: camel/providers/imap/camel-imap-command.c:366
 #, 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:406
+#: camel/providers/imap/camel-imap-command.c:402
 #, 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:219
+#: camel/providers/imap/camel-imap-folder.c:216
 #, 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:578
+#: camel/providers/imap/camel-imap-folder.c:581
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -2675,29 +2799,35 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Zum Lesen und Speichern von Mail auf IMAP-Servern."
 
-#: camel/providers/imap/camel-imap-store.c:161
-#: camel/providers/nntp/camel-nntp-store.c:292
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/imap/camel-imap-store.c:234
+#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid "Password"
 msgstr "Passwort"
 
-#: camel/providers/imap/camel-imap-store.c:163
+#: camel/providers/imap/camel-imap-store.c:236
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschlüsselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:188
-#, c-format
-msgid "Could not connect to IMAP server on %s."
-msgstr "Verbindung zu IMAP-Server auf %s konnte nicht hergestellt werden."
+#: camel/providers/imap/camel-imap-store.c:245
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/providers/imap/camel-imap-store.c:247
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
+msgstr ""
+"Dies verbindet mit dem IMAP-Server und benutzt Kerberos 4, um sich zu "
+"legitimieren."
 
-#: camel/providers/imap/camel-imap-store.c:252
+#: camel/providers/imap/camel-imap-store.c:333
 #, 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:274
+#: camel/providers/imap/camel-imap-store.c:359
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2708,23 +2838,23 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:479
+#: camel/providers/imap/camel-imap-store.c:539
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
 #. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:220
+#: camel/providers/mbox/camel-mbox-folder.c:223
 msgid "Could not create summary"
 msgstr "Zusammenfassung konnte nicht erzeugt werden"
 
-#: camel/providers/mbox/camel-mbox-folder.c:383
-#: camel/providers/mbox/camel-mbox-folder.c:386
+#: camel/providers/mbox/camel-mbox-folder.c:378
+#: camel/providers/mbox/camel-mbox-folder.c:381
 #, c-format
 msgid "Cannot append message to mbox file: %s"
 msgstr "Nachricht kann nicht an mbox-Datei angehängt werden: %s"
 
-#: camel/providers/mbox/camel-mbox-folder.c:489
+#: camel/providers/mbox/camel-mbox-folder.c:485
 #, c-format
 msgid "Cannot get message: %s"
 msgstr "Nachricht kann nicht abgerufen werden: %s"
@@ -2741,7 +2871,7 @@ msgstr ""
 "Zum Lesen von Mail, die vom lokalen System geliefert wird, und zum Speichern "
 "von Mail auf einer lokalen Platte."
 
-#: camel/providers/mbox/camel-mbox-store.c:121
+#: camel/providers/mbox/camel-mbox-store.c:118
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -2750,13 +2880,13 @@ msgstr ""
 "Datei `%s' konnte nicht geöffnet werden:\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:128
-#: camel/providers/mh/camel-mh-store.c:122
+#: camel/providers/mbox/camel-mbox-store.c:125
+#: camel/providers/mh/camel-mh-store.c:119
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Ordner `%s' existiert nicht."
 
-#: camel/providers/mbox/camel-mbox-store.c:137
+#: camel/providers/mbox/camel-mbox-store.c:134
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2765,14 +2895,14 @@ msgstr ""
 "Datei `%s' konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:146
-#: camel/providers/mbox/camel-mbox-store.c:180
+#: camel/providers/mbox/camel-mbox-store.c:143
+#: camel/providers/mbox/camel-mbox-store.c:177
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ist keine reguläre Datei."
 
-#: camel/providers/mbox/camel-mbox-store.c:172
-#: camel/providers/mbox/camel-mbox-store.c:208
+#: camel/providers/mbox/camel-mbox-store.c:169
+#: camel/providers/mbox/camel-mbox-store.c:205
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2781,86 +2911,86 @@ msgstr ""
 "Ordner `%s' konnte nicht gelöscht werden:\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:187
+#: camel/providers/mbox/camel-mbox-store.c:184
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ordner `%s' ist nicht leer. Nicht gelöscht."
 
-#: camel/providers/mbox/camel-mbox-store.c:225
+#: camel/providers/mbox/camel-mbox-store.c:222
 #, c-format
 msgid "Could not rename folder %s to %s: destination exists"
 msgstr "Ordner %s konnte nicht in %s umbenannt werden: Ziel existiert"
 
-#: camel/providers/mbox/camel-mbox-store.c:263
+#: camel/providers/mbox/camel-mbox-store.c:260
 msgid "Mbox folders may not be nested."
 msgstr "Mbox-Ordner können nicht geschachtelt werden."
 
-#: camel/providers/mbox/camel-mbox-store.c:277
+#: camel/providers/mbox/camel-mbox-store.c:274
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokale Maildatei %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:650
+#: camel/providers/mbox/camel-mbox-summary.c:667
 #, c-format
 msgid "Could not open summary %s"
 msgstr "Zusammenfassung %s konnte nicht geöffnet werden"
 
-#: camel/providers/mbox/camel-mbox-summary.c:671
+#: camel/providers/mbox/camel-mbox-summary.c:688
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Temporäre Mailbox konnte nicht angelegt werden: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:715
+#: camel/providers/mbox/camel-mbox-summary.c:734
 msgid "Summary mismatch, aborting sync"
 msgstr "Zusammenfassungs-Prüffehler, Synchronisation wird abgebrochen"
 
-#: camel/providers/mbox/camel-mbox-summary.c:735
+#: camel/providers/mbox/camel-mbox-summary.c:754
 msgid "Summary mismatch, X-Evolution header missing"
 msgstr "Zusammenfassungs-Prüffehler, X-Evolution-Kopfzeile fehlt"
 
-#: camel/providers/mbox/camel-mbox-summary.c:757
+#: camel/providers/mbox/camel-mbox-summary.c:776
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fehler beim Schreiben auf temporäre Mailbox: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:770
-#: camel/providers/mbox/camel-mbox-summary.c:788
+#: camel/providers/mbox/camel-mbox-summary.c:789
+#: camel/providers/mbox/camel-mbox-summary.c:807
 #, c-format
 msgid "Cannot copy data to output file: %s"
 msgstr "Daten können nicht in Ausgabedatei kopiert werden: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:813
+#: camel/providers/mbox/camel-mbox-summary.c:832
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:822
+#: camel/providers/mbox/camel-mbox-summary.c:841
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Temporärer Ordner konnte nicht geschlossen werden: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:830
+#: camel/providers/mbox/camel-mbox-summary.c:849
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:842
+#: camel/providers/mbox/camel-mbox-summary.c:861
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %s"
 
 #. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:211
+#: camel/providers/mh/camel-mh-folder.c:213
 msgid "Could not load or create summary"
 msgstr "Zusammenfassung konnte nicht erzeugt oder geladen werden"
 
-#: camel/providers/mh/camel-mh-folder.c:330
-#: camel/providers/mh/camel-mh-folder.c:333
+#: camel/providers/mh/camel-mh-folder.c:336
+#: camel/providers/mh/camel-mh-folder.c:339
 #, c-format
 msgid "Cannot append message to mh folder: %s"
 msgstr "Nachricht kann nicht an mh-Ordner angehängt werden: %s"
 
-#: camel/providers/mh/camel-mh-folder.c:399
+#: camel/providers/mh/camel-mh-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2877,7 +3007,7 @@ msgstr "Mailverzeichnisse im UNIX-MH-Format"
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Zum Speichern lokaler Mail in Mailverzeichnissen im MH-Format"
 
-#: camel/providers/mh/camel-mh-store.c:115
+#: camel/providers/mh/camel-mh-store.c:112
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -2886,7 +3016,7 @@ msgstr ""
 "Ordner `%s' konnte nicht geöffnet werden:\n"
 "%s"
 
-#: camel/providers/mh/camel-mh-store.c:130
+#: camel/providers/mh/camel-mh-store.c:127
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -2895,33 +3025,33 @@ msgstr ""
 "Ordner `%s' konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/mh/camel-mh-store.c:139
+#: camel/providers/mh/camel-mh-store.c:136
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ist kein Verzeichnis."
 
-#: camel/providers/mh/camel-mh-store.c:158
-#: camel/providers/mh/camel-mh-store.c:171
+#: camel/providers/mh/camel-mh-store.c:155
+#: camel/providers/mh/camel-mh-store.c:168
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ordner `%s' konnte nicht gelöscht werden: %s"
 
-#: camel/providers/mh/camel-mh-store.c:189
-#: camel/providers/mh/camel-mh-store.c:193
+#: camel/providers/mh/camel-mh-store.c:186
+#: camel/providers/mh/camel-mh-store.c:190
 #, c-format
 msgid "Could not rename folder `%s': %s"
 msgstr "Ordner `%s' konnte nicht umbenannt werden: %s"
 
-#: camel/providers/mh/camel-mh-store.c:197
+#: camel/providers/mh/camel-mh-store.c:194
 #, c-format
 msgid "Could not rename folder `%s': %s exists"
 msgstr "Ordner `%s' konnte nicht umbenannt werden: %s existiert"
 
-#: camel/providers/mh/camel-mh-store.c:205
+#: camel/providers/mh/camel-mh-store.c:202
 msgid "MH folders may not be nested."
 msgstr "MH-Ordner können nicht geschachtelt werden."
 
-#: camel/providers/mh/camel-mh-store.c:217
+#: camel/providers/mh/camel-mh-store.c:214
 #, c-format
 msgid "Local mail directory %s"
 msgstr "Lokales Mailverzeichnis %s"
@@ -2952,13 +3082,13 @@ msgstr "Nachricht %s nicht gefunden."
 msgid "Could not get group list from server."
 msgstr "Gruppenliste konnte nicht vom Server abgerufen werden."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:93
-#: camel/providers/nntp/camel-nntp-grouplist.c:102
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
 #, 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:151
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "grouplist-Datei für %s konnte nicht gespeichert werden: %s"
@@ -2977,12 +3107,12 @@ msgstr ""
 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:287
+#: camel/providers/nntp/camel-nntp-store.c:288
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-News über %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:294
+#: camel/providers/nntp/camel-nntp-store.c:295
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -2990,8 +3120,8 @@ msgstr ""
 "Diese Option führt die Legitimation am NNTP-Server mit einem "
 "unverschlüsselten Passwort durch."
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:499
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
 #, 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"
@@ -3024,7 +3154,7 @@ msgstr ""
 "om Mail von manchen Web-Mailprovidern und proprietären E-Mail-Systemen "
 "abzurufen."
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:150
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3032,7 +3162,7 @@ msgstr ""
 "Diese Option wird mit dem POP-Server unter einem unverschlüsselten Passwort "
 "verbinden. Viele POP-Server unterstützen nur dies."
 
-#: camel/providers/pop3/camel-pop3-store.c:162
+#: camel/providers/pop3/camel-pop3-store.c:160
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -3042,29 +3172,29 @@ msgstr ""
 "über das APO-Protokoll verbinden. Dies funktioniert evtl. nicht für alle "
 "Benutzer, sogar auf Servern, die behaupten, es zu unterstützen."
 
-#: camel/providers/pop3/camel-pop3-store.c:174
+#: camel/providers/pop3/camel-pop3-store.c:172
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dies verbindet mit dem POP-Server und benutzt Kerberos 4, um sich zu "
 "legitimieren."
 
-#: camel/providers/pop3/camel-pop3-store.c:219
+#: camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Legitimation beim KPOP-Server konnte nicht erfolgen: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Verbindung zu POP-Server auf %s konnte nicht hergestellt werden."
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:389
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sBitte geben Sie das POP3-Passwort für %s@%s ein"
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3073,12 +3203,12 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Benutzernamens: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:411
+#: camel/providers/pop3/camel-pop3-store.c:448
 msgid "(Unknown)"
 msgstr "(Unbekannt)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:438
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3086,7 +3216,7 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Keine Unterstützung für den verlangten Legitimationsmechanismus."
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3095,7 +3225,7 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:554
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
@@ -3162,107 +3292,108 @@ msgstr "E-Mail-Quelle: Virtueller Ordner"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Zum Lesen von Mail in Form einer Abfrage über andere Ordner"
 
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 Byte"
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u Bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:94
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1f kB"
 
-#: composer/e-msg-composer-attachment-bar.c:98
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1f MB"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1f GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:299 mail/mail-display.c:118
+#: composer/e-msg-composer-attachment-bar.c:301 mail/mail-display.c:117
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:397
+#: ui/evolution-message-composer.xml.h:8
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: composer/e-msg-composer-attachment-bar.c:442 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:13
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:443
+#: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
 msgstr "Entferne das gewählte Element aus der Anlagenliste"
 
-#: composer/e-msg-composer-attachment-bar.c:474
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Add attachment..."
 msgstr "Anlage hinzufügen..."
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:477
 msgid "Attach a file to the message"
 msgstr "Eine Datei zu der Nachricht hinzufügen"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: composer/e-msg-composer-attachment.glade.h:7
 msgid "Attachment properties"
 msgstr "Anlagen-Eigenschaften"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
-msgstr "MIME-Typ:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "File name:"
 msgstr "Dateiname:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
+#: composer/e-msg-composer-attachment.glade.h:10
+msgid "MIME type:"
+msgstr "MIME-Typ:"
+
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
+#: mail/mail-format.c:599
 msgid "From:"
 msgstr "Von:"
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Für das Adressbuch hier klicken"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:291
 msgid "Enter the identity you wish to send this message from"
 msgstr "Geben Sie die Identität ein, mit der Sie diese Nachricht senden wollen"
 
-#: composer/e-msg-composer-hdrs.c:300
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:603
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "Gebe die Empfänger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:305
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:605
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:301
 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:311
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3270,15 +3401,15 @@ msgstr ""
 "Gebe die Adressen ein, die eine Kopie erhalten, dienicht in der "
 "Empfängerliste auftaucht."
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:607
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Gebe den Betreff der Nachricht an"
 
-#: composer/e-msg-composer.c:299
+#: composer/e-msg-composer.c:428
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3287,38 +3418,38 @@ msgstr ""
 "Signaturdatei %s konnte nicht geöffnet werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:406
+#: composer/e-msg-composer.c:595
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: composer/e-msg-composer.c:417
+#: composer/e-msg-composer.c:606
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:437
+#: composer/e-msg-composer.c:626
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:459
+#: composer/e-msg-composer.c:648
 msgid "Saving changes to message..."
 msgstr "Speichere Änderungen an Nachricht..."
 
-#: composer/e-msg-composer.c:461
+#: composer/e-msg-composer.c:650
 msgid "Save changes to message..."
 msgstr "Änderungen an Nachricht speichern..."
 
-#: composer/e-msg-composer.c:502
+#: composer/e-msg-composer.c:691
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Fehler beim Speichern des Erstellen in 'Entwürfe': %s"
 
-#: composer/e-msg-composer.c:546 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:735 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:552
+#: composer/e-msg-composer.c:741
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3328,27 +3459,27 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre Änderungen speichern?"
 
-#: composer/e-msg-composer.c:574
+#: composer/e-msg-composer.c:763
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:889
 msgid "That file does not exist."
 msgstr "Diese Datei existiert nicht."
 
-#: composer/e-msg-composer.c:710
+#: composer/e-msg-composer.c:899
 msgid "That is not a regular file."
 msgstr "Diese Datei ist keine normale Datei."
 
-#: composer/e-msg-composer.c:720
+#: composer/e-msg-composer.c:909
 msgid "That file exists but is not readable."
 msgstr "Diese Datei existiert, ist aber nicht lesbar."
 
-#: composer/e-msg-composer.c:730
+#: composer/e-msg-composer.c:919
 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:752
+#: composer/e-msg-composer.c:941
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3356,47 +3487,59 @@ 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:773
+#: composer/e-msg-composer.c:962
 msgid "An error occurred while reading the file."
 msgstr "Ein Fehler trat beim Lesen der Datei auf."
 
-#: composer/e-msg-composer.c:1136
+#: composer/e-msg-composer.c:1339
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1416
 msgid "Could not create composer window."
 msgstr "Konnte Erstellungsfenster nicht erzeugen."
 
-#: filter/filter-datespec.c:61
+#: composer/evolution-composer.c:307
+msgid "Cannot initialize Evolution's composer."
+msgstr "Evolutions Maileditor kann nicht initialisiert werden."
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "Jahre"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "Monate"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "Wochen"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:65
 msgid "days"
 msgstr "Tage"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "Stunden"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "Minuten"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "Sekunden"
 
-#: filter/filter-datespec.c:232
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr "Hoppla. Sie haben vergessen, ein Datum zu wählen."
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr "Hoppla. Sie haben ein ungültiges Datum gewählt."
+
+#: filter/filter-datespec.c:259
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -3406,7 +3549,7 @@ msgstr ""
 "verglichen, zu der der Filter ausgeführt oder\n"
 "der VFolder geöfnet wird."
 
-#: filter/filter-datespec.c:254
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -3414,7 +3557,7 @@ msgstr ""
 "Das Datum der Nachricht wird mit der hier\n"
 "von Ihnen angegebenen Zeit verglichen."
 
-#: filter/filter-datespec.c:293
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -3425,42 +3568,37 @@ msgstr ""
 "Zeit, z.B. \"vor einer Woche\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "the current time"
 msgstr "der aktuellen Zeit"
 
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr "einer von Ihnen angegebene Zeit"
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:358
 msgid "a time relative to the current time"
 msgstr "einer zur momentanen Zeit relativen Zeit"
 
 #. The label
-#: filter/filter-datespec.c:387
+#: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr "Vergleichen mit"
 
-#: filter/filter-datespec.c:661
+#: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<hier klicken, um ein Datum zu wählen>"
 
-#: filter/filter-editor.c:159 mail/mail-autofilter.c:287
-#: mail/mail-autofilter.c:336
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
+#: mail/mail-autofilter.c:333
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
-#: filter/filter-editor.c:207
+#: filter/filter-editor.c:233
 msgid "Edit Filter Rule"
 msgstr "Filterregel bearbeiten"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: filter/filter-editor.c:404 filter/filter.glade.h:7
+#: filter/filter-editor.c:456 filter/filter.glade.h:10
 msgid "Edit Filters"
 msgstr "Filter bearbeiten"
 
@@ -3477,226 +3615,271 @@ msgstr "Aktion hinzufügen"
 msgid "Remove action"
 msgstr "Aktion entfernen"
 
-#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+"Hoppla, Sie haben vergessen, einen Ordner zu wählen.\n"
+"Bitte gehen Sie zurück und wählen Sie einen gültigen Ordner zum Ausliefern "
+"der Mail."
+
+#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
-#: filter/filter-folder.c:209
+#: filter/filter-folder.c:235
 msgid "Enter folder URI"
 msgstr "Ordner-URI eingeben"
 
-#: filter/filter-folder.c:254
+#: filter/filter-folder.c:281
 msgid "<click here to select a folder>"
 msgstr "<hier klicken, um einen Ordner zu wählen>"
 
-#: filter/filter-part.c:420
+#: filter/filter-input.c:188
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Fehler im regulären Ausdruck '%s':\n"
+"%s"
+
+#: filter/filter-part.c:458
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:509
+#: filter/filter-rule.c:520
 msgid "Rule name: "
 msgstr "Regelname: "
 
-#: filter/filter-rule.c:513
+#: filter/filter-rule.c:524
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:527
+#: filter/filter-rule.c:538
 msgid "If"
 msgstr "Wenn"
 
-#: filter/filter-rule.c:544
+#: filter/filter-rule.c:555
 msgid "Execute actions"
 msgstr "Aktionen ausführen"
 
-#: filter/filter-rule.c:548
+#: filter/filter-rule.c:559
 msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:553
+#: filter/filter-rule.c:564
 msgid "if any criteria are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:575
 msgid "Add criterion"
 msgstr "Kriterium hinzufügen"
 
-#: filter/filter-rule.c:570
+#: filter/filter-rule.c:581
 msgid "Remove criterion"
 msgstr "Kriterium entfernen"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-"Ankommend\n"
-"Ausgehend\n"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Filterregeln"
-
-#: filter/filter.glade.h:13 filter/filter.glade.h:18
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
+#: filter/filter.glade.h:9 mail/folder-browser.c:463
+#: mail/mail-config-druid.glade.h:26 mail/mail-config.glade.h:10
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:11
 msgid "Edit VFolders"
 msgstr "VOrdner bearbeiten"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:12
+msgid "Filter Rules"
+msgstr "Filterregeln"
+
+#: filter/filter.glade.h:14
 msgid "Virtual Folders"
 msgstr "Virtuelle Ordner"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23
+#: filter/filter.glade.h:15
 msgid "vFolder Sources"
 msgstr "vOrdner-Quellen"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:2 mail/message-list.c:511
+msgid "Answered"
+msgstr "Beantwortet"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Farbe zuweisen"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Sendedatum"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
+msgid "Deleted"
+msgstr "Gelöscht"
+
+#: filter/libfilter-i18n.h:10
+msgid "Draft"
+msgstr "Entwurf"
+
+#: filter/libfilter-i18n.h:11
 msgid "Expression"
-msgstr "Ausdrucl"
+msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
+msgid "Flagged"
+msgstr "Markiert"
+
+#: filter/libfilter-i18n.h:13
 msgid "Forward to Address"
 msgstr "Weiterleiten an Adresse"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:14
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:15
 msgid "Message was received"
 msgstr "Nachricht wurde empfangen"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:16
 msgid "Message was sent"
 msgstr "Nachricht wurde gesendet"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:17
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:19
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:20 mail/message-list.c:508
+msgid "Seen"
+msgstr "Gelesen"
+
+#: filter/libfilter-i18n.h:21
 msgid "Sender"
 msgstr "Absender"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:24
+msgid "Set Flag"
+msgstr "Marke setzen"
+
+#: filter/libfilter-i18n.h:25
+msgid "Source"
+msgstr "Quelle"
+
+#: filter/libfilter-i18n.h:27
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:28
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:29
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:30
 msgid "after"
 msgstr "nach"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:31
 msgid "before"
 msgstr "vor"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:32
 msgid "contains"
 msgstr "enthält"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:33
 msgid "does not contain"
 msgstr "enthält nicht"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:34
 msgid "does not end with"
 msgstr "endet nicht mit"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:35
 msgid "does not exist"
 msgstr "existiert nicht"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:36
 msgid "does not match regex"
 msgstr "passt nicht auf Regex"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:37
+msgid "does not sound like"
+msgstr "klingt nicht wie"
+
+#: filter/libfilter-i18n.h:38
 msgid "does not start with"
 msgstr "beginnt nicht mit"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:39
 msgid "ends with"
 msgstr "endet mit"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:40
 msgid "exists"
 msgstr "existiert"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:41
 msgid "is greater than"
 msgstr "ist größer als"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:42
 msgid "is less than"
 msgstr "ist kleiner als"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:43
 msgid "is not"
 msgstr "ist nicht"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:44
 msgid "is"
 msgstr "ist"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:45
 msgid "matches regex"
 msgstr "passt auf Regex"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:46
 msgid "on or after"
 msgstr "am oder nach"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:47
 msgid "on or before"
 msgstr "am oder vor"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:48
+msgid "sounds like"
+msgstr "klingt wie"
+
+#: filter/libfilter-i18n.h:49
 msgid "starts with"
 msgstr "beginnt mit"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:50
 msgid "was after"
 msgstr "war nach"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:51
 msgid "was before"
 msgstr "war vor"
 
@@ -3733,67 +3916,149 @@ msgstr ""
 msgid "Cannot initialize Evolution's mail storage hash."
 msgstr "Evolutions Mailspeicherungs-Hash kann nicht initialisiert werden."
 
-#: mail/component-factory.c:323
-#, c-format
-msgid "Bad storage URL (no server): %s"
-msgstr "Ungültiger Speicher-URL (kein Server): %s"
-
-#: mail/component-factory.c:342
+#: mail/component-factory.c:279
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser.c:137
+#: mail/folder-browser.c:156 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save"
+msgstr "Speichern"
+
+#: mail/folder-browser.c:169
 msgid "Body or subject contains"
 msgstr "Rumpf oder Betreff enthält"
 
-#: mail/folder-browser.c:138
+#: mail/folder-browser.c:170
 msgid "Body contains"
 msgstr "Rumpf enthält"
 
-#: mail/folder-browser.c:139
+#: mail/folder-browser.c:171
 msgid "Subject contains"
 msgstr "Betreff enthält"
 
-#: mail/folder-browser.c:140
+#: mail/folder-browser.c:172
 msgid "Body does not contain"
 msgstr "Rumpf enthält nicht"
 
-#: mail/folder-browser.c:141
+#: mail/folder-browser.c:173
 msgid "Subject does not contain"
 msgstr "Betreff enthält nicht"
 
-#: mail/folder-browser.c:142
-msgid "Custom search"
-msgstr "Benutzerdefinierte Suche"
+#: mail/folder-browser.c:451
+msgid "VFolder on Subject"
+msgstr "VOrdner über Betreffzeile"
+
+#: mail/folder-browser.c:452
+msgid "VFolder on Sender"
+msgstr "VOrdner über Absender"
 
-#: mail/folder-browser.c:314
-msgid "Custom"
-msgstr "Benutzerdefiniert"
+#: mail/folder-browser.c:453
+msgid "VFolder on Recipients"
+msgstr "VOrdner über Empfänger"
 
-#: mail/folder-browser.c:492
-msgid "Full Search"
-msgstr "Volle Suche"
+#: mail/folder-browser.c:455
+msgid "Filter on Subject"
+msgstr "Filter über Betreffzeile"
 
-#: mail/folder-browser.c:497
-msgid "Save"
-msgstr "Speichern"
+#: mail/folder-browser.c:456
+msgid "Filter on Sender"
+msgstr "Filter über Absender"
 
-#: mail/mail-autofilter.c:76
+#: mail/folder-browser.c:457
+msgid "Filter on Recipients"
+msgstr "Filter über Empfänger"
+
+#: mail/folder-browser.c:458 mail/folder-browser.c:543
+msgid "Filter on Mailing List"
+msgstr "Filter über Mailingliste"
+
+#: mail/folder-browser.c:462 ui/evolution-message-composer.xml.h:16
+msgid "Open"
+msgstr "Öffnen"
+
+#: mail/folder-browser.c:464 mail/mail-view.c:163
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
+#: ui/evolution-mail.xml.h:29
+msgid "Print"
+msgstr "Drucken"
+
+#: mail/folder-browser.c:466
+msgid "Reply to Sender"
+msgstr "Antwort an Absender"
+
+#: mail/folder-browser.c:467 mail/mail-view.c:156 ui/evolution-mail.xml.h:35
+msgid "Reply to All"
+msgstr "Allen antworten"
+
+#: mail/folder-browser.c:468 mail/mail-view.c:159 ui/evolution-mail.xml.h:18
+msgid "Forward"
+msgstr "Weiterleiten"
+
+#: mail/folder-browser.c:469 ui/evolution-mail.xml.h:19
+msgid "Forward as Attachment"
+msgstr "Als Anlage weiterleiten"
+
+#: mail/folder-browser.c:471
+msgid "Mark as Read"
+msgstr "Als gelesen markieren"
+
+#: mail/folder-browser.c:472
+msgid "Mark as Unread"
+msgstr "Als ungelesen markieren"
+
+#: mail/folder-browser.c:474
+msgid "Move to Folder..."
+msgstr "In Ordner verschieben..."
+
+#: mail/folder-browser.c:475
+msgid "Copy to Folder..."
+msgstr "In Ordner kopieren..."
+
+#: mail/folder-browser.c:477
+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:481
+msgid "Apply Filters"
+msgstr "Filter anwenden"
+
+#: mail/folder-browser.c:483 ui/evolution-mail.xml.h:11
+msgid "Create Rule From Message"
+msgstr "Regel aus Nachricht erzeugen"
+
+#: mail/folder-browser.c:485
+msgid "View Message Source"
+msgstr "Nachrichtenquellcode betrachten"
+
+#: mail/folder-browser.c:545
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr "Filter über Mailingliste (%s)"
+
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail an %s"
 
+#: mail/mail-autofilter.c:214
+#, c-format
+msgid "Subject is %s"
+msgstr "Betreff ist %s"
+
 #: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
 
-#: mail/mail-autofilter.c:332
+#: mail/mail-autofilter.c:329
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
 
-#: mail/mail-callbacks.c:73
+#: mail/mail-callbacks.c:74
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3805,7 +4070,7 @@ msgstr ""
 "empfangen oder erstellen können.\n"
 "Möchten Sie ihn jetzt konfigurieren?"
 
-#: mail/mail-callbacks.c:113
+#: mail/mail-callbacks.c:114
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -3813,7 +4078,7 @@ msgstr ""
 "Sie müssen eine Identität einrichten,\n"
 "bevor Sie Mail erstellen können."
 
-#: mail/mail-callbacks.c:127
+#: mail/mail-callbacks.c:128
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -3821,19 +4086,19 @@ msgstr ""
 "Sie müssen einen Mailtransport einrichten,\n"
 "bevor Sie Mail erstellen können."
 
-#: mail/mail-callbacks.c:163 mail/mail-callbacks.c:175
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
 msgid "You have no mail sources configured"
 msgstr "Sie haben keine Mailquellen konfiguriert"
 
-#: mail/mail-callbacks.c:212
+#: mail/mail-callbacks.c:213
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Mailtransport-Methode eingestellt"
 
-#: mail/mail-callbacks.c:221
+#: mail/mail-callbacks.c:222
 msgid "You have no Outbox configured"
 msgstr "Sie haben keinen Ordner für ausgehende Mail konfiguriert"
 
-#: mail/mail-callbacks.c:245
+#: mail/mail-callbacks.c:246
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3841,19 +4106,19 @@ msgstr ""
 "Diese Nachricht hat keine Betreffzeile.\n"
 "Wirklich senden?"
 
-#: mail/mail-callbacks.c:290
+#: mail/mail-callbacks.c:291
 msgid "You must specify recipients in order to send this message."
 msgstr "Sie müssen Empfänger angeben, um diese Nachricht zu senden."
 
-#: mail/mail-callbacks.c:532
+#: mail/mail-callbacks.c:542
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:534
+#: mail/mail-callbacks.c:544
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:649
+#: mail/mail-callbacks.c:659
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3861,7 +4126,7 @@ msgstr ""
 "Sie können nur im Entwürfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:788
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3870,11 +4135,11 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:793 mail/message-list.c:1574
+#: mail/mail-callbacks.c:833
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:840
+#: mail/mail-callbacks.c:880
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
@@ -3896,51 +4161,51 @@ msgstr "Voller Name:"
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-druid.glade.h:41 mail/mail-config-gui.c:484
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-druid.glade.h:63 mail/mail-config-gui.c:495
 msgid "Signature file:"
 msgstr "Signaturdatei:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:20
 msgid "Signature File"
 msgstr "Signaturdatei"
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:906
 msgid "Server:"
 msgstr "Server:"
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-druid.glade.h:67 mail/mail-config-gui.c:912
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:918
 msgid "Path:"
 msgstr "Pfad:"
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:927
 msgid "Authentication:"
 msgstr "Authentikation:"
 
-#: mail/mail-config-gui.c:941
+#: mail/mail-config-gui.c:940
 msgid "Detect supported types..."
 msgstr "Unterstützte Typen feststellen..."
 
-#: mail/mail-config-gui.c:968
+#: mail/mail-config-druid.glade.h:24 mail/mail-config-gui.c:967
 msgid "Don't delete messages from server"
 msgstr "Nachrichten nicht vom Server löschen"
 
-#: mail/mail-config-gui.c:980
+#: mail/mail-config-druid.glade.h:65 mail/mail-config-gui.c:979
 msgid "Test Settings"
 msgstr "Einstellungen testen"
 
-#: mail/mail-config-gui.c:1107
+#: mail/mail-config-gui.c:1106
 msgid "Mail source type:"
 msgstr "Mailquellen-Typ:"
 
-#: mail/mail-config-gui.c:1112 mail/mail-config-gui.c:1160
+#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3954,11 +4219,11 @@ msgstr ""
 "Wenn der Server Authentikation erfordert, können Sie auf \"Unterstützte "
 "Typen feststellen...\" klicken, bevor Sie andere Informationen eingeben."
 
-#: mail/mail-config-gui.c:1131
+#: mail/mail-config-gui.c:1130
 msgid "News source type:"
 msgstr "Newsquellen-Typ:"
 
-#: mail/mail-config-gui.c:1136
+#: mail/mail-config-gui.c:1135
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -3973,180 +4238,324 @@ msgstr ""
 "Typen feststellen...\" klicken, nachdem Sie die anderen Informationen "
 "eingegeben haben."
 
-#: mail/mail-config-gui.c:1155
+#: mail/mail-config-gui.c:1154
 msgid "Mail transport type:"
 msgstr "Mailtransport-Typ:"
 
-#: mail/mail-config-gui.c:1210
+#: mail/mail-config-gui.c:1209
 msgid "Add Identity"
 msgstr "Identität hinzufügen"
 
-#: mail/mail-config-gui.c:1212
+#: mail/mail-config-gui.c:1211
 msgid "Edit Identity"
 msgstr "Identität bearbeiten"
 
-#: mail/mail-config-gui.c:1310
+#: mail/mail-config-gui.c:1309
 msgid "Add Source"
 msgstr "Quelle hinzufügen"
 
-#: mail/mail-config-gui.c:1312
+#: mail/mail-config-gui.c:1311
 msgid "Edit Source"
 msgstr "Quelle bearbeiten"
 
-#: mail/mail-config-gui.c:1407
+#: mail/mail-config-gui.c:1406
 msgid "Add News Server"
 msgstr "Newsserver hinzufügen"
 
-#: mail/mail-config-gui.c:1409
+#: mail/mail-config-gui.c:1408
 msgid "Edit News Server"
 msgstr "Newsserver bearbeiten"
 
-#: mail/mail-config-gui.c:2233
+#: mail/mail-config-gui.c:2232
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Teste \"%s\""
 
-#: mail/mail-config-gui.c:2235
+#: mail/mail-config-gui.c:2234
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "Testverbindung mit \"%s\""
 
-#: mail/mail-config-gui.c:2277
+#: mail/mail-config-gui.c:2275
 msgid "The connection was successful!"
 msgstr "Die Verbindung war erfolgreich!"
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2325
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr "Ermittle Autorisationsfähigkeiten von \"%s\""
 
-#: mail/mail-config-gui.c:2329
+#: mail/mail-config-gui.c:2327
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr "Ermittle Autorisation auf \"%s\""
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
+#: mail/mail-config-druid.glade.h:7
+msgid "Account Information"
+msgstr "Account-Information"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr "Accountverwaltung"
+
+#: mail/mail-config-druid.glade.h:9
+msgid "Accounts"
+msgstr "Accounts"
+
+#: mail/mail-config-druid.glade.h:11
+msgid "Add Optional Fields..."
+msgstr "Optionale Felder hinzufügen..."
+
+#: mail/mail-config-druid.glade.h:12
+msgid "Additional Identity Fields"
+msgstr "Zusätzliche Identitätsfelder"
+
+#: mail/mail-config-druid.glade.h:13
+msgid "Authentication"
+msgstr "Authentikation"
+
+#: mail/mail-config-druid.glade.h:15
+msgid "Browse..."
+msgstr "Stöbern..."
+
 #: mail/mail-config-druid.glade.h:16
+msgid "Congratulations, your mail configuration is complete."
+msgstr "Glückwunsch! Ihre Mailkonfiguration ist abgeschlossen."
+
+#: mail/mail-config-druid.glade.h:22
+msgid "Default"
+msgstr "Voreingestellt"
+
+#: mail/mail-config-druid.glade.h:25
+msgid "Done"
+msgstr "Fertig"
+
+#: mail/mail-config-druid.glade.h:27
+msgid "Edit Mail Configuration Settings"
+msgstr "Mailkonfiguration bearbeiten"
+
+#: mail/mail-config-druid.glade.h:28
+msgid "Email Address:"
+msgstr "E-Mail-Adresse:"
+
+#: mail/mail-config-druid.glade.h:29
+msgid "Evolution Mail Configuration"
+msgstr "Evolution-Mailkonfiguration"
+
+#: mail/mail-config-druid.glade.h:30
+msgid "Full Name:"
+msgstr "Voller Name:"
+
+#: mail/mail-config-druid.glade.h:31
+msgid "IMAP"
+msgstr "IMAP"
+
+#: mail/mail-config-druid.glade.h:32
+msgid "Identity"
+msgstr "Identität"
+
+#: mail/mail-config-druid.glade.h:33
+msgid "Mail"
+msgstr "Mail"
+
+#: mail/mail-config-druid.glade.h:34
 msgid "Mail Configuration"
 msgstr "Mailkonfiguration"
 
-#: mail/mail-config-druid.glade.h:9
+#: mail/mail-config-druid.glade.h:35
+msgid "Mail Configuration Druid"
+msgstr "Mailkonfigurations-Druide"
+
+#: mail/mail-config-druid.glade.h:36
+msgid "Make this my default account"
+msgstr "Dies zu meinem Standardaccount machen"
+
+#: mail/mail-config-druid.glade.h:38
+msgid "News"
+msgstr "Nachrichten"
+
+#: mail/mail-config-druid.glade.h:39
+msgid "Optional"
+msgstr "Optional"
+
+#: mail/mail-config-druid.glade.h:40
+msgid "Optional Information"
+msgstr "Optionale Informationen"
+
+#: mail/mail-config-druid.glade.h:42
+msgid "Password:"
+msgstr "Passwort:"
+
+#: mail/mail-config-druid.glade.h:44
 msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
+"Please enter information about your incoming mail server below. If you don't "
+"know what"
 msgstr ""
-"Willkommen zum Evolution-Mailkonfigurations-Druiden!\n"
-"Durch Eintragen einiger Informationen über Ihre E-Mail-\n"
-"Einstellungen können Sie sofort beginnen, Mail zu\n"
-"senden und zum Empfangen. Klicken Sie \"Weiter\" zum\n"
-"Fortsetzen."
+"Bitte geben Sie unten Informationen über Ihren Server für eingehende Mail "
+"ein. Wenn Sie nicht wissen, was"
 
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "Identität"
+#: mail/mail-config-druid.glade.h:46
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know "
+msgstr ""
+"Bitte geben Sie unten Informationen über Ihren Server für ausgehende Mail "
+"ein. Wenn Sie nicht wissen, was"
+
+#: mail/mail-config-druid.glade.h:48
+msgid ""
+"Please enter your name and email address below. The &quot;optional&quot; "
+"fields below do not "
+msgstr ""
+"Bitte geben Sie unten Ihren Namen und Ihre E-Mail-Adresse ein. Die "
+"&quot;optionalen&quot; Felder unten sind nicht"
 
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "Mailquelle"
+#: mail/mail-config-druid.glade.h:50
+msgid "Preferred type: "
+msgstr "Bevorzugter Typ: "
 
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "Mailtransport"
+#: mail/mail-config-druid.glade.h:51
+msgid "Receiving Email"
+msgstr "Mail erhalten"
 
-#: mail/mail-config-druid.glade.h:17
+#: mail/mail-config-druid.glade.h:52
+msgid "Receiving Mail"
+msgstr "Mail erhalten"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Remember my password"
+msgstr "Sich an mein Passwort erinnern"
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Reply-to:"
+msgstr "Antwort an:"
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Required"
+msgstr "Benötigt"
+
+#: mail/mail-config-druid.glade.h:56
+msgid "SMTP"
+msgstr "SMTP"
+
+#: mail/mail-config-druid.glade.h:57
+msgid "SMTP server requires authentication"
+msgstr "SMTP-Server benötigt Authentikation"
+
+#: mail/mail-config-druid.glade.h:58
+msgid "Sending Email"
+msgstr "Sende E-Mail"
+
+#: mail/mail-config-druid.glade.h:59
+msgid "Sending Mail"
+msgstr "Sende Mail"
+
+#: mail/mail-config-druid.glade.h:60
+msgid "Server Configuration"
+msgstr "Server-Konfiguration"
+
+#: mail/mail-config-druid.glade.h:61
+msgid "Server Type: "
+msgstr "Servertyp: "
+
+#: mail/mail-config-druid.glade.h:64 mail/mail-config.glade.h:21
+msgid "Sources"
+msgstr "Quellen"
+
+#: mail/mail-config-druid.glade.h:68
+msgid "Welcome to the Evolution Mail Configuration Druid! "
+msgstr "Willkommen zum Evolution-Mailkonfigurations-Druiden! "
+
+#: mail/mail-config-druid.glade.h:74
 msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+"You are almost done with the mail configuration process. The identity, "
+"incoming"
 msgstr ""
-"Ihre E-Mail-Konfiguration ist nun fertig.\n"
-"Klicken Sie auf \"Abschließen\", um Ihre\n"
-"neuen Einstellungen zu speichern."
+"Sie sind fast fertig mit der Mailkonfiguration. Die Identität, der Server "
+"für eingehende"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-msgid "Identities"
-msgstr "Identitäten"
+#: mail/mail-config-druid.glade.h:78
+msgid "Your mail server supports the following types of authentication. Please"
+msgstr "Ihr Mailserver unterstützt folgende Authentikationstypen. Bitte"
 
 #: mail/mail-config.glade.h:8
 msgid "Address"
 msgstr "Adresse"
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "Organisation"
-
-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "Quellen"
+#: mail/mail-config.glade.h:11
+msgid "Identities"
+msgstr "Identitäten"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:12
 msgid "Mail Sources"
 msgstr "Mailquellen"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:13
+msgid "Mail Transport"
+msgstr "Mailtransport"
+
+#: mail/mail-config.glade.h:14
+msgid "Mark message as seen [ms]: "
+msgstr "Nachrichten als gesehen markieren [ms]: "
+
+#: mail/mail-config.glade.h:15
 msgid "News Servers"
 msgstr "Newsserver"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:16
 msgid "News Sources"
 msgstr "Newsquellen"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:17
+msgid "Organization"
+msgstr "Organisation"
+
+#: mail/mail-config.glade.h:19
 msgid "Send messages in HTML format"
 msgstr "Nachrichten in HTML-Format senden"
 
-#: mail/mail-config.glade.h:27
-msgid "Mark message as seen [ms]: "
-msgstr "Nachrichten als gesehen markieren [ms]: "
-
-#: mail/mail-crypto.c:137
+#: mail/mail-crypto.c:136
 #, c-format
 msgid "Couldn't create pipe to %s: %s"
 msgstr "Pipe zu %s konnte nicht angelegt werden: %s"
 
-#: mail/mail-crypto.c:164
+#: mail/mail-crypto.c:163
 #, c-format
 msgid "Could not execute %s: %s\n"
 msgstr "%s konnte nicht ausgeführt werden: %s\n"
 
-#: mail/mail-crypto.c:168
+#: mail/mail-crypto.c:167
 #, c-format
 msgid "Cannot fork %s: %s"
 msgstr "Kann %s nicht forken: %s"
 
-#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
+#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Bitte geben Sie Ihre PGP-/GPG-Passphrase ein."
 
-#: mail/mail-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
+#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
 msgid "No password provided."
 msgstr "Kein Passwort angegeben."
 
-#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Konnte Pipe zu GPG/PGP nicht anlegen: %s"
 
-#: mail/mail-crypto.c:600
+#: mail/mail-crypto.c:599
 msgid "No GPG/PGP program available."
 msgstr "Kein GPG/PGP-Programm verfügbar."
 
-#: mail/mail-display.c:68
+#: mail/mail-display.c:67
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
-#: mail/mail-display.c:72
+#: mail/mail-display.c:71
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4154,7 +4563,7 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits.\n"
 "Überschreiben?"
 
-#: mail/mail-display.c:86
+#: mail/mail-display.c:85
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4163,73 +4572,123 @@ msgstr ""
 "Datei %s konnte nicht geöffnet werden:\n"
 "%s"
 
-#: mail/mail-display.c:98
+#: mail/mail-display.c:97
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:193
 msgid "Save Attachment"
 msgstr "Anlage speichern"
 
-#: mail/mail-display.c:234
+#: mail/mail-display.c:233
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:275
 msgid "Save to Disk..."
 msgstr "Auf Platte speichern..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:277
 #, c-format
 msgid "Open in %s..."
 msgstr "Öffnen in %s..."
 
-#: mail/mail-display.c:280
+#: mail/mail-display.c:279
 msgid "View Inline"
 msgstr "An Ort und Stelle betrachten"
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:303
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:327
+#: mail/mail-display.c:326
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "An Ort und Stelle betrachten (über %s)"
 
-#: mail/mail-display.c:331
+#: mail/mail-display.c:330
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-local.c:279
+#: mail/mail-format.c:478
+#, c-format
+msgid "%s attachment"
+msgstr "%s-Anlage"
+
+#: mail/mail-format.c:601
+msgid "Reply-To:"
+msgstr "Antwort an:"
+
+#: mail/mail-format.c:823
+msgid "No GPG/PGP support available in this copy of Evolution."
+msgstr ""
+"Keine GPG-/PGP-Unterstützung in diesem Exemplar von Evolution verfügbar."
+
+#: mail/mail-format.c:835
+msgid "Encrypted message not displayed"
+msgstr "Verschlüsselte Nachricht nicht angezeigt"
+
+#: mail/mail-format.c:841
+msgid "Encrypted message"
+msgstr "Verschlüsselte Nachricht"
+
+#: mail/mail-format.c:842
+msgid "Click icon to decrypt."
+msgstr "Zum Entschlüsseln Icon klicken."
+
+#: mail/mail-format.c:1444
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Zeiger auf FTP-Site (%s)"
+
+#: mail/mail-format.c:1456
+#, 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:1460
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Zeiger auf lokale Datei (%s)"
+
+#: mail/mail-format.c:1494
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
+
+#: mail/mail-format.c:1499
+msgid "Malformed external-body part."
+msgstr "Ungültiger external-body-Teil."
+
+#: mail/mail-local.c:194
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:198
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Ordner \"%s\" in \"%s\"-Format umwandeln"
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:254
 msgid "Closing current folder"
 msgstr "Schließe aktuellen Ordner"
 
-#: mail/mail-local.c:359
+#: mail/mail-local.c:286
 msgid "Renaming old folder and opening"
 msgstr "Benenne alten Ordner um und öffne"
 
-#: mail/mail-local.c:380
+#: mail/mail-local.c:307
 msgid "Creating new folder"
 msgstr "Lege einen neuen Ordner an"
 
-#: mail/mail-local.c:395
+#: mail/mail-local.c:322
 msgid "Copying messages"
 msgstr "Kopiere Nachrichten"
 
-#: mail/mail-local.c:407
+#: mail/mail-local.c:334
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4238,7 +4697,7 @@ msgstr ""
 "Metainformationen zu Ordner können nicht gespeichert werden; Sie\n"
 "werden ihn wahrscheinlich nie mehr öffnen können: %s"
 
-#: mail/mail-local.c:443
+#: mail/mail-local.c:370
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4246,277 +4705,296 @@ msgstr ""
 "Wenn Sie diese Mailbox nicht mehr öffnen können,\n"
 "werden Sie sie wohl von Hand reparieren müssen."
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
-msgstr " (XXX ungelesen)"
+#: mail/mail-local.c:659
+msgid "Registering local folder"
+msgstr "Lokaler Ordner wird registriert"
+
+#: mail/mail-local.c:661
+msgid "Register local folder"
+msgstr "Lokalen Ordner registrieren"
 
-#: mail/mail-ops.c:68
+#: mail/mail-ops.c:70
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Rufe E-Mail von %s ab"
 
-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:72
 #, c-format
 msgid "Fetch email from %s"
 msgstr "E-Mail von %s abrufen"
 
-#: mail/mail-ops.c:110
-#, c-format
-msgid "Retrieving messages : %s"
-msgstr "Rufe Nachrichten ab: %s"
-
-#: mail/mail-ops.c:253
+#: mail/mail-ops.c:312
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Es gibt keine neue Mail auf %s."
 
-#: mail/mail-ops.c:308
+#: mail/mail-ops.c:367
 msgid "Filtering email on demand"
 msgstr "Filtere E-Mail auf Anfrage"
 
-#: mail/mail-ops.c:310
+#: mail/mail-ops.c:369
 msgid "Filter email on demand"
 msgstr "E-Mail auf Anfrage filtern"
 
-#: mail/mail-ops.c:441
+#: mail/mail-ops.c:504
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:446
+#: mail/mail-ops.c:509
 msgid "Sending a message without a subject"
 msgstr "Sende eine Nachricht ohne eine Betreffzeile"
 
-#: mail/mail-ops.c:449
+#: mail/mail-ops.c:512
 #, c-format
 msgid "Send \"%s\""
 msgstr "\"%s\" senden"
 
-#: mail/mail-ops.c:452
+#: mail/mail-ops.c:515
 msgid "Send a message without a subject"
 msgstr "Eine Nachricht ohne eine Betreffzeile senden"
 
-#: mail/mail-ops.c:623
+#: mail/mail-ops.c:686
 msgid "Sending queue"
 msgstr "Sende Warteschlange"
 
-#: mail/mail-ops.c:625
+#: mail/mail-ops.c:688
 msgid "Send queue"
 msgstr "Warteschlange senden"
 
-#: mail/mail-ops.c:761 mail/mail-ops.c:768
+#: mail/mail-ops.c:824 mail/mail-ops.c:831
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Hänge \"%s\" an"
 
-#: mail/mail-ops.c:765 mail/mail-ops.c:771
+#: mail/mail-ops.c:828 mail/mail-ops.c:834
 msgid "Appending a message without a subject"
 msgstr "Hänge eine Nachricht ohne eine Betreffzeile an"
 
-#: mail/mail-ops.c:843
+#: mail/mail-ops.c:906
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Säubere \"%s\""
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:908
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "\"%s\" säubern"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:967
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Verschiebe Nachrichten von \"%s\" in \"%s\""
 
-#: mail/mail-ops.c:906
+#: mail/mail-ops.c:969
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiere Nachrichten von \"%s\" in \"%s\""
 
-#: mail/mail-ops.c:909
+#: mail/mail-ops.c:972
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Machrichten von \"%s\" in \"%s\" verschieben"
 
-#: mail/mail-ops.c:911
+#: mail/mail-ops.c:974
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiere Nachrichten von \"%s\" in \"%s\""
 
-#: mail/mail-ops.c:942
+#: mail/mail-ops.c:1005
 msgid "Moving"
 msgstr "Verschiebe"
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:1008
 msgid "Copying"
 msgstr "Kopiere"
 
-#: mail/mail-ops.c:965
+#: mail/mail-ops.c:1028
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s Nachricht %d von %d (UID \"%s\")"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1107
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Markiere Nachrichten in Ordner \"%s\""
 
-#: mail/mail-ops.c:1047
+#: mail/mail-ops.c:1110
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Markiere Nachrichten in Ordner \"%s\""
 
-#: mail/mail-ops.c:1078
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Markiere Nachricht %d von %d"
 
-#: mail/mail-ops.c:1198
+#: mail/mail-ops.c:1264
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
-#: mail/mail-ops.c:1201
+#: mail/mail-ops.c:1266
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Ordner in \"%s\" abtasten"
 
-#: mail/mail-ops.c:1272 mail/subscribe-dialog.c:194
+#: mail/mail-ops.c:1335 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Keine Beschreibung)"
 
-#: mail/mail-ops.c:1332
+#: mail/mail-ops.c:1396
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Hänge Nachrichten aus Ordner \"%s\" an"
 
-#: mail/mail-ops.c:1335
+#: mail/mail-ops.c:1399
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Nachrichten aus \"%s\" beilegen"
 
-#: mail/mail-ops.c:1438
+#: mail/mail-ops.c:1499
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Leite Nachrichten weiter: \"%s\""
 
-#: mail/mail-ops.c:1443
+#: mail/mail-ops.c:1503
 msgid "Forwarding a message without a subject"
 msgstr "Leite eine Nachricht ohne eine Betreffzeile weiter"
 
-#: mail/mail-ops.c:1446
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Nachricht \"%s\" weiterleiten"
 
-#: mail/mail-ops.c:1451
+#: mail/mail-ops.c:1510
 msgid "Forward a message without a subject"
 msgstr "Eine Nachricht ohne eine Betreffzeile weiterleiten"
 
-#: mail/mail-ops.c:1488
+#: mail/mail-ops.c:1557
 #, 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:1505
+#: mail/mail-ops.c:1573
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "Konnte beim Erzeugen der weitergeleiteten Nachricht keinen MIME-Part aus der "
 "Nachricht erzeugen."
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1736
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Lade \"%s\""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1738
 #, c-format
 msgid "Load \"%s\""
 msgstr "\"%s\" laden"
 
-#: mail/mail-ops.c:1695
+#: mail/mail-ops.c:1840
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Erzeuge \"%s\""
 
-#: mail/mail-ops.c:1697
+#: mail/mail-ops.c:1842
 #, c-format
 msgid "Create \"%s\""
 msgstr "\"%s\" erzeugen"
 
-#: mail/mail-ops.c:1745
+#: mail/mail-ops.c:1890
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 "Ausnahmezustand beim Übermitteln des Ergebnisses an "
 "Shell-Komponenten-Listener."
 
-#: mail/mail-ops.c:1791
+#: mail/mail-ops.c:1936
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synchronisiere \"%s\""
 
-#: mail/mail-ops.c:1793
+#: mail/mail-ops.c:1938
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "\"%s\" synchronisieren"
 
-#: mail/mail-ops.c:1856
+#: mail/mail-ops.c:2002
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Zeige Nachrichten-UID \"%s\" an"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:2005
 msgid "Clearing message display"
 msgstr "Lösche Nachrichtenanzeige"
 
-#: mail/mail-ops.c:1862
+#: mail/mail-ops.c:2008
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Nachrichten-UID \"%s\" anzeigen"
 
-#: mail/mail-ops.c:1865
+#: mail/mail-ops.c:2011
 msgid "Clear message display"
 msgstr "Nachrichtenanzeige löschen"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:2124
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Öffne Nachrichten aus Ordner \"%s\""
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:2127
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Nachrichten aus \"%s\" öffnen"
 
-#: mail/mail-ops.c:2081
+#: mail/mail-ops.c:2231
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Lade %s-Ordner"
 
-#: mail/mail-ops.c:2083
+#: mail/mail-ops.c:2233
 #, c-format
 msgid "Load %s Folder"
 msgstr "%s-Ordner laden"
 
-#: mail/mail-ops.c:2150
+#: mail/mail-ops.c:2300
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Betrachte Nachrichten aus Ordner \"%s\""
 
-#: mail/mail-ops.c:2153
+#: mail/mail-ops.c:2303
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Nachrichten aus Ordner \"%s\" betrachten"
 
-#: mail/mail-ops.c:2179
+#: mail/mail-ops.c:2329 mail/mail-ops.c:2447
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Rufe Nachricht %d von %d ab (UID \"%s\")"
 
-#: mail/mail-threads.c:299
+#: mail/mail-ops.c:2419
+#, c-format
+msgid "Viewing message sources from folder \"%s\""
+msgstr "Betrachte Nachrichtenquellen aus Ordner \"%s\""
+
+#: mail/mail-ops.c:2422
+#, c-format
+msgid "View message sources from \"%s\""
+msgstr "Nachrichtenquellen aus \"%s\" betrachten"
+
+#: mail/mail-search-dialogue.c:104
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: mail/mail-summary.c:95 mail/mail-threads.c:703
+msgid "Incomplete message written on pipe!"
+msgstr "Unvollständige Nachricht auf Pipe geschrieben!"
+
+#: mail/mail-summary.c:368
+msgid "Mailbox summary"
+msgstr "Postfach-Zusammenfassung"
+
+#: mail/mail-threads.c:301
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -4525,7 +5003,7 @@ msgstr ""
 "Fehler beim Vorbereiten auf %s:\n"
 "%s"
 
-#: mail/mail-threads.c:648
+#: mail/mail-threads.c:650
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4534,38 +5012,34 @@ msgstr ""
 "Fehler beim `%s'_\n"
 "%s"
 
-#: mail/mail-threads.c:701
-msgid "Incomplete message written on pipe!"
-msgstr "Unvollständige Nachricht auf Pipe geschrieben!"
-
-#: mail/mail-threads.c:705
+#: mail/mail-threads.c:707
 msgid "Error reading commands from dispatching thread."
 msgstr "Fehler beim Lesen von Befehlen vom verwaltenden Thread."
 
-#: mail/mail-threads.c:770
+#: mail/mail-threads.c:772
 msgid "Corrupted message from dispatching thread?"
 msgstr "Schadhafte Nachricht von verwaltendem Thread?"
 
-#: mail/mail-threads.c:889
+#: mail/mail-threads.c:891
 msgid "Could not create dialog box."
 msgstr "Konnte Dialogfenster nicht erzeugen."
 
-#: mail/mail-threads.c:899
+#: mail/mail-threads.c:902
 msgid "User cancelled query."
 msgstr "Benutzer hat Anfrage abgebrochen."
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:187
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Konnte temporäre Mbox `%s' nicht anlegen: %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:264
+#: mail/mail-tools.c:237
 #, c-format
 msgid "Examining %s"
 msgstr "Begutachte %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:267
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -4574,46 +5048,41 @@ msgstr ""
 "Nachrichten erhalten werden."
 
 #. Info
-#: mail/mail-tools.c:315
+#: mail/mail-tools.c:288
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Rufe Nachricht %d von %d ab"
 
 #. Append it to dest
-#: mail/mail-tools.c:328
+#: mail/mail-tools.c:301
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Schreibe Nachricht %d von %d"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:330
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Speichere Änderungen an %s"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:367
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (weitergeleitete Nachricht)"
 
-#: mail/mail-tools.c:400
+#: mail/mail-tools.c:377
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (keine Betreffzeile)"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:416
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:418
 msgid "Forwarded message (no subject)"
 msgstr "Weitergeleitete Nachricht (keine Betreffzeile)"
 
-#: mail/mail-tools.c:551
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr "Kenne Protokol zum Öffnen von URI `%s' nicht"
-
-#: mail/mail-tools.c:580
+#: mail/mail-tools.c:521
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4632,133 +5101,89 @@ msgstr "Neuer VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:151 ui/evolution-mail.h:34
+#: mail/mail-view.c:153 ui/evolution-mail.xml.h:34
 msgid "Reply"
 msgstr "Antworten"
 
-#: mail/mail-view.c:151 ui/evolution-mail.h:39
+#: mail/mail-view.c:153 ui/evolution-mail.xml.h:39
 msgid "Reply to the sender of this message"
 msgstr "An den Sender der Nachricht antworten"
 
-#: mail/mail-view.c:154 mail/message-list.c:1577 ui/evolution-mail.h:35
-msgid "Reply to All"
-msgstr "Allen antworten"
-
-#: mail/mail-view.c:154 ui/evolution-mail.h:38
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:38
 msgid "Reply to all recipients of this message"
 msgstr "allen Empfängern der Nachricht antworten"
 
-#: mail/mail-view.c:157 ui/evolution-mail.h:19
-msgid "Forward"
-msgstr "Weiterleiten"
-
-#: mail/mail-view.c:157 ui/evolution-mail.h:20
+#: mail/mail-view.c:159 ui/evolution-mail.xml.h:20
 msgid "Forward this message"
 msgstr "Die Nachricht weiterleiten"
 
-#: mail/mail-view.c:161 ui/evolution-addressbook.h:16
-#: ui/evolution-calendar.h:26 ui/evolution-mail.h:29
-msgid "Print"
-msgstr "Drucken"
-
-#: mail/mail-view.c:161 ui/evolution-mail.h:33
+#: mail/mail-view.c:163 ui/evolution-mail.xml.h:33
 msgid "Print the selected message"
 msgstr "Die gewählte Nachricht drucken"
 
-#: mail/mail-view.c:163 ui/evolution-mail.h:14
+#: mail/mail-view.c:165 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Die Nachricht löschen"
 
-#: mail/message-list.c:518
+#: mail/message-list.c:505
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:521
-msgid "Seen"
-msgstr "Gelesen"
-
-#: mail/message-list.c:524
-msgid "Answered"
-msgstr "Beantwortet"
-
-#: mail/message-list.c:1572
-msgid "Open in New Window"
-msgstr "In neuem Fenster öffnen"
-
-#: mail/message-list.c:1573
-msgid "Edit Message"
-msgstr "Nachricht bearbeiten"
-
-#: mail/message-list.c:1576
-msgid "Reply to Sender"
-msgstr "Antwort an Absender"
-
-#: mail/message-list.c:1578
-msgid "Forward Message"
-msgstr "Nachricht weiterleiten"
-
-#: mail/message-list.c:1580
-msgid "Delete Message"
-msgstr "Nachricht löschen"
-
-#: mail/message-list.c:1581
-msgid "Move Message"
-msgstr "Nachricht verschieben"
+#: mail/message-list.c:2045
+msgid "Rebuilding message view"
+msgstr "Baue Nachrichtenansicht neu auf"
 
-#: mail/message-list.c:1582
-msgid "Copy Message"
-msgstr "Nachricht kopieren"
+#: mail/message-list.c:2047
+msgid "Rebuild message view"
+msgstr "Nachrichtenansicht neu aufbauen"
 
-#: mail/message-list.c:1584
-msgid "VFolder on Subject"
-msgstr "VOrdner über Betreffzeile"
+#: mail/message-thread.c:583
+msgid "Threading message list"
+msgstr "Nachrichtenliste wird in Stränge geordnet"
 
-#: mail/message-list.c:1585
-msgid "VFolder on Sender"
-msgstr "VOrdner über Absender"
+#: mail/message-thread.c:585
+msgid "Thread message list"
+msgstr "Nachrichtenliste in Stränge ordnen"
 
-#: mail/message-list.c:1586
-msgid "VFolder on Recipients"
-msgstr "VOrdner über Empfänger"
+#: mail/subscribe-dialog.c:139
+msgid "Display folders starting with:"
+msgstr "Ordner anzeigen, die beginnen mit:"
 
-#: mail/message-list.c:1588
-msgid "Filter on Subject"
-msgstr "Filter über Betreffzeile"
-
-#: mail/message-list.c:1589
-msgid "Filter on Sender"
-msgstr "Filter über Absender"
-
-#: mail/message-list.c:1590
-msgid "Filter on Recipients"
-msgstr "Filter über Empfänger"
+#: mail/subscribe-dialog.c:172
+#, c-format
+msgid "Getting store for \"%s\""
+msgstr "Erhalte Speicher für \"%s\""
 
-#: mail/message-list.c:1591 mail/message-list.c:1614
-msgid "Filter on Mailing List"
-msgstr "Filter über Mailingliste"
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
+msgstr "Speicher für \"%s\" erhalten"
 
-#: mail/message-list.c:1616
+#: mail/subscribe-dialog.c:282
 #, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filter über Mailingliste (%s)"
+msgid "Subscribing to folder \"%s\""
+msgstr "Ordner \"%s\" wird abonniert"
 
-#: mail/message-list.c:1734
-msgid "Rebuilding message view"
-msgstr "Baue Nachrichtenansicht neu auf"
+#: mail/subscribe-dialog.c:286
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
-#: mail/message-list.c:1736
-msgid "Rebuild message view"
-msgstr "Nachrichtenansicht neu aufbauen"
+#: mail/subscribe-dialog.c:290
+#, c-format
+msgid "Subscribe to folder \"%s\""
+msgstr "Ordner \"%s\" abonnieren"
 
-#: mail/subscribe-dialog.c:132
-msgid "Display folders containing:"
-msgstr "Ordner anzeigen, die folgendes enthalten:"
+#: mail/subscribe-dialog.c:293
+#, c-format
+msgid "Unsubscribe from folder \"%s\""
+msgstr "Ordner \"%s\" abbestellen"
 
-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: shell/e-setup.c:110 shell/e-setup.c:179
 msgid "Evolution installation"
 msgstr "Installation von Evolution"
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:114
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -4766,31 +5191,31 @@ msgstr ""
 "Diese neue Version von Evolution muss zusätzliche Dateien in Ihr\n"
 "persönliches Evolution-Verzeichnis installieren"
 
-#: shell/e-setup.c:111
+#: shell/e-setup.c:115
 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:152
+#: shell/e-setup.c:156
 msgid "Could not update files correctly"
 msgstr "Dateien konnte nicht korrekt aktualisiert werden"
 
-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:160 shell/e-setup.c:220
 msgid "Evolution files successfully installed."
 msgstr "Evolutions Dateien erfolgreich installiert."
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:183
 msgid "This seems to be the first time you run Evolution."
 msgstr "Dies scheint das erste Mal zu sein, dass Sie Evolution ausführen."
 
-#: shell/e-setup.c:180
+#: shell/e-setup.c:184
 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:197
+#: shell/e-setup.c:201
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4802,7 +5227,7 @@ msgstr ""
 "nicht anlegen.\n"
 "Fehler: %s"
 
-#: shell/e-setup.c:212
+#: shell/e-setup.c:216
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -4812,7 +5237,7 @@ msgstr ""
 "`%s'\n"
 "kopieren."
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:241
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4823,7 +5248,7 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:253
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4906,25 +5331,30 @@ msgstr "(Kein Ordner angezeigt)"
 msgid "Folders"
 msgstr "Ordner"
 
-#: shell/e-shell-view.c:993
+#: shell/e-shell-view.c:1018 widgets/misc/e-dateedit.c:212
+#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
+msgid "None"
+msgstr "Keine"
+
+#: shell/e-shell-view.c:1022
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1133
+#: shell/e-shell.c:339
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kann lokalen Speicher nicht einstellen -- %s"
+
+#: shell/e-shell.c:1157
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Hoppla! Die Ansicht für `%s' ist unerwartet gestorben.  :-(\n"
 "Das heißt wahrscheinlich, dass die %s-Komponente abgestürzt ist."
 
-#: shell/e-shell.c:336
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kann lokalen Speicher nicht einstellen -- %s"
-
 #: shell/e-shortcuts-view.c:122
 msgid "Create new shortcut group"
 msgstr "Neue Verknüpfungsgruppe anlegen"
@@ -4994,63 +5424,64 @@ msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von Verknüpfungen."
 
-#: shell/e-storage.c:127
+#: shell/e-storage.c:128
 msgid "(No name)"
 msgstr "(Kein Name)"
 
-#: shell/e-storage.c:318
+#: shell/e-storage.c:327
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:320
+#: shell/e-storage.c:329
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: shell/e-storage.c:322
+#: shell/e-storage.c:331
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:324
+#: shell/e-storage.c:333
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ungültig"
 
-#: shell/e-storage.c:326
+#: shell/e-storage.c:335
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:328
+#: shell/e-storage.c:337
 msgid "Not enough space to create the folder"
 msgstr "Nicht genügend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:330
+#: shell/e-storage.c:339
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:332
+#: shell/e-storage.c:341
 msgid "Function not implemented in this storage"
 msgstr "Funktion für diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:334
+#: shell/e-storage.c:343
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: shell/e-storage.c:336
+#: shell/e-storage.c:345
 msgid "Operation not supported"
 msgstr "Operation nicht unterstützt"
 
-#: shell/e-storage.c:338
+#: shell/e-storage.c:347
 msgid "The specified type is not supported in this storage"
 msgstr "Der angegebene Typ wird für diese Speicherweise nicht unterstützt"
 
-#: shell/e-storage-set-view.c:223 ui/evolution.h:39
+#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:126
+#: ui/evolution-message-composer.xml.h:46 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Ansicht"
 
-#: shell/e-storage-set-view.c:223
+#: shell/e-storage-set-view.c:235
 msgid "View the selected folder"
 msgstr "Den gewählten Ordner betrachten"
 
-#: shell/main.c:68
+#: shell/main.c:70
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5092,7 +5523,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
 "werden, und wir hoffen auf Ihre Mitarbeit!\n"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5100,578 +5531,1112 @@ msgstr ""
 "Danke.\n"
 "das Evolution-Team\n"
 
-#: shell/main.c:123
+#: shell/main.c:122
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kann die Evolution-Shell nicht initialisieren."
 
-#: shell/main.c:160
+#: shell/main.c:144
+msgid "Disable."
+msgstr "Deaktivieren."
+
+#: shell/main.c:166
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kann das Bonobo-System nicht initialisieren."
 
 #.
-#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.h:9
+#: ui/evolution-addressbook-ldap.xml.h:7
 msgid "N_ew Directory Server"
 msgstr "Neuer Verzeichnisserver"
 
-#: ui/evolution-addressbook-ldap.h:10
+#: ui/evolution-addressbook-ldap.xml.h:8
 msgid "_Actions"
 msgstr "_Aktionen"
 
-#: ui/evolution-addressbook.h:10
+#: ui/evolution-addressbook.xml.h:8
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: ui/evolution-addressbook.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Delete a contact"
 msgstr "Einen Kontakt löschen"
 
-#: ui/evolution-addressbook.h:13
+#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:68
 msgid "Find"
 msgstr "Suchen"
 
-#: ui/evolution-addressbook.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Find a contact"
 msgstr "Einen Kontakt suchen"
 
-#: ui/evolution-addressbook.h:15 ui/evolution-calendar.h:21
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Neu"
 
-#: ui/evolution-addressbook.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Print contacts"
 msgstr "Kontakte drucken"
 
-#: ui/evolution-addressbook.h:18
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.h:19
+#: ui/evolution-addressbook.xml.h:17
 msgid "Stop Loading"
 msgstr "Laden abbrechen"
 
-#: ui/evolution-addressbook.h:20
+#: ui/evolution-addressbook.xml.h:18
 msgid "View All"
 msgstr "Alle betrachten"
 
-#: ui/evolution-addressbook.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "View all contacts"
 msgstr "Alle Kontakte betrachten"
 
-#: ui/evolution-addressbook.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "_New Contact"
 msgstr "Neuer Kontakt?"
 
-#: ui/evolution-addressbook.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Print Contacts..."
 msgstr "Kontakte drucken..."
 
-#: ui/evolution-addressbook.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Search for contacts"
 msgstr "Nach Kontakten suchen"
 
-#: ui/evolution-addressbook.h:25
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-event-editor.xml.h:124
 msgid "_Tools"
 msgstr "Werkzeuge"
 
 #.
-#. *  This file is autogenerated from evolution-calendar.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-calendar.h:9
+#: ui/evolution-calendar.xml.h:7
 msgid "5 Days"
 msgstr "5 Tage"
 
-#: ui/evolution-calendar.h:10
+#: ui/evolution-calendar.xml.h:8
 msgid "Alter preferences"
 msgstr "Einstellungen ändern"
 
-#: ui/evolution-calendar.h:11
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Kalender-Einstellungen..."
 
-#: ui/evolution-calendar.h:12
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ui/evolution-calendar.h:13
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: ui/evolution-calendar.h:14
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Tag"
 
-#: ui/evolution-calendar.h:15
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "In der Zeit zurückgehen"
 
-#: ui/evolution-calendar.h:16
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "In der Zeit vorangehen"
 
-#: ui/evolution-calendar.h:17
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: ui/evolution-calendar.h:18
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Zu bestimmtem Datum gehen"
 
-#: ui/evolution-calendar.h:19
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Zur aktuellen Zeit gehen"
 
-#: ui/evolution-calendar.h:20
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Monat"
 
-#: ui/evolution-calendar.h:22
+#: ui/evolution-calendar.xml.h:20
 msgid "New Ca_lendar"
 msgstr "Neuer Kalender"
 
-#: ui/evolution-calendar.h:23
+#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:75
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/evolution-calendar.h:24
+#: ui/evolution-calendar.xml.h:22
 msgid "Open a calendar"
 msgstr "Einen Kalender öffnen"
 
-#: ui/evolution-calendar.h:25
+#: ui/evolution-calendar.xml.h:23
 msgid "Prev"
 msgstr "Zurück"
 
-#: ui/evolution-calendar.h:27
+#: ui/evolution-calendar.xml.h:25
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.h:28
-msgid "Save calendar As something else"
-msgstr "Kalender unter anderem Namen speichern"
+#: ui/evolution-calendar.xml.h:26
+msgid "Save calendar as something else"
+msgstr "Kalender als etwas anderes speichern"
 
-#: ui/evolution-calendar.h:29
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 day"
 msgstr "Einen Tag zeigen"
 
-#: ui/evolution-calendar.h:30
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 month"
 msgstr "1 Monat zeigen"
 
-#: ui/evolution-calendar.h:31
+#: ui/evolution-calendar.xml.h:29
 msgid "Show 1 week"
 msgstr "1 Woche zeigen"
 
-#: ui/evolution-calendar.h:32
+#: ui/evolution-calendar.xml.h:30
 msgid "Show the working week"
 msgstr "Die Arbeitswoche zeigen"
 
-#: ui/evolution-calendar.h:33 widgets/misc/e-dateedit.c:331
+#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:365
 msgid "Today"
 msgstr "Heute"
 
-#: ui/evolution-calendar.h:34
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Woche"
 
-#: ui/evolution-calendar.h:35 ui/evolution.h:35
+#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:34
 msgid "_New"
 msgstr "_Neu"
 
-#: ui/evolution-calendar.h:36
+#: ui/evolution-calendar.xml.h:34
 msgid "_New appointment..."
 msgstr "_Neuer Termin..."
 
-#: ui/evolution-calendar.h:37
+#: ui/evolution-calendar.xml.h:35
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: ui/evolution-calendar.h:38
+#: ui/evolution-calendar.xml.h:36
 msgid "_Open Calendar"
 msgstr "Kalender öffnen"
 
-#: ui/evolution-calendar.h:39
+#: ui/evolution-calendar.xml.h:37
 msgid "_Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.h:40
+#: ui/evolution-calendar.xml.h:38
 msgid "_Save Calendar As"
 msgstr "Kalender _speichern unter"
 
-#.
-#. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-contact-editor.h:9 ui/evolution-subscribe.h:19
-#: ui/evolution.h:29
+#: ui/evolution-contact-editor.xml.h:8
+msgid "Delete this item"
+msgstr "Diesen Eintrag löschen"
+
+#: ui/evolution-contact-editor.xml.h:9
+msgid "Delete..."
+msgstr "Löschen..."
+
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Help"
+msgstr "Hilfe"
+
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Print En_velope..."
+msgstr "Umschlag drucken..."
+
+#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
+msgid "Print this item"
+msgstr "Diesen Eintrag drucken"
+
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:83
+msgid "Print..."
+msgstr "Drucken..."
+
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save _As..."
+msgstr "Speichern _unter..."
+
+#: ui/evolution-contact-editor.xml.h:15 ui/evolution-event-editor.xml.h:91
+msgid "Save and Close"
+msgstr "Speichern und schließen"
+
+#: ui/evolution-contact-editor.xml.h:16
+msgid "Save the contact and close the dialog box"
+msgstr "Den Kontakt speichern und das Dialogfenster schließen"
+
+#: ui/evolution-contact-editor.xml.h:17
+msgid "Se_nd contact to other..."
+msgstr "Kontakt an anderen senden..."
+
+#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:99
+msgid "See online help"
+msgstr "Online-Hilfe einsehen"
+
+#: ui/evolution-contact-editor.xml.h:19
+msgid "Send _message to contact..."
+msgstr "_Nachricht an Kontakt senden..."
+
+#: ui/evolution-contact-editor.xml.h:20 ui/evolution-event-editor.xml.h:111
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "_File"
 msgstr "_Datei"
 
-#: ui/evolution-contact-editor.h:10
+#: ui/evolution-contact-editor.xml.h:21
+msgid "_Print..."
+msgstr "_Drucken..."
+
+#: ui/evolution-contact-editor.xml.h:22 ui/evolution-event-editor.xml.h:122
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ui/evolution-contact-editor.h:11
-msgid "Save _As"
-msgstr "Speichern _unter"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
+#: ui/evolution-event-editor.xml.h:7
+msgid "About this application"
+msgstr "Über diese Anwendung"
+
+#: ui/evolution-event-editor.xml.h:8
+msgid "About..."
+msgstr "Info..."
+
+#: ui/evolution-event-editor.xml.h:9
+msgid "Actio_ns"
+msgstr "Aktio_nen"
+
+#: ui/evolution-event-editor.xml.h:10
+msgid "C_lear"
+msgstr "_Löschen"
+
+#: ui/evolution-event-editor.xml.h:11
+msgid "C_ut"
+msgstr "Ausschneiden"
+
+#: ui/evolution-event-editor.xml.h:12
+msgid "Clear"
+msgstr "Löschen"
+
+#: ui/evolution-event-editor.xml.h:13
+msgid "Clear the selection"
+msgstr "Die Auswahl löschen"
+
+#: ui/evolution-event-editor.xml.h:15
+msgid "Close this appointment"
+msgstr "Diesen Termin abschließen"
+
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-mail.xml.h:9
+msgid "Copy"
+msgstr "Kopieren"
+
+#: ui/evolution-event-editor.xml.h:17
+msgid "Copy the selection"
+msgstr "Die Auswahl kopieren"
+
+#: ui/evolution-event-editor.xml.h:18
+msgid "Cut"
+msgstr "Ausschneiden"
+
+#: ui/evolution-event-editor.xml.h:19
+msgid "Cut the selection"
+msgstr "Die Auswahl ausschneiden"
+
+#: ui/evolution-event-editor.xml.h:22
+msgid "Dump XML"
+msgstr "XML auswerfen"
+
+#: ui/evolution-event-editor.xml.h:23
+msgid "Dump the UI Xml description"
+msgstr "Die XML-UI-Beschreibung auswerfen"
+
+#: ui/evolution-event-editor.xml.h:24
+msgid "FIXME: Address _Book..."
+msgstr "FIXME: Adress_buch..."
+
+#: ui/evolution-event-editor.xml.h:25
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Formular wählen..."
+
+#: ui/evolution-event-editor.xml.h:26
+msgid "FIXME: Chec_k Names"
+msgstr "FIXME: Namen prüfen"
+
+#: ui/evolution-event-editor.xml.h:27
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: In Ordner kopieren..."
+
+#: ui/evolution-event-editor.xml.h:28
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: Ein Formular entwerfen..."
+
+#: ui/evolution-event-editor.xml.h:29
+msgid "FIXME: Define Print _Styles"
+msgstr "FIXME: Druckstile definieren"
+
+#: ui/evolution-event-editor.xml.h:30
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Dieses Formular bearbeiten"
+
+#: ui/evolution-event-editor.xml.h:31
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: Erster Eintrag im Ordner"
+
+#: ui/evolution-event-editor.xml.h:32
+msgid "FIXME: For_ward"
+msgstr "FIXME: _Weiterleiten"
+
+#: ui/evolution-event-editor.xml.h:33
+msgid "FIXME: Forward as v_Calendar"
+msgstr "FIXME: Als vCalendar weiterleiten"
+
+#: ui/evolution-event-editor.xml.h:34
+msgid "FIXME: Help"
+msgstr "FIXME: Hilfe"
+
+#: ui/evolution-event-editor.xml.h:35
+msgid "FIXME: In_complete Task"
+msgstr "FIXME: Unvollständige Aufgabe"
+
+#: ui/evolution-event-editor.xml.h:36
+msgid "FIXME: Insert File"
+msgstr "FIXME: Datei einfügen"
+
+#: ui/evolution-event-editor.xml.h:37
+msgid "FIXME: It_em..."
+msgstr "FIXME: Eintrag..."
+
+#: ui/evolution-event-editor.xml.h:38
+msgid "FIXME: Paste _Special... "
+msgstr "FIXME: Besonderes einfügen..."
+
+#: ui/evolution-event-editor.xml.h:39
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Druckvorschau"
+
+#: ui/evolution-event-editor.xml.h:40
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: Formular veröffentlichen als..."
+
+#: ui/evolution-event-editor.xml.h:41
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: _Formular veröffentlichen..."
+
+#: ui/evolution-event-editor.xml.h:42
+msgid "FIXME: Rec_urrence..."
+msgstr "FIXME: Wiederholung..."
+
+#: ui/evolution-event-editor.xml.h:43
+msgid "FIXME: S_end"
+msgstr "FIXME: Senden"
+
+#: ui/evolution-event-editor.xml.h:44
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Anlagen speichern..."
+
+#: ui/evolution-event-editor.xml.h:45
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Skriptdebugger"
+
+#: ui/evolution-event-editor.xml.h:46
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Aufgabenanfrage"
+
+#: ui/evolution-event-editor.xml.h:47
+msgid "FIXME: _Contact"
+msgstr "FIXME: Kontakt"
+
+#: ui/evolution-event-editor.xml.h:48
+msgid "FIXME: _Customize..."
+msgstr "FIXME: Anpassen..."
+
+#: ui/evolution-event-editor.xml.h:49
+msgid "FIXME: _File..."
+msgstr "FIXME: _Datei..."
+
+#: ui/evolution-event-editor.xml.h:50
+msgid "FIXME: _Font..."
+msgstr "FIXME: Schriftart..."
+
+#: ui/evolution-event-editor.xml.h:51
+msgid "FIXME: _Formatting"
+msgstr "FIXME: Formatierung"
+
+#: ui/evolution-event-editor.xml.h:52
+msgid "FIXME: _Item"
+msgstr "FIXME: Eintrag"
+
+#: ui/evolution-event-editor.xml.h:53
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: _Journal-Eintrag"
+
+#: ui/evolution-event-editor.xml.h:54
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: Letzter Eintrag im Ordner"
+
+#: ui/evolution-event-editor.xml.h:55
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: Nachricht mailen"
+
+#: ui/evolution-event-editor.xml.h:56
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: Memo-Stil"
+
+#: ui/evolution-event-editor.xml.h:57
+msgid "FIXME: _Move to Folder..."
+msgstr "FIXME: In Ordner verschieben..."
+
+#: ui/evolution-event-editor.xml.h:58
+msgid "FIXME: _New Appointment"
+msgstr "FIXME: _Neuer Termin"
+
+#: ui/evolution-event-editor.xml.h:59
+msgid "FIXME: _Note"
+msgstr "FIXME: _Notiz"
+
+#: ui/evolution-event-editor.xml.h:60
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Objekt..."
+
+#: ui/evolution-event-editor.xml.h:61
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: Absatz..."
+
+#: ui/evolution-event-editor.xml.h:62
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: Rechtschreibung..."
+
+#: ui/evolution-event-editor.xml.h:63
+msgid "FIXME: _Standard"
+msgstr "FIXME: _Standard"
+
+#: ui/evolution-event-editor.xml.h:64
+msgid "FIXME: _Task"
+msgstr "FIXME: Aufgabe"
+
+#: ui/evolution-event-editor.xml.h:65
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: Ungelesener Eintrag"
+
+#: ui/evolution-event-editor.xml.h:66
+msgid "FIXME: what goes here?"
+msgstr "FIXME: was kommt hierher?"
+
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-message-composer.xml.h:12
+msgid "F_ormat"
+msgstr "Format"
+
+#: ui/evolution-event-editor.xml.h:69
+msgid "Find Again"
+msgstr "Weitersuchen"
+
+#: ui/evolution-event-editor.xml.h:70
+msgid "Find _Again"
+msgstr "Weitersuchen"
+
+#: ui/evolution-event-editor.xml.h:71
+msgid "Go to the next item"
+msgstr "Zum nächsten Eintrag gehen"
+
+#: ui/evolution-event-editor.xml.h:72
+msgid "Go to the previous item"
+msgstr "Zum vorigen Eintrag gehen"
+
+#: ui/evolution-event-editor.xml.h:73
+msgid "Modify the file's properties"
+msgstr "Eigenschaften der Datei ändern"
+
+#: ui/evolution-event-editor.xml.h:74
+msgid "N_ext"
+msgstr "Weiter"
+
+#: ui/evolution-event-editor.xml.h:76
+msgid "Paste"
+msgstr "Einfügen"
+
+#: ui/evolution-event-editor.xml.h:77
+msgid "Paste the clipboard"
+msgstr "Inhalt der Zwischenablage einfügen"
+
+#: ui/evolution-event-editor.xml.h:78
+msgid "Pre_vious"
+msgstr "Zurück"
+
+#: ui/evolution-event-editor.xml.h:79
+msgid "Previous"
+msgstr "Voriger"
+
+#: ui/evolution-event-editor.xml.h:80
+msgid "Print S_etup..."
+msgstr "Druckeinstellungen..."
+
+#: ui/evolution-event-editor.xml.h:81
+msgid "Print Setup"
+msgstr "Druckeinstellungen"
+
+#: ui/evolution-event-editor.xml.h:84
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#: ui/evolution-event-editor.xml.h:85
+msgid "Redo"
+msgstr "Wiederherstellen"
+
+#: ui/evolution-event-editor.xml.h:86
+msgid "Redo the undone action"
+msgstr "Die rückgängig gemachte Aktion wiederherstellen"
+
+#: ui/evolution-event-editor.xml.h:87
+msgid "Replace"
+msgstr "Ersetzen"
+
+#: ui/evolution-event-editor.xml.h:88
+msgid "Replace a string"
+msgstr "Eine Zeichenkette ersetzen"
+
+#: ui/evolution-event-editor.xml.h:92
+msgid "Save the appointment and close the dialog box"
+msgstr "Den Termin speichern und das Dialogfenster schließen"
+
+#: ui/evolution-event-editor.xml.h:93 ui/evolution-message-composer.xml.h:23
+msgid "Save the current file"
+msgstr "Die aktuelle Datei speichern"
+
+#: ui/evolution-event-editor.xml.h:94
+msgid "Schedule Meeting"
+msgstr "Besprechung ansetzen"
+
+#: ui/evolution-event-editor.xml.h:95
+msgid "Schedule _Meeting"
+msgstr "Besprechung ansetzen"
+
+#: ui/evolution-event-editor.xml.h:96
+msgid "Schedule some sort of a meeting"
+msgstr "Eine Besprechung ansetzen"
+
+#: ui/evolution-event-editor.xml.h:97
+msgid "Search again for the same string"
+msgstr "Noch einmal nach derselben Zeichenkette suchen"
+
+#: ui/evolution-event-editor.xml.h:98
+msgid "Search for a string"
+msgstr "Eine Zeichenkette suchen"
+
+#: ui/evolution-event-editor.xml.h:100
+msgid "Select All"
+msgstr "Alle auswählen"
+
+#: ui/evolution-event-editor.xml.h:101
+msgid "Select everything"
+msgstr "Alles auswählen"
+
+#: ui/evolution-event-editor.xml.h:102
+msgid "Setup the page settings for your current printer"
+msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker einrichten"
+
+#: ui/evolution-event-editor.xml.h:103
+msgid "Undo"
+msgstr "Rückgängig"
+
+#: ui/evolution-event-editor.xml.h:104
+msgid "Undo the last action"
+msgstr "Die letzte Aktion rückgängig machen"
+
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:37
+msgid "_About..."
+msgstr "Info..."
+
+#: ui/evolution-event-editor.xml.h:106 ui/evolution-message-composer.xml.h:38
+msgid "_Close"
+msgstr "Schließen"
+
+#: ui/evolution-event-editor.xml.h:107
+msgid "_Copy"
+msgstr "Kopieren"
+
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
+msgid "_Debug"
+msgstr "_Diagnose"
+
+#: ui/evolution-event-editor.xml.h:110 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-subscribe.xml.h:16 ui/evolution.xml.h:27
+msgid "_Edit"
+msgstr "_Bearbeiten"
+
+#: ui/evolution-event-editor.xml.h:112
+msgid "_Find..."
+msgstr "Suchen..."
+
+#: ui/evolution-event-editor.xml.h:113
+msgid "_Forms"
+msgstr "_Formulare"
+
+#: ui/evolution-event-editor.xml.h:114 ui/evolution-message-composer.xml.h:42
+#: ui/evolution.xml.h:31
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ui/evolution-event-editor.xml.h:115
+msgid "_Insert"
+msgstr "Einfügen"
 
-#: ui/evolution-contact-editor.h:13
+#: ui/evolution-event-editor.xml.h:116
+msgid "_Object"
+msgstr "_Objekt"
+
+#: ui/evolution-event-editor.xml.h:117
+msgid "_Paste"
+msgstr "Einfügen"
+
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Print"
 msgstr "Drucken"
 
-#: ui/evolution-contact-editor.h:15
-msgid "Save and Close"
-msgstr "Speichern und schließen"
+#: ui/evolution-event-editor.xml.h:119
+msgid "_Properties..."
+msgstr "Eigenschaften..."
 
-#: ui/evolution-contact-editor.h:16
-msgid "Save the contact and close the dialog box"
-msgstr "Den Kontakt speichern und das Dialogfenster schließen"
+#: ui/evolution-event-editor.xml.h:120
+msgid "_Redo"
+msgstr "Wiederherstellen"
 
-#: ui/evolution-contact-editor.h:17
-msgid "Print..."
-msgstr "Drucken..."
+#: ui/evolution-event-editor.xml.h:121
+msgid "_Replace..."
+msgstr "Ersetzen..."
 
-#: ui/evolution-contact-editor.h:18
-msgid "Print this item"
-msgstr "Diesen Eintrag drucken"
+#: ui/evolution-event-editor.xml.h:123
+msgid "_Toolbars"
+msgstr "Werkzeugleisten"
 
-#: ui/evolution-contact-editor.h:20
-msgid "Delete this item"
-msgstr "Diesen Eintrag löschen"
+#: ui/evolution-event-editor.xml.h:125
+msgid "_Undo"
+msgstr "Rückgängig"
 
 #.
-#. *  This file is autogenerated from evolution-mail.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-mail.h:9
+#: ui/evolution-mail.xml.h:7
 msgid "Compose"
 msgstr "Erstellen"
 
-#: ui/evolution-mail.h:10
+#: ui/evolution-mail.xml.h:8
 msgid "Compose a new message"
 msgstr "Eine neue Nachricht erstellen"
 
-#: ui/evolution-mail.h:11
-msgid "Copy"
-msgstr "Kopieren"
-
-#: ui/evolution-mail.h:12
+#: ui/evolution-mail.xml.h:10
 msgid "Copy message to a new folder"
 msgstr "Die Nachricht in einen neuen Ordner kopieren"
 
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:11
+#: ui/evolution-mail.xml.h:14 ui/evolution-subscribe.xml.h:9
 msgid "F_older"
 msgstr "Ordner"
 
-#: ui/evolution-mail.h:16
+#: ui/evolution-mail.xml.h:15
 msgid "Fi_lter on Sender"
 msgstr "Filter über Absender"
 
-#: ui/evolution-mail.h:17
+#: ui/evolution-mail.xml.h:16
 msgid "Filter on Rec_ipients"
 msgstr "Filter über Empfänger"
 
-#: ui/evolution-mail.h:18
+#: ui/evolution-mail.xml.h:17
 msgid "Forget _Passwords"
 msgstr "Passwörter vergessen"
 
-#: ui/evolution-mail.h:21
+#: ui/evolution-mail.xml.h:21
 msgid "Get Mail"
 msgstr "Mail abrufen"
 
-#: ui/evolution-mail.h:22
+#: ui/evolution-mail.xml.h:22
 msgid "Mail _Filters..."
 msgstr "Mail_filter..."
 
-#: ui/evolution-mail.h:23
+#: ui/evolution-mail.xml.h:23
 msgid "Manage Subscriptions..."
 msgstr "Abonnements verwalten..."
 
-#: ui/evolution-mail.h:24
+#: ui/evolution-mail.xml.h:24
 msgid "Mar_k As Read"
 msgstr "Als gelesen markieren"
 
-#: ui/evolution-mail.h:25
+#: ui/evolution-mail.xml.h:25
 msgid "Mark As U_nread"
 msgstr "Als ungelesen markieren"
 
-#: ui/evolution-mail.h:26
+#: ui/evolution-mail.xml.h:26
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail.h:27
+#: ui/evolution-mail.xml.h:27
 msgid "Move message to a new folder"
 msgstr "Die Nachricht in einen neuen Ordner verschieben"
 
-#: ui/evolution-mail.h:28
+#: ui/evolution-mail.xml.h:28
 msgid "Previews the message to be printed"
 msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
 
-#: ui/evolution-mail.h:30
+#: ui/evolution-mail.xml.h:30
 msgid "Print Preview of message..."
 msgstr "Druckvorschau der Nachricht..."
 
-#: ui/evolution-mail.h:31
+#: ui/evolution-mail.xml.h:31
 msgid "Print message to the printer"
 msgstr "Nachricht auf dem Drucker drucken"
 
-#: ui/evolution-mail.h:32
+#: ui/evolution-mail.xml.h:32
 msgid "Print message..."
 msgstr "Nachricht drucken..."
 
-#: ui/evolution-mail.h:36
+#: ui/evolution-mail.xml.h:36
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: ui/evolution-mail.h:37
+#: ui/evolution-mail.xml.h:37
 msgid "Reply to _Sender"
 msgstr "Antwort an Absender"
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:15
+#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:13
 msgid "Select _All"
 msgstr "Alle auswählen"
 
-#: ui/evolution-mail.h:41
+#: ui/evolution-mail.xml.h:41
 msgid "Send queued mail and retrieve new mail"
 msgstr "Mail in der Warteschlange senden und neue Mail abholen"
 
-#: ui/evolution-mail.h:42
+#: ui/evolution-mail.xml.h:42
 msgid "Threaded Message list"
 msgstr "Nachrichtenliste in Stränge geordnet"
 
-#: ui/evolution-mail.h:43
+#: ui/evolution-mail.xml.h:43
 msgid "VFolder on Se_nder"
 msgstr "VOrdner über Absender"
 
-#: ui/evolution-mail.h:44
+#: ui/evolution-mail.xml.h:44
 msgid "VFolder on _Recipients"
 msgstr "VOrdner über Empfänger"
 
-#: ui/evolution-mail.h:45
+#: ui/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "Filter _anwenden"
 
-#: ui/evolution-mail.h:46
+#: ui/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "Ordner konfigurieren"
 
-#: ui/evolution-mail.h:47
-msgid "_Copy to Folder"
-msgstr "In Ordner kopieren"
+#: ui/evolution-mail.xml.h:47
+msgid "_Copy to Folder..."
+msgstr "In Ordner kopieren..."
 
-#: ui/evolution-mail.h:49
+#: ui/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "Nachricht bearbeiten"
 
-#: ui/evolution-mail.h:50
+#: ui/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr "Säubern"
 
-#: ui/evolution-mail.h:51
+#: ui/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "Filter über Betreffzeile"
 
-#: ui/evolution-mail.h:52
+#: ui/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: ui/evolution-mail.h:53 ui/evolution-subscribe.h:20
+#: ui/evolution-mail.xml.h:53 ui/evolution-subscribe.xml.h:18
 msgid "_Invert Selection"
 msgstr "Auswahl umkehren"
 
-#: ui/evolution-mail.h:54
+#: ui/evolution-mail.xml.h:54
 msgid "_Mail Configuration..."
 msgstr "_Mailkonfiguration..."
 
-#: ui/evolution-mail.h:55
+#: ui/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "Nachricht"
 
-#: ui/evolution-mail.h:56
-msgid "_Move to Folder"
-msgstr "In Ordner verschieben"
+#: ui/evolution-mail.xml.h:56
+msgid "_Move to Folder..."
+msgstr "In Ordner verschieben..."
 
-#: ui/evolution-mail.h:57
+#: ui/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "In neuem Fenster öffnen"
 
-#: ui/evolution-mail.h:58
+#: ui/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "Nachricht drucken"
 
-#: ui/evolution-mail.h:59
+#: ui/evolution-mail.xml.h:59
 msgid "_Threaded"
 msgstr "In Strängen"
 
-#: ui/evolution-mail.h:60
+#: ui/evolution-mail.xml.h:60
+msgid "_Undelete"
+msgstr "Löschen rückgängig"
+
+#: ui/evolution-mail.xml.h:61
 msgid "_VFolder on Subject"
 msgstr "VOrdner über Betreffzeile"
 
-#: ui/evolution-mail.h:61
+#: ui/evolution-mail.xml.h:62
 msgid "_Virtual Folder Editor..."
 msgstr "Editor für virtuelle Ordner..."
 
 #.
-#. *  This file is autogenerated from evolution-subscribe.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution-subscribe.h:9
+#: ui/evolution-message-composer.xml.h:7
+msgid "Attach"
+msgstr "Beilegen"
+
+#: ui/evolution-message-composer.xml.h:9
+msgid "Bold"
+msgstr "Fett"
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Close the current file"
+msgstr "Die aktuelle Datei schließen"
+
+#: ui/evolution-message-composer.xml.h:13
+msgid "HTML"
+msgstr "HTML"
+
+#: ui/evolution-message-composer.xml.h:14
+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:15
+msgid "Insert text file..."
+msgstr "Textdatei einfügen..."
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "Open a file"
+msgstr "Eine Datei öffnen"
+
+#: ui/evolution-message-composer.xml.h:19
+msgid "Save As"
+msgstr "Speichern _unter"
+
+#: ui/evolution-message-composer.xml.h:21
+msgid "Save in _folder... (FIXME)"
+msgstr "In Ordner speichern... (FIXME)"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save in folder..."
+msgstr "In Ordner speichern..."
+
+#: ui/evolution-message-composer.xml.h:24
+msgid "Save the current file with a different name"
+msgstr "Die aktuelle Datei unter anderem Namen speichern"
+
+#: ui/evolution-message-composer.xml.h:25
+msgid "Save the message in a specified folder"
+msgstr "Die Nachricht in einem bestimmten Ordner speichern"
+
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send"
+msgstr "Senden"
+
+#: ui/evolution-message-composer.xml.h:27
+msgid "Send _Later"
+msgstr "Später senden"
+
+#: ui/evolution-message-composer.xml.h:28
+msgid "Send _later"
+msgstr "Später senden"
+
+#: ui/evolution-message-composer.xml.h:29
+msgid "Send the mail in HTML format"
+msgstr "Die Mail im HTML-Format senden"
+
+#: ui/evolution-message-composer.xml.h:30
+msgid "Send the message later"
+msgstr "Die Nachricht später senden"
+
+#: ui/evolution-message-composer.xml.h:31
+msgid "Send the message now"
+msgstr "Die Nachricht jetzt senden"
+
+#: ui/evolution-message-composer.xml.h:32
+msgid "Send this message now"
+msgstr "Diese Nachricht jetzt senden"
+
+#: ui/evolution-message-composer.xml.h:33
+msgid "Sets something as bold"
+msgstr "Etwas fett setzen"
+
+#: ui/evolution-message-composer.xml.h:34
+msgid "Show / hide attachments"
+msgstr "Anlagen anzeigen / verbergen"
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Show _attachments"
+msgstr "Anlagen anzeigen"
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "Show attachments"
+msgstr "Anlagen zeigen"
+
+#: ui/evolution-message-composer.xml.h:43
+msgid "_Insert text file... (FIXME)"
+msgstr "Textdatei einfügen... (FIXME)"
+
+#: ui/evolution-message-composer.xml.h:44
+msgid "_Open..."
+msgstr "Öffnen..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
+#: ui/evolution-subscribe.xml.h:7
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufügen"
 
-#: ui/evolution-subscribe.h:12
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List"
 msgstr "Liste aktualisieren"
 
-#: ui/evolution-subscribe.h:13
+#: ui/evolution-subscribe.xml.h:11
 msgid "Refresh List of Folders"
 msgstr "Liste von Ordnern aktualisieren"
 
-#: ui/evolution-subscribe.h:14
+#: ui/evolution-subscribe.xml.h:12
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Ordner aus Ihrer Liste abonnierter Ordner entfernen"
 
-#: ui/evolution-subscribe.h:16
+#: ui/evolution-subscribe.xml.h:14
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ui/evolution-subscribe.h:17
+#: ui/evolution-subscribe.xml.h:15
 msgid "Unsubscribe"
 msgstr "Abonnement kündigen"
 
-#: ui/evolution-subscribe.h:18 ui/evolution.h:28
-msgid "_Edit"
-msgstr "_Bearbeiten"
-
 #.
-#. *  This file is autogenerated from evolution.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
 #.
-#: ui/evolution.h:9
+#: ui/evolution.xml.h:7
 msgid "Create a new folder"
 msgstr "Einen neuen Ordner anlegen"
 
-#: ui/evolution.h:10
+#: ui/evolution.xml.h:8
 msgid "Display a different folder"
 msgstr "Einen anderen Ordner anzeigen"
 
-#: ui/evolution.h:11
+#: ui/evolution.xml.h:9
 msgid "E_xit"
 msgstr "Beenden"
 
-#: ui/evolution.h:12
+#: ui/evolution.xml.h:10
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-Leistenverknüpfung"
 
-#: ui/evolution.h:13
+#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Das Programm verlassen"
 
-#: ui/evolution.h:14
+#: ui/evolution.xml.h:12
 msgid "Getting _Started"
 msgstr "Erste Schritte"
 
-#: ui/evolution.h:15
+#: ui/evolution.xml.h:13
 msgid "Show information about Evolution"
 msgstr "Information über Evolution anzeigen"
 
-#: ui/evolution.h:16
+#: ui/evolution.xml.h:14
 msgid "Show the _Folder Bar"
 msgstr "Die Ordnerleiste anzeigen"
 
-#: ui/evolution.h:17
+#: ui/evolution.xml.h:15
 msgid "Show the _Shortcut Bar"
 msgstr "Die Verknüpfungsleiste anzeigen"
 
-#: ui/evolution.h:18
+#: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr "Fehlerbericht einschicken"
+
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ui/evolution.h:19
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Anzeige der Ordnerleiste an/aus"
 
-#: ui/evolution.h:20
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Anzeige der Verknüpfungsleiste an/aus"
 
-#: ui/evolution.h:21
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Die Kontaktverwaltung benutzen"
 
-#: ui/evolution.h:22
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Den Kalender benutzen"
 
-#: ui/evolution.h:23
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "Den _Mailer benutzen"
 
-#: ui/evolution.h:24
+#: ui/evolution.xml.h:23
 msgid "_About Evolution..."
 msgstr "Über Evolution..."
 
-#: ui/evolution.h:25
+#: ui/evolution.xml.h:24
 msgid "_Appointment (FIXME)"
 msgstr "Termin (FIXME)"
 
-#: ui/evolution.h:26
+#: ui/evolution.xml.h:25
 msgid "_Contact (FIXME)"
 msgstr "Kontakt (FIXME)"
 
-#: ui/evolution.h:27
+#: ui/evolution.xml.h:26
 msgid "_Create New Folder..."
 msgstr "Neuen Ordner anlegen..."
 
-#: ui/evolution.h:30
+#: ui/evolution.xml.h:29
 msgid "_Folder"
 msgstr "Ordner"
 
-#: ui/evolution.h:31
+#: ui/evolution.xml.h:30
 msgid "_Go to Folder..."
 msgstr "_Gehe zu Ordner..."
 
-#: ui/evolution.h:32
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: ui/evolution.h:33
+#: ui/evolution.xml.h:32
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.h:34
+#: ui/evolution.xml.h:33
 msgid "_Mail message (FIXME)"
 msgstr "Mailnachricht (FIXME)"
 
-#: ui/evolution.h:36
+#: ui/evolution.xml.h:35
 msgid "_Settings"
 msgstr "Einstellungen"
 
-#: ui/evolution.h:37
-msgid "_Submit Bug Report"
-msgstr "Fehlerbericht einschicken"
-
-#: ui/evolution.h:38
+#: ui/evolution.xml.h:36
 msgid "_Task (FIXME)"
 msgstr "Auftrag (FIXME)"
 
@@ -5758,39 +6723,33 @@ msgstr "Alle Anwesenden"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B %Y"
 
-#. 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:415
-msgid "MTWTFSS"
-msgstr "MDMDFSS"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2670
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:106
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:325
-msgid "Now"
-msgstr "Jetzt"
-
-#. This is a strptime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:641 widgets/misc/e-dateedit.c:731
-#: widgets/misc/e-dateedit.c:768 widgets/misc/e-dateedit.c:813
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:234 widgets/misc/e-dateedit.c:673
+#: widgets/misc/e-dateedit.c:766 widgets/misc/e-dateedit.c:811
 #: widgets/misc/e-dateedit.c:1127
 msgid "%H:%M"
 msgstr "%H.%M"
 
-#. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:644 widgets/misc/e-dateedit.c:734
-#: widgets/misc/e-dateedit.c:771 widgets/misc/e-dateedit.c:816
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:237 widgets/misc/e-dateedit.c:676
+#: widgets/misc/e-dateedit.c:769 widgets/misc/e-dateedit.c:814
 #: widgets/misc/e-dateedit.c:1130
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
+#: widgets/misc/e-dateedit.c:359
+msgid "Now"
+msgstr "Jetzt"
+
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"