I like monkeys - Federico

svn path=/trunk/; revision=6981

1 files changed, 2177 insertions, 1816 deletions

diff --git a/po/de.po b/po/de.po
index b5b09d6ca8..e47a001818 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.4\n"
-"POT-Creation-Date: 2000-11-16 20:25+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -304,10 +304,10 @@ msgstr ""
 #: 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:1012
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1092
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Konnte Bonobo nicht initialisieren"
 
@@ -430,28 +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:207
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor konnte nicht geladen werden\n"
 
-#: addressbook/conduit/address-conduit.c:220
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
-#: addressbook/conduit/address-conduit.c:579
-#: calendar/conduits/calendar/calendar-conduit.c:651
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "Konnte den wombat-Server nicht starten"
 
-#: addressbook/conduit/address-conduit.c:580
-#: calendar/conduits/calendar/calendar-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:525
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "Konnte wombat nicht starten"
 
-#: addressbook/conduit/address-conduit.c:613
 #: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr "Konnte Address-Anwendungsblock des Pilot nicht lesen"
 
@@ -472,105 +472,11 @@ 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:1266
-msgid "Assistant"
-msgstr "Assistent"
-
-#: 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:1268
-msgid "Business 2"
-msgstr "Geschäftlich 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1269
-msgid "Business Fax"
-msgstr "Geschäftliches Fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1270
-msgid "Callback"
-msgstr "Rückruf"
-
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Car"
-msgstr "Auto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1272
-msgid "Company"
-msgstr "Firma"
-
-#: 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:1274
-msgid "Home 2"
-msgstr "Zu Hause 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-msgid "Home Fax"
-msgstr "Fax zu Hause"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-msgid "Mobile"
-msgstr "Mobil"
-
-#: 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:1279
-msgid "Other Fax"
-msgstr "Anderes Fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Primary"
-msgstr "Primär"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Telex"
-msgstr "Telex"
-
-#: 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:1328
-msgid "Primary Email"
-msgstr "Primäre E-Mail"
-
-#: addressbook/contact-editor/e-contact-editor.c:1329
-msgid "Email 2"
-msgstr "E-Mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1330
-msgid "Email 3"
-msgstr "E-Mail 3"
-
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Kontakt löschen?"
 
@@ -584,7 +490,7 @@ msgid "_Add"
 msgstr "Hinzufügen"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "Löschen"
 
@@ -599,12 +505,11 @@ 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.
+#. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: 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
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -644,6 +549,11 @@ msgstr "Geschäftliches Fax"
 msgid "_Mobile"
 msgstr "Mobil"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "Primäre E-Mail"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "Geschäftlich"
@@ -657,7 +567,7 @@ msgid "C_ontacts..."
 msgstr "Kontakte..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Kategorien..."
 
@@ -674,7 +584,7 @@ msgid "_Address..."
 msgstr "Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "Allgemein"
 
@@ -719,44 +629,145 @@ msgid "No_tes:"
 msgstr "Notizen:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Details"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "Assistent"
+
+#: 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:1268
+msgid "Business 2"
+msgstr "Geschäftlich 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Geschäftliches Fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "Rückruf"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Auto"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Firma"
+
+#: 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:1274
+msgid "Home 2"
+msgstr "Zu Hause 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Fax zu Hause"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+msgid "Mobile"
+msgstr "Mobil"
+
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: po/tmp/mail-config.glade.h:17
+msgid "Other"
+msgstr "Andere"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Anderes Fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Pager"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "Primär"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TTD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "E-Mail 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "E-Mail 3"
+
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr "Adresse _2"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:7
+#, fuzzy
+msgid "Canada"
+msgstr "Kalender"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Adresse prüfen"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "Land:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:10
+#, fuzzy
+msgid "Finland"
+msgstr "Suchen"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "Ort:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Postfach:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Staat/Bundesland:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:14
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "Postleitzahl/_ZIP:"
 
@@ -819,25 +830,25 @@ msgstr "Nachname:"
 msgid "_Suffix:"
 msgstr "Suffix:"
 
-#: addressbook/gui/component/addressbook.c:266
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Als _Minikarten"
 
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:272
-#: ui/evolution-addressbook.xml.h:7
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Als Tabelle"
 
-#: addressbook/gui/component/addressbook.c:392
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "Kann das Adressbuch nicht öffnen"
 
-#: addressbook/gui/component/addressbook.c:397
+#: addressbook/gui/component/addressbook.c:391
+#, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -846,7 +857,7 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 "Wir haben dieses Adressbuch nicht öffnen können. Dies\n"
 "heißt entweder, dass Sie einen ungültigen URI eingegeben\n"
@@ -859,27 +870,27 @@ msgstr ""
 "müssen Sie OpenLDAP herunterladen, installieren, und\n"
 "Evolution neu compilieren und installieren.\n"
 
-#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
 msgid "Show All"
 msgstr "Alle anzeigen"
 
-#: addressbook/gui/component/addressbook.c:509 mail/folder-browser.c:154
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
 msgid "Advanced..."
 msgstr "Komplex..."
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:533
 msgid "Any field contains"
 msgstr "Irgend ein Feld enthält"
 
-#: addressbook/gui/component/addressbook.c:540
+#: addressbook/gui/component/addressbook.c:534
 msgid "Name contains"
 msgstr "Name enthält"
 
-#: addressbook/gui/component/addressbook.c:541
+#: addressbook/gui/component/addressbook.c:535
 msgid "Email contains"
 msgstr "E-Mail enthält"
 
-#: addressbook/gui/component/addressbook.c:627
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -889,66 +900,180 @@ msgstr "Externe Verzeichnisse"
 
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:8
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "LDAP-Server:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-#: mail/mail-config-druid.glade.h:37
+#: po/tmp/ldap-server-dialog.glade.h:8
 msgid "Name:"
 msgstr "Name:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "Portnummer:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr "Root-DN:"
 
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Suchen..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Nachrichtenempfänger"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Namen wählen"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "Name aus Liste wählen:"
 
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Suchen"
+
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "window2"
-msgstr "windows2"
+#: po/tmp/alphabet.glade.h:7
+#, fuzzy
+msgid "a"
+msgstr "AM"
+
+#: po/tmp/alphabet.glade.h:8
+msgid "b"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:9
+msgid "c"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:10
+msgid "d"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:11
+#, fuzzy
+msgid "e"
+msgstr "Mi"
+
+#: po/tmp/alphabet.glade.h:12
+#, fuzzy
+msgid "f"
+msgstr "Wenn"
+
+#: po/tmp/alphabet.glade.h:13
+msgid "g"
+msgstr ""
+
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+msgid "h"
+msgstr "h"
+
+#: po/tmp/alphabet.glade.h:15
+#, fuzzy
+msgid "i"
+msgstr "ist"
+
+#: po/tmp/alphabet.glade.h:16
+msgid "j"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:17
+#, fuzzy
+msgid "k"
+msgstr "OK"
+
+#: po/tmp/alphabet.glade.h:18
+msgid "l"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:19
+#, fuzzy
+msgid "m"
+msgstr "AM"
+
+#: po/tmp/alphabet.glade.h:20
+#, fuzzy
+msgid "n"
+msgstr "bei"
+
+#: po/tmp/alphabet.glade.h:21
+#, fuzzy
+msgid "o"
+msgstr "bei"
+
+#: po/tmp/alphabet.glade.h:22
+#, fuzzy
+msgid "p"
+msgstr "PM"
+
+#: po/tmp/alphabet.glade.h:23
+msgid "q"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:24
+#, fuzzy
+msgid "r"
+msgstr "Fr"
+
+#: po/tmp/alphabet.glade.h:25
+#, fuzzy
+msgid "s"
+msgstr "ist"
+
+#: po/tmp/alphabet.glade.h:26
+#, fuzzy
+msgid "t"
+msgstr "."
+
+#: po/tmp/alphabet.glade.h:27
+#, fuzzy
+msgid "u"
+msgstr "So"
+
+#: po/tmp/alphabet.glade.h:28
+msgid "v"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:29
+msgid "w"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:30
+msgid "x"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: po/tmp/alphabet.glade.h:31
+msgid "y"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:32
+msgid "z"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:417
 #: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
@@ -971,197 +1096,190 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Suchen"
-
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
+#: po/tmp/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr "10 Punkt Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: po/tmp/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 Punkt Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: po/tmp/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Leere Formulare am Ende:"
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: po/tmp/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Textkörper"
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: po/tmp/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Unten:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: po/tmp/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Ausmaße:"
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: po/tmp/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Schrifart..."
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: po/tmp/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Schrifarten"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: po/tmp/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Fußzeile:"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: po/tmp/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: po/tmp/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Kopfzeile"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: po/tmp/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Kopf-/Fußzeile"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Überschriften"
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: po/tmp/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "Überschriften für jeden Buchstaben"
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: po/tmp/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Höhe:"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Folgen einander unmittelbar"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: po/tmp/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "Dazunehmen:"
 
-#: addressbook/printing/e-contact-print.glade.h:24
+#: po/tmp/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Querformat"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: po/tmp/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Links:"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: po/tmp/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Buchstabenreiter an der Seite"
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: po/tmp/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Ränder"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: po/tmp/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Anzahl Spalten:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: po/tmp/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Optionen"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: po/tmp/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Ausrichtung"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: po/tmp/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Seite"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: po/tmp/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Seite einrichten:"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: po/tmp/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papier"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Papierquelle:"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Hochformat"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: po/tmp/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Vorschau:"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: po/tmp/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Mit grauer Schattierung drucken"
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: po/tmp/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Auf geraden Seiten umkehren"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Rechts:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Abschnitte:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: po/tmp/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Schattierung"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Größe:"
 
-#: addressbook/printing/e-contact-print.glade.h:43
+#: po/tmp/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Auf einer neuen Seite beginnen"
 
-#: addressbook/printing/e-contact-print.glade.h:44
+#: po/tmp/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Stilname:"
 
-#: addressbook/printing/e-contact-print.glade.h:45
+#: po/tmp/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Oben:"
 
-#: addressbook/printing/e-contact-print.glade.h:46
-#: mail/mail-config-druid.glade.h:66
+#: po/tmp/e-contact-print.glade.h:45
 msgid "Type:"
 msgstr "Typ:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
+#: po/tmp/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Breite:"
 
-#: addressbook/printing/e-contact-print.glade.h:48
+#: po/tmp/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "AM"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 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"
@@ -1170,13 +1288,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:607
-#: calendar/conduits/todo/todo-conduit.c:480
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:706
-#: calendar/conduits/calendar/calendar-conduit.c:709
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr "Konnte Calendar-Anwendungsblock des Pilot nicht lesen"
 
@@ -1188,8 +1306,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:579
-#: calendar/conduits/todo/todo-conduit.c:582
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr "Konnte den ToDo-Anwendungsblock des Pilot nicht lesen"
 
@@ -1233,46 +1351,46 @@ 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:382
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
-#: calendar/gui/calendar-commands.c:406
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "Kalender öffnen"
 
-#: calendar/gui/calendar-commands.c:445
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Kalender speichern"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 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/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Öffentlich"
 
-#: calendar/gui/calendar-model.c:347
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:350
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Vertraulich"
 
