Translation updates finally committed

svn path=/trunk/; revision=8740
author: Matthias Warkus <mawarkus@src.gnome.org> 2001-03-16 03:40:03 +0800
committer: Matthias Warkus <mawarkus@src.gnome.org> 2001-03-16 03:40:03 +0800
commit: 0d6dc87fdf5ec85988b452598671aa944a83e3bb (patch)
tree: 738622e836e743a71c40c25ecdc16e945ecf2f97 /po/de.po
parent: 1a0445682ab85cd7f5e64911e905d69e94f5e2af (diff)
download: gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.tar
gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.tar.gz
gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.tar.bz2
gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.tar.lz
gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.tar.xz
gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.tar.zst
gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.zip
1 files changed, 1771 insertions, 1524 deletions
diff --git a/po/de.po b/po/de.po
index 01ab0c3749..3e5064436a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,12 +7,11 @@
 # task = Aufgabe (Auftrag klingt nach Buchhaltung)
 # mailbox = Postfach (dt. Mailbox ist die Übersetzung von "BBS")
 #
-#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.8cvs\n"
-"POT-Creation-Date: 2001-02-16 17:46+0100\n"
-"PO-Revision-Date: 2001-02-16 17:56+01:00\n"
+"POT-Creation-Date: 2001-03-15 11:46+0100\n"
+"PO-Revision-Date: 2001-03-15 11:50+01:00\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -318,130 +317,12 @@ msgstr "Importiert GnomeCard-Dateien in Evolution."
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
+#: addressbook/gui/component/addressbook-factory.c:39
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
-msgstr "Konnte Bonobo nicht initialisieren"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Inaktiv"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Synchronisieren"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Aus Pilot kopieren"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "In Pilot kopieren"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Aus Pilot einfließen lassen"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "In Pilot einfließen lassen"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Ursprünglicher Autor:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Evolution-Adressbuch-Verbindung"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
-msgstr "Konfigurationswerkzeug für die Evolution-Adressbuch-Verbindung.\n"
-
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "Synchronisationsaktion"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Conduit-Zustand"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Kein Pilot konfiguriert, bitte wählen Sie zunächst\n"
-"das Capplet \"Pilot-Verbindungseigenschaften\"."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "Nicht mit dem gnome-pilot-Dämon verbunden"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Ein Fehler trat beim dem Versuch auf, die Pilot-\n"
-"Liste vom gnome-pilot-Dämon zu lesen"
+msgstr "Bonobo konnte nicht initialisiert werden"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
@@ -455,32 +336,24 @@ msgstr "EBook nicht geladen\n"
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
-msgstr "Konnte den wombat-Server nicht starten"
+msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
 #: addressbook/conduit/address-conduit.c:652
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
-msgstr "Konnte wombat nicht starten"
+msgstr "Wombat konnte nicht gestartet werden"
 
 #: addressbook/conduit/address-conduit.c:684
 #: addressbook/conduit/address-conduit.c:687
 msgid "Could not read pilot's Address application block"
-msgstr "Konnte Address-Anwendungsblock des Pilot nicht lesen"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
-msgid "Configure the address conduit"
-msgstr "Die Adress-Verbindung konfigurieren"
-
-#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Address conduit "
-msgstr "Evolution-Adress-Verbindung"
+msgstr "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
 #: addressbook/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -521,7 +394,7 @@ msgstr "Einsortieren unter:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "Allgemein"
 
@@ -538,7 +411,7 @@ msgid "Phone Types"
 msgstr "Telefon-Typen"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1339
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Primäre E-Mail"
 
@@ -551,6 +424,7 @@ msgid "Web page address:"
 msgstr "Adresse der Webseite:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
 msgid "_Add"
 msgstr "Hinzufügen"
 
@@ -575,8 +449,8 @@ msgid "_Company:"
 msgstr "Firma:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "Löschen"
 
@@ -628,113 +502,129 @@ msgstr "Dies ist die Postadresse"
 msgid "Delete Contact?"
 msgstr "Kontakt löschen?"
 
-#: addressbook/contact-editor/e-contact-editor.c:574
+#: addressbook/contact-editor/e-contact-editor.c:590
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt gehört in folgende Kategorien:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1382
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Geschäftlich 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Geschäftliches Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr "Rückruf"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/contact-editor/e-contact-editor.c:1383
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Zu Hause"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/contact-editor/e-contact-editor.c:1384
-#: addressbook/gui/widgets/e-addressbook-view.c:584
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:47
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Andere"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr "Primär"
 
-#: addressbook/contact-editor/e-contact-editor.c:1293
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1294
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1295
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1340
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "E-Mail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "E-Mail 3"
 
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr "Kontakt schnell hinzufügen"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+msgid "Edit Full"
+msgstr "Voll bearbeiten"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+msgid "Full Name"
+msgstr "Voller Name"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+msgid "E-mail"
+msgstr "E-Mail"
+
 #: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2"
@@ -847,25 +737,25 @@ msgstr "Suffix:"
 msgid "_Title:"
 msgstr "Titel:"
 
-#: addressbook/gui/component/addressbook.c:230
+#: addressbook/gui/component/addressbook.c:237
 msgid "As _Minicards"
 msgstr "Als _Minikarten"
 
-#: addressbook/gui/component/addressbook.c:236
+#: addressbook/gui/component/addressbook.c:243
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Als Tabelle"
 
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:412
 #, c-format
 msgid "Enter password for %s"
 msgstr "Bitte geben Sie das Passwort für %s ein"
 
-#: addressbook/gui/component/addressbook.c:433
+#: addressbook/gui/component/addressbook.c:440
 msgid "Unable to open addressbook"
-msgstr "Kann das Adressbuch nicht öffnen"
+msgstr "Das Adressbuch kann nicht geöffnet werden"
 
-#: addressbook/gui/component/addressbook.c:438
+#: addressbook/gui/component/addressbook.c:445
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -887,27 +777,27 @@ msgstr ""
 "müssen Sie OpenLDAP herunterladen, installieren, \n"
 "und Evolution neu compilieren und installieren.\n"
 
-#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:568
 msgid "Show All"
 msgstr "Alle anzeigen"
 
-#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:570
 msgid "Advanced..."
 msgstr "Komplex..."
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:600
 msgid "Any field contains"
 msgstr "Irgend ein Feld enthält"
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:601
 msgid "Name contains"
 msgstr "Name enthält"
 
-#: addressbook/gui/component/addressbook.c:595
+#: addressbook/gui/component/addressbook.c:602
 msgid "Email contains"
 msgstr "E-Mail enthält"
 
-#: addressbook/gui/component/addressbook.c:738
+#: addressbook/gui/component/addressbook.c:745
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -932,9 +822,9 @@ msgid "None (anonymous mode)"
 msgstr "Kein (Anonymer Modus)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:250
+#: camel/providers/imap/camel-imap-store.c:260
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Passwort"
 
@@ -975,7 +865,7 @@ msgid "Remember this password"
 msgstr "Dieses Passwort speichern"
 
 #: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "Host:"
 msgstr "Host-Rechner:"
 
@@ -1004,12 +894,12 @@ msgid "Search Scope:"
 msgstr "Suche-Bereich:"
 
 #: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Legitimation:"
 
 #: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:491 mail/mail-config.glade.h:50
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Pfad:"
 
@@ -1038,7 +928,7 @@ msgstr ""
 "Informationen ein."
 
 #: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Name:"
 
@@ -1063,21 +953,21 @@ msgstr "Adressbuch-Quellen"
 #: addressbook/gui/component/addressbook-config.glade.h:3
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:570
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Löschen"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/folder-browser.c:670 mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:22
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Name"
 msgstr "Name"
 
@@ -1085,31 +975,44 @@ msgstr "Name"
 msgid "URI"
 msgstr "URI"
 
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+msgid "Add to Contacts"
+msgstr "Zu Kontakten hinzufügen"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for displaying an address."
+msgstr "Eine Bonobo-Control, um eine Adresse anzuzeigen."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Eine beispielhafte Bonobo-Komponente, die ein Adressbuch anzeigt."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Control, die eine Evolution-Adressbuch-Minikarte anzeigt."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution component for handling contacts."
 msgstr "Evolution-Komponente für Kontaktverwaltung."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Factory für die Adressbuch-Minikarten-Control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Factory für den Adressanzeiger des Adressbuchs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Evolution addressbook component."
 msgstr "Factory für die Evolution-Adressbuch-Komponente."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory für die beispielhafte Adressbuch-Kontrolle"
 
@@ -1121,6 +1024,20 @@ msgstr "Evolution Namenauswahlschnittstelle für das Adressbuch."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory für die Namenauswahl-Schnittstelle des Adressbuchs"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+msgid "Remove"
+msgstr "Entfernen"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+msgid "Remove All"
+msgstr "Alle Entfernen"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr "Kontaktinfo bearbeiten"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Suchen..."
@@ -1249,64 +1166,64 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:376
+#: addressbook/gui/widgets/e-addressbook-view.c:481
+#: addressbook/gui/widgets/e-minicard.c:435
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "* Click here to add a contact *"
 msgstr "* Hier klicken, um einen Kontakt hinzuzufügen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Email"
 msgstr "E-Mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 msgid "Department"
 msgstr "Abteilung"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 msgid "Office"
 msgstr "Büro"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 msgid "Profession"
 msgstr "Beruf"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Spouse"
 msgstr "Lebenspartner"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 msgid "Note"
 msgstr "Notiz"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Free-busy URL"
 msgstr "Frei/beschäftigt-URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:606
 msgid "Click here to add a contact"
 msgstr "Hier klicken, um einen Kontakt hinzuzufügen"
 
@@ -1314,7 +1231,7 @@ msgstr "Hier klicken, um einen Kontakt hinzuzufügen"
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -1328,6 +1245,10 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+msgid "Card View"
+msgstr "Kartenansicht"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 Punkt Tahoma"
@@ -1485,7 +1406,7 @@ msgstr "Stilname:"
 msgid "Top:"
 msgstr "Oben:"
 
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:72
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Typ:"
 
@@ -1497,14 +1418,6 @@ msgstr "Breite:"
 msgid "label26"
 msgstr "label26"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Evolution-Kalender-Verbindung"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Konfigurationswerkzeug für die Evolution-Kalender-Verbindung.\n"
-
 #: calendar/conduits/calendar/calendar-conduit.c:687
 #: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
@@ -1513,50 +1426,12 @@ msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 #: calendar/conduits/calendar/calendar-conduit.c:786
 #: calendar/conduits/calendar/calendar-conduit.c:789
 msgid "Could not read pilot's Calendar application block"
-msgstr "Konnte Calendar-Anwendungsblock des Pilot nicht lesen"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
-msgid "Configure the GnomeCal conduit"
-msgstr "Die GnomeCal-Verbindung konfigurieren"
-
-#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
-msgid "Evolution Calendar conduit"
-msgstr "Evolution-Kalender-Verbindung"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
-msgid "Configure the todo conduit"
-msgstr "Die To-Do-Verbindung konfigurieren"
-
-#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
-msgid "Evolution ToDo conduit "
-msgstr "Evolution-To-Do-Verbindung"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Evolution-ToDo-Verbindung"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Konfigurationswerkzeug für die Evolution-ToDo-Verbindung.\n"
+msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
 #: calendar/conduits/todo/todo-conduit.c:600
 #: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
-msgstr "Konnte den ToDo-Anwendungsblock des Pilot nicht lesen"
-
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
-msgstr "Erinnerung für Ihren Termin um "
-
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Weiterschlafen"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-msgid "Ok"
-msgstr "OK"
+msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
 #: calendar/gui/calendar-commands.c:233
 msgid "File not found"
@@ -1570,75 +1445,114 @@ msgstr "Kalender öffnen"
 msgid "Save calendar"
 msgstr "Kalender speichern"
 
-#: calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:451
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Die Kalender-Ansicht konnte nicht erstellt werden. Bitte überprüfen Sie Ihre "
 "ORBit und OAF Einstellungen. "
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:334
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-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:338 calendar/gui/calendar-model.c:768
-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:342 calendar/gui/calendar-model.c:771
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:376
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr "Öffentlich"
 
-#: calendar/gui/calendar-model.c:379
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:382
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
-#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:475
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:547
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "Hoch"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "Niedrig"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:550
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr "Opak"
 
-#: calendar/gui/calendar-model.c:776
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "Nicht gestartet"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "In Bearbeitung"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+msgid "Cancelled"
+msgstr "Storniert"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a, %d.%m.%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a, %d.%m.%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1649,36 +1563,26 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-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:895
-msgid "%I:%M:%S %p%n"
-msgstr ""
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:898
-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:902
-msgid "%I:%M %p%n"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
+"Die Klassifizierung muss 'Öffentlich', 'Privat', 'Vertraulich' oder 'Keine' "
+"sein"
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:905
-msgid "%H:%M%n"
-msgstr "%H.%M%n"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:1025
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1688,64 +1592,71 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1013
 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:1105
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "Die Priorität muss zwischen 1 und 9 (einschließlich) sein"
+#: calendar/gui/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
+"Die Priorität muss 'Hoch', 'Normal', 'Niedrig' oder 'Undefiniert' sein."
 