@@ -1304,7 +1422,7 @@ msgstr "Transparent"
 msgid "Opaque"
 msgstr "Opak"
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1316,36 +1434,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
-#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H.%M%n"
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1355,15 +1472,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschließlich) sein"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Die Priorität muss zwischen 1 und 9 (einschließlich) sein"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
@@ -1381,382 +1498,469 @@ msgstr "Keine Zusammenfassung verfügbar."
 
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: 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
+#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
+#: po/tmp/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:8
+#: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Schließen"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:9 calendar/gui/gnome-cal.c:1466
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
 msgid "Snooze"
 msgstr "Weiterschlafen"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Weiterschlaf-Zeit (Minuten)"
 
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: po/tmp/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "05 minutes"
+msgstr "Minuten"
+
+#: po/tmp/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "10 minutes"
+msgstr "Minuten"
+
+#: po/tmp/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 Stunden (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: po/tmp/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "15 minutes"
+msgstr "Minuten"
+
+#: po/tmp/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 Stunden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: po/tmp/cal-prefs-dialog.glade.h:11
+#, fuzzy
+msgid "30 minutes"
+msgstr "Minuten"
+
+#: po/tmp/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "60 minutes"
+msgstr "Minuten"
+
+#: po/tmp/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Alarme schweigen nach"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: po/tmp/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Audio-Alarme"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: po/tmp/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Piepsen, wenn Alarmfenster erscheinen."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: po/tmp/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: po/tmp/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Kalender-Einstellungen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14 calendar/gui/prop.c:528
+#: po/tmp/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Farben"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: po/tmp/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Wochenenden komprimieren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: po/tmp/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Optionen zum Datumsnavigator"
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:842
+#: po/tmp/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Voreinstellungen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Anzeigeoptionen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 calendar/gui/prop.c:610
+#: po/tmp/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Fällig am"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: po/tmp/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Weiterschlafen aktivieren für "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: po/tmp/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Ende des Tages:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: po/tmp/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Erster Tag der Woche:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/gnome-month-item.c:741
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
 msgid "Fri"
 msgstr "Fr"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "Freitag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Markieren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: po/tmp/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "Heute fällige Einträge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: po/tmp/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Heute fällige Einträge:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: po/tmp/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "Noch nicht fällige Einträge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: po/tmp/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "Noch nicht fällige Einträge:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/gnome-month-item.c:737
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
 msgid "Mon"
 msgstr "Mo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Montag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "Überfällige Einträge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: po/tmp/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "Überfällige Einträge:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: po/tmp/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Priorität"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: po/tmp/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Mich an alle Termine erinnern,"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: po/tmp/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Erinnerungen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/gnome-month-item.c:742
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
 msgid "Sat"
 msgstr "Sa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "Samstag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Anzeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: po/tmp/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Endzeiten von Terminen anzeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: po/tmp/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Wochennummern zeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: po/tmp/cal-prefs-dialog.glade.h:47
 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
-#: calendar/gui/gnome-month-item.c:736
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
 msgid "Sun"
 msgstr "So"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "Auftragsblock"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/gnome-month-item.c:740
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
 msgid "Thu"
 msgstr "Do"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:612
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "Zeit bis Fälligkeit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: po/tmp/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Zeit-Unterteilungen:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: po/tmp/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/gnome-month-item.c:738
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
 msgid "Tue"
 msgstr "Di"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Visuelle Alarme"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/gnome-month-item.c:739
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
 msgid "Wed"
 msgstr "Mi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Arbeitswoche"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: po/tmp/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "Minuten bevor sie auftreten."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: po/tmp/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "Sekunden."
 
-#: calendar/gui/dialogs/task-editor.c:655
-msgid "Edit Task"
-msgstr "Auftrag bearbeiten"
-
-#: 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:667 calendar/gui/event-editor.c:322
-#, c-format
-msgid "Appointment - %s"
-msgstr "Termin - %s"
-
-#: 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:673 calendar/gui/event-editor.c:328
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Journal-Eintrag  - %s"
-
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% abgeschlossen:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#: po/tmp/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "Klassifikation:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: po/tmp/task-editor-dialog.glade.h:9
+#, fuzzy
+msgid "Cancelled"
+msgstr "Abbrechen"
+
+#: po/tmp/task-editor-dialog.glade.h:10
+#, fuzzy
+msgid "Completed"
+msgstr "% abgeschlossen:"
+
+#: po/tmp/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Abgeschlossen am:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: po/tmp/task-editor-dialog.glade.h:14
+#, fuzzy
+msgid "High"
+msgstr "Höhe:"
+
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Low"
+msgstr "jetzt"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
+#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
+#: widgets/misc/e-dateedit.c:1446
+msgid "None"
+msgstr "Keine"
+
+#: po/tmp/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Normal"
+msgstr "Format"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Not Started"
+msgstr "Erste Schritte"
+
+#: po/tmp/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: po/tmp/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Anfangsdatum:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Auftrag"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: po/tmp/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "Kontakte..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: po/tmp/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "Fällig am:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Priorität:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: po/tmp/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
-#: calendar/gui/e-calendar-table.c:294
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Auftrag bearbeiten"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Keine Zusammenfassung"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Termin - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Auftrag - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Journal-Eintrag  - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "Öffnen..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Den Auftrag öffnen"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 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: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
+#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:479 mail/mail-view.c:165
+#: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
+#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
 msgid "Delete"
 msgstr "Löschen"
 
-#: calendar/gui/e-calendar-table.c:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Diesen Auftrag löschen"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1173
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:1187
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1200
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: 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
+#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
+#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
+#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
 msgid "New appointment..."
 msgstr "Neuer Termin..."
 
-#: 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
+#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
+#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
 msgid "Edit this appointment..."
 msgstr "Diesen Termin bearbeiten..."
 
-#: calendar/gui/e-day-view.c:2636 calendar/gui/e-week-view.c:2935
-#: ui/evolution-event-editor.xml.h:21
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Diesen Termin löschen"
 
-#: calendar/gui/e-day-view.c:2643 calendar/gui/e-week-view.c:2942
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "Diesen Termin beweglich machen"
 
-#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "Dieses Auftreten löschen"
 
-#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "Jedes Auftreten löschen"
 
@@ -1767,252 +1971,201 @@ msgstr "Jedes Auftreten löschen"
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/event-editor.c:310
-msgid "Edit Appointment"
-msgstr "Termin bearbeiten"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/event-editor-dialog.glade.h:6
+msgid "A_ll day event"
+msgstr "Ganztägiges Ereignis"
 
-#: calendar/gui/event-editor.c:365
-msgid "on"
-msgstr "bei"
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
+msgstr "Termin-Grundeinstellungen"
 
-#: calendar/gui/event-editor.c:389 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
-msgid "day"
-msgstr "Tag"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr "Klassifikation"
 
-#: calendar/gui/event-editor.c:390 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Montag"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr "Benutzerdefinierte Wiederholung"
 
-#: calendar/gui/event-editor.c:391
-msgid "Tuesday"
-msgstr "Dienstag"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "Tage"
 
-#: calendar/gui/event-editor.c:392
-msgid "Wednesday"
-msgstr "Mittwoch"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Alle"
 
-#: calendar/gui/event-editor.c:393
-msgid "Thursday"
-msgstr "Donnerstag"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "Ausnahmen"
 
-#: calendar/gui/event-editor.c:394
-msgid "Friday"
-msgstr "Freitag"
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
+msgstr "Stunden"
 
-#: calendar/gui/event-editor.c:395
-msgid "Saturday"
-msgstr "Samstag"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "Mail an:"
 
-#: calendar/gui/event-editor.c:396 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Sonntag"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Minuten"
 
-#: calendar/gui/event-editor.c:514
-msgid "on the"
-msgstr "am"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "Ändern"
 
-#: calendar/gui/event-editor.c:521
-msgid "th"
-msgstr "."
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr "Keine Wiederholung"
 
-#: calendar/gui/event-editor.c:675
-msgid "occurrences"
-msgstr "Auftreten"
+#: po/tmp/event-editor-dialog.glade.h:21
+msgid "Preview"
+msgstr "Vorschau"
 
-#: 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."
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "Privat"
 
-#: 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"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "Öffentlich"
 
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "Wiederholung"
+
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
+msgstr "Wiederholungsregel"
+
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
+msgstr "Erinnerung"
+
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr "Einfache Wiederholung"
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:38
+#: po/tmp/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "Zusammenfassung:"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
+#: po/tmp/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Zeit"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "_Start time:"
-msgstr "Anfangszeit:"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "_End time:"
-msgstr "Endzeit:"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "A_ll day event"
-msgstr "Ganztägiges Ereignis"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "Klassifikation"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
-msgstr "Öffentlich"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
-msgstr "Privat"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "Audio"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: po/tmp/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minuten"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Hours"
-msgstr "Stunden"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Days"
-msgstr "Tage"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
+#: po/tmp/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "Anzeige"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Program"
-msgstr "_Programm"
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "Endzeit:"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
+#: po/tmp/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "Mail"
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "Mail _to:"
-msgstr "Mail an:"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "_Programm"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
+#: po/tmp/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "Programm ausführen:"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "Audio"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "Reminder"
-msgstr "Erinnerung"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "Appointment Basics"
-msgstr "Termin-Grundeinstellungen"
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "Anfangszeit:"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Anfangsdatum:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "Recurrence Rule"
-msgstr "Wiederholungsregel"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "Tag(e)"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "No recurrence"
-msgstr "Keine Wiederholung"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "event-editor-dialog"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "Simple recurrence"
-msgstr "Einfache Wiederholung"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
+msgstr "für"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Custom recurrence"
-msgstr "Benutzerdefinierte Wiederholung"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
+msgstr "für immer"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Every"
-msgstr "Alle"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr "label21"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "day(s)"
-msgstr "Tag(e)"
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "Monat(e)"
+
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr "bis"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: po/tmp/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "Woche(n)"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "month(s)"
-msgstr "Monat(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:48
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "for"
-msgstr "für"
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Termin bearbeiten"
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "until"
-msgstr "bis"
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr "bei"
 
-#: calendar/gui/event-editor-dialog.glade.h:51
-msgid "forever"
-msgstr "für immer"
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "Tag"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-msgid "Exceptions"
-msgstr "Ausnahmen"
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr "am"
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-msgid "Modify"
-msgstr "Ändern"
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr "."
 
-#: calendar/gui/event-editor-dialog.glade.h:56
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
+msgstr "Auftreten"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
-msgid "Preview"
-msgstr "Vorschau"
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+"Dieser Termin enthält Wiederholungsregeln, die Evolution nicht bearbeiten "
+"kann."
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-msgid "Recurrence"
-msgstr "Wiederholung"
+#: calendar/gui/event-editor.c:3079 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"
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -2224,30 +2377,6 @@ msgstr "zwölfter"
 msgid "ago"
 msgstr "her"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr "To-Do-Eintrag erzeugen"
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr "To-Do-Eintrag bearbeiten"
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "Zusammenfassung:"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "Fällig am:"
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "Priorität:"
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr "Kommentar zum Eintrag:"
-
 #: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
 #: calendar/gui/gnome-cal.c:1530
 msgid "Reminder of your appointment at "