-#: calendar/gui/calendar-model.c:1548
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Normal"
-msgstr "Normal"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr "Undefiniert"
 
-#: calendar/gui/calendar-model.c:1550
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr "Die Transparenz muss 'Transparent', 'Opak' oder 'Keine' sein."
+
+#: calendar/gui/calendar-model.c:1598
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1552
+#: calendar/gui/calendar-model.c:1600
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1558
+#: calendar/gui/calendar-model.c:1606
 msgid "No"
 msgstr "Nein"
 
-#: calendar/gui/calendar-summary.c:197
+#: calendar/gui/calendar-summary.c:196
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 msgid "%I:%M%p"
 msgstr "%H.%M"
 
-#: calendar/gui/calendar-summary.c:438
+#: calendar/gui/calendar-summary.c:437
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Fehler beim Laden des Kalenders</b>"
 
-#: calendar/gui/calendar-summary.c:450
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Fehler beim Laden des Kalenders:<br>Methode wird nicht unterstützt"
 
-#: calendar/gui/calendar-summary.c:620
+#: calendar/gui/calendar-summary.c:616
 msgid "Display"
 msgstr "Anzeige"
 
-#: calendar/gui/calendar-summary.c:625
+#: calendar/gui/calendar-summary.c:621
 msgid "Show appointments"
 msgstr "Termine anzeigen"
 
-#: calendar/gui/calendar-summary.c:633
+#: calendar/gui/calendar-summary.c:629
 msgid "Show tasks"
 msgstr "Aufgaben zeigen"
 
-#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Kalender laden"
 
@@ -1753,6 +1664,39 @@ msgstr "Kalender laden"
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "Erinnerung für Ihren Termin um "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Weiterschlafen"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "OK"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "Alarm-Benachrichtigungsdienst"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "Factory für den Alarm-Benachrichtigungsdienst."
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
+msgstr "GNOME konnte nicht initialisiert werden"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+msgid "Could not create the alarm notify service factory"
+msgstr "Factory für Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
+
 #: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm am %A, %d. %b %Y um %H.%M"
@@ -1821,7 +1765,7 @@ msgid "Beep when alarm windows appear."
 msgstr "Piepsen, wenn Alarmfenster erscheinen."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:3
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -1850,7 +1794,7 @@ msgid "Display options"
 msgstr "Anzeigeoptionen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:161
 msgid "Due Date"
 msgstr "Fällig am"
 
@@ -1871,7 +1815,7 @@ msgid "Fri"
 msgstr "Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Friday"
 msgstr "Freitag"
 
@@ -1900,7 +1844,7 @@ msgid "Mon"
 msgstr "Mo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:473
+#: calendar/gui/event-editor.c:475
 msgid "Monday"
 msgstr "Montag"
 
@@ -1917,7 +1861,8 @@ msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:164 filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:132
 msgid "Priority"
 msgstr "Priorität"
 
@@ -1935,7 +1880,7 @@ msgid "Sat"
 msgstr "Sa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -1960,7 +1905,7 @@ msgid "Sun"
 msgstr "So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -1973,7 +1918,7 @@ msgid "Thu"
 msgstr "Do"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -1994,7 +1939,7 @@ msgid "Tue"
 msgstr "Di"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:474
+#: calendar/gui/event-editor.c:476
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -2007,7 +1952,7 @@ msgid "Wed"
 msgstr "Mi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -2020,7 +1965,7 @@ msgid "minutes before they occur."
 msgstr "Minuten bevor sie auftreten."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:84
 msgid "seconds."
 msgstr "Sekunden."
 
@@ -2061,20 +2006,12 @@ msgstr "Wollen Sie die Änderungen speichern?"
 msgid "% Comp_lete:"
 msgstr "% abgeschlossen:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-msgid "Cancelled"
-msgstr "Storniert"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:157
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Klassifikation"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Abgeschlossen"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 #: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Date & Time"
@@ -2084,22 +2021,6 @@ msgstr "Datum & Zeit"
 msgid "Date Completed:"
 msgstr "Abgeschlossen am:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Hoch"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
-msgstr "In Bearbeitung"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Niedrig"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Not Started"
-msgstr "Nicht gestartet"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 #: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Pri_vate"
@@ -2131,10 +2052,6 @@ msgstr "Aufgabe"
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Undefiniert"
-
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 #: calendar/gui/event-editor-dialog.glade.h:28
 msgid "_Confidential"
@@ -2161,91 +2078,146 @@ msgstr "Status:"
 msgid "Edit Task"
 msgstr "Aufgabe bearbeiten"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journal-Eintrag  - %s"
 
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:156
 msgid "Categories"
 msgstr "Kategorien"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 msgid "Completion Date"
 msgstr "Abschlussdatum"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 msgid "End Date"
 msgstr "Enddatum"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr "Geographische Lage"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Fertigstellungsgrad"
-
 #: calendar/gui/e-calendar-table.c:163
+msgid "Percent complete"
+msgstr "Fertigstellung in Prozent"
+
+#: calendar/gui/e-calendar-table.c:165
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 msgid "Transparency"
 msgstr "Transparenz"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:169
 msgid "Click here to add a task"
 msgstr "Hier klicken, um eine Aufgabe hinzuzufügen"
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "Die Aufgabe als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:556
 msgid "Edit this task..."
 msgstr "Diese Aufgabe bearbeiten..."
 
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:557
 msgid "Edit the task"
 msgstr "Die Aufgabe bearbeiten"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:559
 #: ui/evolution-task-editor-dialog.xml.h:19
 msgid "Delete this task"
 msgstr "Diese Aufgabe löschen"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
 msgstr "Diese Aufgabe löschen"
 
@@ -2256,68 +2228,67 @@ 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:271 calendar/gui/e-day-view.c:1273
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: calendar/gui/e-week-view-main-item.c:321
 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:275 calendar/gui/e-day-view.c:1287
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: calendar/gui/e-week-view-main-item.c:330
 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:279 calendar/gui/e-day-view.c:1300
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
-#: calendar/gui/print.c:611
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
-#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
-msgid "New appointment..."
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+msgid "New Appointment..."
 msgstr "Neuer Termin..."
 
-#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
-msgid "Schedule meeting"
-msgstr "Besprechung ansetzen"
-
-#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
-#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
-msgid "Edit this appointment..."
-msgstr "Diesen Termin bearbeiten..."
+#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:541 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Öffnen"
 
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+msgid "Delete this Appointment"
 msgstr "Diesen Termin löschen"
 
-#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
-msgid "Make this appointment movable"
-msgstr "Diesen Termin beweglich machen"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+msgid "Schedule Meeting"
+msgstr "Besprechung ansetzen"
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+msgid "Make this Occurrence Movable"
+msgstr "Dieses Auftreten beweglich machen"
 
-#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
-msgid "Delete this occurrence"
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+msgid "Delete this Occurrence"
 msgstr "Dieses Auftreten löschen"
 
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3047
+msgid "Delete all Occurrences"
 msgstr "Jedes Auftreten löschen"
 
 #: calendar/gui/e-itip-control.c:153
@@ -2414,7 +2385,8 @@ msgstr "Kalender wird geladen..."
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:18
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:138
 msgid "Sender"
 msgstr "Absender"
 
@@ -2506,26 +2478,26 @@ msgstr ""
 "Termin\n"
 "ansetzen"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:24
-#: mail/message-list.c:1167
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:145 mail/message-list.c:1171
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr "Alle"
 
-#: calendar/gui/e-tasks.c:150
+#: calendar/gui/e-tasks.c:154
 msgid "Category:"
 msgstr "Kategorie:"
 
-#: calendar/gui/e-tasks.c:288
+#: calendar/gui/e-tasks.c:297
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Die Aufgaben in `%s' konnten nicht geladen werden"
 
-#: calendar/gui/e-tasks.c:300
+#: calendar/gui/e-tasks.c:309
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
@@ -2538,6 +2510,10 @@ msgstr ""
 msgid "%d %B"
 msgstr "%d. %B"
 
+#: calendar/gui/e-week-view.c:3255
+msgid "Delete All Occurrences"
+msgstr "Jedes Auftreten löschen"
+
 #: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
 msgstr "Ganztägiges Ereignis"
@@ -2571,7 +2547,7 @@ msgid "No recurrence"
 msgstr "Keine Wiederholung"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1566
+#: calendar/gui/event-editor.c:1577
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
@@ -2592,21 +2568,21 @@ msgid "Reminder"
 msgstr "Erinnerung"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1575
+#: calendar/gui/event-editor.c:1586
 msgid "Run a program"
 msgstr "Ein Programm ausführen"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1572
+#: calendar/gui/event-editor.c:1583
 msgid "Send an email"
 msgstr "Eine E-Mail senden"
 
-#: calendar/gui/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
 msgid "Settings..."
 msgstr "Einstellungen..."
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1569
+#: calendar/gui/event-editor.c:1580
 msgid "Show a dialog"
 msgstr "Ein Dialogfenster anzeigen"
 
@@ -2626,11 +2602,14 @@ msgstr "Anfangszeit:"
 msgid "_Starting date:"
 msgstr "Anfangsdatum:"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:27
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:63
 msgid "after"
 msgstr "nach"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:28
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:64
 msgid "before"
 msgstr "vor"
 
@@ -2686,140 +2665,140 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: calendar/gui/event-editor.c:369
+#: calendar/gui/event-editor.c:371
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/event-editor.c:447
+#: calendar/gui/event-editor.c:449
 msgid "on"
 msgstr "bei"
 
-#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
 msgid "day"
 msgstr "Tag"
 
-#: calendar/gui/event-editor.c:599
+#: calendar/gui/event-editor.c:601
 msgid "on the"
 msgstr "am"
 
-#: calendar/gui/event-editor.c:606
+#: calendar/gui/event-editor.c:608
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:752
+#: calendar/gui/event-editor.c:754
 msgid "occurrences"
 msgstr "Auftreten"
 
-#: calendar/gui/event-editor.c:869
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Dieser Termin enthält Wiederholungsregeln, die Evolution nicht bearbeiten "
 "kann."
 
-#: calendar/gui/event-editor.c:1521
+#: calendar/gui/event-editor.c:1532
 #, c-format
 msgid " %d days"
 msgstr " %d Tage"
 
-#: calendar/gui/event-editor.c:1523
+#: calendar/gui/event-editor.c:1534
 msgid " 1 day"
 msgstr " 1 Tag"
 
-#: calendar/gui/event-editor.c:1526
+#: calendar/gui/event-editor.c:1537
 #, c-format
 msgid " %d weeks"
 msgstr " %d Wochen"
 
-#: calendar/gui/event-editor.c:1528
+#: calendar/gui/event-editor.c:1539
 msgid " 1 week"
 msgstr " 1 Woche"
 
-#: calendar/gui/event-editor.c:1531
+#: calendar/gui/event-editor.c:1542
 #, c-format
 msgid " %d hours"
 msgstr " %d Stunden"
 
-#: calendar/gui/event-editor.c:1533
+#: calendar/gui/event-editor.c:1544
 msgid " 1 hour"
 msgstr " 1 Stunde"
 
-#: calendar/gui/event-editor.c:1536
+#: calendar/gui/event-editor.c:1547
 #, c-format
 msgid " %d minutes"
 msgstr " %d Minuten"
 
-#: calendar/gui/event-editor.c:1538
+#: calendar/gui/event-editor.c:1549
 msgid " 1 minute"
 msgstr " 1 Minute"
 
-#: calendar/gui/event-editor.c:1541
+#: calendar/gui/event-editor.c:1552
 #, c-format
 msgid " %d seconds"
 msgstr " %d Sekunden"
 
-#: calendar/gui/event-editor.c:1543
+#: calendar/gui/event-editor.c:1554
 msgid " 1 second"
 msgstr " 1 Sekunde"
 
-#: calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1601
 msgid " before start of appointment"
 msgstr " vor Terminbeginn"
 
-#: calendar/gui/event-editor.c:1592
+#: calendar/gui/event-editor.c:1603
 msgid " after start of appointment"
 msgstr " nach Terminbeginn"
 
-#: calendar/gui/event-editor.c:1600
+#: calendar/gui/event-editor.c:1611
 msgid " before end of appointment"
 msgstr " vor Terminende"
 
-#: calendar/gui/event-editor.c:1602
+#: calendar/gui/event-editor.c:1613
 msgid " after end of appointment"
 msgstr " nach Terminende"
 
-#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
-#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Eine beispielhafte Bonobo-Komponente, die einen Kalender anzeigt."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 msgid "Evolution calendar executive summary component."
 msgstr "Evolutions Chefsesselansichts-Komponente für den Kalender."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "iTip-/iMip-Betrachter für den Evolution-Kalender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution-Komponente für die Verwaltung des Kalenders."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Factory for the Calendar Summary component."
 msgstr "Factory für die Kalenderzusammenfassungs-Komponente."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Evolution calendar component."
 msgstr "Factory für die Evolution-Kalender-Komponente."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the calendar iTip view control"
 msgstr "Factory für die Kalender-iTip-Ansichts-Control"
 
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Eine beispielhafte Bonobo-Komponente, die einen Kalender anzeigt."
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the sample Calendar control"
 msgstr "Factory für die beispielhafte Kalender-Control"
 
-#: calendar/gui/gnome-cal.c:694
+#: calendar/gui/gnome-cal.c:695
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Der Ordner in `%s' konnte nicht geöffnet werden"
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/gnome-cal.c:706
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -2881,199 +2860,197 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "GNOME Konnte nicht initialisiert werden"
-
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "So"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:357
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:943
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "Aufträge"
 
 #. Day