@@ -2486,192 +2615,95 @@ msgstr "Aktuelles Jahr (%Y)"
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:873
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "Zeitanzeige"
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "Zeitformat"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12 Stunden (AM/PM)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24 Stunden"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "Wochen beginnen mit"
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "Tagesbereich"
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-"Bitte wählen Sie den Anfang und das Ende des\n"
-"Stundenbereichs, der in der Tages- und\n"
-"Wochenansicht dargestellt werden soll. Zeiten\n"
-"außerhalb dieses Bereichs werden normalerweise\n"
-"nicht dargestellt."
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr "Tagesbeginn:"
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr "Tagesende:"
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr "Farben für Anzeige"
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr "Auf To-Do-Liste zeigen:"
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr "Stiloptionen der To-Do-Liste:"
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr "Überfällige Einträge markieren"
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr "Noch nicht fällige Einträge markieren"
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr "Heute fällig Einträge markieren"
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr "Eigenschaften der To-Do-Liste"
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr "To-Do-Liste"
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "Alarme"
-
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr "Alarm-Eigenschaften"
-
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr "Bei angezeigtem Alarm piepsen"
-
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
-msgstr "Audio-Alarme schweigen nach"
-
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
-msgstr " Sekunden"
-
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
-msgstr "Weiterschlafen aktivieren für "
-
 #. 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
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
-#: calendar/gui/weekday-picker.c:347 calendar/gui/weekday-picker.c:437
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 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:134 camel/camel-movemail.c:181
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
 #, 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:144
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, 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-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "Maildatei %s konnte nicht überprüft werden: %s"
+
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Maildatei %s konnte nicht geöffnet werden: %s"
 
-#: camel/camel-movemail.c:154
+#: camel/camel-movemail.c:156
 #, 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:195
+#: camel/camel-movemail.c:197
 #, 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: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:241
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fehler beim Lesen der Maildatei: %s"
 
-#: camel/camel-movemail.c:252
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fehler beim Schreiben der temporären Maildatei: %s"
 
-#: camel/camel-movemail.c:270
+#: camel/camel-movemail.c:272
 #, 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:302
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Pipe konnte nicht angelegt werden: %s"
 
-#: camel/camel-movemail.c:314
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr "forK() konnte nicht durchgeführt werden: %s"
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-Programm fehlgeschlagen: %s"
 
-#: camel/camel-movemail.c:353
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Unbekannter Fehler)"
 
@@ -2704,6 +2736,10 @@ msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 msgid "(unknown host)"
 msgstr "(unbekannter Rechner)"
 
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
 #: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
@@ -2719,22 +2755,22 @@ msgstr "URL '%s' braucht einen Rechnernamen-Teil"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%ss' braucht einen Pfad-Teil"
 
-#: camel/camel-service.c:486
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr "Rechner %s gibt es nicht."
 
-#: camel/camel-service.c:489
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Momentan ist es nicht möglich, Rechername %s aufzulösen."
 
-#: camel/camel-session.c:271
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle für Protokoll `%s' verfügbar"
 
-#: camel/camel-session.c:359
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2758,6 +2794,18 @@ msgstr "URL-Zeichenkette `%s' enthält ein ungültiges Protokoll"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer in URL `%s' ist nicht numerisch"
 
+#: camel/providers/imap/camel-imap-auth.c:127
+#, fuzzy, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr "Pipe konnte nicht angelegt werden: %s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Unerwartete Antwort von IMAP-Server: %s"
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2768,16 +2816,21 @@ msgstr "Unerwartete Antwort von IMAP-Server: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: camel/providers/imap/camel-imap-command.c:366
+#: camel/providers/imap/camel-imap-command.c:271
+#, fuzzy
+msgid "Server response ended too soon."
+msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, 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:402
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
@@ -2787,7 +2840,7 @@ msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung für %s konnte nicht geladen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -2843,50 +2896,201 @@ msgstr ""
 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:223
-msgid "Could not create summary"
-msgstr "Zusammenfassung konnte nicht erzeugt werden"
+#: camel/providers/local/camel-local-provider.c:36
+#, fuzzy
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "Mailverzeichnisse im UNIX-MH-Format"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "Zum Speichern lokaler Mail in Mailverzeichnissen im MH-Format"
+
+#: camel/providers/local/camel-local-provider.c:47
+#, fuzzy
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "UNIX-Maildateien im mbox-Format"
+
+#: camel/providers/local/camel-local-provider.c:48
+#, fuzzy
+msgid "For storing local mail in standard mbox format"
+msgstr "Zum Speichern lokaler Mail in Mailverzeichnissen im MH-Format"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+#, fuzzy
+msgid "For storing local mail in qmail maildir directories"
+msgstr "Zum Speichern lokaler Mail in Mailverzeichnissen im MH-Format"
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "Nachricht kann nicht an mbox-Datei angehängt werden: %s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "`%s' ist keine reguläre Datei."
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Kann %s nicht forken: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+#, fuzzy
+msgid "Local folders may not be nested."
+msgstr "Mbox-Ordner können nicht geschachtelt werden."
+
+#: camel/providers/local/camel-local-store.c:200
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Nachricht kann nicht abgerufen werden: %s"
+msgid "Local mail file %s"
+msgstr "Lokale Maildatei %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "UNIX-Maildateien im mbox-Format"
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Ordner `%s' konnte nicht umbenannt werden: %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Ordner `%s' konnte nicht gelöscht werden: %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Ordner `%s' konnte nicht gelöscht werden: %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "Nachricht kann nicht an mh-Ordner angehängt werden: %s"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-maildir-folder.c:204
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
-"Zum Lesen von Mail, die vom lokalen System geliefert wird, und zum Speichern "
-"von Mail auf einer lokalen Platte."
+"Nachricht kann nicht erhalten werden: %s\n"
+"  %s"
 
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#, fuzzy
+msgid "No such message"
+msgstr "Rechner %s gibt es nicht."
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+#, fuzzy
+msgid "Invalid message contents"
+msgstr "_Nachricht an Kontakt senden..."
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Datei `%s' konnte nicht geöffnet werden:\n"
+"Ordner `%s' konnte nicht geöffnet werden:\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Ordner `%s' existiert nicht."
 
-#: camel/providers/mbox/camel-mbox-store.c:134
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Ordner `%s' konnte nicht angelegt werden:\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' ist kein Verzeichnis."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Ordner `%s' konnte nicht gelöscht werden: %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "Lokales Mailverzeichnis %s"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, fuzzy, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Temporäre Mailbox konnte nicht angelegt werden: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, fuzzy, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "Nachricht kann nicht an mbox-Datei angehängt werden: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:327
+#: camel/providers/local/camel-mbox-folder.c:357
+#: camel/providers/local/camel-mbox-folder.c:368
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Nachricht kann nicht erhalten werden: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Datei `%s' konnte nicht geöffnet werden:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2895,14 +3099,14 @@ msgstr ""
 "Datei `%s' konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ist keine reguläre Datei."
 
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2911,151 +3115,90 @@ msgstr ""
 "Ordner `%s' konnte nicht gelöscht werden:\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:160
 #, 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: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:260
-msgid "Mbox folders may not be nested."
-msgstr "Mbox-Ordner können nicht geschachtelt werden."
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+"Ordner konnte nicht geöffnet werden: Nachrichtenliste war unvollständig."
 
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Local mail file %s"
-msgstr "Lokale Maildatei %s"
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
 
-#: 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/local/camel-mbox-summary.c:341
+#, fuzzy, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Kann %s nicht forken: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:688
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+"Ordner `%s' konnte nicht geöffnet werden:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-summary.c:491
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Temporäre Mailbox konnte nicht angelegt werden: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
+#: camel/providers/local/camel-mbox-summary.c:512
+#: camel/providers/local/camel-mbox-summary.c:520
+#: camel/providers/local/camel-mbox-summary.c:691
+#: camel/providers/local/camel-mbox-summary.c:699
+#, fuzzy
+msgid "Summary and folder mismatch, even after a sync"
 msgstr "Zusammenfassungs-Prüffehler, Synchronisation wird abgebrochen"
 
-#: 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:776
+#: camel/providers/local/camel-mbox-summary.c:562
 #, 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: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/local/camel-mbox-summary.c:579
+#, fuzzy, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Fehler beim Schreiben auf temporäre Mailbox: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:832
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, 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:841
+#: camel/providers/local/camel-mbox-summary.c:604
 #, 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:849
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:861
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %s"
 
-#. FIXME: right error code
-#: 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:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nachricht kann nicht an mh-Ordner angehängt werden: %s"
 
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Nachricht kann nicht erhalten werden: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "Mailverzeichnisse im UNIX-MH-Format"
-
-#: camel/providers/mh/camel-mh-provider.c:36
-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:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Ordner `%s' konnte nicht geöffnet werden:\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:127
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Ordner `%s' konnte nicht angelegt werden:\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:136
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ist kein Verzeichnis."
 
-#: 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: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: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:202
-msgid "MH folders may not be nested."
-msgstr "MH-Ordner können nicht geschachtelt werden."
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Lokales Mailverzeichnis %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3073,7 +3216,7 @@ msgstr "Benutzername konnte nicht an Server gesendet werden"
 msgid "Server rejected username/password"
 msgstr "Server lehnte Benutzername/Passwort ab"
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "Nachricht %s nicht gefunden."
@@ -3126,17 +3269,17 @@ msgstr ""
 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"
 
-#: camel/providers/pop3/camel-pop3-folder.c:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Ordner konnte nicht geöffnet werden: Nachrichtenliste war unvollständig."
 
-#: camel/providers/pop3/camel-pop3-folder.c:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, c-format
 msgid "No message with uid %s"
 msgstr "Keine Nachricht mit UID %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nachricht konnte nicht vom POP-Server %s abgerufen werden: %s"
@@ -3225,7 +3368,7 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
@@ -3317,51 +3460,50 @@ msgid "%.1fG"
 msgstr "%.1f GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:301 mail/mail-display.c:117
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:397
-#: ui/evolution-message-composer.xml.h:8
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:13
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "Entferne das gewählte Element aus der Anlagenliste"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Anlage hinzufügen..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "Eine Datei zu der Nachricht hinzufügen"
 
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Anlagen-Eigenschaften"
 
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Dateiname:"
 
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:9
 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
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "Von:"
 
@@ -3373,7 +3515,7 @@ msgstr "Für das Adressbuch hier klicken"
 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:295 mail/mail-format.c:603
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "An:"
 
@@ -3381,7 +3523,7 @@ msgstr "An:"
 msgid "Enter the recipients of the message"
 msgstr "Gebe die Empfänger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:605
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -3401,7 +3543,7 @@ msgstr ""
 "Gebe die Adressen ein, die eine Kopie erhalten, dienicht in der "
 "Empfängerliste auftaucht."
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:607
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Betreff:"
 
@@ -3409,7 +3551,7 @@ msgstr "Betreff:"
 msgid "Enter the subject of the mail"
 msgstr "Gebe den Betreff der Nachricht an"
 
-#: composer/e-msg-composer.c:428
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3418,38 +3560,38 @@ msgstr ""
 "Signaturdatei %s konnte nicht geöffnet werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:595
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: composer/e-msg-composer.c:606
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:648
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Speichere Änderungen an Nachricht..."
 
-#: composer/e-msg-composer.c:650
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Änderungen an Nachricht speichern..."
 
-#: composer/e-msg-composer.c:691
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Fehler beim Speichern des Erstellen in 'Entwürfe': %s"
 
-#: composer/e-msg-composer.c:735 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:741
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3459,27 +3601,27 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre Änderungen speichern?"
 
-#: composer/e-msg-composer.c:763
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:889
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Diese Datei existiert nicht."
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Diese Datei ist keine normale Datei."
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Diese Datei existiert, ist aber nicht lesbar."
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:923
 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:941
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3487,15 +3629,15 @@ 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:962
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Ein Fehler trat beim Lesen der Datei auf."
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:1416
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "Konnte Erstellungsfenster nicht erzeugen."
 
@@ -3503,6 +3645,11 @@ msgstr "Konnte Erstellungsfenster nicht erzeugen."
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutions Maileditor kann nicht initialisiert werden."
 
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Suchen"
+
 #: filter/filter-datespec.c:62
 msgid "years"
 msgstr "Jahre"