-#: calendar/gui/print.c:1073
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr "Aktueller Tag (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1088
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1099
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Aktuelle Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr "Aktueller Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1114
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr "Aktuelles Jahr (%Y)"
 
-#: calendar/gui/print.c:1151
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1287
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
@@ -3081,26 +3058,64 @@ msgstr "Druckvorschau"
 msgid "The URI of the tasks folder to display"
 msgstr "Der URI, den der Aufgabenordner anzeigen wird"
 
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+"Evolution hat die Aufgaben aus Ihrem Kalenderordner entnommen und sie "
+"automatisch in den neuen Aufgaben-Ordner migriert."
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+"Evolution hat versucht, die Aufgaben aus Ihrem Kalenderordner zu entnehmen "
+"und sie in den neuen Aufgaben-Ordner migriert.\n"
+"Einige Aufgaben konnten nicht migriert werden, so dass sich dieser Vorgang "
+"vielleicht noch einmal wiederholen wird."
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+"`%s' konnte nicht geöffnet werden; es werden keine Objekte aus dem "
+"Kalenderordner in den Aufgaben-Ordner migriert."
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+"Die zum Laden von `%s' benötigte Methode ist nicht unterstützt; keine "
+"Objekte aus dem Kalenderordner werden in den Aufgaben-Ordner migriert werden."
+
 #: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "SMDMDFS"
 
-#: camel/camel-filter-driver.c:767
+#: camel/camel-filter-driver.c:790
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:772
+#: camel/camel-filter-driver.c:795
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausführen des Filters: %s: %s"
 
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
+#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
 
-#: camel/camel-folder-search.c:320
+#: camel/camel-folder-search.c:323
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3109,7 +3124,7 @@ msgstr ""
 "Suchausdruck kann nicht verarbeitet werden: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:330
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3118,16 +3133,16 @@ msgstr ""
 "Fehler beim Ausführen eines Suchausdrucks: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
 
-#: camel/camel-folder-search.c:547
+#: camel/camel-folder-search.c:554
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
 
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ungültiger Typ in body-contains, Zeichenkette wurde erwartet"
 
@@ -3219,36 +3234,156 @@ msgstr "%s konnte nicht geladen werden: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul."
 
-#: camel/camel-remote-store.c:176
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr "%s-Server %s"
 
-#: camel/camel-remote-store.c:180
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-Dienst für %s auf %s"
 
-#: camel/camel-remote-store.c:306
+#: camel/camel-remote-store.c:232
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
-#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:229
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(unbekannter Rechner)"
 
-#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
-#: camel/camel-remote-store.c:538
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
+#: camel/camel-remote-store.c:453
+msgid "Server unexpectedly disconnected"
+msgstr "Verbindung zum Server unerwartet getrennt"
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+msgid "Authentication failed."
+msgstr "Legitimation fehlgeschlagen."
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+"Ungültige E-Mail-Adressverfolgungs-Information:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:118
+#, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Ungültige opake Verfolgungsinformation:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:130
+#, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+"Ungültige Verfolgungsinformation\n"
+"%s"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/camel-sasl-cram-md5.c:34
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Dies verbindet mit dem SMTP-Server und benutzt, falls es der Server "
+"unterstützt, ein sicheres CRAM-MD5-Passwort."
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: camel/camel-sasl-digest-md5.c:39
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Dies verbindet mit dem SMTP-Server und benutzt, falls es der Server "
+"unterstützt, ein sicheres DIGEST-MD5-Passwort."
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr "Server-Herausforderung zu lang (>2048 Oktette)\n"
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr "Server-Herausforderung ungültig\n"
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+"Server-Herausforderung enthielt ungültiges \"Quality-of-Protection\"-Token\n"
+
+#: camel/camel-sasl-digest-md5.c:798
+msgid "Server response did not contain authorization data\n"
+msgstr "Serverantwort enthielt keine Legitimationsdaten\n"
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr "Serverantwort enthielt unvollständige Legitimationsdaten\n"
+
+#: camel/camel-sasl-digest-md5.c:826
+msgid "Server response does not match\n"
+msgstr "Antwort des Servers passt nicht\n"
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+"Dies verbindet mit dem Server und benutzt Kerberos 4, um sich zu "
+"legitimieren."
+
+#: camel/camel-sasl-kerberos4.c:158
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kerberos-Ticket konnte nicht erhalten werden:\n"
+"%s"
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:380
+msgid "Bad authentication response from server."
+msgstr "Ungültige Legitimationsantwort vom Server."
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr "PLAIN"
+
+#: camel/camel-sasl-plain.c:31
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"Dies verbindet mit dem SMTP-Server und benutzt, falls es der Server "
+"untersützt, den PLAIN-SASL-Mechanismus."
+
 #: camel/camel-search-private.c:105
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -3279,12 +3414,20 @@ msgstr "Rechner %s gibt es nicht."
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Momentan ist es nicht möglich, Rechername %s aufzulösen."
 
-#: camel/camel-session.c:299
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr "E-Mail-Quelle: Virtueller Ordner"
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr "Zum Lesen von Mail in Form einer Abfrage über andere Ordner"
+
+#: camel/camel-session.c:323
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle für Protokoll `%s' verfügbar"
 
-#: camel/camel-session.c:394
+#: camel/camel-session.c:418
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3293,33 +3436,31 @@ msgstr ""
 "Verzeichnis %s konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/camel-url.c:75
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+msgid "Trash"
+msgstr "Müll"
+
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL-Zeichenkette `%s' enthält kein Protokoll"
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL-Zeichenkette `%s' enthält ein ungültiges Protokoll"
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer in URL `%s' ist nicht numerisch"
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-vee-folder.c:960
 #, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos-Ticket konnte nicht erhalten werden:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Ungültige Legitimationsantwort vom Server."
+msgid "No such message: %s"
+msgstr "Nachricht gibt es nicht: %s"
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
@@ -3331,7 +3472,7 @@ msgstr "Unerwartete Antwort von IMAP-Server: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -3349,13 +3490,17 @@ msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung für %s konnte nicht geladen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:702
-#: camel/providers/imap/camel-imap-folder.c:864
+#: camel/providers/imap/camel-imap-folder.c:329
+msgid "Scanning IMAP folder"
+msgstr "IMAP-Ordner wird abgetastet"
+
+#: camel/providers/imap/camel-imap-folder.c:837
+#: camel/providers/imap/camel-imap-folder.c:999
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -3367,29 +3512,35 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Zum Lesen und Speichern von Mail auf IMAP-Servern."
 
-#: camel/providers/imap/camel-imap-store.c:252
+#: camel/providers/imap/camel-imap-store.c:262
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschlüsselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:261
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:263
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
+#: camel/providers/imap/camel-imap-store.c:407
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
-"Dies verbindet mit dem IMAP-Server und benutzt Kerberos 4, um sich zu "
-"legitimieren."
+"IMAP-Server %s unterstützt den verlangten Legitimationsmechanismus %s nicht."
+
+#: camel/providers/imap/camel-imap-store.c:418
+#, c-format
+msgid "No support for authentication type %s"
+msgstr "Keine Unterstützung für Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:369
+#: camel/providers/imap/camel-imap-store.c:446
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sBitte geben Sie das IMAP-Passwort für %s@%s ein"
 
-#: camel/providers/imap/camel-imap-store.c:397
+#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:345
+msgid "You didn't enter a password."
+msgstr "Sie haben kein Passwort eingegeben."
+
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:353
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3400,7 +3551,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:674
+#: camel/providers/imap/camel-imap-store.c:764
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
@@ -3635,12 +3786,12 @@ msgstr "Fataler Mailparser-Fehler nahe Position %ld in Ordner %s"
 #: camel/providers/local/camel-mbox-summary.c:362
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
-msgstr "Kann Zusammenfassung von Ordner nicht erstellen: %s: %s"
+msgstr "Zusammenfassung von Ordner kann nicht erstellt werden: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1326
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
 msgid "Synchronising folder"
-msgstr "Ordner Synchronisieren"
+msgstr "Ordner wird synchronisiert"
 
 #: camel/providers/local/camel-mbox-summary.c:498
 #: camel/providers/local/camel-mbox-summary.c:699
@@ -3810,7 +3961,7 @@ msgstr ""
 "om Mail von manchen Web-Mailprovidern und proprietären E-Mail-Systemen "
 "abzurufen."
 
-#: camel/providers/pop3/camel-pop3-store.c:142
+#: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3818,7 +3969,7 @@ msgstr ""
 "Diese Option wird mit dem POP-Server unter einem unverschlüsselten Passwort "
 "verbinden. Viele POP-Server unterstützen nur dies."
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:157
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -3828,29 +3979,29 @@ msgstr ""
 "über das APO-Protokoll verbinden. Dies funktioniert evtl. nicht für alle "
 "Benutzer, sogar auf Servern, die behaupten, es zu unterstützen."
 
-#: camel/providers/pop3/camel-pop3-store.c:164
+#: camel/providers/pop3/camel-pop3-store.c:169
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dies verbindet mit dem POP-Server und benutzt Kerberos 4, um sich zu "
 "legitimieren."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Legitimation beim KPOP-Server konnte nicht erfolgen: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:326
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Verbindung zu POP-Server auf %s konnte nicht hergestellt werden."
 
-#: camel/providers/pop3/camel-pop3-store.c:373
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sBitte geben Sie das POP3-Passwort für %s@%s ein"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3859,12 +4010,12 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Benutzernamens: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:395
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(Unbekannt)"
 
-#: camel/providers/pop3/camel-pop3-store.c:422
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3872,7 +4023,7 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Keine Unterstützung für den verlangten Legitimationsmechanismus."
 
-#: camel/providers/pop3/camel-pop3-store.c:430
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3881,7 +4032,7 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:535
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
@@ -3929,15 +4080,19 @@ msgstr "%s konnte nicht ausgeführt werden: Mail nicht gesendet."
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail gab Status %d zurück: Mail nicht gesendet."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+msgid "Could not find 'From' address in message"
+msgstr "'Von'-Adresse konnte nicht in Nachricht gefunden werden"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr "Mailauslieferung über das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:56
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -3945,96 +4100,122 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Zum Ausliefern von Mail über einen Mailknotenpunkt im Netz per SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:141
+#: camel/providers/smtp/camel-smtp-transport.c:143
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfehler, Befehl nicht erkannt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-transport.c:145
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfehler in Parametern oder Argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:147
 msgid "Command not implemented"
 msgstr "Befehl nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:149
 msgid "Command parameter not implemented"
 msgstr "Befehlsparameter nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:151
 msgid "System status, or system help reply"
 msgstr "Systemstatus- oder Systemhilfe-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:153
 msgid "Help message"
 msgstr "Hilfemeldung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:155
 msgid "Service ready"
 msgstr "Dienst ist bereit"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:157
 msgid "Service closing transmission channel"
 msgstr "Dienst schließt Übertragungskanal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:159
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst nicht verfügbar, Übertragungskanal wird geschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:161
 msgid "Requested mail action okay, completed"
 msgstr "Angeforderte Mailaktion in Ordnung, abgeschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "User not local; will forward to <forward-path>"
 msgstr "Benutzer nicht lokal; Weiterleitung erfolgt zu <weiterleitungspfad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Angeforderte Mailaktion nicht ausgeführt: Postfach nicht verfügbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Angeforderte Aktion nicht ausgeführt: Postfach nicht verfügbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Requested action aborted: error in processing"
 msgstr "Angeforderte Aktion abgebrochen: Fehler bei Verarbeitung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "User not local; please try <forward-path>"
 msgstr "Benutzer nicht lokal; probieren Sie es mit <weiterleitungspfad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Angeforderte Aktion nicht ausgeführt: unzureichender Systemspeicher"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Angeforderte Aktion nicht ausgeführt: Speicherzuteilung überschritten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Angeforderte Aktion nicht ausgeführt: Postfachname nicht erlaubt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Maileingabe beginnen; Ende mit <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Transaction failed"
 msgstr "Transaktion fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:185
+msgid "A password transition is needed"
+msgstr "Ein Passwordübergang ist notwendig"
+
+#: camel/providers/smtp/camel-smtp-transport.c:187
+msgid "Authentication mechanism is too weak"
+msgstr "Legitimationsmechanismus ist zu schwach"
+
+#: camel/providers/smtp/camel-smtp-transport.c:189
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"Für den verlangten Legitimationsmechanismus ist Verschlüsselung erforderlich."
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Temporary authentication failure"
+msgstr "Zeitweiliger Legitimationsfehlschlag"
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+msgid "Authentication required"
+msgstr "Legitimation benötigt"
+
+#: camel/providers/smtp/camel-smtp-transport.c:258
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Willkommen-Antwortfehler: %s: vielleicht nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:330
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sBitte geben Sie das SMTP-Passwort für %s@%s ein"
+
+#: camel/providers/smtp/camel-smtp-transport.c:438
 msgid "No authentication required"
 msgstr "Keine Legitimation benötigt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:440
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
 "authentication. This should be fine for connecting to most SMTP servers."
@@ -4042,127 +4223,112 @@ msgstr ""
 "Diese Option wird mit dem SMTP-Server ohne jede Art von Legitimation "
 "verbinden. Dies sollte für die meisten SMTP-Server völlig in Ordnung sein."
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/providers/smtp/camel-smtp-transport.c:350
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Dies verbindet mit dem SMTP-Server und benutzt CRAM-MD5, um sich zu "
-"legitimieren."
-
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:483
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-Server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-Mailauslieferung über %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:405
+#: camel/providers/smtp/camel-smtp-transport.c:510
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "Nachricht konnte nicht gesendet werden: Sender-Adresse nicht angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "Cannot send message: sender address not valid."
 msgstr "Nachricht konnte nicht gesendet werden: Sender-Adresse nicht gültig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:426
+#: camel/providers/smtp/camel-smtp-transport.c:531
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht gesendet werden: Keine Empfänger angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:625
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Zeitüberschreitung bei HELO-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:539
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO-Antwortfehler: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:578
+#: camel/providers/smtp/camel-smtp-transport.c:679
+#: camel/providers/smtp/camel-smtp-transport.c:691
+#, c-format
+msgid "AUTH request timed out: %s"
+msgstr "Zeitüberschreitung bei AUTH-Anfrage: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:749
+msgid "Bad authentication response from server.\n"
+msgstr "Ungültige Legitimationsantwort vom Server.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:774
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei MAIL-FROM-Anfrage: %s: Mail nicht gesendet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:597
+#: camel/providers/smtp/camel-smtp-transport.c:793
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL-FROM-Antwortfehler: %s: Mail nicht gesendet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:818
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei RCPT-TO-Anfrage: %s: Mail nicht gesendet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:641
+#: camel/providers/smtp/camel-smtp-transport.c:837
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT-TO-Antwortfehler: %s: Mail nicht gesendet."
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: Mail nicht gesendet."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA-Antwortfehler: %s: Mail nicht gesendet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
+#: camel/providers/smtp/camel-smtp-transport.c:902
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zeitüberschreitung beim Senden von DATA: Nachrichtenabschluss: %s Mail nicht "
 "gesendet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:939
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA-Antwortfehler: Nachrichtenabschluss: %s: Mail nicht gesendet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:767
+#: camel/providers/smtp/camel-smtp-transport.c:963
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeitüberschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:786
+#: camel/providers/smtp/camel-smtp-transport.c:982
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET-Antwort-Fehler: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Zeitüberschreitung bei QUIT-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:828
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT-Antwortfehler: %s: nicht fatal"
 
-#: camel/providers/vee/camel-vee-folder.c:617
-#, c-format
-msgid "No such message: %s"
-msgstr "Nachricht existiert nicht: %s"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "E-Mail-Quelle: Virtueller Ordner"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "Zum Lesen von Mail in Form einer Abfrage über andere Ordner"
-
 #: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 Byte"
@@ -4197,11 +4363,6 @@ msgstr "anlage"
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Entfernen"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Entferne das gewählte Element aus der Anlagenliste"
@@ -4214,7 +4375,8 @@ msgstr "Anlage hinzufügen..."
 msgid "Attach a file to the message"
 msgstr "Eine Datei zu der Nachricht hinzufügen"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1167
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
 msgid "Attachment"
 msgstr "Anlage"
 
@@ -4238,40 +4400,52 @@ msgstr "MIME-Typ:"
 msgid "Send as:"
 msgstr "Senden als:"
 
-#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
-#: mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:314
+msgid "Click here for the address book"
+msgstr "Für das Adressbuch hier klicken"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
 msgid "From:"
 msgstr "Von:"
 
-#: composer/e-msg-composer-hdrs.c:330
-msgid "Click here for the address book"
-msgstr "Für das Adressbuch hier klicken"
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Antwort an:"
 
-#: composer/e-msg-composer-hdrs.c:387
-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"
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "Gebe die Empfänger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:381
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Gebe die Adressen ein, die eine Kopie der Nachricht erhalten"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4279,15 +4453,7 @@ msgstr ""
 "Gebe die Adressen ein, die eine Kopie erhalten, dienicht in der "
 "Empfängerliste auftaucht."
 
-#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: composer/e-msg-composer-hdrs.c:410
-msgid "Enter the subject of the mail"
-msgstr "Gebe den Betreff der Nachricht an"
-
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4296,39 +4462,26 @@ msgstr ""
 "Signaturdatei %s konnte nicht geöffnet werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:665
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Speichere Änderungen an Nachricht..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "Änderungen an Nachricht speichern..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Fehler beim Speichern des Erstellen in 'Entwürfe': %s"
-
-#: composer/e-msg-composer.c:819 evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:818 evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4338,27 +4491,27 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre Änderungen speichern?"
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:976
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "Diese Datei existiert nicht."
 
-#: composer/e-msg-composer.c:986
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Diese Datei ist keine normale Datei."
 
-#: composer/e-msg-composer.c:996
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "Diese Datei existiert, ist aber nicht lesbar."
 
-#: composer/e-msg-composer.c:1006
+#: composer/e-msg-composer.c:1005
 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:1028
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4366,19 +4519,28 @@ 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:1049
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Ein Fehler trat beim Lesen der Datei auf."
 
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:1608
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
-msgstr "Konnte Erstellungsfenster nicht erzeugen."
+msgstr "Erstellungsfenster konnte nicht erzeugt werden."
+
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+"Es konnte kein Erstellungsfenster angelegt werden, da Sie\n"
+"in der Mailkomponente noch keine Identität konfiguriert\n"
+"haben."
 
-#: composer/evolution-composer.c:359
+#: composer/evolution-composer.c:367
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutions Maileditor kann nicht initialisiert werden."
 
@@ -4390,6 +4552,54 @@ msgstr "Adresskarte"
 msgid "calendar information"
 msgstr "Kalender-Information"
 
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr ""
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+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.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr ""
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H.%M%n"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+msgid "%a %m/%d/%Y"
+msgstr "%a, %d.%m.%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a, %d.%m.%Y %H.%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a, %d.%m.%Y %I.%M %p"
+
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr "Evolution-Komponente für die Chefsesselansicht"
@@ -4410,7 +4620,8 @@ msgid ""
 "\n"
 "Just leave it blank for the default"
 msgstr ""
-"Sie können eine andere HTML-Seite als Hintergrund für die Chefsesselansicht auswählen.\n"
+"Sie können eine andere HTML-Seite als Hintergrund für die Chefsesselansicht "
+"auswählen.\n"
 "\n"
 "Um die Vorgabe einzustellen, lassen Sie den Eintrag einfach frei."
 
@@ -4670,8 +4881,8 @@ msgstr "jetzt"
 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:286
-#: mail/mail-autofilter.c:335
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:336
+#: mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
@@ -4679,16 +4890,7 @@ msgstr "Filterregel hinzufügen"
 msgid "Edit Filter Rule"
 msgstr "Filterregel bearbeiten"
 
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "eingehend"
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "ausgehend"
-
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
+#: filter/filter-editor.c:457 filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Filter bearbeiten"
 
@@ -4714,7 +4916,7 @@ msgstr ""
 "Bitte gehen Sie zurück und wählen Sie einen gültigen Ordner zum Ausliefern "
 "der Mail."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
@@ -4739,35 +4941,35 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:572
 msgid "Rule name: "
 msgstr "Regelname: "
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:576
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:592
 msgid "If"
 msgstr "Wenn"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:609
 msgid "Execute actions"
 msgstr "Aktionen ausführen"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:613
 msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:618
 msgid "if any criteria are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:629
 msgid "Add criterion"
 msgstr "Kriterium hinzufügen"
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:635
 msgid "Remove criterion"
 msgstr "Kriterium entfernen"
 
@@ -4775,8 +4977,8 @@ msgstr "Kriterium entfernen"
 msgid "Replied to"
 msgstr "Beantwortet an"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
 #: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "Wichtig"
@@ -4806,164 +5008,220 @@ msgid "Virtual Folders"
 msgstr "Virtuelle Ordner"
 
 #: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "nur bestimmte Ordner"
+
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "vOrdner-Quellen"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "mit allen aktiven Ordnern aus dem Netz"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "mit allen lokalen Ordnern und aktiven Ordnern aus dem Netz"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "mit allen lokalen Ordnern"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Farbe zuweisen"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
+msgid "Attachments"
+msgstr "Anlagen"
+
+#: filter/libfilter-i18n.h:7 filter/libfilter-i18n.h:65
+msgid "contains"
+msgstr "enthält"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Sendedatum"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:17
+msgid "Deleted"
+msgstr "Gelöscht"
+
+#: filter/libfilter-i18n.h:18
+msgid "Draft"
+msgstr "Entwurf"
+
+#: filter/libfilter-i18n.h:21 filter/libfilter-i18n.h:90
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1171
+msgid "Flagged"
+msgstr "Markiert"
+
+#: filter/libfilter-i18n.h:23 filter/libfilter-i18n.h:91
 msgid "Forward to Address"
 msgstr "Weiterleiten an Adresse"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:24 filter/libfilter-i18n.h:110
+msgid "Mailing list"
+msgstr "Mailingliste"
+
+#: filter/libfilter-i18n.h:25 filter/libfilter-i18n.h:112
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:26 filter/libfilter-i18n.h:113
 msgid "Message Header"
 msgstr "Nachrichtenkopf"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:27 filter/libfilter-i18n.h:114
 msgid "Message was received"
 msgstr "Nachricht wurde empfangen"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:28 filter/libfilter-i18n.h:115
 msgid "Message was sent"
 msgstr "Nachricht wurde gesendet"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:29 filter/libfilter-i18n.h:116
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:34 filter/libfilter-i18n.h:135
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:35 filter/libfilter-i18n.h:136
 msgid "Regex Match"
 msgstr "Regex-Treffer"
 
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1167
+#: filter/libfilter-i18n.h:37 mail/message-list.c:621
+msgid "Seen"
+msgstr "Gelesen"
+
+#: filter/libfilter-i18n.h:39 filter/libfilter-i18n.h:137
+#: filter/score-rule.c:192 filter/score-rule.c:194 mail/message-list.c:1171
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:43 filter/libfilter-i18n.h:50
 msgid "Set Flag"
 msgstr "Marke setzen"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:44 filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:139
 msgid "Set Status"
 msgstr "Status setzen:"
 
-#: filter/libfilter-i18n.h:21 filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45 filter/libfilter-i18n.h:140
 msgid "sounds like"
 msgstr "klingt wie"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:46 filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:141 mail/mail-config.glade.h:68
 msgid "Source"
 msgstr "Quelle"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:47 filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:142
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:60 filter/libfilter-i18n.h:146
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:26 mail/message-list.c:1168
+#: filter/libfilter-i18n.h:61 filter/libfilter-i18n.h:147
+#: mail/message-list.c:1172
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/libfilter-i18n.h:29
-msgid "contains"
-msgstr "enthält"
-
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:69 filter/libfilter-i18n.h:80
 msgid "does not contain"
 msgstr "enthält nicht"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:70 filter/libfilter-i18n.h:81
 msgid "does not end with"
 msgstr "endet nicht mit"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:71 filter/libfilter-i18n.h:82
 msgid "does not exist"
 msgstr "existiert nicht"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:72 filter/libfilter-i18n.h:83
 msgid "does not sound like"
 msgstr "klingt nicht wie"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:73 filter/libfilter-i18n.h:84
 msgid "does not start with"
 msgstr "beginnt nicht mit"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:74
+msgid "Do Not Exist"
+msgstr "Existieren nicht"
+
+#: filter/libfilter-i18n.h:75 filter/libfilter-i18n.h:85
 msgid "ends with"
 msgstr "endet mit"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:76
+msgid "Exist"
+msgstr "Existieren"
+
+#: filter/libfilter-i18n.h:77 filter/libfilter-i18n.h:86
 msgid "exists"
 msgstr "existiert"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:94 filter/libfilter-i18n.h:103
+#: filter/libfilter-i18n.h:120
+msgid "is"
+msgstr "ist"
+
+#: filter/libfilter-i18n.h:95 filter/libfilter-i18n.h:104
 msgid "is greater than"
 msgstr "ist größer als"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:96 filter/libfilter-i18n.h:105
 msgid "is less than"
 msgstr "ist kleiner als"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:97 filter/libfilter-i18n.h:106
 msgid "is not"
 msgstr "ist nicht"
 
-#: filter/libfilter-i18n.h:40
-msgid "is"
-msgstr "ist"
+#: filter/libfilter-i18n.h:99
+msgid "matches regex"
+msgstr "passt auf Regex"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:122 filter/libfilter-i18n.h:128
 msgid "on or after"
 msgstr "am oder nach"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:123 filter/libfilter-i18n.h:129
 msgid "on or before"
 msgstr "am oder vor"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:143
 msgid "starts with"
 msgstr "beginnt mit"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:148
 msgid "was after"
 msgstr "war nach"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:149
 msgid "was before"
 msgstr "war vor"
 