@@ -3589,8 +3736,8 @@ msgstr "Vergleichen mit"
 msgid "<click here to select a date>"
 msgstr "<hier klicken, um ein Datum zu wählen>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
-#: mail/mail-autofilter.c:333
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
@@ -3598,7 +3745,16 @@ msgstr "Filterregel hinzufügen"
 msgid "Edit Filter Rule"
 msgstr "Filterregel bearbeiten"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:10
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Filter bearbeiten"
 
@@ -3624,19 +3780,19 @@ msgstr ""
 "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
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Ordner-URI eingeben"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<hier klicken, um einen Ordner zu wählen>"
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:184
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3645,7 +3801,12 @@ msgstr ""
 "Fehler im regulären Ausdruck '%s':\n"
 "%s"
 
-#: filter/filter-part.c:458
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr "Test"
 
@@ -3657,229 +3818,225 @@ msgstr "Regelname: "
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Wenn"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Aktionen ausführen"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "Kriterium hinzufügen"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Kriterium entfernen"
 
-#: filter/filter.glade.h:9 mail/folder-browser.c:463
-#: mail/mail-config-druid.glade.h:26 mail/mail-config.glade.h:10
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: filter/filter.glade.h:11
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "VOrdner bearbeiten"
 
-#: filter/filter.glade.h:12
+#: po/tmp/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Filterregeln"
 
-#: filter/filter.glade.h:14
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
+msgstr "Umrandung:"
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Virtuelle Ordner"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "vOrdner-Quellen"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:511
-msgid "Answered"
-msgstr "Beantwortet"
-
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Farbe zuweisen"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Sendedatum"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "Gelöscht"
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr "Entwurf"
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:12
-msgid "Flagged"
-msgstr "Markiert"
-
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr "Weiterleiten an Adresse"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "Nachrichtenrumpf"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Nachricht wurde empfangen"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Nachricht wurde gesendet"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: filter/libfilter-i18n.h:20 mail/message-list.c:508
-msgid "Seen"
-msgstr "Gelesen"
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "Absender"
 
-#: filter/libfilter-i18n.h:24
-msgid "Set Flag"
-msgstr "Marke setzen"
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "Status:"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Quelle"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "Status:"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "nach"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "vor"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "enthält"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "enthält nicht"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "endet nicht mit"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "existiert nicht"
 
-#: filter/libfilter-i18n.h:36
-msgid "does not match regex"
-msgstr "passt nicht auf Regex"
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr "klingt nicht wie"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "beginnt nicht mit"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "endet mit"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "existiert"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "ist größer als"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "ist kleiner als"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "ist nicht"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "ist"
 
-#: filter/libfilter-i18n.h:45
-msgid "matches regex"
-msgstr "passt auf Regex"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "am oder nach"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "am oder vor"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "klingt wie"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "beginnt mit"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "war nach"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "war vor"
 
@@ -3903,137 +4060,132 @@ msgstr "VOrdner-Regel hinzufügen"
 msgid "Edit VFolder Rule"
 msgstr "VFolder-Regel bearbeiten"
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kann die Evolution-Mail-Komponente nicht initialisieren"
 
-#: mail/component-factory.c:236
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr ""
-"Kann die Evolution-Mailzusammenfassungs-Komponente nicht initialisieren."
-
-#: mail/component-factory.c:241
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Evolutions Mailspeicherungs-Hash kann nicht initialisiert werden."
-
-#: mail/component-factory.c:279
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser.c:156 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:18
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "Speichern"
 
-#: mail/folder-browser.c:169
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "Rumpf oder Betreff enthält"
 
-#: mail/folder-browser.c:170
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "Rumpf enthält"
 
-#: mail/folder-browser.c:171
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Betreff enthält"
 
-#: mail/folder-browser.c:172
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "Rumpf enthält nicht"
 
-#: mail/folder-browser.c:173
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Betreff enthält nicht"
 
-#: mail/folder-browser.c:451
+#: mail/folder-browser.c:453
 msgid "VFolder on Subject"
 msgstr "VOrdner über Betreffzeile"
 
-#: mail/folder-browser.c:452
+#: mail/folder-browser.c:454
 msgid "VFolder on Sender"
 msgstr "VOrdner über Absender"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:455
 msgid "VFolder on Recipients"
 msgstr "VOrdner über Empfänger"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:457
 msgid "Filter on Subject"
 msgstr "Filter über Betreffzeile"
 
-#: mail/folder-browser.c:456
+#: mail/folder-browser.c:458
 msgid "Filter on Sender"
 msgstr "Filter über Absender"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:459
 msgid "Filter on Recipients"
 msgstr "Filter über Empfänger"
 
-#: mail/folder-browser.c:458 mail/folder-browser.c:543
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
 msgid "Filter on Mailing List"
 msgstr "Filter über Mailingliste"
 
-#: mail/folder-browser.c:462 ui/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 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
+#: mail/folder-browser.c:466
+#, fuzzy
+msgid "Save As..."
+msgstr "Speichern _unter..."
+
+#: mail/folder-browser.c:467 mail/mail-view.c:163
+#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
+#: po/tmp/evolution-mail.xml.h:28
 msgid "Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:469
 msgid "Reply to Sender"
 msgstr "Antwort an Absender"
 
-#: mail/folder-browser.c:467 mail/mail-view.c:156 ui/evolution-mail.xml.h:35
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Allen antworten"
 
-#: mail/folder-browser.c:468 mail/mail-view.c:159 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
 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:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "In der Zeit vorangehen"
 
-#: mail/folder-browser.c:471
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:472
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "Als ungelesen markieren"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:477
 msgid "Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:478
 msgid "Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:480
 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
+#: mail/folder-browser.c:484
 msgid "Apply Filters"
 msgstr "Filter anwenden"
 
-#: mail/folder-browser.c:483 ui/evolution-mail.xml.h:11
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 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
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter über Mailingliste (%s)"
@@ -4053,7 +4205,7 @@ msgstr "Betreff ist %s"
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
 
-#: mail/mail-autofilter.c:329
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
@@ -4110,15 +4262,15 @@ msgstr ""
 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:542
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:544
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:659
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4126,7 +4278,29 @@ msgstr ""
 "Sie können nur im Entwürfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:788
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "Datei überschreiben?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Eine Datei mit diesem Namen existiert bereits.\n"
+"Überschreiben?"
+
+#: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Speichern unter..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Speichern unter..."
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4135,15 +4309,47 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:833
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:880
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/mail-config-druid.glade.h:6
+msgid "Identity"
+msgstr "Identität"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "Mailkonfiguration"
+
+#: po/tmp/mail-config-druid.glade.h:8
+#, fuzzy
+msgid "Mail Source"
+msgstr "Mailquellen"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Mailtransport"
+
+#: po/tmp/mail-config-druid.glade.h:10
+#, fuzzy
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr "Willkommen zum Evolution-Mailkonfigurations-Druiden! "
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -4153,59 +4359,64 @@ msgstr ""
 "ausgehenden Mail ein. Sie können auf Wunsch auch den Namen Ihrer "
 "Organisation erwähnen, und den einer Datei, in der Ihre Signatur steht."
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Voller Name:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: mail/mail-config-druid.glade.h:41 mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config-druid.glade.h:63 mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Signaturdatei:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:20
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Signaturdatei"
 
-#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Server:"
 
-#: mail/mail-config-druid.glade.h:67 mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Pfad:"
 
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Authentikation:"
 
-#: mail/mail-config-gui.c:940
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Unterstützte Typen feststellen..."
 
-#: mail/mail-config-druid.glade.h:24 mail/mail-config-gui.c:967
+#: mail/mail-config-gui.c:968
+#, fuzzy
+msgid "Remember this password"
+msgstr "Sich an mein Passwort erinnern"
+
+#: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "Nachrichten nicht vom Server löschen"
 
-#: mail/mail-config-druid.glade.h:65 mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "Einstellungen testen"
 
-#: mail/mail-config-gui.c:1106
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "Mailquellen-Typ:"
 
-#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4219,11 +4430,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:1130
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr "Newsquellen-Typ:"
 
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4238,332 +4449,112 @@ msgstr ""
 "Typen feststellen...\" klicken, nachdem Sie die anderen Informationen "
 "eingegeben haben."
 
-#: mail/mail-config-gui.c:1154
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr "Mailtransport-Typ:"
 
-#: mail/mail-config-gui.c:1209
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Identität hinzufügen"
 
-#: mail/mail-config-gui.c:1211
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr "Identität bearbeiten"
 
-#: mail/mail-config-gui.c:1309
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Quelle hinzufügen"
 
-#: mail/mail-config-gui.c:1311
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Quelle bearbeiten"
 
-#: mail/mail-config-gui.c:1406
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "Newsserver hinzufügen"
 
-#: mail/mail-config-gui.c:1408
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Newsserver bearbeiten"
 
-#: mail/mail-config-gui.c:2232
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Teste \"%s\""
 
-#: mail/mail-config-gui.c:2234
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "Testverbindung mit \"%s\""
 
-#: mail/mail-config-gui.c:2275
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "Die Verbindung war erfolgreich!"
 
-#: mail/mail-config-gui.c:2325
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr "Ermittle Autorisationsfähigkeiten von \"%s\""
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr "Ermittle Autorisation auf \"%s\""
 
-#.
-#. * 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
-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: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 ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what"
-msgstr ""
-"Bitte geben Sie unten Informationen über Ihren Server für eingehende Mail "
-"ein. Wenn Sie nicht wissen, was"
-
-#: 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:50
-msgid "Preferred type: "
-msgstr "Bevorzugter Typ: "
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Receiving Email"
-msgstr "Mail erhalten"
-
-#: 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 ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming"
-msgstr ""
-"Sie sind fast fertig mit der Mailkonfiguration. Die Identität, der Server "
-"für eingehende"
-
-#: 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
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adresse"
 
-#: mail/mail-config.glade.h:11
+#: po/tmp/mail-config.glade.h:10
 msgid "Identities"
 msgstr "Identitäten"
 
-#: mail/mail-config.glade.h:12
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Mailquellen"
 
-#: mail/mail-config.glade.h:13
-msgid "Mail Transport"
-msgstr "Mailtransport"
-
-#: mail/mail-config.glade.h:14
+#: po/tmp/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Nachrichten als gesehen markieren [ms]: "
 
-#: mail/mail-config.glade.h:15
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Newsserver"
 
-#: mail/mail-config.glade.h:16
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Newsquellen"
 
-#: mail/mail-config.glade.h:17
+#: po/tmp/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organisation"
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Nachrichten in HTML-Format senden"
 
-#: 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:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "%s konnte nicht ausgeführt werden: %s\n"
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Kann %s nicht forken: %s"
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Quellen"
 
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Bitte geben Sie Ihre PGP-/GPG-Passphrase ein."
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Kein Passwort angegeben."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Konnte Pipe zu GPG/PGP nicht anlegen: %s"
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "Kein GPG/PGP-Programm verfügbar."
 
-#: mail/mail-display.c:67
-msgid "Overwrite file?"
-msgstr "Datei überschreiben?"
-
-#: mail/mail-display.c:71
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Eine Datei mit diesem Namen existiert bereits.\n"
-"Überschreiben?"
-
-#: mail/mail-display.c:85
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4572,123 +4563,128 @@ msgstr ""
 "Datei %s konnte nicht geöffnet werden:\n"
 "%s"
 
-#: mail/mail-display.c:97
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-display.c:193
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Anlage speichern"
 
-#: mail/mail-display.c:233
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/mail-display.c:275
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Auf Platte speichern..."
 
-#: mail/mail-display.c:277
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "Öffnen in %s..."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr "An Ort und Stelle betrachten"
 