@@ -4983,141 +5241,128 @@ msgstr "VOrdner-Regel hinzufügen"
 msgid "Edit VFolder Rule"
 msgstr "VFolder-Regel bearbeiten"
 
-#. mail_msg_wait (mail_get_trash ("file:/", got_folder, &trash_folder));
-#: mail/component-factory.c:215 mail/mail-ops.c:1746
-msgid "Trash"
-msgstr "Müll"
-
-#: mail/component-factory.c:301
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
-msgstr "Kann die Evolution-Mail-Komponente nicht initialisieren"
+msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:374
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Suche als VOrdner speichern"
-
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Rumpf oder Betreff enthält"
-
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Rumpf enthält"
-
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Betreff enthält"
-
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Rumpf enthält nicht"
+#: mail/folder-browser-factory.c:237
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Eigenschaften von \"%s\""
 
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Betreff enthält nicht"
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Eigenschaften"
 
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Absender enthält"
+#: mail/folder-browser.c:219
+msgid "Store search as vFolder"
+msgstr "Suche als VOrdner speichern"
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:508
 msgid "VFolder on Subject"
 msgstr "VOrdner über Betreffzeile"
 
-#: mail/folder-browser.c:657
+#: mail/folder-browser.c:511
 msgid "VFolder on Sender"
 msgstr "VOrdner über Absender"
 
-#: mail/folder-browser.c:658
+#: mail/folder-browser.c:514
 msgid "VFolder on Recipients"
 msgstr "VOrdner über Empfänger"
 
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:517 mail/folder-browser.c:701
+msgid "VFolder on Mailing List"
+msgstr "VFilter über Mailingliste"
+
+#: mail/folder-browser.c:523
 msgid "Filter on Subject"
 msgstr "Filter über Betreffzeile"
 
-#: mail/folder-browser.c:661
+#: mail/folder-browser.c:526
 msgid "Filter on Sender"
 msgstr "Filter über Absender"
 
-#: mail/folder-browser.c:662
+#: mail/folder-browser.c:529
 msgid "Filter on Recipients"
 msgstr "Filter über Empfänger"
 
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
+#: mail/folder-browser.c:532 mail/folder-browser.c:700
 msgid "Filter on Mailing List"
 msgstr "Filter über Mailingliste"
 
-#: mail/folder-browser.c:669 ui/evolution-calendar.xml.h:17
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Öffnen"
-
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:543
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
+#: mail/folder-browser.c:545 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:550
 msgid "Reply to Sender"
 msgstr "Antwort an Absender"
 
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:552 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Allen antworten"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
+#: mail/folder-browser.c:554 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
+#: mail/folder-browser.c:556
 msgid "Forward inline"
 msgstr "Im Rumpf weiterleiten"
 
-#: mail/folder-browser.c:679
+#: mail/folder-browser.c:559
 msgid "Mark as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:561
 msgid "Mark as Unread"
 msgstr "Als ungelesen markieren"
 
-#: mail/folder-browser.c:682
+#: mail/folder-browser.c:566
 msgid "Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:568
 msgid "Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:685
+#: mail/folder-browser.c:572
 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:689
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:582
 msgid "Apply Filters"
 msgstr "Filter anwenden"
 
-#: mail/folder-browser.c:691
+#: mail/folder-browser.c:586
 msgid "Create Rule From Message"
 msgstr "Regel aus Nachricht erzeugen"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:703
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter über Mailingliste (%s)"
 
+#: mail/folder-browser.c:704
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr "VOrdner über Mailingliste (%s)"
+
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
 msgstr "Evolution-Komponente für den Umgang mit Mail."
@@ -5150,22 +5395,6 @@ msgstr "Factory für die Evolution-Mail-Komponente."
 msgid "Factory for the Mail Summary component."
 msgstr "Factory für die Mailzusammenfassungs-Komponente."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Factory, um Outlook-Express-4-Mails in Evolution zu importieren"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Factory to import mbox into Evolution"
-msgstr "Factory, um mbox in Evolution zu importieren"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Importiert Outlook-Express-4-Dateien in Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Imports mbox files into Evolution"
-msgstr "Importiert mbox-Dateien in Evolution"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Aktuelles Speicherformat:"
@@ -5201,25 +5430,24 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
-#: mail/mail-account-editor.c:777 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:916 mail/mail-config.glade.h:44
-#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Keine"
-
-#: mail/mail-accounts.c:115
+#: mail/mail-accounts.c:116
 msgid " (default)"
 msgstr " (voreingestellt)"
 
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+msgid "Are you sure you want to delete this account?"
+msgstr "Sind Sie sicher, dass Sie diesen Account löschen wollen?"
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+msgid "Are you sure you want to delete this news account?"
+msgstr "Sind Sie sicher, dass Sie diesen News-Account löschen wollen?"
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
+#: mail/mail-accounts.c:423
 msgid "Evolution Account Manager"
 msgstr "Evolution-Accountverwaltung"
 
-#: mail/mail-account-editor.c:286
+#: mail/mail-account-editor.c:307
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
@@ -5228,10 +5456,14 @@ msgstr ""
 "Möchten Sie trotzdem speichern?"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:646
+#: mail/mail-account-editor.c:706
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
+#: mail/mail-account-editor.c:727
+msgid "Unspecified"
+msgstr "Unbestimmt"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -5247,12 +5479,12 @@ msgstr "Betreff ist %s"
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5264,7 +5496,7 @@ msgstr ""
 "empfangen oder erstellen können.\n"
 "Möchten Sie ihn jetzt konfigurieren?"
 
-#: mail/mail-callbacks.c:134
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5272,7 +5504,7 @@ msgstr ""
 "Sie müssen eine Identität einrichten,\n"
 "bevor Sie Mail erstellen können."
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5280,11 +5512,11 @@ msgstr ""
 "Sie müssen einen Mailtransport einrichten,\n"
 "bevor Sie Mail erstellen können."
 
-#: mail/mail-callbacks.c:190
+#: mail/mail-callbacks.c:194
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Mailtransport-Methode eingestellt"
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5292,33 +5524,33 @@ msgstr ""
 "Diese Nachricht hat keine Betreffzeile.\n"
 "Wirklich senden?"
 
-#: mail/mail-callbacks.c:290
+#: mail/mail-callbacks.c:294
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Sie müssen einen Account einrichten, bevor Sie diese Mail senden können."
 
-#: mail/mail-callbacks.c:310
+#: mail/mail-callbacks.c:316
 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:571
+#: mail/mail-callbacks.c:579
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Am %s schrieb %s:\n"
 
-#: mail/mail-callbacks.c:727
+#: mail/mail-callbacks.c:761
 msgid "Forwarded message:\n"
 msgstr "Weitergeleitete Nachricht:\n"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:814
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:949
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5326,11 +5558,11 @@ msgstr ""
 "Sie können nur im Entwürfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:982 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
-#: mail/mail-callbacks.c:986 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5338,15 +5570,15 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits.\n"
 "Überschreiben?"
 
-#: mail/mail-callbacks.c:1030
+#: mail/mail-callbacks.c:1088
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:1032
+#: mail/mail-callbacks.c:1090
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:1140
+#: mail/mail-callbacks.c:1198
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5355,22 +5587,14 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1189
+#: mail/mail-callbacks.c:1247
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:1236
+#: mail/mail-callbacks.c:1294
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-config.c:835
-msgid "Connecting to server"
-msgstr "Verbindung mit Server"
-
-#: mail/mail-config.c:837
-msgid "Connect to server"
-msgstr "Mit Server verbinden"
-
 #: mail/mail-config.glade.h:1
 msgid "Account"
 msgstr "Account"
@@ -5383,31 +5607,27 @@ msgstr "Account-Information"
 msgid "Account Management"
 msgstr "Accountverwaltung"
 
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Account-Eigenschaften"
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
 msgid "Advanced"
 msgstr "Komplex"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 msgid "Authentication Type:"
 msgstr "Legitimations-Typ:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "Automatically check mail every"
 msgstr "Automatisch nach Mail sehen alle"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "Check settings"
 msgstr "Einstellungen prüfen"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5426,44 +5646,44 @@ msgstr ""
 "speichern."
 
 #: mail/mail-config.glade.h:19
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:20
-msgid "Default"
-msgstr "Voreinstellung"
+msgid "De_fault"
+msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Done"
 msgstr "Fertig"
 
 #: mail/mail-config.glade.h:23
-msgid "E-Mail Address:"
-msgstr "E-Mail Adresse:"
-
-#: mail/mail-config.glade.h:25
 msgid "Email Address:"
-msgstr "E-Mail Adresse:"
+msgstr "E-Mail-Adresse:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
+msgstr "E-Mail-Adresse:"
+
+#: mail/mail-config.glade.h:25
 msgid "Evolution Mail Configuration"
 msgstr "Evolution-Mailkonfiguration"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Voller Name:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "Hostname:"
 msgstr "Hostname:"
 
+#: mail/mail-config.glade.h:30
+msgid "IMAP"
+msgstr "IMAP"
+
 #: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Identität"
 
 #: mail/mail-config.glade.h:32
-msgid "Incoming Mail Server"
-msgstr "Server für eingehende Mail"
+msgid "Include this account when receiving mail"
+msgstr "Diesen Zugang beim Empfangen von Mail einschließen"
 
 #: mail/mail-config.glade.h:33
 msgid "Keep mail on server"
@@ -5497,54 +5717,54 @@ msgstr "Dies zu meinem Standardaccount machen"
 msgid "Mark messages as \"Read\" after:"
 msgstr "Nachrichten als \"Gelesen\" markieren nach:"
 
-#: mail/mail-config.glade.h:41
-msgid "Miscellaneous"
-msgstr "Diverses"
-
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "News"
 msgstr "Nachrichten"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Optional"
 msgstr "Optional"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:48
-msgid "Outgoing Mail Server"
-msgstr "Server für ausgehende Mail"
+#: mail/mail-config.glade.h:47
+msgid "PGP binary path:"
+msgstr "Pfad zur PGP-Binärdatei:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "Password:"
 msgstr "Passwort:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Plain Text"
 msgstr "Einfacher Text"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Receiving Email"
 msgstr "Mail erhalten"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Remember my password"
 msgstr "Passwort speichern"
 
-#: mail/mail-config.glade.h:54 mail/mail-format.c:629
-msgid "Reply-To:"
-msgstr "Antwort an:"
+#: mail/mail-config.glade.h:53
+msgid "Reply address:"
+msgstr "Antwortadresse:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Required"
 msgstr "Benötigt"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Save password"
 msgstr "Passwort speichern"
 
+#: mail/mail-config.glade.h:57
+msgid "Select PGP binary"
+msgstr "PGP-Binärdatei wählen"
+
 #: mail/mail-config.glade.h:58
 msgid "Select signature file"
 msgstr "Signaturdatei wählen"
@@ -5570,8 +5790,8 @@ msgid "Server requires authentication"
 msgstr "Server benötigt Legitimation"
 
 #: mail/mail-config.glade.h:65
-msgid "Servers"
-msgstr "Server"
+msgid "Server type:"
+msgstr "Servertyp:"
 
 #: mail/mail-config.glade.h:66
 msgid "Signature file:"
@@ -5581,19 +5801,27 @@ msgstr "Signaturdatei:"
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Sources"
 msgstr "Quellen"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "This server requires a secure connection (SSL)"
 msgstr "Dieser Server benötigt eine sichere Verbindung (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
+msgid "Transport"
+msgstr "Transport"
+
+#: mail/mail-config.glade.h:72
+msgid "Transport Authentication"
+msgstr "Transport-Legitimation"
+
+#: mail/mail-config.glade.h:73
 msgid "Type"
 msgstr "Typ"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
@@ -5601,15 +5829,15 @@ msgstr ""
 "Geben Sie den Namen ein, unter dem Sie diese Server führen wollen, zum "
 "Beispiel \"Büro\" oder \"Privat\"."
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "User Information"
 msgstr "Benutzer-Information"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5619,11 +5847,17 @@ msgstr ""
 "\n"
 "Klicken Sie \"Weiter\" zum Beginnen."
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "_Bearbeiten"
+
+#: mail/mail-config.glade.h:83
 msgid "minutes."
 msgstr "Minuten."
 
-#: mail/mail-config-druid.c:399
+#: mail/mail-config-druid.c:421
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -5632,11 +5866,11 @@ msgstr ""
 "Konfiguration für eingehende Mail konnte nicht bestätigt werden.\n"
 "Sie werden vielleicht Probleme beim Abrufen von Mail von %s erleben."
 
-#: mail/mail-config-druid.c:489
+#: mail/mail-config-druid.c:515
 msgid "Namespace:"
 msgstr "Namensraum:"
 
-#: mail/mail-config-druid.c:677
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5646,7 +5880,7 @@ msgstr ""
 "Sie werden vielleicht Probleme beim Senden von Mail über %s erleben."
 
 #. set window title
-#: mail/mail-config-druid.c:1036
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr "Evolution-Account-Druide"
 
@@ -5690,106 +5924,99 @@ msgstr "Verbergen"
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:654
+#: mail/mail-format.c:704
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-format.c:943
+#: mail/mail-format.c:993
 msgid "Encrypted message not displayed"
 msgstr "Verschlüsselte Nachricht nicht angezeigt"
 
-#: mail/mail-format.c:949
+#: mail/mail-format.c:999
 msgid "Encrypted message"
 msgstr "Verschlüsselte Nachricht"
 
-#: mail/mail-format.c:950
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr "Zum Entschlüsseln Icon klicken."
 
-#: mail/mail-format.c:1019 mail/mail-format.c:1399
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Diese Nachricht ist digital signiert und wurde als authentisch nachgewiesen."
 
-#: mail/mail-format.c:1027 mail/mail-format.c:1407
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Diese Nachricht ist digital signiert, kann aber nicht als authentisch "
 "nachgewiesen werden."
 
-#: mail/mail-format.c:1611
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:1623
+#: mail/mail-format.c:1689
 #, 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:1627
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:1661
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:1666
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr "Ungültiger external-body-Teil."
 
-#: mail/mail-local.c:444
-msgid "Registering local folder"
-msgstr "Lokaler Ordner wird registriert"
-
-#: mail/mail-local.c:446
-msgid "Register local folder"
-msgstr "Lokalen Ordner registrieren"
+#: mail/mail-local.c:335
+#, c-format
+msgid "No such folder %s"
+msgstr "Ordner %s gibt es nicht"
 
-#: mail/mail-local.c:553
+#: mail/mail-local.c:508
 #, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Ordner '%s' kann nicht registriert werden:\n"
-"%s"
+msgid "Opening '%s'"
+msgstr "Öffnen von '%s'..."
 
-#: mail/mail-local.c:717
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:721
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Ordner \"%s\" in \"%s\"-Format umwandeln"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:814
 msgid "Reconfiguring folder"
-msgstr "Ordner re-konfigurieren"
+msgstr "Ordner wird neu konfiguriert"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:781
+#: mail/mail-local.c:843
 msgid "Closing current folder"
-msgstr "Schließe aktuellen Ordner"
+msgstr "Aktueller Ordner wird geschlossen"
 
-#: mail/mail-local.c:813
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
-msgstr "Benenne alten Ordner um und öffne"
+msgstr "Alter Ordner wird umbenannt und geöffnet"
 
-#: mail/mail-local.c:831
+#: mail/mail-local.c:893
 msgid "Creating new folder"
-msgstr "Lege einen neuen Ordner an"
+msgstr "Neuer Ordner wird angelegt"
 
-#: mail/mail-local.c:845
+#: mail/mail-local.c:907
 msgid "Copying messages"
-msgstr "Kopiere Nachrichten"
+msgstr "Nachrichten werden kopiert"
 
-#: mail/mail-local.c:866
+#: mail/mail-local.c:928
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5798,13 +6025,13 @@ msgstr ""
 "Metainformationen zu Ordner können nicht gespeichert werden; Sie\n"
 "werden ihn wahrscheinlich nie mehr öffnen können: %s"
 
-#: mail/mail-local.c:898
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr "Datei %s konnte nicht geladen werden"
 
-#: mail/mail-mt.c:88
+#: mail/mail-mt.c:177
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -5813,7 +6040,7 @@ msgstr ""
 "Fehler beim `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:90
+#: mail/mail-mt.c:179
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -5822,118 +6049,96 @@ msgstr ""
 "Fehler beim Ausführen eines Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:386 mail/mail-mt.c:415
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:875
 msgid "Working"
 msgstr "In Arbeit"
 
-#: mail/mail-ops.c:519
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
+msgstr "Akzeptieren Sie dies?"
+
+#: mail/mail-mt.c:857
+msgid "Evolution progress"
+msgstr "Evolution-Fortschritt"
+
+#: mail/mail-ops.c:516
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:521
+#: mail/mail-ops.c:518
 msgid "Sending message"
 msgstr "Nachricht senden"
 
-#: mail/mail-ops.c:749 mail/mail-ops.c:756
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Hänge \"%s\" an"
-
-#: mail/mail-ops.c:753 mail/mail-ops.c:759
-msgid "Appending a message without a subject"
-msgstr "Hänge eine Nachricht ohne eine Betreffzeile an"
+#: mail/mail-ops.c:752
+msgid "Saving message to folder"
+msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:841
+#: mail/mail-ops.c:825
 #, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Verschiebe Nachrichten von \"%s\" in \"%s\""
+msgid "Moving messages to %s"
+msgstr "Machrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:843
+#: mail/mail-ops.c:825
 #, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Kopiere Nachrichten von \"%s\" in \"%s\""
+msgid "Copying messages to %s"
+msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:846
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Machrichten von \"%s\" in \"%s\" verschieben"
-
-#: mail/mail-ops.c:848
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Kopiere Nachrichten von \"%s\" in \"%s\""
-
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Verschiebe"
 
-#: mail/mail-ops.c:882
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Kopiere"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s Nachricht %d von %d (UID \"%s\")"
 
-#: mail/mail-ops.c:977
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
-#: mail/mail-ops.c:1089
+#: mail/mail-ops.c:1085
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1130 mail/mail-ops.c:1264
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s öffnen"
 
-#: mail/mail-ops.c:1195
+#: mail/mail-ops.c:1193
 #, c-format
 msgid "Opening store %s"
 msgstr "Öffnen des Speichers %s"
 
-#: mail/mail-ops.c:1376
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr "Säubere Ordner"
 
-#: mail/mail-ops.c:1425
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s abrufen"
 
-#: mail/mail-ops.c:1492
+#: mail/mail-ops.c:1496
 msgid "Retrieving messages"
 msgstr "Nachrichten abrufen"
 
-#: mail/mail-ops.c:1502
+#: mail/mail-ops.c:1506
 #, 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:1654
-#, c-format
-msgid "Opening Trash folder for %s"
-msgstr "Müllordner für %s wird geöffnet"
-
-#: mail/mail-ops.c:1809
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Ordner %s für %s laden"
-
-#: mail/mail-ops.c:1811
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "Ordner %s für %s laden"
-
-#: mail/mail-ops.c:1969
+#: mail/mail-ops.c:1580
 msgid "Saving messages"
 msgstr "Nachrichten speichern"
 
-#: mail/mail-ops.c:2048
+#: mail/mail-ops.c:1659
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5942,12 +6147,12 @@ msgstr ""
 "Ausgabedatei konnte nicht erstellt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2061
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Nachricht %d von %d (UID \"%s\") speichern"
 
-#: mail/mail-ops.c:2075
+#: mail/mail-ops.c:1686
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5956,11 +6161,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2149
+#: mail/mail-ops.c:1760
 msgid "Saving attachment"
 msgstr "Speichern der Anlage"
 
-#: mail/mail-ops.c:2164
+#: mail/mail-ops.c:1775
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -5969,7 +6174,7 @@ msgstr ""
 "Ausgabedatei kann nicht erstellt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2192
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
@@ -5978,139 +6183,103 @@ msgstr "Daten konnten nicht geschrieben werden: %s"
 msgid "_Search"
 msgstr "_Suchen"
 
-#: mail/mail-send-recv.c:127
+#: mail/mail-send-recv.c:136
 msgid "Cancelling ..."
 msgstr "Stornieren..."
 
-#: mail/mail-send-recv.c:218
+#: mail/mail-send-recv.c:231
 msgid "Send & Receive mail"
 msgstr "Mail erhalten & senden"
 
-#: mail/mail-send-recv.c:221
+#: mail/mail-send-recv.c:234
 msgid "Receiving"
 msgstr "Erhalten"
 
-#: mail/mail-send-recv.c:267
+#: mail/mail-send-recv.c:283
 msgid "Updating ..."
 msgstr "Aktualisieren..."
 
-#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
 msgid "Waiting ..."
 msgstr "Warten..."
 
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:304
 msgid "Sending"
 msgstr "Senden"
 
-#: mail/mail-send-recv.c:483
+#: mail/mail-send-recv.c:469
 msgid "Cancelled."
 msgstr "Storniert"
 
-#: mail/mail-send-recv.c:487
+#: mail/mail-send-recv.c:473
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-summary.c:111 mail/mail-threads.c:734
+#: mail/mail-summary.c:111
 msgid "Incomplete message written on pipe!"
 msgstr "Unvollständige Nachricht auf Pipe geschrieben!"
 
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Fehler beim Vorbereiten auf %s:\n"
-"%s"
-
-#: mail/mail-threads.c:681
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Fehler beim `%s'_\n"
-"%s"
-
-#: mail/mail-threads.c:738
-msgid "Error reading commands from dispatching thread."
-msgstr "Fehler beim Lesen von Befehlen vom verwaltenden Thread."
-
-#: mail/mail-threads.c:803
-msgid "Corrupted message from dispatching thread?"
-msgstr "Schadhafte Nachricht von verwaltendem Thread?"
-
-#: mail/mail-threads.c:922
-msgid "Could not create dialog box."
-msgstr "Konnte Dialogfenster nicht erzeugen."
-
-#: mail/mail-threads.c:933
-msgid "User cancelled query."
-msgstr "Benutzer hat Anfrage abgebrochen."
-
-#: mail/mail-tools.c:198
+#: mail/mail-tools.c:138
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Konnte temporäre Mbox `%s' nicht anlegen: %s"
+msgstr "Temporäre Mbox `%s' konnte nicht angelegt werden: %s"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (weitergeleitete Nachricht)"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (keine Betreffzeile)"
 
-#: mail/mail-tools.c:283
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:285
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "Weitergeleitete Nachricht (keine Betreffzeile)"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:411
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"Kann Ort `%s' nicht öffnen:\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
+msgstr "-----Weitergeleitete Nachricht-----<br><b>Von:</b> %s<br><b>An:</b> %s<br><b>Betreff:</b> %s<br>"
 
-#: mail/mail-vfolder.c:150
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/mail-vfolder.c:303
+#: mail/mail-vfolder.c:426
 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:138 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Antworten"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "An den Sender der Nachricht antworten"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "allen Empfängern der Nachricht antworten"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Die Nachricht weiterleiten"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Die gewählte Nachricht drucken"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Die Nachricht löschen"
 
@@ -6118,10 +6287,6 @@ msgstr "Die Nachricht löschen"
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:621
-msgid "Seen"
-msgstr "Gelesen"
-
 #: mail/message-list.c:624
 msgid "Answered"
 msgstr "Beantwortet"
@@ -6134,146 +6299,127 @@ msgstr "Mehrere ungelesene Nachrichten"
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:952
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:960 mail/message-list.c:976
+#: mail/message-list.c:964 mail/message-list.c:980
 #, c-format
 msgid "%s, et al."
 msgstr "%s u.a."
 
-#: mail/message-list.c:963 mail/message-list.c:979
+#: mail/message-list.c:967 mail/message-list.c:983
 msgid "<unknown>"
 msgstr "<Unbekannt>"
 
-#: mail/message-list.c:1031
+#: mail/message-list.c:1035
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1038
+#: mail/message-list.c:1042
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:1047
+#: mail/message-list.c:1051
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1059
+#: mail/message-list.c:1063
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1071
 msgid "%b %d %l:%M %p"
 msgstr "%a %d %l:%M %p"
 
-#: mail/message-list.c:1069
+#: mail/message-list.c:1073
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1167
-msgid "Flagged"
-msgstr "Markiert"
-
-#: mail/message-list.c:1168
+#: mail/message-list.c:1172
 msgid "From"
 msgstr "Von"
 
-#: mail/message-list.c:1168
+#: mail/message-list.c:1172
 msgid "Date"
 msgstr "Datum"
 
-#: mail/message-list.c:1168
+#: mail/message-list.c:1172
 msgid "Received"
 msgstr "Empfangen"
 
-#: mail/message-list.c:1169
+#: mail/message-list.c:1173
 msgid "To"
 msgstr "An"
 
-#: mail/message-list.c:1169
+#: mail/message-list.c:1173
 msgid "Size"
 msgstr "Größe"
 
-#: mail/openpgp-utils.c:77
+#: mail/openpgp-utils.c:89
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Bitte geben Sie Ihre %s-Passphrase für %s ein."
 
-#: mail/openpgp-utils.c:80
+#: mail/openpgp-utils.c:92
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Bitte geben Sie Ihre %s-Passphrase ein."
 
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 msgid "No GPG/PGP program available."
 msgstr "Kein GPG/PGP-Programm verfügbar."
 
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 msgid "No password provided."
 msgstr "Kein Passwort angegeben."
 
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Konnte Pipe zu GPG/PGP nicht anlegen: %s"
+msgstr "Pipe zu GPG/PGP konnte nicht angelegt werden: %s"
 
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
+#: mail/openpgp-utils.c:588
 msgid "No recipients specified"
 msgstr "Keine Empfänger angegeben"
 
-#: mail/openpgp-utils.c:1060
+#: mail/openpgp-utils.c:1088
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Temporäre Datei konnte nicht angelegt werden: %s"
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
 msgid "Folder"
 msgstr "Ordner"
 
-#: mail/subscribe-dialog.c:63
+#: mail/subscribe-dialog.c:65
 msgid "Store"
 msgstr "Speicher"
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:147
 msgid "Display folders starting with:"
 msgstr "Ordner anzeigen, die beginnen mit:"
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:177
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Erhalte Speicher für \"%s\""
 
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "Speicher für \"%s\" erhalten"
-
-#: mail/subscribe-dialog.c:292
+#: mail/subscribe-dialog.c:280
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Ordner \"%s\" wird abonniert"
 
-#: mail/subscribe-dialog.c:296
+#: mail/subscribe-dialog.c:282
 #, c-format
-msgid "Unsubscribing from folder \"%s\""
+msgid "Unsubscribing to folder \"%s\""
 msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Ordner \"%s\" abonnieren"
-
-#: mail/subscribe-dialog.c:303
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Ordner \"%s\" abbestellen"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Ordnername:"
@@ -6288,7 +6434,7 @@ msgstr "Angeben, wo der Ordner erstellt werden soll:"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
+#: shell/importer/importer.c:157
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6299,7 +6445,7 @@ msgstr ""
 "Importeur nicht bereit.\n"
 "Es wird 5 Sekunden bis zum nächsten Versuch gewartet"
 
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
+#: shell/importer/importer.c:175 shell/importer/importer.c:202
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6308,7 +6454,7 @@ msgstr ""
 "Importieren von %s\n"
 "Importiert wird Objekt %d."
 
-#: shell/importer/importer.c:307
+#: shell/importer/importer.c:309
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -6318,11 +6464,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/importer/importer.c:317
+#: shell/importer/importer.c:319
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/importer/importer.c:325
+#: shell/importer/importer.c:327
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -6331,12 +6477,12 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/importer/importer.c:340
+#: shell/importer/importer.c:342
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/importer/importer.c:355
+#: shell/importer/importer.c:357
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6345,27 +6491,27 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/importer/importer.c:426
+#: shell/importer/importer.c:428
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/importer/importer.c:476
+#: shell/importer/importer.c:478
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:481
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: shell/importer/importer.c:491
+#: shell/importer/importer.c:493
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:572
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
 msgid "Import"
 msgstr "Importieren"
 
-#: shell/importer/importer.c:605
+#: shell/importer/importer.c:609
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -6446,9 +6592,9 @@ msgid ""
 "%s\n"
 "Error: %s"
 msgstr ""
-"Kann das Verzeichnis\n"
+"Verzeichnis\n"
 "%s\n"
-"nicht anlegen.\n"
+"kann nicht angelegt werden.\n"
 "Fehler: %s"
 
 #: shell/e-setup.c:224
@@ -6457,9 +6603,9 @@ msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
-"Kann Dateien nicht in\n"
+"Dateien können nicht in\n"
 "`%s'\n"
-"kopieren."
+"kopiert werden."
 
 #: shell/e-setup.c:249
 #, c-format
@@ -6490,7 +6636,7 @@ msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Kann den angegebenen Ordner nicht erstellen:\n"
+"Der angegebene Ordner kann nicht erstellt werden:\n"
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:153
@@ -6535,9 +6681,9 @@ msgid ""
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
-"Evolution ist eine Mail-, Kalender-\n"
-"und Kontakt-Management Anwendung\n"
-"innerhalt der GNOME-Desktops."
+"Evolution ist eine Suite von Groupware-Anwendungen\n"
+"für Mail sowie Termin- und Kontaktverwaltung\n"
+"in der GNOME-Desktopumgebung."
 
 #: shell/e-shell-view-menu.c:360
 msgid "Go to folder..."
@@ -6564,9 +6710,9 @@ msgstr "%s - Evolution %s [%s]"
 #: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
-msgstr "Kann lokalen Speicher nicht einstellen -- %s"
+msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1242
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6652,61 +6798,61 @@ msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von Verknüpfungen."
 
-#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Ansicht"
 
-#: shell/e-storage-set-view.c:345
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr "Den gewählten Ordner betrachten"
 
-#: shell/e-storage.c:160
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Kein Name)"
 