-#: mail/mail-display.c:303
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "An Ort und Stelle betrachten (über %s)"
 
-#: mail/mail-display.c:330
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-format.c:478
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
-#: mail/mail-format.c:823
+#: mail/mail-format.c:845
 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
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr "Verschlüsselte Nachricht nicht angezeigt"
 
-#: mail/mail-format.c:841
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "Verschlüsselte Nachricht"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr "Zum Entschlüsseln Icon klicken."
 
-#: mail/mail-format.c:1444
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1482
 #, 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
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:1494
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:1499
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr "Ungültiger external-body-Teil."
 
-#: mail/mail-local.c:194
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:198
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Ordner \"%s\" in \"%s\"-Format umwandeln"
 
-#: mail/mail-local.c:254
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Schließe aktuellen Ordner"
 
-#: mail/mail-local.c:286
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "Benenne alten Ordner um und öffne"
 
-#: mail/mail-local.c:307
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Lege einen neuen Ordner an"
 
-#: mail/mail-local.c:322
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Kopiere Nachrichten"
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4697,7 +4693,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:370
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4705,295 +4701,306 @@ msgstr ""
 "Wenn Sie diese Mailbox nicht mehr öffnen können,\n"
 "werden Sie sie wohl von Hand reparieren müssen."
 
-#: mail/mail-local.c:659
+#: mail/mail-local.c:781
 msgid "Registering local folder"
 msgstr "Lokaler Ordner wird registriert"
 
-#: mail/mail-local.c:661
+#: mail/mail-local.c:783
 msgid "Register local folder"
 msgstr "Lokalen Ordner registrieren"
 
-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Rufe E-Mail von %s ab"
 
-#: mail/mail-ops.c:72
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "E-Mail von %s abrufen"
 
-#: mail/mail-ops.c:312
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Es gibt keine neue Mail auf %s."
 
-#: mail/mail-ops.c:367
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "Filtere E-Mail auf Anfrage"
 
-#: mail/mail-ops.c:369
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "E-Mail auf Anfrage filtern"
 
-#: mail/mail-ops.c:504
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:509
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "Sende eine Nachricht ohne eine Betreffzeile"
 
-#: mail/mail-ops.c:512
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "\"%s\" senden"
 
-#: mail/mail-ops.c:515
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Eine Nachricht ohne eine Betreffzeile senden"
 
-#: mail/mail-ops.c:686
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "Sende Warteschlange"
 
-#: mail/mail-ops.c:688
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "Warteschlange senden"
 
-#: mail/mail-ops.c:824 mail/mail-ops.c:831
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Hänge \"%s\" an"
 
-#: mail/mail-ops.c:828 mail/mail-ops.c:834
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr "Hänge eine Nachricht ohne eine Betreffzeile an"
 
-#: mail/mail-ops.c:906
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Säubere \"%s\""
 
-#: mail/mail-ops.c:908
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "\"%s\" säubern"
 
-#: mail/mail-ops.c:967
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Verschiebe Nachrichten von \"%s\" in \"%s\""
 
-#: mail/mail-ops.c:969
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiere Nachrichten von \"%s\" in \"%s\""
 
-#: mail/mail-ops.c:972
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Machrichten von \"%s\" in \"%s\" verschieben"
 
-#: mail/mail-ops.c:974
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiere Nachrichten von \"%s\" in \"%s\""
 
-#: mail/mail-ops.c:1005
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Verschiebe"
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Kopiere"
 