-#: shell/e-storage.c:411
+#: shell/e-storage.c:429
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:413
+#: shell/e-storage.c:431
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: shell/e-storage.c:415
+#: shell/e-storage.c:433
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:417
+#: shell/e-storage.c:435
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ungültig"
 
-#: shell/e-storage.c:419
+#: shell/e-storage.c:437
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:421
+#: shell/e-storage.c:439
 msgid "Not enough space to create the folder"
 msgstr "Nicht genügend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:423
+#: shell/e-storage.c:441
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:425
+#: shell/e-storage.c:443
 msgid "Function not implemented in this storage"
 msgstr "Funktion für diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:427
+#: shell/e-storage.c:445
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:447
 msgid "Operation not supported"
 msgstr "Operation nicht unterstützt"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:449
 msgid "The specified type is not supported in this storage"
 msgstr "Der angegebene Typ wird für diese Speicherweise nicht unterstützt"
 
@@ -6716,47 +6862,43 @@ msgstr "Die Evolution-Shell."
 
 #: shell/main.c:74
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 "Hallo. Viele Dank dafür, dass Sie sich die Zeit genommen haben, diese\n"
-"Vorschauversion der Evolution-Groupware-Suite herunterzuladen.\n"
+"VORSCHAUVERSION der Evolution-Groupware-Suite herunterzuladen.\n"
 "\n"
-"Über die letzten anderthalb Monate haben wir uns darauf konzentriert,\n"
-"Evolution benutzbar zu machen. Viele der Evolution-Entwickler\n"
-"verwenden inzwischen Evolution, um all ihre Mail zu lesen. Auch Sie\n"
-"könnten das tun. (Machen Sie aber Sicherheitskopien.)\n"
+"Evolution ist noch nicht fertig. Es ist nahe dran, aber es gibt noch\n"
+"Stellen, wo Funktionen entweder fehlen oder nur halbwegs arbeiten.\n"
+"Wenn Sie nicht herausfinden können, wie etwas geht, liegt das\n"
+"wahrscheinlich daran, dass es noch nicht möglich ist! :-)\n"
 "\n"
-"Doch obwohl wir viele Fehler ausgemerzt haben, die die Stabilität und\n"
-"Sicherheit beeinträchtigt haben, kriegen Sie trotzdem einen\n"
-"Disclaimer: Evolution wird: abstürzen, Ihre Mail verlieren wenn Sie\n"
-"das nicht wollen, sich weigern, Ihre Mail zu löschen, wenn Sie es\n"
-"wollen, freilaufende Prozesse zurücklassen, 100% CPU verbrauchen, sich\n"
-"verklemmen, sich aufhängen, HTML-Mail an zufällig ausgewählte\n"
-"Mailinglisten verschicken und Sie vor Ihren Freunden und Mitarbeitern\n"
+"Wir hoffen, dass Evolution für Sie benutzbar sein wird, aber wir\n"
+"halten es immer noch für notwendig, Sie zu warnen: Es könnte\n"
+"abstürzen, Ihre Mail verlieren, freilaufende Prozesse zurücklassen,\n"
+"100% Ihrer CPU verbrauchen, nicht akzeptierte Befehle an Ihre Server\n"
+"schicken und Sie ganz allgemein vor Ihren Freunden und Mitarbeitern\n"
 "lächerlich machen. Zu Risiken und Nebenwirkungen fragen Sie Ihren Arzt\n"
 "oder Apotheker.\n"
 "\n"
 "Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
 "werden, und wir hoffen auf Ihre Mitarbeit!\n"
 
-#: shell/main.c:101
+#: shell/main.c:99
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6764,17 +6906,17 @@ msgstr ""
 "Danke.\n"
 "das Evolution-Team\n"
 
-#: shell/main.c:132
+#: shell/main.c:130
 msgid "Cannot initialize the Evolution shell."
-msgstr "Kann die Evolution-Shell nicht initialisieren."
+msgstr "Evolution-Shell kann nicht initialisiert werden."
 
-#: shell/main.c:178
+#: shell/main.c:176
 msgid "Disable."
 msgstr "Deaktivieren."
 
-#: shell/main.c:198
+#: shell/main.c:196
 msgid "Cannot initialize the Bonobo component system."
-msgstr "Kann das Bonobo-System nicht initialisieren."
+msgstr "Das Bonobo-Komponentensystem kann nicht initialisiert werden."
 
 #: ui/evolution-addressbook.xml.h:2
 msgid "Create new contact"
@@ -6794,42 +6936,53 @@ msgstr "Einen Kontakt suchen"
 
 #: ui/evolution-addressbook.xml.h:7
 msgid "New contact"
-msgstr "Neuer Kontakte"
+msgstr "Neuer Kontakt"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+msgid "Previews the message to be printed"
+msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
+
+#: ui/evolution-addressbook.xml.h:11
 msgid "Print contacts"
 msgstr "Kontakte drucken"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:13
 msgid "Stop Loading"
 msgstr "Laden abbrechen"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:14
 msgid "View All"
 msgstr "Alle betrachten"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:15
 msgid "View all contacts"
 msgstr "Alle Kontakte betrachten"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "_Addressbuckkonfiguration..."
+#: ui/evolution-addressbook.xml.h:16
+msgid "_Addressbook Sources..."
+msgstr "_Adressbuch-Quellen..."
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "Kontakte drucken..."
+#: ui/evolution-addressbook.xml.h:17
+msgid "_Contact"
+msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
+msgid "_Print..."
+msgstr "_Drucken..."
+
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Search for contacts"
 msgstr "Nach Kontakten _suchen"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
 msgid "_Tools"
 msgstr "Werkzeuge"
 
@@ -6841,117 +6994,115 @@ msgstr "5 Tage"
 msgid "Alter preferences"
 msgstr "Einstellungen ändern"
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "Ka_lender"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Calendar Preferences..."
-msgstr "Kalender-Einstellungen..."
-
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:4
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:6
 msgid "Day"
 msgstr "Tag"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:7
+msgid "Go To"
+msgstr "Gehe zu"
+
+#: ui/evolution-calendar.xml.h:8
 msgid "Go back in time"
 msgstr "In der Zeit zurückgehen"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:9
 msgid "Go forward in time"
 msgstr "In der Zeit vorangehen"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to"
-msgstr "Gehe zu"
-
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to a specific date"
 msgstr "Zu bestimmtem Datum gehen"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to present time"
 msgstr "Zur aktuellen Zeit gehen"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:12
 msgid "Month"
 msgstr "Monat"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "New appointment"
+#: ui/evolution-calendar.xml.h:13
+msgid "New Appointment"
 msgstr "Neuer Termin"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:16
 msgid "Open Calendar"
 msgstr "Kalender öffnen"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:17
 msgid "Prev"
 msgstr "Zurück"
 
 #: ui/evolution-calendar.xml.h:21
+msgid "Print calendar"
+msgstr "Kalender drucken"
+
+#: ui/evolution-calendar.xml.h:22
 msgid "Print this Calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Speichern _unter"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:24
 msgid "Save calendar as something else"
 msgstr "Kalender als etwas anderes speichern"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Einen Tag zeigen"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "1 Monat zeigen"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "1 Woche zeigen"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Die Arbeitswoche zeigen"
 
-#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Heute"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Woche"
 
-#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
+#: ui/evolution-calendar.xml.h:32
+msgid "_Appointment"
+msgstr "_Termin"
+
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
 msgid "_New"
 msgstr "_Neu"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:34
 msgid "_Open Calendar"
 msgstr "Kalender öffnen"
 
-#: ui/evolution-calendar.xml.h:32
-msgid "_Print this calendar"
-msgstr "Diesen Kalender drucken"
-
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
@@ -6977,7 +7128,7 @@ msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Drucken..."
 
@@ -7009,17 +7160,13 @@ msgid "Send _message to contact..."
 msgstr "_Nachricht an Kontakt senden..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Datei"
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Drucken..."
-
 #: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "_Speichern"
@@ -7068,7 +7215,7 @@ msgstr "Diesen Termin abschließen"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "In Ordner kopieren... (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Kopieren"
@@ -7085,6 +7232,10 @@ msgstr "Ausschneiden"
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "Diesen Termin löschen"
+
 #: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
 msgid "Dump XML"
 msgstr "XML auswerfen"
@@ -7153,12 +7304,8 @@ msgstr "Druckeinstellungen..."
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Eigenschaften"
-
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:207
 msgid "Save"
 msgstr "Speichern"
 
@@ -7171,10 +7318,6 @@ msgstr "Den Termin speichern und das Dialogfenster schließen"
 msgid "Save the current file"
 msgstr "Die aktuelle Datei speichern"
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Besprechung ansetzen"
-
 #: ui/evolution-event-editor.xml.h:46
 msgid "Schedule _Meeting"
 msgstr "Besprechung ansetzen"
@@ -7199,18 +7342,18 @@ msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker einrichten"
 msgid "Task _Request (FIXME)"
 msgstr "Aufgabenanfrage (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
 #: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "Info..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "Schließen"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "_Contact (FIXME)"
 msgstr "Kontakt (FIXME)"
 
@@ -7218,19 +7361,13 @@ msgstr "Kontakt (FIXME)"
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
 #: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "_Diagnose"
 
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Bearbeiten"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
 msgid "_Help"
 msgstr "_Hilfe"
 
@@ -7267,7 +7404,8 @@ msgstr "Einfügen"
 msgid "_Print"
 msgstr "Drucken"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "Eigenschaften..."
 
@@ -7304,206 +7442,234 @@ msgstr "Einstellungen der Chefsesselansicht..."
 msgid "New Mail"
 msgstr "Neue Mail"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail.xml.h:2
 msgid "Compose"
 msgstr "Erstellen"
 
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail.xml.h:3
 msgid "Compose a new message"
 msgstr "Eine neue Nachricht erstellen"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:5
 msgid "Copy message to a new folder"
 msgstr "Die Nachricht in einen neuen Ordner kopieren"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Regel erstellen"
-
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "Ordner"
+#: ui/evolution-mail.xml.h:6
+msgid "Create _Virtual Folder From Message"
+msgstr "_Virtuellen Ordner aus Nachricht erzeugen"
 
 #: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filter über Absender"
+msgid "Display all of the message headers"
+msgstr "Alle Nachrichtenkopfzeilen anzeigen"
 
 #: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filter über Empfänger"
+msgid "Empty Trash"
+msgstr "Müll leeren"
 
 #: ui/evolution-mail.xml.h:11
+msgid "Filter on Se_nder"
+msgstr "Filter über Absender"
+
+#: ui/evolution-mail.xml.h:12
+msgid "Filter on _Recipients"
+msgstr "Filter über Empfänger"
+
+#: ui/evolution-mail.xml.h:13
+msgid "Filter on _Subject"
+msgstr "Filter über Betreffzeile"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Passwörter vergessen"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Mail abrufen"
-
 #: ui/evolution-mail.xml.h:16
+msgid "Forward As"
+msgstr "Weiterleiten als"
+
+#: ui/evolution-mail.xml.h:18
+msgid "Full Headers"
+msgstr "Alle Kopfzeilen"
+
+#: ui/evolution-mail.xml.h:19
 msgid "Hide S_elected Messages"
 msgstr "Gewählte Nachrichten _verbergen"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail.xml.h:20
 msgid "Hide _Deleted Messages"
 msgstr "Ge_löschte Nachrichten verbergen"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:21
 msgid "Hide _Read messages"
 msgstr "_Gelesene Nachrichten verbergen"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "Mail-_Filter..."
+#: ui/evolution-mail.xml.h:22
+msgid "Inline"
+msgstr "An Ort und Stelle"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
+#: ui/evolution-mail.xml.h:23
+msgid "Manage _Subscriptions..."
 msgstr "Abonnements verwalten..."
 
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
+#: ui/evolution-mail.xml.h:24
+msgid "Mar_k as Read"
 msgstr "Als gelesen markieren"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
+#: ui/evolution-mail.xml.h:25
+msgid "Mark All as R_ead"
+msgstr "Alle als gelesen markieren"
+
+#: ui/evolution-mail.xml.h:26
+msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
+msgid "Message _Display"
+msgstr "Nachrichtenanzeige"
+
+#: ui/evolution-mail.xml.h:28
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:29
 msgid "Move message to a new folder"
 msgstr "Die Nachricht in einen neuen Ordner verschieben"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Previews the message to be printed"
-msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
-
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Druckvorschau der Nachricht..."
-
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:33
 msgid "Print message to the printer"
 msgstr "Nachricht auf dem Drucker drucken"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
-msgstr "Nachricht drucken..."
+#: ui/evolution-mail.xml.h:36
+msgid "Quoted"
+msgstr "Umschrieben"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr "Umleitung (FIXME: implementier mich)"
+
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Antwort an Absender"
-
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:43
 msgid "S_ource"
 msgstr "Quelle"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Alle auswählen"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:45
+msgid "Select _Thread"
+msgstr "Strang auswählen"
+
+#: ui/evolution-mail.xml.h:46
+msgid "Send and Receive"
+msgstr "Senden und Empfangen"
+
+#: ui/evolution-mail.xml.h:47
 msgid "Send queued mail and retrieve new mail"
 msgstr "Mail in der Warteschlange senden und neue Mail abholen"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
-msgstr "_Alle Nachrichten anzeigen"
+#: ui/evolution-mail.xml.h:48
+msgid "Show _All"
+msgstr "Alle zeigen"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:50
 msgid "Threaded Message list"
 msgstr "Nachrichtenliste in Stränge geordnet"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:51
 msgid "VFolder on Se_nder"
 msgstr "VOrdner über Absender"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:52
 msgid "VFolder on _Recipients"
 msgstr "VOrdner über Empfänger"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:53
+msgid "VFolder on _Subject"
+msgstr "VOrdner über Betreffzeile"
+
+#: ui/evolution-mail.xml.h:54
 msgid "View Raw Message Source"
 msgstr "Nachrichtenquellcode anzeigen"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:55
+msgid "Virtual Folder _Editor..."
+msgstr "_Editor für virtuelle Ordner..."
+
+#: ui/evolution-mail.xml.h:56
+msgid "_Actions"
+msgstr "Aktio_nen"
+
+#: ui/evolution-mail.xml.h:57
 msgid "_Apply Filters"
 msgstr "Filter _anwenden"
 
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "Ordner konfigurieren..."
+#: ui/evolution-mail.xml.h:58
+msgid "_Compose"
+msgstr "Erstellen"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:59
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "Nachricht bearbeiten"
+#: ui/evolution-mail.xml.h:60
+msgid "_Create Filter From Message"
+msgstr "Filter aus Nachricht erzeugen"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:62
 msgid "_Expunge"
 msgstr "Säubern"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "Filter über Betreffzeile"
+#: ui/evolution-mail.xml.h:63
+msgid "_Filters..."
+msgstr "_Filter..."
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "Ordner"
+
+#: ui/evolution-mail.xml.h:65
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Auswahl umkehren"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_Mailkonfiguration..."
+#: ui/evolution-mail.xml.h:67
+msgid "_Mail Message"
+msgstr "Nachricht verschicken"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
-msgstr "Nachricht"
+#: ui/evolution-mail.xml.h:68
+msgid "_Mail Settings..."
+msgstr "Mail-Einstellungen..."
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:69
+msgid "_Message Hiding"
+msgstr "Verbergen von Nachrichten"
+
+#: ui/evolution-mail.xml.h:70
 msgid "_Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "In neuem Fenster öffnen"
-
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "Nachricht drucken"
+#: ui/evolution-mail.xml.h:71
+msgid "_Open Selected Items"
+msgstr "Gewählte Objekte öffnen"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "Nachricht _Speichern unter..."
+#: ui/evolution-mail.xml.h:74
+msgid "_Send and Receive"
+msgstr "Senden und empfangen"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:75
 msgid "_Threaded"
 msgstr "In S_trängen"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:77
 msgid "_Undelete"
 msgstr "Löschen rückgängig"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "VOrdner über Betreffzeile"
-
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Editor für _virtuelle Ordner..."
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Beilegen"
@@ -7609,15 +7775,51 @@ msgstr "Anlagen anzeigen"
 msgid "Sign this message with your PGP key"
 msgstr "Diese Nachricht mit PGP signieren"
 
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Anzeige des BCC-Feldes an/aus"
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr "Anzeige des CC-Feldes an/aus"
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Anzeige des From-Wählers an/aus"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Anzeige des Antwort-an-Feldes an/aus"
+
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr "_BCC-Feld"
+
 #: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr "_CC-Feld"
+
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr "_Von-Feld"
+
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr "Einfügen"
+
+#: ui/evolution-message-composer.xml.h:48
 msgid "_Insert text file... (FIXME)"
 msgstr "Textdatei e_infügen... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_Öffnen..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:50
+msgid "_Reply-To Field"
+msgstr "Antwort-an-Feld"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_Sicherheit"
 
@@ -7625,6 +7827,10 @@ msgstr "_Sicherheit"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufügen"
 
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "Ordner"
+
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "Liste aktualisieren"
@@ -7705,7 +7911,7 @@ msgstr "Rückgängig"
 msgid "Undo the last action"
 msgstr "Die letzte Aktion rückgängig machen"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
 msgid "_Appointment (FIXME)"
 msgstr "Termin (FIXME)"
 
@@ -7722,8 +7928,8 @@ msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
 #: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Neu"
+msgid "New Task"
+msgstr "Neue Aufgabe"
 
 #: ui/evolution-tasks.xml.h:5
 msgid "Save task as something else"
@@ -7733,6 +7939,10 @@ msgstr "Aufgabe als etwas anderes speichern"
 msgid "Tasks Preferences..."
 msgstr "Aufgaben-Einstellungen..."
 
+#: ui/evolution-tasks.xml.h:9
+msgid "_Task"
+msgstr "Aufgabe"
+
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Über Evolution..."
@@ -7742,8 +7952,8 @@ msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
 #: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "Anpassen..."
+msgid "Customi_ze Toolbars..."
+msgstr "Werkzeugleisten anpassen..."
 
 #: ui/evolution.xml.h:5
 msgid "Customize"
@@ -7766,96 +7976,92 @@ msgid "Evolution bar _shortcut"
 msgstr "Evolution-Leistenverknüpfung"
 
 #: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Beenden"
-
-#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Das Programm verlassen"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:11
 msgid "Getting _Started"
 msgstr "Erste Schritte"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:12
 msgid "Import an external file format"
 msgstr "Ein externes Dateiformat importieren"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hauptwerkzeugleiste"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Show information about Evolution"
 msgstr "Information über Evolution anzeigen"
 
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Die Ordnerleiste anzeigen"
-
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Die Verknüpfungsleiste anzeigen"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:15
 msgid "Submit Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:16
 msgid "Submit _Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy."
 msgstr "Einen Fehlerbericht mit dem Fehlermelder (Bug Buddy) einschicken"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Anzeige der Ordnerleiste an/aus"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Anzeige der Verknüpfungsleiste an/aus"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Die Kontaktverwaltung benutzen"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Den Kalender benutzen"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "Den _Mailer benutzen"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:23
+msgid "Work Offline"
+msgstr "Offline arbeiten"
+
+#: ui/evolution.xml.h:24
 msgid "_About Evolution..."
 msgstr "Über Evolution..."
 
-#: ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "Ordner"
+#: ui/evolution.xml.h:31
+msgid "_Folder Bar"
+msgstr "Ordnerleiste"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:32
 msgid "_Go to Folder..."
 msgstr "_Gehe zu Ordner..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:34
 msgid "_Import file..."
 msgstr "Datei _importieren..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:35
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "_Mail message"
 msgstr "_Mailnachricht"
 
+#: ui/evolution.xml.h:38
+msgid "_New Folder"
+msgstr "Neuer Ordner"
+
 #: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "Einstellungen"
+msgid "_Shortcut Bar"
+msgstr "Verknüpfungsleiste"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
@@ -7936,6 +8142,10 @@ msgstr "Ende der Besprechung:"
 msgid "All Attendees"
 msgstr "Alle Anwesenden"
 
+#: widgets/menus/gal-view-menus.c:171
+msgid "_Current View"
+msgstr "Aktuelle Ansicht"
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:421
@@ -7947,26 +8157,63 @@ msgstr "MDMDFSS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
-
-#: widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Jetzt"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr "OK"
+
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
 #: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
 #: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H.%M"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
 #: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
 #: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr "Die Zeit ist ungültig"
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-filter-bar.c:134
+msgid "Save Search"
+msgstr "Suche speichren"
+
+#: widgets/misc/e-filter-bar.c:205
+msgid "Advanced Search"
+msgstr "Komplexe Suche"
+
+#: widgets/misc/e-filter-bar.c:285
+msgid "Advanced ..."
+msgstr "Komplex..."
+
 #: widgets/misc/e-messagebox.c:141
 msgid "Information"
 msgstr "Information"
@@ -7988,9 +8235,9 @@ msgstr "Meldung"
 msgid "Don't show this message again."
 msgstr "Diese Meldung nicht mehr anzeigen."
 
-#: widgets/misc/e-search-bar.c:135
+#: widgets/misc/e-search-bar.c:140
 msgid "Sear_ch"
-msgstr "Succhen"
+msgstr "Su_chen"
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
@@ -8000,15 +8247,15 @@ msgstr "Der persönliche Adressbuchserver"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Der persönliche Kalenderserver; Kalender-Factory"
 
-#: wombat/wombat.c:182
+#: wombat/wombat.c:153
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME VFS konnte nicht initialisiert werden"
 
-#: wombat/wombat.c:194
+#: wombat/wombat.c:165
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 
-#: wombat/wombat.c:207
+#: wombat/wombat.c:178
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
author	Matthias Warkus <mawarkus@src.gnome.org>	2001-03-16 03:40:03 +0800
committer	Matthias Warkus <mawarkus@src.gnome.org>	2001-03-16 03:40:03 +0800
commit	0d6dc87fdf5ec85988b452598671aa944a83e3bb (patch)
tree	738622e836e743a71c40c25ecdc16e945ecf2f97 /po/de.po
parent	1a0445682ab85cd7f5e64911e905d69e94f5e2af (diff)
download	gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.tar gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.tar.gz gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.tar.bz2 gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.tar.lz gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.tar.xz gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.tar.zst gsoc2013-evolution-0d6dc87fdf5ec85988b452598671aa944a83e3bb.zip