-#: mail/mail-ops.c:1028
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s Nachricht %d von %d (UID \"%s\")"
 
-#: mail/mail-ops.c:1107
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Markiere Nachrichten in Ordner \"%s\""
 
-#: mail/mail-ops.c:1110
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Markiere Nachrichten in Ordner \"%s\""
 
-#: mail/mail-ops.c:1141
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Markiere Nachricht %d von %d"
 
-#: mail/mail-ops.c:1264
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
-#: mail/mail-ops.c:1266
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Ordner in \"%s\" abtasten"
 
-#: mail/mail-ops.c:1335 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Keine Beschreibung)"
 
-#: mail/mail-ops.c:1396
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Hänge Nachrichten aus Ordner \"%s\" an"
 
-#: mail/mail-ops.c:1399
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Nachrichten aus \"%s\" beilegen"
 
-#: mail/mail-ops.c:1499
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Leite Nachrichten weiter: \"%s\""
 
-#: mail/mail-ops.c:1503
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "Leite eine Nachricht ohne eine Betreffzeile weiter"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Nachricht \"%s\" weiterleiten"
 
-#: mail/mail-ops.c:1510
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Eine Nachricht ohne eine Betreffzeile weiterleiten"
 
-#: mail/mail-ops.c:1557
+#: mail/mail-ops.c:1593
 #, 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:1573
+#: mail/mail-ops.c:1610
 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:1736
+#: mail/mail-ops.c:1665
+#, fuzzy
+msgid "Forwarded messages"
+msgstr "Weitergeleitete Nachricht - %s"
+
+#: mail/mail-ops.c:1679
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Weitergeleitete Nachricht - %s"
+
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Lade \"%s\""
 
-#: mail/mail-ops.c:1738
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "\"%s\" laden"
 
-#: mail/mail-ops.c:1840
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Erzeuge \"%s\""
 
-#: mail/mail-ops.c:1842
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "\"%s\" erzeugen"
 
-#: mail/mail-ops.c:1890
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 "Ausnahmezustand beim Übermitteln des Ergebnisses an "
 "Shell-Komponenten-Listener."
 
-#: mail/mail-ops.c:1936
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synchronisiere \"%s\""
 
-#: mail/mail-ops.c:1938
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "\"%s\" synchronisieren"
 
-#: mail/mail-ops.c:2002
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Zeige Nachrichten-UID \"%s\" an"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "Lösche Nachrichtenanzeige"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Nachrichten-UID \"%s\" anzeigen"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "Nachrichtenanzeige löschen"
 
-#: mail/mail-ops.c:2124
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Öffne Nachrichten aus Ordner \"%s\""
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Nachrichten aus \"%s\" öffnen"
 
-#: mail/mail-ops.c:2231
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Lade %s-Ordner"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "%s-Ordner laden"
 
-#: mail/mail-ops.c:2300
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Betrachte Nachrichten aus Ordner \"%s\""
 
-#: mail/mail-ops.c:2303
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Nachrichten aus Ordner \"%s\" betrachten"
 
-#: mail/mail-ops.c:2329 mail/mail-ops.c:2447
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Rufe Nachricht %d von %d ab (UID \"%s\")"
 
-#: mail/mail-ops.c:2419
-#, c-format
-msgid "Viewing message sources from folder \"%s\""
-msgstr "Betrachte Nachrichtenquellen aus Ordner \"%s\""
+#: mail/mail-ops.c:2428
+#, fuzzy, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "Hänge Nachrichten aus Ordner \"%s\" an"
 
-#: mail/mail-ops.c:2422
-#, c-format
-msgid "View message sources from \"%s\""
-msgstr "Nachrichtenquellen aus \"%s\" betrachten"
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "Öffne Nachrichten aus Ordner \"%s\""
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "Rufe Nachricht %d von %d ab (UID \"%s\")"
 
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: mail/mail-summary.c:95 mail/mail-threads.c:703
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 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 ""
@@ -5003,7 +5010,7 @@ msgstr ""
 "Fehler beim Vorbereiten auf %s:\n"
 "%s"
 
-#: mail/mail-threads.c:650
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -5012,34 +5019,34 @@ msgstr ""
 "Fehler beim `%s'_\n"
 "%s"
 
-#: mail/mail-threads.c:707
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr "Fehler beim Lesen von Befehlen vom verwaltenden Thread."
 
-#: mail/mail-threads.c:772
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr "Schadhafte Nachricht von verwaltendem Thread?"
 
-#: mail/mail-threads.c:891
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "Konnte Dialogfenster nicht erzeugen."
 
-#: mail/mail-threads.c:902
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "Benutzer hat Anfrage abgebrochen."
 
-#: mail/mail-tools.c:187
+#: mail/mail-tools.c:189
 #, 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:237
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr "Begutachte %s"
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5048,41 +5055,41 @@ msgstr ""
 "Nachrichten erhalten werden."
 
 #. Info
-#: mail/mail-tools.c:288
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Rufe Nachricht %d von %d ab"
 
 #. Append it to dest
-#: mail/mail-tools.c:301
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Schreibe Nachricht %d von %d"
 
-#: mail/mail-tools.c:330
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Speichere Änderungen an %s"
 
-#: mail/mail-tools.c:367
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (weitergeleitete Nachricht)"
 
-#: mail/mail-tools.c:377
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (keine Betreffzeile)"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "Weitergeleitete Nachricht (keine Betreffzeile)"
 
-#: mail/mail-tools.c:521
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5095,56 +5102,72 @@ msgstr ""
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 msgid "New VFolder"
 msgstr "Neuer VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Antworten"
 
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:39
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "An den Sender der Nachricht antworten"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "allen Empfängern der Nachricht antworten"
 
-#: mail/mail-view.c:159 ui/evolution-mail.xml.h:20
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Die Nachricht weiterleiten"
 
-#: mail/mail-view.c:163 ui/evolution-mail.xml.h:33
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Die gewählte Nachricht drucken"
 
-#: mail/mail-view.c:165 ui/evolution-mail.xml.h:13
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Die Nachricht löschen"
 
-#: mail/message-list.c:505
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:2045
+#: mail/message-list.c:575
+msgid "Seen"
+msgstr "Gelesen"
+
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr "Beantwortet"
+
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
+msgstr ""
+
+#. well, we could scan more children, build up a (more accurate) list, but this should do ok
+#: mail/message-list.c:858 mail/message-list.c:873
+#, c-format
+msgid "%s, et al."
+msgstr ""
+
+#: mail/message-list.c:860 mail/message-list.c:875
+#, fuzzy
+msgid "<unknown>"
+msgstr "Unbekannt"
+
+#: mail/message-list.c:2068
 msgid "Rebuilding message view"
 msgstr "Baue Nachrichtenansicht neu auf"
 
-#: mail/message-list.c:2047
+#: mail/message-list.c:2070
 msgid "Rebuild message view"
 msgstr "Nachrichtenansicht neu aufbauen"
 
-#: mail/message-thread.c:583
-msgid "Threading message list"
-msgstr "Nachrichtenliste wird in Stränge geordnet"
-
-#: mail/message-thread.c:585
-msgid "Thread message list"
-msgstr "Nachrichtenliste in Stränge ordnen"
-
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr "Ordner anzeigen, die beginnen mit:"
@@ -5179,11 +5202,11 @@ msgstr "Ordner \"%s\" abonnieren"
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Ordner \"%s\" abbestellen"
 
-#: shell/e-setup.c:110 shell/e-setup.c:179
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "Installation von Evolution"
 
-#: shell/e-setup.c:114
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -5191,31 +5214,31 @@ msgstr ""
 "Diese neue Version von Evolution muss zusätzliche Dateien in Ihr\n"
 "persönliches Evolution-Verzeichnis installieren"
 
-#: shell/e-setup.c:115
+#: shell/e-setup.c:117
 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:156
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr "Dateien konnte nicht korrekt aktualisiert werden"
 
-#: shell/e-setup.c:160 shell/e-setup.c:220
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr "Evolutions Dateien erfolgreich installiert."
 
-#: shell/e-setup.c:183
+#: shell/e-setup.c:187
 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:184
+#: shell/e-setup.c:188
 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:201
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5227,7 +5250,7 @@ msgstr ""
 "nicht anlegen.\n"
 "Fehler: %s"
 
-#: shell/e-setup.c:216
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5237,7 +5260,7 @@ msgstr ""
 "`%s'\n"
 "kopieren."
 
-#: shell/e-setup.c:241
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5248,7 +5271,7 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:253
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5305,11 +5328,11 @@ msgstr "Der Fehlermelder kann nicht gefunden werden"
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5319,34 +5342,29 @@ msgstr ""
 "und Kontakt-Management Anwendung\n"
 "innerhalt der GNOME-Desktops."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "Gehe zu Ordner..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Ordner"
 
-#: 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
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:339
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kann lokalen Speicher nicht einstellen -- %s"
 
-#: shell/e-shell.c:1157
+#: shell/e-shell.c:1208
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5424,64 +5442,65 @@ msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von Verknüpfungen."
 
-#: shell/e-storage.c:128
+#: po/tmp/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:34
+#: shell/e-storage-set-view.c:235
+msgid "_View"
+msgstr "_Ansicht"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Den gewählten Ordner betrachten"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Kein Name)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ungültig"
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Nicht genügend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "Funktion für diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "Operation nicht unterstützt"
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 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: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:235
-msgid "View the selected folder"
-msgstr "Den gewählten Ordner betrachten"
-
-#: shell/main.c:70
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5523,7 +5542,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
 "werden, und wir hoffen auf Ihre Mitarbeit!\n"
 
-#: shell/main.c:97
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5531,1115 +5550,1123 @@ msgstr ""
 "Danke.\n"
 "das Evolution-Team\n"
 
-#: shell/main.c:122
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kann die Evolution-Shell nicht initialisieren."
 
-#: shell/main.c:144
+#: shell/main.c:178
 msgid "Disable."
 msgstr "Deaktivieren."
 
-#: shell/main.c:166
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kann das Bonobo-System nicht initialisieren."
 
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.xml.h:7
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr "Neuer Verzeichnisserver"
 
-#: ui/evolution-addressbook-ldap.xml.h:8
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "_Aktionen"
 
-#: ui/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: ui/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Einen Kontakt löschen"
 
-#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:68
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Suchen"
 
-#: ui/evolution-addressbook.xml.h:12
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Einen Kontakt suchen"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Neu"
 
-#: ui/evolution-addressbook.xml.h:15
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Kontakte drucken"
 
-#: ui/evolution-addressbook.xml.h:16
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:17
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Laden abbrechen"
 
-#: ui/evolution-addressbook.xml.h:18
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Alle betrachten"
 
-#: ui/evolution-addressbook.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Alle Kontakte betrachten"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "_New Contact"
-msgstr "Neuer Kontakt?"
-
-#: ui/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Print Contacts..."
 msgstr "Kontakte drucken..."
 
-#: ui/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "Nach Kontakten suchen"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-event-editor.xml.h:124
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "Werkzeuge"
 
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.xml.h:7
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 Tage"
 
-#: ui/evolution-calendar.xml.h:8
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Einstellungen ändern"
 
-#: ui/evolution-calendar.xml.h:9
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Kalender"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Kalender-Einstellungen..."
 
-#: ui/evolution-calendar.xml.h:10
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ui/evolution-calendar.xml.h:11
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: ui/evolution-calendar.xml.h:12
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Tag"
 
-#: ui/evolution-calendar.xml.h:13
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "In der Zeit zurückgehen"
 
-#: ui/evolution-calendar.xml.h:14
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "In der Zeit vorangehen"
 
-#: ui/evolution-calendar.xml.h:15
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: ui/evolution-calendar.xml.h:16
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Zu bestimmtem Datum gehen"
 
-#: ui/evolution-calendar.xml.h:17
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Zur aktuellen Zeit gehen"
 
-#: ui/evolution-calendar.xml.h:18
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Monat"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "New Ca_lendar"
-msgstr "Neuer Kalender"
-
-#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:75
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/evolution-calendar.xml.h:22
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Einen Kalender öffnen"
 
-#: ui/evolution-calendar.xml.h:23
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Zurück"
 
-#: ui/evolution-calendar.xml.h:25
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:26
+#: po/tmp/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Kalender als etwas anderes speichern"
 
-#: ui/evolution-calendar.xml.h:27
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Einen Tag zeigen"
 
-#: ui/evolution-calendar.xml.h:28
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "1 Monat zeigen"
 
-#: ui/evolution-calendar.xml.h:29
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "1 Woche zeigen"
 
-#: ui/evolution-calendar.xml.h:30
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Die Arbeitswoche zeigen"
 
-#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:365
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr "Heute"
 
-#: ui/evolution-calendar.xml.h:32
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Woche"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:34
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Neu"
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_New appointment..."
-msgstr "_Neuer Termin..."
-
-#: ui/evolution-calendar.xml.h:35
-msgid "_Open"
-msgstr "Ö_ffnen"
-
-#: ui/evolution-calendar.xml.h:36
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "Kalender öffnen"
 
-#: ui/evolution-calendar.xml.h:37
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:38
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "Kalender _speichern unter"
 
-#: ui/evolution-contact-editor.xml.h:8
+#: po/tmp/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Diesen Eintrag löschen"
 
-#: ui/evolution-contact-editor.xml.h:9
+#: po/tmp/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "Löschen..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: po/tmp/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Hilfe"
 
-#: ui/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "Umschlag drucken..."
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:83
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
 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
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Speichern _unter..."
 
-#: ui/evolution-contact-editor.xml.h:15 ui/evolution-event-editor.xml.h:91
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
-#: ui/evolution-contact-editor.xml.h:16
+#: po/tmp/evolution-contact-editor.xml.h:15
 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
+#: po/tmp/evolution-contact-editor.xml.h:16
 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
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr "Online-Hilfe einsehen"
 
-#: ui/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-contact-editor.xml.h:18
 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
+#: po/tmp/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:110
+#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "_Datei"
 
-#: ui/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-contact-editor.xml.h:20
 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
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Speichern"
 
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-event-editor.xml.h:7
+#: po/tmp/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr "Über diese Anwendung"
 
-#: ui/evolution-event-editor.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Info..."
 
-#: ui/evolution-event-editor.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "Aktio_nen"
 
-#: ui/evolution-event-editor.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "_Löschen"
 
-#: ui/evolution-event-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: ui/evolution-event-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Löschen"
 
-#: ui/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Die Auswahl löschen"
 
-#: ui/evolution-event-editor.xml.h:15
+#: po/tmp/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Diesen Termin abschließen"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-mail.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ui/evolution-event-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
-#: ui/evolution-event-editor.xml.h:18
+#: po/tmp/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: ui/evolution-event-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ui/evolution-event-editor.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "XML auswerfen"
 
-#: ui/evolution-event-editor.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Die XML-UI-Beschreibung auswerfen"
 
-#: ui/evolution-event-editor.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Adress_buch..."
 
-#: ui/evolution-event-editor.xml.h:25
+#: po/tmp/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Formular wählen..."
 
-#: ui/evolution-event-editor.xml.h:26
+#: po/tmp/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Namen prüfen"
 
-#: ui/evolution-event-editor.xml.h:27
+#: po/tmp/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: In Ordner kopieren..."
 
-#: ui/evolution-event-editor.xml.h:28
+#: po/tmp/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: Ein Formular entwerfen..."
 
-#: ui/evolution-event-editor.xml.h:29
+#: po/tmp/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Druckstile definieren"
 
-#: ui/evolution-event-editor.xml.h:30
+#: po/tmp/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Dieses Formular bearbeiten"
 
-#: ui/evolution-event-editor.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Erster Eintrag im Ordner"
 
-#: ui/evolution-event-editor.xml.h:32
+#: po/tmp/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: _Weiterleiten"
 
-#: ui/evolution-event-editor.xml.h:33
+#: po/tmp/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Als vCalendar weiterleiten"
 
-#: ui/evolution-event-editor.xml.h:34
+#: po/tmp/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Hilfe"
 
-#: ui/evolution-event-editor.xml.h:35
+#: po/tmp/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Unvollständige Aufgabe"
 
-#: ui/evolution-event-editor.xml.h:36
+#: po/tmp/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Datei einfügen"
 
-#: ui/evolution-event-editor.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: Eintrag..."
 
-#: ui/evolution-event-editor.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Besonderes einfügen..."
 
-#: ui/evolution-event-editor.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Druckvorschau"
 
-#: ui/evolution-event-editor.xml.h:40
+#: po/tmp/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Formular veröffentlichen als..."
 
-#: ui/evolution-event-editor.xml.h:41
+#: po/tmp/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: _Formular veröffentlichen..."
 
-#: ui/evolution-event-editor.xml.h:42
+#: po/tmp/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: Wiederholung..."
 
-#: ui/evolution-event-editor.xml.h:43
+#: po/tmp/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: Senden"
 
-#: ui/evolution-event-editor.xml.h:44
+#: po/tmp/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Anlagen speichern..."
 
-#: ui/evolution-event-editor.xml.h:45
+#: po/tmp/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Skriptdebugger"
 
-#: ui/evolution-event-editor.xml.h:46
+#: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Aufgabenanfrage"
 
-#: ui/evolution-event-editor.xml.h:47
+#: po/tmp/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: Kontakt"
 
-#: ui/evolution-event-editor.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: Anpassen..."
 
-#: ui/evolution-event-editor.xml.h:49
+#: po/tmp/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: _Datei..."
 
-#: ui/evolution-event-editor.xml.h:50
+#: po/tmp/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: Schriftart..."
 
-#: ui/evolution-event-editor.xml.h:51
+#: po/tmp/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: Formatierung"
 
-#: ui/evolution-event-editor.xml.h:52
+#: po/tmp/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: Eintrag"
 
-#: ui/evolution-event-editor.xml.h:53
+#: po/tmp/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: _Journal-Eintrag"
 
-#: ui/evolution-event-editor.xml.h:54
+#: po/tmp/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: Letzter Eintrag im Ordner"
 
-#: ui/evolution-event-editor.xml.h:55
+#: po/tmp/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Nachricht mailen"
 
-#: ui/evolution-event-editor.xml.h:56
+#: po/tmp/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: Memo-Stil"
 
-#: ui/evolution-event-editor.xml.h:57
+#: po/tmp/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: In Ordner verschieben..."
 
-#: ui/evolution-event-editor.xml.h:58
+#: po/tmp/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Neuer Termin"
 
-#: ui/evolution-event-editor.xml.h:59
+#: po/tmp/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: _Notiz"
 
-#: ui/evolution-event-editor.xml.h:60
+#: po/tmp/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Objekt..."
 
-#: ui/evolution-event-editor.xml.h:61
+#: po/tmp/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: Absatz..."
 
-#: ui/evolution-event-editor.xml.h:62
+#: po/tmp/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: Rechtschreibung..."
 
-#: ui/evolution-event-editor.xml.h:63
+#: po/tmp/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: _Standard"
 
-#: ui/evolution-event-editor.xml.h:64
+#: po/tmp/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: Aufgabe"
 
-#: ui/evolution-event-editor.xml.h:65
+#: po/tmp/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Ungelesener Eintrag"
 
-#: ui/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr "FIXME: was kommt hierher?"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr "Format"
 
-#: ui/evolution-event-editor.xml.h:69
+#: po/tmp/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Weitersuchen"
 
-#: ui/evolution-event-editor.xml.h:70
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Weitersuchen"
 
-#: ui/evolution-event-editor.xml.h:71
+#: po/tmp/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Zum nächsten Eintrag gehen"
 
-#: ui/evolution-event-editor.xml.h:72
+#: po/tmp/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Zum vorigen Eintrag gehen"
 
-#: ui/evolution-event-editor.xml.h:73
+#: po/tmp/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Eigenschaften der Datei ändern"
 
-#: ui/evolution-event-editor.xml.h:74
+#: po/tmp/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "Weiter"
 
-#: ui/evolution-event-editor.xml.h:76
+#: po/tmp/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Einfügen"
 
-#: ui/evolution-event-editor.xml.h:77
+#: po/tmp/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Inhalt der Zwischenablage einfügen"
 
-#: ui/evolution-event-editor.xml.h:78
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "Zurück"
 
-#: ui/evolution-event-editor.xml.h:79
+#: po/tmp/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Voriger"
 
-#: ui/evolution-event-editor.xml.h:80
+#: po/tmp/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Druckeinstellungen..."
 
-#: ui/evolution-event-editor.xml.h:81
+#: po/tmp/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
-#: ui/evolution-event-editor.xml.h:84
+#: po/tmp/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: ui/evolution-event-editor.xml.h:85
+#: po/tmp/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: ui/evolution-event-editor.xml.h:86
+#: po/tmp/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Die rückgängig gemachte Aktion wiederherstellen"
 
-#: ui/evolution-event-editor.xml.h:87
+#: po/tmp/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: ui/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Eine Zeichenkette ersetzen"
 
-#: ui/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-event-editor.xml.h:91
 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
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "Die aktuelle Datei speichern"
 
-#: ui/evolution-event-editor.xml.h:94
+#: po/tmp/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "Besprechung ansetzen"
 
-#: ui/evolution-event-editor.xml.h:95
+#: po/tmp/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "Besprechung ansetzen"
 
-#: ui/evolution-event-editor.xml.h:96
+#: po/tmp/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "Eine Besprechung ansetzen"
 
-#: ui/evolution-event-editor.xml.h:97
+#: po/tmp/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Noch einmal nach derselben Zeichenkette suchen"
 
-#: ui/evolution-event-editor.xml.h:98
+#: po/tmp/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Eine Zeichenkette suchen"
 
-#: ui/evolution-event-editor.xml.h:100
+#: po/tmp/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: ui/evolution-event-editor.xml.h:101
+#: po/tmp/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Alles auswählen"
 
-#: ui/evolution-event-editor.xml.h:102
+#: po/tmp/evolution-event-editor.xml.h:101
 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
+#: po/tmp/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: ui/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-event-editor.xml.h:103
 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
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "Info..."
 
-#: ui/evolution-event-editor.xml.h:106 ui/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "Schließen"
 
-#: ui/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
 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
+#: po/tmp/evolution-event-editor.xml.h:109
+#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ui/evolution-event-editor.xml.h:112
+#: po/tmp/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "Suchen..."
 
-#: ui/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Formulare"
 
-#: ui/evolution-event-editor.xml.h:114 ui/evolution-message-composer.xml.h:42
-#: ui/evolution.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ui/evolution-event-editor.xml.h:115
+#: po/tmp/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "Einfügen"
 
-#: ui/evolution-event-editor.xml.h:116
+#: po/tmp/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Objekt"
 
-#: ui/evolution-event-editor.xml.h:117
+#: po/tmp/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "Einfügen"
 
-#: ui/evolution-event-editor.xml.h:118
+#: po/tmp/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "Drucken"
 
-#: ui/evolution-event-editor.xml.h:119
+#: po/tmp/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "Eigenschaften..."
 
-#: ui/evolution-event-editor.xml.h:120
+#: po/tmp/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "Wiederherstellen"
 
-#: ui/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "Ersetzen..."
 
-#: ui/evolution-event-editor.xml.h:123
+#: po/tmp/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "Werkzeugleisten"
 
-#: ui/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "Rückgängig"
 
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.xml.h:7
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Erstellen"
 
-#: ui/evolution-mail.xml.h:8
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Eine neue Nachricht erstellen"
 
-#: ui/evolution-mail.xml.h:10
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Die Nachricht in einen neuen Ordner kopieren"
 
-#: ui/evolution-mail.xml.h:14 ui/evolution-subscribe.xml.h:9
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "Ordner"
 
-#: ui/evolution-mail.xml.h:15
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Filter über Absender"
 
-#: ui/evolution-mail.xml.h:16
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filter über Empfänger"
 
-#: ui/evolution-mail.xml.h:17
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Passwörter vergessen"
 
-#: ui/evolution-mail.xml.h:21
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Mail abrufen"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Mail _Filters..."
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
 msgstr "Mail_filter..."
 
-#: ui/evolution-mail.xml.h:23
-msgid "Manage Subscriptions..."
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
 msgstr "Abonnements verwalten..."
 
-#: ui/evolution-mail.xml.h:24
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "Als gelesen markieren"
 
-#: ui/evolution-mail.xml.h:25
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "Als ungelesen markieren"
 
-#: ui/evolution-mail.xml.h:26
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail.xml.h:27
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Die Nachricht in einen neuen Ordner verschieben"
 
-#: ui/evolution-mail.xml.h:28
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
 
-#: ui/evolution-mail.xml.h:30
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "Druckvorschau der Nachricht..."
 
-#: ui/evolution-mail.xml.h:31
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "Nachricht auf dem Drucker drucken"
 
-#: ui/evolution-mail.xml.h:32
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Nachricht drucken..."
 
-#: ui/evolution-mail.xml.h:36
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: ui/evolution-mail.xml.h:37
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Antwort an Absender"
 
-#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:13
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Alle auswählen"
 
-#: ui/evolution-mail.xml.h:41
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr "Mail in der Warteschlange senden und neue Mail abholen"
 
-#: ui/evolution-mail.xml.h:42
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "Nachrichtenliste in Stränge geordnet"
 
-#: ui/evolution-mail.xml.h:43
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "VOrdner über Absender"
 
-#: ui/evolution-mail.xml.h:44
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "VOrdner über Empfänger"
 
-#: ui/evolution-mail.xml.h:45
+#: po/tmp/evolution-mail.xml.h:44
+#, fuzzy
+msgid "View Raw Message Source"
+msgstr "Nachrichtenquellcode betrachten"
+
+#: po/tmp/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "Filter _anwenden"
 
-#: ui/evolution-mail.xml.h:46
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "Ordner konfigurieren"
 
-#: ui/evolution-mail.xml.h:47
+#: po/tmp/evolution-mail.xml.h:47
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: ui/evolution-mail.xml.h:49
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "Nachricht bearbeiten"
 
-#: ui/evolution-mail.xml.h:50
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr "Säubern"
 
-#: ui/evolution-mail.xml.h:51
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "Filter über Betreffzeile"
 
-#: ui/evolution-mail.xml.h:52
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: ui/evolution-mail.xml.h:53 ui/evolution-subscribe.xml.h:18
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "Auswahl umkehren"
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Mail Configuration..."
-msgstr "_Mailkonfiguration..."
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "Mailkonfiguration"
 
-#: ui/evolution-mail.xml.h:55
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "Nachricht"
 
-#: ui/evolution-mail.xml.h:56
+#: po/tmp/evolution-mail.xml.h:56
 msgid "_Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: ui/evolution-mail.xml.h:57
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "In neuem Fenster öffnen"
 
-#: ui/evolution-mail.xml.h:58
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "Nachricht drucken"
 
-#: ui/evolution-mail.xml.h:59
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Speichern unter..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Quelle"
+
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "In Strängen"
 
-#: ui/evolution-mail.xml.h:60
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Undelete"
 msgstr "Löschen rückgängig"
 
-#: ui/evolution-mail.xml.h:61
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "VOrdner über Betreffzeile"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
 msgstr "Editor für virtuelle Ordner..."
 
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-message-composer.xml.h:7
+#: po/tmp/evolution-message-composer.xml.h:6
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "Bold"
-msgstr "Fett"
-
-#: ui/evolution-message-composer.xml.h:11
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Die aktuelle Datei schließen"
 
-#: ui/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:14
+#: po/tmp/evolution-message-composer.xml.h:12
 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
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert text file..."
 msgstr "Textdatei einfügen..."
 
-#: ui/evolution-message-composer.xml.h:17
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open a file"
 msgstr "Eine Datei öffnen"
 
-#: ui/evolution-message-composer.xml.h:19
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Speichern _unter"
 
-#: ui/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save in _folder... (FIXME)"
 msgstr "In Ordner speichern... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:22
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "In Ordner speichern..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Die aktuelle Datei unter anderem Namen speichern"
 
-#: ui/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Die Nachricht in einem bestimmten Ordner speichern"
 
-#: ui/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Senden"
 
-#: ui/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send _Later"
 msgstr "Später senden"
 
-#: ui/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _later"
 msgstr "Später senden"
 
-#: ui/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send the mail in HTML format"
 msgstr "Die Mail im HTML-Format senden"
 
-#: ui/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the message later"
 msgstr "Die Nachricht später senden"
 
-#: ui/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message now"
 msgstr "Die Nachricht jetzt senden"
 
-#: ui/evolution-message-composer.xml.h:32
+#: po/tmp/evolution-message-composer.xml.h:30
 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
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Show / hide attachments"
 msgstr "Anlagen anzeigen / verbergen"
 
-#: ui/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Show _attachments"
 msgstr "Anlagen anzeigen"
 
-#: ui/evolution-message-composer.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show attachments"
 msgstr "Anlagen zeigen"
 
-#: ui/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr "Textdatei einfügen... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:44
+#: po/tmp/evolution-message-composer.xml.h:41
 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.xml.h:7
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufügen"
 
-#: ui/evolution-subscribe.xml.h:10
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Liste aktualisieren"
 
-#: ui/evolution-subscribe.xml.h:11
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Liste von Ordnern aktualisieren"
 
-#: ui/evolution-subscribe.xml.h:12
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Ordner aus Ihrer Liste abonnierter Ordner entfernen"
 
-#: ui/evolution-subscribe.xml.h:14
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ui/evolution-subscribe.xml.h:15
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Abonnement kündigen"
 
 #.
 #. * 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.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.xml.h:7
-msgid "Create a new folder"
-msgstr "Einen neuen Ordner anlegen"
-
-#: ui/evolution.xml.h:8
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Einen anderen Ordner anzeigen"
 
-#: ui/evolution.xml.h:9
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Beenden"
 
-#: ui/evolution.xml.h:10
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-Leistenverknüpfung"
 
-#: ui/evolution.xml.h:11
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Das Programm verlassen"
 
-#: ui/evolution.xml.h:12
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Erste Schritte"
 
-#: ui/evolution.xml.h:13
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Information über Evolution anzeigen"
 
-#: ui/evolution.xml.h:14
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Die Ordnerleiste anzeigen"
 
-#: ui/evolution.xml.h:15
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Die Verknüpfungsleiste anzeigen"
 
-#: ui/evolution.xml.h:16
+#: po/tmp/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:17
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:15
+#, fuzzy
+msgid "Submit bug report using Bug Buddy."
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ui/evolution.xml.h:18
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Anzeige der Ordnerleiste an/aus"
 
-#: ui/evolution.xml.h:19
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Anzeige der Verknüpfungsleiste an/aus"
 
-#: ui/evolution.xml.h:20
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Die Kontaktverwaltung benutzen"
 
-#: ui/evolution.xml.h:21
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Den Kalender benutzen"
 
-#: ui/evolution.xml.h:22
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Den _Mailer benutzen"
 
-#: ui/evolution.xml.h:23
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "Über Evolution..."
 
-#: ui/evolution.xml.h:24
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "Termin (FIXME)"
 
-#: ui/evolution.xml.h:25
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "Kontakt (FIXME)"
 
-#: ui/evolution.xml.h:26
-msgid "_Create New Folder..."
-msgstr "Neuen Ordner anlegen..."
-
-#: ui/evolution.xml.h:29
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "Ordner"
 
-#: ui/evolution.xml.h:30
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Gehe zu Ordner..."
 
-#: ui/evolution.xml.h:32
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:33
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "Mailnachricht (FIXME)"
 
-#: ui/evolution.xml.h:35
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "Einstellungen"
 
-#: ui/evolution.xml.h:36
+#: po/tmp/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "Auftrag (FIXME)"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d. %B %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Vorläufig"
@@ -6716,13 +6743,6 @@ msgstr "Ende der Besprechung:"
 msgid "All Attendees"
 msgstr "Alle Anwesenden"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d. %B %Y"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6732,25 +6752,366 @@ msgstr "%B %Y"
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:408
+msgid "Now"
+msgstr "Jetzt"
+
 #. 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
+#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
+#: widgets/misc/e-dateedit.c:1487
 msgid "%H:%M"
 msgstr "%H.%M"
 
 #. 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
+#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
+#: widgets/misc/e-dateedit.c:1490
 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"
 msgstr "Gruppe %i"
+
+#~ msgid "window2"
+#~ msgstr "windows2"
+
+#~ msgid "Create to-do item"
+#~ msgstr "To-Do-Eintrag erzeugen"
+
+#~ msgid "Edit to-do item"
+#~ msgstr "To-Do-Eintrag bearbeiten"
+
+#~ msgid "Summary:"
+#~ msgstr "Zusammenfassung:"
+
+#~ msgid "Due Date:"
+#~ msgstr "Fällig am:"
+
+#~ msgid "Priority:"
+#~ msgstr "Priorität:"
+
+#~ msgid "Item Comments:"
+#~ msgstr "Kommentar zum Eintrag:"
+
+#~ msgid "Time display"
+#~ msgstr "Zeitanzeige"
+
+#~ msgid "Time format"
+#~ msgstr "Zeitformat"
+
+#~ msgid "12-hour (AM/PM)"
+#~ msgstr "12 Stunden (AM/PM)"
+
+#~ msgid "24-hour"
+#~ msgstr "24 Stunden"
+
+#~ msgid "Weeks start on"
+#~ msgstr "Wochen beginnen mit"
+
+#~ msgid "Day range"
+#~ msgstr "Tagesbereich"
+
+#~ msgid ""
+#~ "Please select the start and end hours you want\n"
+#~ "to be displayed in the day view and week view.\n"
+#~ "Times outside this range will not be displayed\n"
+#~ "by default."
+#~ msgstr ""
+#~ "Bitte wählen Sie den Anfang und das Ende des\n"
+#~ "Stundenbereichs, der in der Tages- und\n"
+#~ "Wochenansicht dargestellt werden soll. Zeiten\n"
+#~ "außerhalb dieses Bereichs werden normalerweise\n"
+#~ "nicht dargestellt."
+
+#~ msgid "Day start:"
+#~ msgstr "Tagesbeginn:"
+
+#~ msgid "Day end:"
+#~ msgstr "Tagesende:"
+
+#~ msgid "Colors for display"
+#~ msgstr "Farben für Anzeige"
+
+#~ msgid "Show on TODO List:"
+#~ msgstr "Auf To-Do-Liste zeigen:"
+
+#~ msgid "To Do List style options:"
+#~ msgstr "Stiloptionen der To-Do-Liste:"
+
+#~ msgid "Highlight overdue items"
+#~ msgstr "Überfällige Einträge markieren"
+
+#~ msgid "Highlight not yet due items"
+#~ msgstr "Noch nicht fällige Einträge markieren"
+
+#~ msgid "Highlight items due today"
+#~ msgstr "Heute fällig Einträge markieren"
+
+#~ msgid "To Do List Properties"
+#~ msgstr "Eigenschaften der To-Do-Liste"
+
+#~ msgid "To Do List"
+#~ msgstr "To-Do-Liste"
+
+#~ msgid "Preferences"
+#~ msgstr "Einstellungen"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarme"
+
+#~ msgid "Alarm Properties"
+#~ msgstr "Alarm-Eigenschaften"
+
+#~ msgid "Beep on display alarms"
+#~ msgstr "Bei angezeigtem Alarm piepsen"
+
+#~ msgid "Audio alarms timeout after"
+#~ msgstr "Audio-Alarme schweigen nach"
+
+#~ msgid " seconds"
+#~ msgstr " Sekunden"
+
+#~ msgid "Enable snoozing for "
+#~ msgstr "Weiterschlafen aktivieren für "
+
+#~ msgid "Could not create summary"
+#~ msgstr "Zusammenfassung konnte nicht erzeugt werden"
+
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Nachricht kann nicht abgerufen werden: %s"
+
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "Zum Lesen von Mail, die vom lokalen System geliefert wird, und zum Speichern "
+#~ "von Mail auf einer lokalen Platte."
+
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "Ordner %s konnte nicht in %s umbenannt werden: Ziel existiert"
+
+#~ msgid "Could not open summary %s"
+#~ msgstr "Zusammenfassung %s konnte nicht geöffnet werden"
+
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "Zusammenfassungs-Prüffehler, X-Evolution-Kopfzeile fehlt"
+
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Daten können nicht in Ausgabedatei kopiert werden: %s"
+
+#~ msgid "Could not load or create summary"
+#~ msgstr "Zusammenfassung konnte nicht erzeugt oder geladen werden"
+
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Ordner `%s' konnte nicht umbenannt werden: %s existiert"
+
+#~ msgid "MH folders may not be nested."
+#~ msgstr "MH-Ordner können nicht geschachtelt werden."
+
+#~ msgid "Deleted"
+#~ msgstr "Gelöscht"
+
+#~ msgid "Draft"
+#~ msgstr "Entwurf"
+
+#~ msgid "Flagged"
+#~ msgstr "Markiert"
+
+#~ msgid "Set Flag"
+#~ msgstr "Marke setzen"
+
+#~ msgid "does not match regex"
+#~ msgstr "passt nicht auf Regex"
+
+#~ msgid "matches regex"
+#~ msgstr "passt auf Regex"
+
+#~ msgid "Cannot initialize Evolution's mail summary component."
+#~ msgstr ""
+#~ "Kann die Evolution-Mailzusammenfassungs-Komponente nicht initialisieren."
+
+#~ msgid "Cannot initialize Evolution's mail storage hash."
+#~ msgstr "Evolutions Mailspeicherungs-Hash kann nicht initialisiert werden."
+
+#~ msgid "Forward as Attachment"
+#~ msgstr "Als Anlage weiterleiten"
+
+#~ msgid "Account Information"
+#~ msgstr "Account-Information"
+
+#~ msgid "Account Management"
+#~ msgstr "Accountverwaltung"
+
+#~ msgid "Accounts"
+#~ msgstr "Accounts"
+
+#~ msgid "Add Optional Fields..."
+#~ msgstr "Optionale Felder hinzufügen..."
+
+#~ msgid "Additional Identity Fields"
+#~ msgstr "Zusätzliche Identitätsfelder"
+
+#~ msgid "Authentication"
+#~ msgstr "Authentikation"
+
+#~ msgid "Browse..."
+#~ msgstr "Stöbern..."
+
+#~ msgid "Congratulations, your mail configuration is complete."
+#~ msgstr "Glückwunsch! Ihre Mailkonfiguration ist abgeschlossen."
+
+#~ msgid "Default"
+#~ msgstr "Voreingestellt"
+
+#~ msgid "Done"
+#~ msgstr "Fertig"
+
+#~ msgid "Edit Mail Configuration Settings"
+#~ msgstr "Mailkonfiguration bearbeiten"
+
+#~ msgid "Email Address:"
+#~ msgstr "E-Mail-Adresse:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Evolution-Mailkonfiguration"
+
+#~ msgid "Full Name:"
+#~ msgstr "Voller Name:"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Mail"
+#~ msgstr "Mail"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Mailkonfigurations-Druide"
+
+#~ msgid "Make this my default account"
+#~ msgstr "Dies zu meinem Standardaccount machen"
+
+#~ msgid "News"
+#~ msgstr "Nachrichten"
+
+#~ msgid "Optional"
+#~ msgstr "Optional"
+
+#~ msgid "Optional Information"
+#~ msgstr "Optionale Informationen"
+
+#~ msgid "Password:"
+#~ msgstr "Passwort:"
+
+#~ msgid ""
+#~ "Please enter information about your incoming mail server below. If you don't "
+#~ "know what"
+#~ msgstr ""
+#~ "Bitte geben Sie unten Informationen über Ihren Server für eingehende Mail "
+#~ "ein. Wenn Sie nicht wissen, was"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "Preferred type: "
+#~ msgstr "Bevorzugter Typ: "
+
+#~ msgid "Receiving Email"
+#~ msgstr "Mail erhalten"
+
+#~ msgid "Receiving Mail"
+#~ msgstr "Mail erhalten"
+
+#~ msgid "Reply-to:"
+#~ msgstr "Antwort an:"
+
+#~ msgid "Required"
+#~ msgstr "Benötigt"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "SMTP server requires authentication"
+#~ msgstr "SMTP-Server benötigt Authentikation"
+
+#~ msgid "Sending Email"
+#~ msgstr "Sende E-Mail"
+
+#~ msgid "Sending Mail"
+#~ msgstr "Sende Mail"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Server-Konfiguration"
+
+#~ msgid "Server Type: "
+#~ msgstr "Servertyp: "
+
+#~ msgid ""
+#~ "You are almost done with the mail configuration process. The identity, "
+#~ "incoming"
+#~ msgstr ""
+#~ "Sie sind fast fertig mit der Mailkonfiguration. Die Identität, der Server "
+#~ "für eingehende"
+
+#~ msgid ""
+#~ "Your mail server supports the following types of authentication. Please"
+#~ msgstr "Ihr Mailserver unterstützt folgende Authentikationstypen. Bitte"
+
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Pipe zu %s konnte nicht angelegt werden: %s"
+
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "%s konnte nicht ausgeführt werden: %s\n"
+
+#~ msgid "Viewing message sources from folder \"%s\""
+#~ msgstr "Betrachte Nachrichtenquellen aus Ordner \"%s\""
+
+#~ msgid "View message sources from \"%s\""
+#~ msgstr "Nachrichtenquellen aus \"%s\" betrachten"
+
+#~ msgid "Mailbox summary"
+#~ msgstr "Postfach-Zusammenfassung"
+
+#~ msgid "Threading message list"
+#~ msgstr "Nachrichtenliste wird in Stränge geordnet"
+
+#~ msgid "Thread message list"
+#~ msgstr "Nachrichtenliste in Stränge ordnen"
+
+#~ msgid "_New Contact"
+#~ msgstr "Neuer Kontakt?"
+
+#~ msgid "New Ca_lendar"
+#~ msgstr "Neuer Kalender"
+
+#~ msgid "_New appointment..."
+#~ msgstr "_Neuer Termin..."
+
+#~ msgid "_Open"
+#~ msgstr "Ö_ffnen"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_Mailkonfiguration..."
+
+#~ msgid "Bold"
+#~ msgstr "Fett"
+
+#~ msgid "Sets something as bold"
+#~ msgstr "Etwas fett setzen"
+
+#~ msgid "Create a new folder"
+#~ msgstr "Einen neuen Ordner anlegen"
+
+#~ msgid "_Create New Folder..."
+#~ msgstr "Neuen Ordner anlegen..."