From 245e48af1118c758b4810fa7f0344e48451f40cc Mon Sep 17 00:00:00 2001
From: Christian Neumair <cneumair@src.gnome.org>
Date: Tue, 11 Mar 2003 21:03:13 +0000
Subject: Updated German translation.

svn path=/trunk/; revision=20252
---
 po/ChangeLog |    4 +
 po/de.po     | 6953 ++++++++++++++++++++++++++++++----------------------------
 2 files changed, 3612 insertions(+), 3345 deletions(-)

(limited to 'po')

diff --git a/po/ChangeLog b/po/ChangeLog
index 68ea9a1479..1215c0ca4f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-11  Christian Neumair  <chris@gnome-de.org>
+
+	* de.po: Updated German translation.
+
 2003-03-11  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Updated italian translation.
diff --git a/po/de.po b/po/de.po
index c19bffe299..7a13e0c620 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,199 +14,52 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.x\n"
-"POT-Creation-Date: 2003-01-20 12:34+0100\n"
-"PO-Revision-Date: 2002-12-15 20:08+0100\n"
-"Last-Translator: Christian Meyer <chrisime@gnome-de.org>\n"
+"POT-Creation-Date: 2003-03-11 22:24+0100\n"
+"PO-Revision-Date: 2003-03-11 22:05+0100\n"
+"Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:1297
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Fabrik zum Import von LDIF-Dateien in Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr "Importiert LDIF-Dateien in Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Fabrik zum Import von VCard-Dateien in Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Importiert VCard-Dateien in Evolution."
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1310
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Einsortieren unter"
 
-#: addressbook/backend/ebook/e-card.c:1304
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:320
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Voller Name"
-
-#: addressbook/backend/ebook/e-card.c:1311
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1324
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Name"
 
-#: addressbook/backend/ebook/e-card.c:1317
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Adresse"
-
-#: addressbook/backend/ebook/e-card.c:1324
-msgid "Address Label"
-msgstr "Adress-Beschriftung"
-
-#: addressbook/backend/ebook/e-card.c:1331
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/backend/ebook/e-card.c:1338
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1351
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-Mail"
 
-#: addressbook/backend/ebook/e-card.c:1345
-msgid "Birth date"
-msgstr "Geburtsdatum"
-
-#: addressbook/backend/ebook/e-card.c:1351
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1358
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card.c:1365
-msgid "Organizational Unit"
-msgstr "Organisationseinheit"
-
-#: addressbook/backend/ebook/e-card.c:1372
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Büro"
-
-#: addressbook/backend/ebook/e-card.c:1379
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Titel"
-
-#: addressbook/backend/ebook/e-card.c:1386
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Position"
-
-#: addressbook/backend/ebook/e-card.c:1393
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Vorgesetzter"
-
-#: addressbook/backend/ebook/e-card.c:1400
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/backend/ebook/e-card.c:1407
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: addressbook/backend/ebook/e-card.c:1414
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Lebenspartner"
-
-#: addressbook/backend/ebook/e-card.c:1421
-#: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Anniversary"
-msgstr "Jahrestag"
-
-#: addressbook/backend/ebook/e-card.c:1427 mail/mail-format.c:933
-msgid "Mailer"
-msgstr "Mailer"
-
-#: addressbook/backend/ebook/e-card.c:1434
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "Kalender-URI"
-
-#: addressbook/backend/ebook/e-card.c:1441
-msgid "Free/Busy URL"
-msgstr "Verfügbarkeits-URL"
-
-#: addressbook/backend/ebook/e-card.c:1448
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Notiz"
-
-# CHECK
-#: addressbook/backend/ebook/e-card.c:1455
-msgid "Related Contacts"
-msgstr "Verwandte Kontakte"
-
-#: addressbook/backend/ebook/e-card.c:1462
-#: addressbook/backend/ebook/e-card-simple.c:104
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorien"
-
-#: addressbook/backend/ebook/e-card.c:1469
-msgid "Category List"
-msgstr "Liste der Kategorien"
-
-#: addressbook/backend/ebook/e-card.c:1476
-msgid "Wants HTML"
-msgstr "Will HTML"
-
-#: addressbook/backend/ebook/e-card.c:1483
-msgid "Wants HTML set"
-msgstr "Will HTML gesetzt"
-
-#: addressbook/backend/ebook/e-card.c:1490
-msgid "List"
-msgstr "Liste"
-
-# CHECK
-#: addressbook/backend/ebook/e-card.c:1497
-msgid "List Show Addresses"
-msgstr "Liste der Anzeigeadressen"
-
-#: addressbook/backend/ebook/e-card.c:1504
-msgid "Arbitrary"
-msgstr "Beliebig"
-
-#: addressbook/backend/ebook/e-card.c:1511
-msgid "ID"
-msgstr "Kennung"
-
-#: addressbook/backend/ebook/e-card.c:1518
-msgid "Last Use"
-msgstr "Zuletzt verwendet"
-
-#: addressbook/backend/ebook/e-card.c:1529
-msgid "Use Score"
-msgstr "Bewertung verwenden"
-
-#: addressbook/backend/ebook/e-card.c:2870
-msgid "Multiple VCards"
-msgstr "Mehrere VCards"
-
-#: addressbook/backend/ebook/e-card.c:2878
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard für %s"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1764
 msgid "Primary"
 msgstr "Primär"
 
@@ -214,11 +67,19 @@ msgstr "Primär"
 msgid "Prim"
 msgstr "Prim"
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1413
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Assistent"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/contact-editor/e-contact-editor.c:1800
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1821
 msgid "Business"
 msgstr "Geschäftlich"
 
@@ -228,12 +89,12 @@ msgid "Bus"
 msgstr "Geschäftl."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
 msgid "Callback"
 msgstr "Rückruf"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
 msgid "Company"
 msgstr "Firma"
 
@@ -244,29 +105,35 @@ msgstr "Fa."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1735
-#: addressbook/gui/contact-editor/e-contact-editor.c:1801
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1822
 msgid "Home"
 msgstr "Zu Hause"
 
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisation"
+
 #: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Geschäftliches Fax"
@@ -276,13 +143,13 @@ msgid "Bus Fax"
 msgstr "Gesch. Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "Business 2"
 msgstr "Geschäftlich 2"
 
@@ -291,43 +158,43 @@ msgid "Bus 2"
 msgstr "Geschäft 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
-#: addressbook/gui/contact-editor/e-contact-editor.c:1802
+#: addressbook/gui/contact-editor/e-contact-editor.c:1761
+#: addressbook/gui/contact-editor/e-contact-editor.c:1823
 msgid "Other"
 msgstr "Andere"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1762
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1763
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Funk"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1766
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Telex"
@@ -338,15 +205,15 @@ msgid "TTY"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1773
+#: addressbook/gui/component/e-address-popup.c:482
+#: addressbook/gui/contact-editor/e-contact-editor.c:1794
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-Mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1774
+#: addressbook/gui/component/e-address-popup.c:492
+#: addressbook/gui/contact-editor/e-contact-editor.c:1795
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-Mail 3"
@@ -369,10 +236,22 @@ msgstr "Abteilung"
 msgid "Dep"
 msgstr "Abt"
 
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Büro"
+
 #: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Büro"
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Titel"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -382,6 +261,12 @@ msgstr "Beruf"
 msgid "Prof"
 msgstr "Beruf"
 
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1406
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Vorgesetzter"
+
 #: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Chef"
@@ -390,10 +275,33 @@ msgstr "Chef"
 msgid "Ass"
 msgstr "Ass"
 
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1420
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Spitzname"
+
 #: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Spitzn."
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1427
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Lebenspartner"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1468
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Notiz"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1447
+msgid "Calendar URI"
+msgstr "Kalender-URI"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "KalURI"
@@ -408,122 +316,212 @@ msgid "FBUrl"
 msgstr "VURL"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Default server calendar"
+msgstr "Voreingestellter Server-Kalender"
+
+# CHECK
+#: addressbook/backend/ebook/e-card-simple.c:100
+msgid "icsCalendar"
+msgstr "icsCalendar"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1434
+msgid "Anniversary"
+msgstr "Jahrestag"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "JTag"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Geburtsdatum"
 
 #: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1482
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorien"
+
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Familienname"
 
-#: addressbook/backend/ebook/e-card-simple.c:334
+#: addressbook/backend/ebook/e-card-simple.c:335
 msgid "ECard"
 msgstr "ECard"
 
-#: addressbook/backend/ebook/e-card-simple.c:829
+#: addressbook/backend/ebook/e-card-simple.c:830
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:890
-#: addressbook/backend/ebook/e-destination.c:704
+#: addressbook/backend/ebook/e-card-simple.c:891
+#: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Namenlose Liste"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Fabrik zum Import von LDIF-Dateien in Evolution."
+#: addressbook/backend/ebook/e-card.c:1317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Voller Name"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "Importiert LDIF-Dateien in Evolution."
+#: addressbook/backend/ebook/e-card.c:1330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Adresse"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Fabrik zum Import von VCard-Dateien in Evolution."
+#: addressbook/backend/ebook/e-card.c:1337
+msgid "Address Label"
+msgstr "Adress-Beschriftung"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importiert VCard-Dateien in Evolution."
+#: addressbook/backend/ebook/e-card.c:1344
+msgid "Phone"
+msgstr "Telefon"
 
-#: addressbook/backend/ebook/test-client.c:31
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/conduit/address-conduit.c:1860
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo konnte nicht initialisiert werden"
+#: addressbook/backend/ebook/e-card.c:1358
+msgid "Birth date"
+msgstr "Geburtsdatum"
 
-#: addressbook/backend/pas/pas-backend-file.c:355
-#: addressbook/backend/pas/pas-backend-ldap.c:3027
-msgid "Searching..."
-msgstr "Suchen..."
+#: addressbook/backend/ebook/e-card.c:1364
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
 
-#: addressbook/backend/pas/pas-backend-file.c:357
-msgid "Loading..."
-msgstr "Laden..."
+#: addressbook/backend/ebook/e-card.c:1378
+msgid "Organizational Unit"
+msgstr "Organisationseinheit"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:597
-msgid "Using Distinguished Name (DN)"
-msgstr "Eindeutigen Namen (EN) wird verwendet"
+#: addressbook/backend/ebook/e-card.c:1399
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Position"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:601
-msgid "Using Email Address"
-msgstr "E-Mail-Adresse wird verwendet"
+#: addressbook/backend/ebook/e-card.c:1440 mail/mail-format.c:930
+msgid "Mailer"
+msgstr "Mailer"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:736
-msgid "Reconnecting to LDAP server..."
-msgstr "Verbindung mit LDAP-Server wird erneut hergestellt..."
+#: addressbook/backend/ebook/e-card.c:1454
+msgid "Free/Busy URL"
+msgstr "Verfügbarkeits-URL"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1279
-msgid "Adding card to LDAP server..."
-msgstr "Karte zu LDAP-Server hinzufügen..."
+#: addressbook/backend/ebook/e-card.c:1461
+msgid "ICS Calendar"
+msgstr "ICS-Kalender"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1385
+# CHECK
+#: addressbook/backend/ebook/e-card.c:1475
+msgid "Related Contacts"
+msgstr "Verwandte Kontakte"
+
+#: addressbook/backend/ebook/e-card.c:1489
+msgid "Category List"
+msgstr "Liste der Kategorien"
+
+#: addressbook/backend/ebook/e-card.c:1496
+msgid "Wants HTML"
+msgstr "Will HTML"
+
+#: addressbook/backend/ebook/e-card.c:1503
+msgid "Wants HTML set"
+msgstr "Will HTML gesetzt"
+
+#: addressbook/backend/ebook/e-card.c:1510
+msgid "List"
+msgstr "Liste"
+
+# CHECK
+#: addressbook/backend/ebook/e-card.c:1517
+msgid "List Show Addresses"
+msgstr "Liste der Anzeigeadressen"
+
+#: addressbook/backend/ebook/e-card.c:1524
+msgid "Arbitrary"
+msgstr "Beliebig"
+
+#: addressbook/backend/ebook/e-card.c:1531
+msgid "ID"
+msgstr "Kennung"
+
+#: addressbook/backend/ebook/e-card.c:1538
+msgid "Last Use"
+msgstr "Zuletzt verwendet"
+
+#: addressbook/backend/ebook/e-card.c:1549
+msgid "Use Score"
+msgstr "Bewertung verwenden"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
+msgid "Could not initialize Bonobo"
+msgstr "Bonobo konnte nicht initialisiert werden"
+
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
+msgid "Searching..."
+msgstr "Suchen..."
+
+#: addressbook/backend/pas/pas-backend-file.c:467
+msgid "Loading..."
+msgstr "Laden..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+msgid "Using Distinguished Name (DN)"
+msgstr "Eindeutigen Namen (EN) wird verwendet"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+msgid "Using Email Address"
+msgstr "E-Mail-Adresse wird verwendet"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
+msgid "Reconnecting to LDAP server..."
+msgstr "Verbindung mit LDAP-Server wird erneut hergestellt..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
+msgid "Adding card to LDAP server..."
+msgstr "Karte zu LDAP-Server hinzufügen..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Karte von LDAP-Server entfernen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1621
-#: addressbook/backend/pas/pas-backend-ldap.c:1624
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "Karte auf LDAP-Server ändern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2938
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Abrufen der LDAP-Suchergebnisse..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3047
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "Fehler beim Ausführen der Suche"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:292
 msgid "Default Sync Address:"
-msgstr "Standard Synchronisationsadresse:"
+msgstr "Voreingstellte Synchronisationsadresse:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:535
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor konnte nicht geladen werden\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:548
 msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: calendar/conduits/calendar/calendar-conduit.c:1272
+#: calendar/conduits/todo/todo-conduit.c:882
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: calendar/conduits/calendar/calendar-conduit.c:1273
+#: calendar/conduits/todo/todo-conduit.c:883
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
@@ -532,7 +530,144 @@ msgstr "Wombat konnte nicht gestartet werden"
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
-#: addressbook/gui/component/addressbook.c:514
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Ein Bonobo-Bedienelement für ein Adress-Popup."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Ein Bonobo-Bedienelement zur Anzeige einer Adresse."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Ein Bonobo-Beispiel-Menüelement zur Anzeige eines Adressbuches."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configuration control for the Evolution Addressbook Storages."
+msgstr "Konfigurations-Bedienelement zum Speichern des Evolution-Adressbuchs."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure access to LDAP directory servers here"
+msgstr "Hier können Sie den Zugriff auf LDAP-Verzeichnis-Server konfigurieren"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Bedienelement zur Anzeige einer Evolution-Adressbuch-Minikarte."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Directory Servers"
+msgstr "Verzeichnis-Server"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution-Adressbuch Minikarten-Betrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution component for handling contacts."
+msgstr "Evolution-Komponente für den Umgang mit Kontakten."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Factory for the controls exported by the Evolution Addressbook"
+msgstr "Fabrik für die vom Evolution-Adressbuch exportierten Bedienelemente"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1863
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Ordner mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP-Server:"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "LDAP-Server mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public Contacts"
+msgstr "Öffentliche Kontakte"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr "Öffentlicher Ordner mit Kontaktinformationen"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Neuer Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:565
+msgid "Create a new contact"
+msgstr "Einen neuen Kontakt anlegen"
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "New Contact List"
+msgstr "Neu Kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "Contact _List"
+msgstr "_Kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:569
+msgid "Create a new contact list"
+msgstr "Eine neue Kontaktliste anlegen"
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr "Legitimation beim IMAP-Server ist fehlgeschlagen"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr "Der Server antwortete mit nicht unterstützen Suchbasen"
+
+#: addressbook/gui/component/addressbook-config.c:1191
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Dieser Server unterstützt keine LDAPv3 Schema-Information"
+
+#: addressbook/gui/component/addressbook-config.c:1213
+msgid "Error retrieving schema information"
+msgstr "Fehler beim Abrufen der Schema-Informationen"
+
+#: addressbook/gui/component/addressbook-config.c:1221
+msgid "Server did not respond with valid schema information"
+msgstr "Server antwortetet nicht mit einer gültigen Schema-Information"
+
+#: addressbook/gui/component/addressbook-config.c:1647
+msgid "Account Name"
+msgstr "Accountname"
+
+#: addressbook/gui/component/addressbook-config.c:1649
+msgid "Server Name"
+msgstr "Servername"
+
+#: addressbook/gui/component/addressbook-config.c:1686
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
+
+#: addressbook/gui/component/addressbook-storage.c:169
+msgid "Other Contacts"
+msgstr "Andere Kontakte"
+
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -540,7 +675,7 @@ msgstr ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Bitte prüfen Sie\n"
 "nach, ob der Pfad existiert und ob Sie darauf zugreifen dürfen."
 
-#: addressbook/gui/component/addressbook.c:524
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -550,7 +685,7 @@ msgstr ""
 "bedeutet entweder, dass Sie einen ungültigen URI eingegeben\n"
 "haben oder dass der LDAP-Server nicht erreichbar ist."
 
-#: addressbook/gui/component/addressbook.c:529
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -563,7 +698,7 @@ msgstr ""
 "nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
 "haben.\n"
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:537
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -573,49 +708,48 @@ msgstr ""
 "bedeutet entweder, dass Sie einen ungültigen URI eingegeben\n"
 "haben oder dass der Server nicht erreichbar ist."
 
-#: addressbook/gui/component/addressbook.c:559
+#: addressbook/gui/component/addressbook.c:557
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch konnte nicht geöffnet werden"
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonymer Zugriff auf LDAP-Server"
 
-#: addressbook/gui/component/addressbook.c:662
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr "Legitimation fehlgeschlagen.\n"
 
-#: addressbook/gui/component/addressbook.c:670
-#: addressbook/gui/component/addressbook.c:673
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasswort für %s (Benutzer %s) eingeben"
 
-#: addressbook/gui/component/addressbook.c:821
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "Name beginnt mit"
 
-#: addressbook/gui/component/addressbook.c:822
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
-#: addressbook/gui/component/addressbook.c:823
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorie ist"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:824
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Irgend ein Feld enthält"
 
-#: addressbook/gui/component/addressbook.c:825
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Komplex..."
 
-#: addressbook/gui/component/addressbook.c:995
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -627,31 +761,31 @@ msgstr ""
 "oder erhöhen Sie das Zeitlimit in den Einstellungen des\n"
 "Verzeichnis-Servers für dieses Adressbuch."
 
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:993
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
 msgstr ""
-"Die für das Ausführen der Abfrage benötigte Zeit hat das Zeitlimit des\n"
+"Die für das Ausführen der Abfrage erforderliche Zeit hat das Zeitlimit des\n"
 "Servers oder das von Ihnen für dieses Adressbuch festgelegte überschritten.\n"
 "Bitte präzisieren Sie Ihre Suche oder erhöhen Sie das Zeitlimit in den\n"
 "Einstellungen des Verzeichnis-Servers für dieses Adressbuch."
 
-#: addressbook/gui/component/addressbook.c:1007
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Die Hintergrundkomponente für dieses Adressbuch konnte diese Abfrage nicht "
 "verarbeiten."
 
-#: addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Die Hintergrundkomponente für dieses Adressbuch konnte diese Abfrage nicht "
 "ausführen."
 
-#: addressbook/gui/component/addressbook.c:1014
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden"
 
@@ -665,199 +799,62 @@ msgstr "Beliebige Kategorie"
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:609
-#: calendar/gui/dialogs/comp-editor-util.c:309
-#: calendar/gui/dialogs/comp-editor-util.c:365
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1085
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Ordner mit Kontaktinformationen"
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(keine)"
 
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP-Server:"
+#: addressbook/gui/component/e-address-popup.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1793
+msgid "Primary Email"
+msgstr "Primäre E-Mail"
 
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "LDAP-Server mit Kontaktinformationen"
+#: addressbook/gui/component/e-address-popup.c:608
+msgid "Select an Action"
+msgstr "Eine Aktion wählen"
 
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Öffentliche Kontakte"
+#: addressbook/gui/component/e-address-popup.c:615
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Einen neuen Kontakt \"%s\" anlegen"
 
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Öffentlicher Ordner mit Kontaktinformationen"
+#: addressbook/gui/component/e-address-popup.c:630
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Adresse zu bestehendem Kontakt \"%s\" hinzufügen"
 
-#: addressbook/gui/component/addressbook-component.c:568
-msgid "New Contact"
-msgstr "Neuer Kontakt"
+#: addressbook/gui/component/e-address-popup.c:911
+msgid "Querying Addressbook..."
+msgstr "Anfrage beim Adressbuch..."
 
-#: addressbook/gui/component/addressbook-component.c:568
-msgid "_Contact"
-msgstr "_Kontakt"
+#: addressbook/gui/component/e-address-popup.c:995
+#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/select-names/e-select-names-popup.c:300
+msgid "Edit Contact Info"
+msgstr "Kontaktinfo bearbeiten"
 
-#: addressbook/gui/component/addressbook-component.c:569
-msgid "Create a new contact"
-msgstr "Einen neuen Kontakt anlegen"
+#: addressbook/gui/component/e-address-popup.c:1025
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:479
+msgid "Add to Contacts"
+msgstr "Zu Kontakten hinzufügen"
 
-#: addressbook/gui/component/addressbook-component.c:572
-msgid "New Contact List"
-msgstr "Neu Kontaktliste"
+#: addressbook/gui/component/e-address-popup.c:1068
+msgid "Merge E-Mail Address"
+msgstr "E-Mail-Adresse einfließen lassen"
 
-#: addressbook/gui/component/addressbook-component.c:572
-msgid "Contact _List"
-msgstr "_Kontaktliste"
+#: addressbook/gui/component/e-address-widget.c:369
+msgid "Disable Queries"
+msgstr "Abfragen deaktivieren"
 
-#: addressbook/gui/component/addressbook-component.c:573
-msgid "Create a new contact list"
-msgstr "Eine neue Kontaktliste anlegen"
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Legitimation beim IMAP-Server ist fehlgeschlagen"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "Der Server antwortete mit nicht unterstützen Suchbasen"
-
-#: addressbook/gui/component/addressbook-config.c:1191
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Dieser Server unterstützt keine LDAPv3 Schema-Information"
-
-#: addressbook/gui/component/addressbook-config.c:1213
-msgid "Error retrieving schema information"
-msgstr "Fehler beim Abrufen der Schema-Informationen"
-
-#: addressbook/gui/component/addressbook-config.c:1221
-msgid "Server did not respond with valid schema information"
-msgstr "Server antwortetet nicht mit einer gültigen Schema-Information"
-
-#: addressbook/gui/component/addressbook-config.c:1647
-msgid "Account Name"
-msgstr "Accountname"
-
-#: addressbook/gui/component/addressbook-config.c:1649
-msgid "Server Name"
-msgstr "Servername"
-
-#: addressbook/gui/component/addressbook-config.c:1686
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
-
-#: addressbook/gui/component/addressbook-storage.c:169
-msgid "Other Contacts"
-msgstr "Andere Kontakte"
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(keine)"
-
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:1772
-msgid "Primary Email"
-msgstr "Primäre E-Mail"
-
-#: addressbook/gui/component/e-address-popup.c:610
-msgid "Select an Action"
-msgstr "Eine Aktion wählen"
-
-#: addressbook/gui/component/e-address-popup.c:617
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Einen neuen Kontakt \"%s\" anlegen"
-
-#: addressbook/gui/component/e-address-popup.c:632
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Adresse zu bestehendem Kontakt \"%s\" hinzufügen"
-
-#: addressbook/gui/component/e-address-popup.c:913
-msgid "Querying Addressbook..."
-msgstr "Anfrage beim Adressbuch..."
-
-#: addressbook/gui/component/e-address-popup.c:995
-#: addressbook/gui/component/e-address-widget.c:391
-#: addressbook/gui/component/select-names/e-select-names-popup.c:302
-msgid "Edit Contact Info"
-msgstr "Kontaktinfo bearbeiten"
-
-#: addressbook/gui/component/e-address-popup.c:1025
-#: addressbook/gui/component/e-address-widget.c:427
-#: addressbook/gui/component/select-names/e-select-names-popup.c:481
-msgid "Add to Contacts"
-msgstr "Zu Kontakten hinzufügen"
-
-#: addressbook/gui/component/e-address-popup.c:1068
-msgid "Merge E-Mail Address"
-msgstr "E-Mail-Adresse einfließen lassen"
-
-#: addressbook/gui/component/e-address-widget.c:368
-msgid "Disable Queries"
-msgstr "Abfragen deaktivieren"
-
-#: addressbook/gui/component/e-address-widget.c:368
-msgid "Enable Queries (Dangerous!)"
-msgstr "Abfragen aktivieren (gefährlich!)"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Ein Bonobo-Bedienelement für ein Adress-Popup."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Ein Bonobo-Bedienelement zur Anzeige einer Adresse."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Ein Bonobo-Beispiel-Menüelement zur Anzeige eines Adressbuches."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr "Konfigurations-Bedienelement zum Speichern des Evolution-Adressbuchs."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure access to LDAP directory servers here"
-msgstr "Hier können Sie den Zugriff auf LDAP-Verzeichnis-Server konfigurieren"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Bedienelement zur Anzeige einer Evolution-Adressbuch-Minikarte."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Directory Servers"
-msgstr "Verzeichnis-Server"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution-Adressbuch Minikarten-Betrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "Evolution-Komponente für den Umgang mit Kontakten."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Factory for the controls exported by the Evolution Addressbook"
-msgstr "Fabrik für die vom Evolution-Adressbuch exportierten Bedienelemente"
+#: addressbook/gui/component/e-address-widget.c:369
+msgid "Enable Queries (Dangerous!)"
+msgstr "Abfragen aktivieren (gefährlich!)"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
@@ -874,7 +871,9 @@ msgstr "  Unterstützte Basen _anzeigen"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
-#: mail/mail-config.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: mail/subscribe-dialog.glade.h:3
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -925,13 +924,13 @@ msgstr "<< Weniger Optionen"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Add (or Edit) Attribute Mappings"
-msgstr "Attributzuordnungen hinzufügen (oder bearbeiten)"
+msgstr "Attributzuordnungen hinzufügen (/ bearbeiten)"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Addressbook Sources"
 msgstr "Adressbuch-Quellen"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:60
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:62
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Immer"
@@ -1004,8 +1003,8 @@ msgstr "LDAP-Konfigurationsassistent"
 msgid "Mappings"
 msgstr "Zuordnungen"
 
-#: addressbook/gui/component/ldap-config.glade.h:35 mail/mail-account-gui.c:62
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:35 mail/mail-account-gui.c:64
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Nie"
 
@@ -1052,11 +1051,11 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid "R_estore Defaults"
-msgstr "Standard wiederh_erstellen"
+msgstr "Vorgaben _wiederherstellen"
 
 #: addressbook/gui/component/ldap-config.glade.h:46
 msgid "Re_store Defaults"
-msgstr "Standard wiederher_stellen"
+msgstr "Vorgaben wie_derherstellen"
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid "S_earch scope: "
@@ -1064,8 +1063,8 @@ msgstr "Suchb_ereich: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:48
-#: calendar/gui/calendar-model.c:1977 calendar/gui/e-day-view.c:1666
-#: calendar/gui/e-week-view.c:1186
+#: calendar/gui/calendar-model.c:1975 calendar/gui/e-day-view.c:1670
+#: calendar/gui/e-week-view.c:1223
 msgid "Searching"
 msgstr "Suchen"
 
@@ -1254,9 +1253,9 @@ msgid ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"Dies ist die Methode, die Evolution verwenden wird, um sie zu legitimieren.  "
-"Beachten Sie, dass ein anonymer Zugang zum LDAP-Server benötigt wird, wenn "
-"Sie dies auf \"E-Mail-Adresse\" einstellen."
+"Dies ist die Methode, die Evolution verwendet, um sie zu legitimieren. "
+"Beachten Sie, dass ein anonymer Zugang zum LDAP-Server erforderlich ist, "
+"wenn Sie dies auf \"E-Mail-Adresse\" einstellen."
 
 #: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
@@ -1277,13 +1276,14 @@ msgid ""
 msgstr ""
 "Dies ist der Port des LDAP-Servers den Evolution zum Verbinden verwenden "
 "soll.\n"
-"Eine Liste mit Standard-Ports wurde bereits angegeben. Fragen Sie\n"
+"Eine Liste der Standard-Ports wurde bereits angegeben. Fragen Sie\n"
 "Ihren System-Administrator, welchen Port Sie angeben müssen."
 
 #: addressbook/gui/component/ldap-config.glade.h:94
 msgid "This option controls how long a search will be run."
 msgstr "Diese Option stellt ein wie lange eine Suche ausgeführt wird."
 
+# CHECK
 #: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
@@ -1292,13 +1292,10 @@ msgid ""
 "contacts\n"
 "that you add to the directory on the LDAP server. "
 msgstr ""
-"Um ein Attribut zum DN hinzuzufügen, wählen Sie es aus der Liste aus und "
-"drücken Sie den\n"
-"\"Attribut hinzufügen\"-Knopf. Jeder Wert, den Sie hinzufügen, wird ein "
-"benötigter Wert\n"
-"für jeden neuen Kontakt, den Sie zum Verzeichnis auf dem LDAP-Server "
-"hinzufügen,\n"
-"werden. "
+"Wählen Sie ein Attribut aus der Liste und klicken Sie den »Attribut "
+"hinzufügen«-Knopf an, um es dem DN hinzuzufügen.\n"
+"Alle hier hinzugefügten Werte sind für jeden neuen Kontakt erforderlich, den "
+"Sie zum Verzeichnis auf dem LDAP-Server hinzufügen."
 
 #: addressbook/gui/component/ldap-config.glade.h:98
 msgid "U_se SSL/TLS:"
@@ -1313,15 +1310,15 @@ msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
 #: addressbook/gui/component/ldap-config.glade.h:101
-#: mail/mail-account-gui.c:61 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:63 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Immer, wenn möglich"
 
 #: addressbook/gui/component/ldap-config.glade.h:102
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:134 shell/glade/e-folder-list.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "Hinzufügen"
 
@@ -1362,7 +1359,7 @@ msgid "_Download limit:"
 msgstr "_Downloadbegrenzung:"
 
 #: addressbook/gui/component/ldap-config.glade.h:112 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:149 ui/evolution-addressbook.xml.h:33
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1405,7 +1402,7 @@ msgstr "_Port-Nummer:"
 
 #: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_Restore Defaults"
-msgstr "Standard wiederherstellen"
+msgstr "Vorgaben _wiederherstellen"
 
 #: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Search base:"
@@ -1421,11 +1418,11 @@ msgstr "_Zeitüberschreitung (Minuten):"
 
 #: addressbook/gui/component/ldap-config.glade.h:125
 msgid "account-druid"
-msgstr "Zugangs-Druide"
+msgstr "Zugangsassistent"
 
 #: addressbook/gui/component/ldap-config.glade.h:126
 msgid "account-editor"
-msgstr "Zugang-Editor"
+msgstr "Zugangs-Editor"
 
 #: addressbook/gui/component/ldap-config.glade.h:127
 msgid "cards"
@@ -1459,19 +1456,21 @@ msgstr "objectclasses-tab"
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/e-select-names.c:494
-msgid "Select Contacts from Addressbook"
-msgstr "Kontakte aus Adressbuch wählen"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Oberfläche zur Auswahl eines Namens für das Evolution-Adressbuch"
 
-#: addressbook/gui/component/select-names/e-select-names.c:554
-msgid "Find contact in"
-msgstr "Kontakt finden in"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+"Fabrik für die Oberfläche zur Auswahl eines Namens für das Evolution-"
+"Adressbuch"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names.c:687
 #: addressbook/gui/component/select-names/e-select-names-popup.c:162
-#: composer/e-msg-composer-attachment-bar.c:504
-#: my-evolution/e-summary-shown.c:536 shell/e-shortcuts-view.c:179
+#: addressbook/gui/component/select-names/e-select-names.c:690
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1483,20 +1482,20 @@ msgstr "Alle Entfernen"
 msgid "Send HTML Mail?"
 msgstr "HTML-Mail verschicken?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:401
+#: addressbook/gui/component/select-names/e-select-names-popup.c:399
 msgid "Edit Contact List"
 msgstr "Kontaktliste bearbeiten"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:419
+#: addressbook/gui/component/select-names/e-select-names-popup.c:417
 msgid "Unnamed Contact List"
 msgstr "Namenlose Kontaktliste"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:436
+#: addressbook/gui/component/select-names/e-select-names-popup.c:434
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d nicht gezeigt)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:502
+#: addressbook/gui/component/select-names/e-select-names-popup.c:500
 msgid "Unnamed Contact"
 msgstr "Namenloser Kontakt"
 
@@ -1505,15 +1504,13 @@ msgstr "Namenloser Kontakt"
 msgid "Source"
 msgstr "Quelle"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Oberfläche zur Auswahl eines Namens für das Evolution-Adressbuch"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+msgid "Select Contacts from Addressbook"
+msgstr "Kontakte aus Adressbuch wählen"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
-"Fabrik für die Oberfläche zur Auswahl eines Namens für das Evolution-"
-"Adressbuch"
+#: addressbook/gui/component/select-names/e-select-names.c:557
+msgid "Find contact in"
+msgstr "Kontakt finden in"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
@@ -1564,7 +1561,7 @@ msgid "Birthda_y:"
 msgstr "_Geburtstag:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorien..."
@@ -1575,7 +1572,7 @@ msgstr "Zusammenarbeit"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1322
+#: addressbook/gui/contact-editor/e-contact-editor.c:1343
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
@@ -1584,7 +1581,7 @@ msgid "D_epartment:"
 msgstr "_Abteilung:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:191
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Details"
 
@@ -1636,14 +1633,14 @@ msgstr "Dies ist die E-_Mail-Adresse"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
-msgstr "Will HTML-Mail erhalten"
+msgstr "Wünscht HTML-Mails"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:653 calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3722 calendar/gui/e-week-view.c:3501
-#: filter/filter.glade.h:15 mail/folder-browser.c:1830
-#: mail/mail-config.glade.h:147 shell/glade/e-folder-list.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:656 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3559
+#: filter/filter.glade.h:15 mail/folder-browser.c:1768
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
 #: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
 #: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
 #: ui/evolution.xml.h:48
@@ -1675,15 +1672,15 @@ msgid "_Web page address:"
 msgstr "Adresse der _Webseite:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
-#: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:362
-#: addressbook/gui/widgets/e-minicard.c:176
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
 #: addressbook/gui/widgets/e-minicard-label.c:151
-#: addressbook/gui/widgets/e-minicard-view.c:472
 #: addressbook/gui/widgets/e-minicard-view-widget.c:118
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:179
 msgid "Editable"
 msgstr "Editierbar"
 
@@ -2709,48 +2706,48 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Simbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:157
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:141
-#: addressbook/gui/widgets/e-addressbook-model.c:297
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:348
-#: addressbook/gui/widgets/e-addressbook-view.c:179
-#: addressbook/gui/widgets/e-minicard-view.c:458
+#: addressbook/gui/contact-editor/e-contact-editor.c:159
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
 #: addressbook/gui/widgets/e-minicard-view-widget.c:104
+#: addressbook/gui/widgets/e-minicard-view.c:459
 msgid "Book"
 msgstr "Buch"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:164
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:148
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/contact-editor/e-contact-editor.c:166
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:186
 msgid "Card"
 msgstr "Karte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:171
+#: addressbook/gui/contact-editor/e-contact-editor.c:173
 msgid "Is New Card"
 msgstr "Ist neue Karte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
 msgid "Writable Fields"
 msgstr "Beschreibbare Felder"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:192
+#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Changed"
 msgstr "Geändert"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:814
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
 msgid "Category editor not available."
 msgstr "Der Kategorie-Editor ist nicht verfügbar."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:844
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt gehört in folgende Kategorien:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:997
+#: addressbook/gui/contact-editor/e-contact-editor.c:1018
 msgid "Save Contact as VCard"
 msgstr "Kontakt als VCard speichern"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1043
+#: addressbook/gui/contact-editor/e-contact-editor.c:1064
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2758,7 +2755,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diese Kontakte löschen wollen?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1046
+#: addressbook/gui/contact-editor/e-contact-editor.c:1067
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2766,24 +2763,24 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diesen Kontakt löschen wollen?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1767
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: addressbook/gui/contact-editor/e-contact-editor.c:2371
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Widget für ein Feld konnte nicht gefunden werden: '%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufügen"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Voll bearbeiten"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "E-Mail"
 
@@ -2793,15 +2790,15 @@ msgid "Error saving %s: %s"
 msgstr "Fehler beim Speichern von %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:211
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2810,7 +2807,7 @@ msgstr ""
 "%s gibt es bereits\n"
 "Möchten Sie sie überschreiben?"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 msgid "Overwrite"
 msgstr "Überschreiben"
 
@@ -2930,7 +2927,7 @@ msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Hide addresses when sending mail to this list"
-msgstr "Adressen _verbergen, wenn Mails an diese Liste verschickt werden"
+msgstr "Adressen _verbergen, wenn E-Mails an diese Liste verschickt werden"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
@@ -2941,16 +2938,16 @@ msgstr "_Entfernen"
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:155
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 msgid "Is New List"
 msgstr "Ist neue Liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:241
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr "Kontaktlisten-Editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:455
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Liste als VCard speichern"
 
@@ -3005,144 +3002,143 @@ msgstr ""
 "trotzdem hinzufügen?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:117
-#: widgets/misc/e-filter-bar.c:150
+#: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:155
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Keine Karten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:158
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 Karte"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:161
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d Karten"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:355
-#: addressbook/gui/widgets/e-addressbook-view.c:186
-#: addressbook/gui/widgets/e-minicard-view.c:465
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
 #: addressbook/gui/widgets/e-minicard-view-widget.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:466
 msgid "Query"
 msgstr "Abfrage"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:441
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 msgid "Error getting book view"
 msgstr "Fehler beim Abrufen der Buchansicht"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:369
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 msgid "Model"
 msgstr "Modell"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:143
-#: addressbook/gui/widgets/e-addressbook-util.c:104
-#: addressbook/gui/widgets/e-minicard.c:512
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:515
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1150
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1160
 msgid "Success"
 msgstr "Erfolg"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:519 shell/e-shell.c:2098
-#: shell/e-storage.c:606 shell/evolution-shell-component.c:1189
+#: camel/providers/pop3/camel-pop3-store.c:522 shell/e-shell.c:2104
+#: shell/e-storage.c:606 shell/evolution-shell-component.c:1199
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:592
-#: shell/evolution-shell-component.c:1180
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:592
+#: shell/evolution-shell-component.c:1190
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Karte nicht gefunden"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kartenkennung existiert bereits"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstützt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1185
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1176
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2297
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
 #: camel/camel-service.c:737 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr "Storniert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Legitimation fehlgeschlagen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Legitimation erforderlich"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS nicht verfügbar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Adressbuch existiert nicht"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Anderer Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:74
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 #: calendar/gui/dialogs/save-comp.c:49
 msgid "Do you want to save changes?"
 msgstr "Wollen Sie die Änderungen speichern?"
 
 # CHECK
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 msgid "_Discard"
 msgstr "Verwerfen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen der Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-util.c:271
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Fehler beim Hinzufügen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:104
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:114
-#: addressbook/gui/widgets/e-addressbook-util.c:229
-#: addressbook/gui/widgets/e-addressbook-view.c:1740
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:196
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -3152,124 +3148,132 @@ msgstr ""
 "%d zusätzliche Fenster auf ihrem Bildschirm angezeigt werden.\n"
 "Wollen Sie wirklich alle Karten anzeigen lassen?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:327
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Karte verschieben nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Karte kopieren nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:332
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Karten verschieben nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Karten kopieren nach"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:193
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Mehrere VCards"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard für %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:591
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
-#: addressbook/gui/widgets/e-addressbook-view.c:861
-#: addressbook/gui/widgets/e-addressbook-view.c:1868
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr "Neuer Kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:849
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr "Neu Kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr "Gehe zu Ordner..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr "Importieren..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr "Nach Kontakten suchen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr "Adressbuch-Quellen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr "Pilot-Einstellungen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Kontakt weiterleiten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Umschlag drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr "In Ordner kopieren..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr "In Ordner verschieben..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopieren"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Einfügen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:877 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:220 shell/e-shell-folder-commands.c:407
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:10
+#: mail/mail-accounts.c:225 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Löschen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
-#: calendar/gui/e-day-view.c:3682 calendar/gui/e-week-view.c:3466
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3680 calendar/gui/e-week-view.c:3524
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
 
@@ -3277,7 +3281,7 @@ msgstr "Aktuelle Ansicht"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,ä,b,c,d,e,f,g,h,i,j,k,l,m,n,o,ö,p,q,r,s,t,u,ü,v,w,x,y,z"
 
@@ -3285,11 +3289,11 @@ msgstr ",123,a,ä,b,c,d,e,f,g,h,i,j,k,l,m,n,o,ö,p,q,r,s,t,u,ü,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,ä,b,c,d,e,f,g,h,i,j,k,l,m,n,o,ö,p,q,r,s,t,u,ü,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1321
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3361,42 +3365,34 @@ msgstr "Anderes Telefon"
 msgid "Primary Phone"
 msgstr "Primäres Telefon"
 
-#: addressbook/gui/widgets/e-minicard.c:139
+#: addressbook/gui/widgets/e-minicard-control.c:204
+#, c-format
+msgid "and %d other cards."
+msgstr "und %d andere Karten."
+
+#: addressbook/gui/widgets/e-minicard-control.c:206
+msgid "and one other card."
+msgstr "und eine andere Karte."
+
+#: addressbook/gui/widgets/e-minicard-control.c:318
+msgid "Save in addressbook"
+msgstr "In Adressbuch speichern"
+
 #: addressbook/gui/widgets/e-minicard-label.c:102
+#: addressbook/gui/widgets/e-minicard.c:142
 msgid "Width"
 msgstr "Breite"
 
-#: addressbook/gui/widgets/e-minicard.c:146
 #: addressbook/gui/widgets/e-minicard-label.c:109
+#: addressbook/gui/widgets/e-minicard.c:149
 msgid "Height"
 msgstr "Höhe"
 
-#: addressbook/gui/widgets/e-minicard.c:154
 #: addressbook/gui/widgets/e-minicard-label.c:116
+#: addressbook/gui/widgets/e-minicard.c:157
 msgid "Has Focus"
 msgstr "Hat den Fokus"
 
-#: addressbook/gui/widgets/e-minicard.c:162
-msgid "Selected"
-msgstr "Ausgewählt"
-
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Cursor"
-msgstr "Hat Cursor"
-
-#: addressbook/gui/widgets/e-minicard-control.c:203
-#, c-format
-msgid "and %d other cards."
-msgstr "und %d andere Karten."
-
-#: addressbook/gui/widgets/e-minicard-control.c:205
-msgid "and one other card."
-msgstr "und eine andere Karte."
-
-#: addressbook/gui/widgets/e-minicard-control.c:319
-msgid "Save in addressbook"
-msgstr "In Adressbuch speichern"
-
 #: addressbook/gui/widgets/e-minicard-label.c:123
 msgid "Field"
 msgstr "Feld"
@@ -3413,7 +3409,11 @@ msgstr "Textmodell"
 msgid "Max field name length"
 msgstr "Maximale Länge des Feldnamens"
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+msgid "Column Width"
+msgstr "Spaltenbreite"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -3427,7 +3427,7 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
@@ -3437,32 +3437,40 @@ msgstr ""
 "\n"
 "In dieser Ansicht gibt es keine Einträge zum Anzeigen."
 
-#: addressbook/gui/widgets/e-minicard-view.c:451
+#: addressbook/gui/widgets/e-minicard-view.c:452
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:125
-msgid "Column Width"
-msgstr "Spaltenbreite"
+#: addressbook/gui/widgets/e-minicard.c:165
+msgid "Selected"
+msgstr "Ausgewählt"
+
+#: addressbook/gui/widgets/e-minicard.c:172
+msgid "Has Cursor"
+msgstr "Hat Cursor"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Kartenansicht"
 
-#: addressbook/printing/e-contact-print.c:1118
-msgid "Print cards"
-msgstr "Karten drucken"
-
-#: addressbook/printing/e-contact-print.c:1180
-#: addressbook/printing/e-contact-print.c:1202
-msgid "Print card"
-msgstr "Karte drucken"
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+msgid "GTK Tree View"
+msgstr "GTK-Baumansicht"
 
 #: addressbook/printing/e-contact-print-envelope.c:216
 #: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Umschlag drucken"
 
+#: addressbook/printing/e-contact-print.c:1130
+msgid "Print cards"
+msgstr "Karten drucken"
+
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
+msgid "Print card"
+msgstr "Karte drucken"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 Punkt Tahoma"
@@ -3532,7 +3540,6 @@ msgid "Include:"
 msgstr "Dazunehmen:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:638
 msgid "Landscape"
 msgstr "Querformat"
 
@@ -3552,12 +3559,11 @@ msgstr "Ränder"
 msgid "Number of columns:"
 msgstr "Anzahl Spalten:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Optionen"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:625
 msgid "Orientation"
 msgstr "Ausrichtung"
 
@@ -3578,9 +3584,7 @@ msgstr "Papier"
 msgid "Paper source:"
 msgstr "Papierquelle:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:631
 msgid "Portrait"
 msgstr "Hochformat"
 
@@ -3636,76 +3640,246 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift..."
 
-#: calendar/cal-util/cal-component.c:1216
+#: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Unbenannter Termin"
 
-#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
-#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "1."
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2."
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3."
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4."
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5."
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6."
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7."
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8."
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9."
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10."
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11."
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12."
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13."
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14."
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15."
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16."
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17."
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18."
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19."
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20."
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21."
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22."
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23."
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24."
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25."
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26."
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27."
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28."
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29."
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "30."
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31."
+
+#: calendar/cal-util/cal-util.c:523 calendar/cal-util/cal-util.c:545
+#: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Hoch"
 
-#: calendar/cal-util/cal-util.c:501 calendar/cal-util/cal-util.c:523
-#: calendar/gui/calendar-model.c:1703
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/cal-util/cal-util.c:525 calendar/cal-util/cal-util.c:547
+#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:503 calendar/cal-util/cal-util.c:525
+#: calendar/cal-util/cal-util.c:527 calendar/cal-util/cal-util.c:549
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Niedrig"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:519
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/cal-util/cal-util.c:543
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 #: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:204
 msgid "Split Multi-Day Events:"
 msgstr "Mehrtätige Ereignisse aufteilen:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1219
+#: calendar/conduits/todo/todo-conduit.c:828
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1370
+#: calendar/conduits/calendar/calendar-conduit.c:1373
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:204
 msgid "Default Priority:"
-msgstr "Standard Priorität:"
+msgstr "Vorgabepriorität:"
 
-#: calendar/conduits/todo/todo-conduit.c:951
-#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:952
+#: calendar/conduits/todo/todo-conduit.c:955
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "A Bonobo control which displays a task list."
+msgstr "Ein Bonobo-Bedienelement zur Anzeige einer Aufgabenliste."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Ein Bonobo-Beispiel-Bedienelement zur Anzeige eines Kalenders"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Konfigurations-Bedienelement für den Evolution-Kalender."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
+"konfigurieren"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution Kelender iTip/iMip-Betrachter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution component for handling the calendar."
+msgstr "Evolution-Komponente für den Umgang mit E-Mails."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Factory for the Evolution Calendar objects"
+msgstr "Fabrik für die Kalender-Objekte von Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Fabrik zur Zentralisierung der Dialoge des Kalender-Komponenteneditors"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Alarm notification service"
+msgstr "Alarm-Benachrichtigungsdienst"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "Fabrik für den Alarm-Benachrichtigungsdienst."
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "Beginnt:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr "Endent:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:228
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "ungültige Zeit"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 msgid "Evolution Alarm"
 msgstr "Evolution-Alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:368
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm am %s"
@@ -3727,17 +3901,17 @@ msgstr "Weiterschlaf-Zeit (Minuten)"
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:679
+#: calendar/gui/alarm-notify/alarm-queue.c:760
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
-#: calendar/gui/alarm-notify/alarm-queue.c:765
-#: calendar/gui/tasks-control.c:455 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:831
+#: calendar/gui/alarm-notify/alarm-queue.c:855
+#: calendar/gui/tasks-control.c:457 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Warnung"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:745
+#: calendar/gui/alarm-notify/alarm-queue.c:835
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3750,7 +3924,7 @@ msgstr ""
 "wird statt dessen eine normales Erinnerungsdialogfenster\n"
 "anzeigen."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:771
+#: calendar/gui/alarm-notify/alarm-queue.c:861
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3767,35 +3941,42 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:785
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 msgid "Do not ask me about this program again."
 msgstr "Mich über dieses Programm nicht mehr fragen."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.h:1
-msgid "Alarm notification service"
-msgstr "Alarm-Benachrichtigungsdienst"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "Fabrik für den Alarm-Benachrichtigungsdienst."
-
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/notify-main.c:173
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr "Fabrik für Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Zusammenfassung enthält"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Beschreibung enthält"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentar enthält"
+
+#: calendar/gui/cal-search-bar.c:356 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "Nicht passend"
+
 #: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view.c:1384
-#: calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-week-view-main-item.c:311
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:312
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -3813,7 +3994,7 @@ msgstr "%d. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:432
-#: calendar/gui/e-week-view-main-item.c:319 calendar/gui/print.c:1489
+#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -3824,142 +4005,10 @@ msgstr ""
 "Die Kalender-Ansicht konnte nicht erstellt werden. Bitte überprüfen Sie Ihre "
 "ORBit und OAF Einstellungen. "
 
-#: calendar/gui/calendar-model.c:406 calendar/gui/calendar-model.c:965
-#: calendar/gui/e-calendar-table.c:372
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/calendar-model.c:409 calendar/gui/calendar-model.c:967
-#: calendar/gui/e-calendar-table.c:373
-msgid "Confidential"
-msgstr "Vertraulich"
-
-#: calendar/gui/calendar-model.c:412 calendar/gui/e-calendar-table.c:371
-msgid "Public"
-msgstr "Öffentlich"
-
-#: calendar/gui/calendar-model.c:524
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:524
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:526
-msgid "E"
-msgstr "O"
-
-#: calendar/gui/calendar-model.c:526
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/calendar-model.c:591 calendar/gui/calendar-model.c:1135
-#: calendar/gui/e-calendar-table.c:445
-msgid "Free"
-msgstr "Frei"
-
-#: calendar/gui/calendar-model.c:593 calendar/gui/e-calendar-table.c:446
-#: calendar/gui/e-meeting-time-sel.c:407
-#: shell/evolution-shell-component.c:1174
-msgid "Busy"
-msgstr "Beschäftigt"
-
-#: calendar/gui/calendar-model.c:744 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2288
-msgid "Not Started"
-msgstr "Nicht gestartet"
-
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2291
-msgid "In Progress"
-msgstr "In Bearbeitung"
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:305
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/print.c:2294
-msgid "Completed"
-msgstr "Abgeschlossen"
-
-#: calendar/gui/calendar-model.c:1037
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Die geographische Position muss in diesem Format eingegeben werden: \n"
-"\n"
-"45.436845,125.862501"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1177 calendar/gui/dialogs/meeting-page.c:288
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1994
-#: mail/folder-browser.c:1792 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1655 mail/mail-accounts.c:389
-#: mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
-#: widgets/misc/e-cell-date-edit.c:254 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1471 widgets/misc/e-dateedit.c:1586
-msgid "None"
-msgstr "Keine"
-
-#: calendar/gui/calendar-model.c:1705
-msgid "Recurring"
-msgstr "Wiederkehrend"
-
-#: calendar/gui/calendar-model.c:1707
-msgid "Assigned"
-msgstr "Zugewiesen"
-
-#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:277
-#: calendar/gui/e-meeting-model.c:287 calendar/gui/e-meeting-model.c:543
-#: calendar/gui/e-meeting-model.c:838
-msgid "Yes"
-msgstr "Ja"
-
-#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:839
-msgid "No"
-msgstr "Nein"
-
-#: calendar/gui/calendar-view-factory.c:118
-msgid "Day View"
-msgstr "Tagesansicht"
-
-#: calendar/gui/calendar-view-factory.c:121
-msgid "Work Week View"
-msgstr "Werkwochenansicht"
-
-#: calendar/gui/calendar-view-factory.c:124
-msgid "Week View"
-msgstr "Wochenansicht"
-
-#: calendar/gui/calendar-view-factory.c:127
-msgid "Month View"
-msgstr "Monatsansicht"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Zusammenfassung enthält"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Beschreibung enthält"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Kommentar enthält"
-
-#: calendar/gui/cal-search-bar.c:356 mail/mail-ops.c:1106
-msgid "Unmatched"
-msgstr "Nicht passend"
-
 #: calendar/gui/calendar-component.c:71 calendar/gui/gnome-cal.c:1341
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1083
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1862
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3976,11 +4025,11 @@ msgid "Public folder containing appointments and events"
 msgstr "Öffentlicher Ordner mit Kontaktinformationen"
 
 #: calendar/gui/calendar-component.c:81 calendar/gui/e-tasks.c:735
-#: calendar/gui/print.c:1775 calendar/gui/tasks-control.c:509
-#: calendar/importers/icalendar-importer.c:705
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:326
-#: my-evolution/e-summary-tasks.c:344 shell/e-local-storage.c:183
-#: shell/e-shortcuts.c:1084
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:511
+#: calendar/importers/icalendar-importer.c:708
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1864
+#: my-evolution/e-summary-tasks.c:326 my-evolution/e-summary-tasks.c:344
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Aufgaben"
 
@@ -4044,197 +4093,218 @@ msgstr "Ganz_tags-Termin"
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
-#: calendar/gui/control-factory.c:119
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Der Ordner in '%s' konnte nicht geöffnet werden"
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:956
+#: calendar/gui/e-calendar-table.c:372
+msgid "Private"
+msgstr "Privat"
 
-#: calendar/gui/control-factory.c:163
-msgid "The URI that the calendar will display"
-msgstr "Der URI, den der Kalender anzeigen wird"
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:958
+#: calendar/gui/e-calendar-table.c:373
+msgid "Confidential"
+msgstr "Vertraulich"
 
-#: calendar/gui/control-factory.c:170
-msgid "The type of view to show"
-msgstr "Typ der anzuzeigenden Ansicht"
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
+msgid "Public"
+msgstr "Öffentlich"
 
-#: calendar/gui/dialogs/alarm-options.c:358
-msgid "Audio Alarm Options"
-msgstr "Audio-Alarmoptionen"
+#: calendar/gui/calendar-model.c:522
+msgid "N"
+msgstr "N"
 
-#: calendar/gui/dialogs/alarm-options.c:367
-msgid "Message Alarm Options"
-msgstr "Nachrichten-Alarmoptionen"
+#: calendar/gui/calendar-model.c:522
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/calendar-model.c:524
+msgid "E"
+msgstr "O"
 
-#: calendar/gui/dialogs/alarm-options.c:376
-msgid "Mail Alarm Options"
-msgstr "Mail-Alarmoptionen"
+#: calendar/gui/calendar-model.c:524
+msgid "W"
+msgstr "W"
 
-#: calendar/gui/dialogs/alarm-options.c:385
-msgid "Program Alarm Options"
-msgstr "Programm-Alarmoptionen"
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1126
+#: calendar/gui/e-calendar-table.c:445
+msgid "Free"
+msgstr "Frei"
 
-#: calendar/gui/dialogs/alarm-options.c:394
-msgid "Unknown Alarm Options"
-msgstr "Unbekannte Alarmoptionen"
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:408
+#: shell/evolution-shell-component.c:1184
+msgid "Busy"
+msgstr "Beschäftigt"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-msgid "Alarm Repeat"
-msgstr "Alarmwiederholung"
+#: calendar/gui/calendar-model.c:742 calendar/gui/calendar-model.c:1170
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
+msgid "Not Started"
+msgstr "Nicht gestartet"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1172
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
+msgid "In Progress"
+msgstr "In Bearbeitung"
+
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1174
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#: calendar/gui/calendar-model.c:1028
 msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 msgstr ""
-"Evolution unterstützt E-Mail-Benachrichtigungen für Erinnerungen leider noch "
-"nicht. Daher können Sie die Optionen für diese Erinnerung nicht bearbeiten."
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display"
-msgstr "Anzuzeigende Nachricht"
+"Die geographische Position muss in diesem Format eingegeben werden: \n"
+"\n"
+"45.436845,125.862501"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Play sound:"
-msgstr "Klang abspielen:"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1168 calendar/gui/dialogs/meeting-page.c:286
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1982
+#: mail/folder-browser.c:1730 mail/mail-account-gui.c:1254
+#: mail/mail-account-gui.c:1686 mail/mail-accounts.c:433
+#: mail/mail-config.glade.h:78
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:196
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
+msgid "None"
+msgstr "Keine"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Repeat the alarm"
-msgstr "Den Alarm wiederholen"
+#: calendar/gui/calendar-model.c:1703
+msgid "Recurring"
+msgstr "Wiederkehrend"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Run program:"
-msgstr "Programm ausführen:"
+#: calendar/gui/calendar-model.c:1705
+msgid "Assigned"
+msgstr "Zugewiesen"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "With these arguments:"
-msgstr "Mit diesen Argumenten:"
+#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:541
+#: calendar/gui/e-meeting-model.c:835
+msgid "Yes"
+msgstr "Ja"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:68
-#: filter/filter.glade.h:20
-msgid "days"
-msgstr "Tage"
+#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:836
+msgid "No"
+msgstr "Nein"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "extra times every"
-msgstr "weitere Male alle"
+#: calendar/gui/calendar-view-factory.c:118
+msgid "Day View"
+msgstr "Tagesansicht"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:67
-#: filter/filter.glade.h:21
-msgid "hours"
-msgstr "Stunden"
+#: calendar/gui/calendar-view-factory.c:121
+msgid "Work Week View"
+msgstr "Werkwochenansicht"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:66
-#: filter/filter.glade.h:22
-msgid "minutes"
-msgstr "Minuten"
+#: calendar/gui/calendar-view-factory.c:124
+msgid "Week View"
+msgstr "Wochenansicht"
 
-#: calendar/gui/dialogs/alarm-page.c:311
-#, c-format
-msgid "%d days"
-msgstr "%d Tage"
+#: calendar/gui/calendar-view-factory.c:127
+msgid "Month View"
+msgstr "Monatsansicht"
 
-#: calendar/gui/dialogs/alarm-page.c:314
-msgid "1 day"
-msgstr "1 Tag"
+#: calendar/gui/comp-editor-factory.c:456
+msgid "Error while opening the calendar"
+msgstr "Fehler beim Öffnen des Kalenders"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d weeks"
-msgstr "%d Wochen"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr "Methode beim Öffnen des Kalenders nicht unterstützt"
 
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 week"
-msgstr "1 Woche"
+#: calendar/gui/comp-editor-factory.c:473
+msgid "Permission denied to open the calendar"
+msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 
-#: calendar/gui/dialogs/alarm-page.c:327
+#: calendar/gui/control-factory.c:119
 #, c-format
-msgid "%d hours"
-msgstr "%d Stunden"
+msgid "Could not open the folder in '%s'"
+msgstr "Der Ordner in '%s' konnte nicht geöffnet werden"
 
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 hour"
-msgstr "1 Stunde"
+#: calendar/gui/control-factory.c:163
+msgid "The URI that the calendar will display"
+msgstr "Der URI, den der Kalender anzeigen wird"
 
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d minutes"
-msgstr "%d Minuten"
+#: calendar/gui/control-factory.c:170
+msgid "The type of view to show"
+msgstr "Typ der anzuzeigenden Ansicht"
 
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 minute"
-msgstr "1 Minute"
+#: calendar/gui/dialogs/alarm-options.c:473
+msgid "Audio Alarm Options"
+msgstr "Audio-Alarmoptionen"
 
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d seconds"
-msgstr "%d Sekunden"
+#: calendar/gui/dialogs/alarm-options.c:482
+msgid "Message Alarm Options"
+msgstr "Nachrichten-Alarmoptionen"
 
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 second"
-msgstr "1 Sekunde"
+#: calendar/gui/dialogs/alarm-options.c:491
+msgid "Email Alarm Options"
+msgstr "E-Mail-Alarmoptionen"
 
-#: calendar/gui/dialogs/alarm-page.c:375
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Einen Klang abspielen"
+#: calendar/gui/dialogs/alarm-options.c:500
+msgid "Program Alarm Options"
+msgstr "Programm-Alarmoptionen"
+
+#: calendar/gui/dialogs/alarm-options.c:509
+msgid "Unknown Alarm Options"
+msgstr "Unbekannte Alarmoptionen"
 
-#: calendar/gui/dialogs/alarm-page.c:379
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Eine Nachricht anzeigen"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "Alarm Repeat"
+msgstr "Alarmwiederholung"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-msgid "Send an email"
-msgstr "Eine E-Mail verschicken"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+msgid "Message to Display"
+msgstr "Anzuzeigende Nachricht"
 
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Ein Programm ausführen"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Message to Send"
+msgstr "Zu verschickende Nachricht"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-msgid "Unknown action to be performed"
-msgstr "Unbekannte auszuführende Aktion"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Play sound:"
+msgstr "Klang abspielen:"
 
-#: calendar/gui/dialogs/alarm-page.c:405
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s vor Terminbeginn"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Repeat the alarm"
+msgstr "Den Alarm wiederholen"
 
-#: calendar/gui/dialogs/alarm-page.c:408
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s nach Terminbeginn"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "Run program:"
+msgstr "Programm ausführen:"
 
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s zum Terminbeginn"
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+msgid "Send To:"
+msgstr "Schicken an:"
 
-#: calendar/gui/dialogs/alarm-page.c:422
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s vor Terminende"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "With these arguments:"
+msgstr "Mit diesen Argumenten:"
 
-#: calendar/gui/dialogs/alarm-page.c:425
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s nach Terminende"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:68
+#: filter/filter.glade.h:20
+msgid "days"
+msgstr "Tage"
 
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s zum Terminende"
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+msgid "extra times every"
+msgstr "weitere Male alle"
 
-#: calendar/gui/dialogs/alarm-page.c:454
-#, c-format
-msgid "%s at %s"
-msgstr "%s um %s"
+#: calendar/gui/dialogs/alarm-options.glade.h:12 filter/filter-datespec.c:67
+#: filter/filter.glade.h:21
+msgid "hours"
+msgstr "Stunden"
 
-#: calendar/gui/dialogs/alarm-page.c:460
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s für einen unbekannten Auslösertyp."
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter-datespec.c:66
+#: filter/filter.glade.h:22
+msgid "minutes"
+msgstr "Minuten"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
@@ -4246,46 +4316,62 @@ msgstr "Grundlagen"
 msgid "Date/Time:"
 msgstr "Datum/Zeit:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Eine Nachricht anzeigen"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Einen Klang abspielen"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Erinnerungen"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Ein Programm ausführen"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an Email"
+msgstr "Eine E-Mail verschicken"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:804 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Optionen..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "nach"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "vor"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "Tag(e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "Ende des Termins"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:179
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "Minute(n)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "Beginn des Termins"
 
@@ -4334,7 +4420,8 @@ msgid "Days"
 msgstr "Tage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1091
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Freitag"
 
@@ -4347,7 +4434,8 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1087
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Montag"
 
@@ -4356,7 +4444,8 @@ msgid "S_un"
 msgstr "_So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -4369,7 +4458,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "_Wochennummern in Datumsnavigator zeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1093
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -4386,7 +4476,8 @@ msgid "Task List"
 msgstr "Aufgabenliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -4403,7 +4494,8 @@ msgid "Time format:"
 msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -4412,7 +4504,8 @@ msgid "W_eek starts:"
 msgstr "W_oche beginnt:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -4454,7 +4547,7 @@ msgid "_Fri"
 msgstr "_Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Allgemein"
 
@@ -4494,7 +4587,7 @@ msgstr "M_i"
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
-#: calendar/gui/dialogs/cancel-comp.c:55
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -4502,12 +4595,12 @@ msgstr ""
 "Das zu löschende Ereignis ist eine Besprechung. Soll eine "
 "Stornierungsnachricht an die betroffene(n) Person(en) verschickt werden?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 "Sind Sie sicher, dass Sie diese Besprechung absagen und löschen wollen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:64
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -4515,11 +4608,11 @@ msgstr ""
 "Die zu löschende Aufgabe wurde bereits jemandem zugewiesen. Soll eine "
 "Stornierungsnachricht an die betroffene(n) Person(en) verschickt werden?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Sind Sie sicher, dass Sie diese Aufgabe stornieren und löschen wollen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:73
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -4527,7 +4620,7 @@ msgstr ""
 "Der zu löschende Journaleintrag wurde bereits veröffentlicht. Soll eine "
 "Stornierungsnachricht verschickt werden?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Sind Sie sicher, dass Sie diesen Journaleintrag stornieren und löschen "
@@ -4581,89 +4674,88 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen gemacht, den Editor aktualisieren?"
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validierungsfehler: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
+msgid " to "
+msgstr " an "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
+msgid " (Completed "
+msgstr " (Abgeschlossen "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
+msgid "Completed "
+msgstr "Abgeschlossen "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
+msgid " (Due "
+msgstr " (Fällig am "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
+msgid "Due "
+msgstr "Fällig am "
+
+#: calendar/gui/dialogs/comp-editor.c:329
 msgid "Could not update invalid object"
 msgstr "Ungültiges Objekt konnte nicht aktualisiert werden"
 
-#: calendar/gui/dialogs/comp-editor.c:325
+#: calendar/gui/dialogs/comp-editor.c:332
 msgid "Object not found, not updated"
 msgstr "Objekt nicht gefunden, wurde nicht aktualisiert"
 
-#: calendar/gui/dialogs/comp-editor.c:328
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "You don't have permissions to update this object"
 msgstr "Sie haben keine Berechtigung dieses Objekt zu aktualisieren"
 
-#: calendar/gui/dialogs/comp-editor.c:331
+#: calendar/gui/dialogs/comp-editor.c:338
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: calendar/gui/dialogs/comp-editor.c:777
+#: calendar/gui/dialogs/comp-editor.c:788
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/comp-editor.c:782
+#: calendar/gui/dialogs/comp-editor.c:793
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:785
+#: calendar/gui/dialogs/comp-editor.c:796
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:788
+#: calendar/gui/dialogs/comp-editor.c:799
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:810
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/comp-editor.c:1200
-#: calendar/gui/e-calendar-table.c:1035 calendar/gui/e-day-view.c:3937
-#: calendar/gui/e-week-view.c:3699 composer/e-msg-composer.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1231
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3938
+#: calendar/gui/e-week-view.c:3760 composer/e-msg-composer.c:1159
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1301
-#: calendar/gui/dialogs/comp-editor.c:1325
-#: calendar/gui/dialogs/comp-editor.c:1349
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1332
+#: calendar/gui/dialogs/comp-editor.c:1356
+#: calendar/gui/dialogs/comp-editor.c:1380
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt gemachte Änderungen verfallen möglicherweise, sobald "
-"Aktualisierungen via E-Mail eintreffen"
+"Aktualisierungen eintreffen"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/dialogs/comp-editor.c:1407
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version konnte nicht ermittelt werden!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validierungsfehler: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2206
-msgid " to "
-msgstr " an "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2210
-msgid " (Completed "
-msgstr " (Abgeschlossen "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2212
-msgid "Completed "
-msgstr "Abgeschlossen "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2217
-msgid " (Due "
-msgstr " (Fällig am "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2219
-msgid "Due "
-msgstr "Fällig am "
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4719,124 +4811,124 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: calendar/gui/dialogs/event-editor.c:197 calendar/gui/print.c:2245
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: calendar/gui/dialogs/event-editor.c:212
-#: calendar/gui/dialogs/event-editor.c:279
-#: calendar/gui/dialogs/event-editor.c:413
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:432
 msgid "Scheduling"
 msgstr "Planung"
 
-#: calendar/gui/dialogs/event-editor.c:217
-#: calendar/gui/dialogs/event-editor.c:282
-#: calendar/gui/dialogs/event-editor.c:416 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:435 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: calendar/gui/dialogs/event-page.c:636 calendar/gui/dialogs/task-page.c:546
+#: calendar/gui/dialogs/event-page.c:654 calendar/gui/dialogs/task-page.c:554
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:646
+#: calendar/gui/dialogs/event-page.c:664
 msgid "End date is wrong"
 msgstr "Das Enddatum ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:669
+#: calendar/gui/dialogs/event-page.c:687
 msgid "Start time is wrong"
 msgstr "Die Anfangszeit ist falsch"
 
-#: calendar/gui/dialogs/event-page.c:676
+#: calendar/gui/dialogs/event-page.c:694
 msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "Ganztägiges Ereignis"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "_Beschäftigt"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Einstufung"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "_Vertraulich"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Datum & Zeit"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "_Frei"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "Ge_ographischer Ort: "
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Privat"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Öffentlich"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Zeit zeigen als"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Zusammenfassung:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:14
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "Kontakte..."
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "_Endzeit:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
-#: calendar/gui/dialogs/meeting-page.c:393
+#: calendar/gui/dialogs/meeting-page.c:400
 msgid "An organizer is required."
-msgstr "Ein Organisator wird benötigt."
+msgstr "Es ist ein Organisator erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "At least one attendee is required."
-msgstr "Mindestens ein Teilnehmer wird benötigt."
+msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:573
+#: calendar/gui/dialogs/meeting-page.c:579
 msgid "That person is already attending the meeting!"
-msgstr "Diese Person nimmt schon an der Besprechung teil!"
+msgstr "Diese Person nimmt bereits an der Besprechung teil!"
 
-#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:652
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
@@ -4876,7 +4968,7 @@ msgid "Member"
 msgstr "Mitglied"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:1176
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
@@ -4898,103 +4990,57 @@ msgid "_Change Organizer"
 msgstr "Organisator _ändern"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:425
+#: calendar/gui/e-meeting-time-sel.c:426
 msgid "_Invite Others..."
 msgstr "Andere einladen..."
 
-# CHECK ME
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:162
-msgid "st"
-msgstr "1."
-
-# CHECK ME
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:153
-msgid "nd"
-msgstr "2."
-
-# CHECK ME
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:154
-msgid "rd"
-msgstr "3."
-
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:147
-#: calendar/gui/dialogs/recurrence-page.c:148
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:155
-#: calendar/gui/dialogs/recurrence-page.c:156
-#: calendar/gui/dialogs/recurrence-page.c:157
-#: calendar/gui/dialogs/recurrence-page.c:158
-#: calendar/gui/dialogs/recurrence-page.c:159
-#: calendar/gui/dialogs/recurrence-page.c:160
-#: calendar/gui/dialogs/recurrence-page.c:161
-msgid "th"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:582
+#: calendar/gui/dialogs/recurrence-page.c:532
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Dieser Termin enthält Wiederholungsregeln, die Evolution nicht bearbeiten "
 "kann."
 
-#: calendar/gui/dialogs/recurrence-page.c:858
-msgid "Recurrent date is wrong"
-msgstr "Das Wiederholungsdatum ist falsch"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
+msgstr "Das Wiederholungsdatum ist ungültig"
 
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "bei"
 
-#: calendar/gui/dialogs/recurrence-page.c:1028
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "erster"
 
-#: calendar/gui/dialogs/recurrence-page.c:1029 filter/filter-datespec.c:65
+#: calendar/gui/dialogs/recurrence-page.c:978 filter/filter-datespec.c:65
 msgid "second"
 msgstr "zweiter"
 
-#: calendar/gui/dialogs/recurrence-page.c:1030
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "dritter"
 
-#: calendar/gui/dialogs/recurrence-page.c:1031
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr "vierter"
 
-#: calendar/gui/dialogs/recurrence-page.c:1032
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "letzter"
 
-#: calendar/gui/dialogs/recurrence-page.c:1058
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr "Anderes Datum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1086 filter/filter-datespec.c:68
+#: calendar/gui/dialogs/recurrence-page.c:1032 filter/filter-datespec.c:68
 msgid "day"
 msgstr "Tag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1226
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "am"
 
-#: calendar/gui/dialogs/recurrence-page.c:1411
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "Auftreten"
 
@@ -5058,28 +5104,28 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "Die Besprechungsinformationen wurden erstellt. Jetzt verschicken?"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 "Die Besprechungsinformationen haben sich geändert. Eine aktualisierte "
 "Version verschicken?"
 
-#: calendar/gui/dialogs/send-comp.c:65
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr "Die Aufgabeninformationen wurden erstellt. Jetzt verschicken?"
 
-#: calendar/gui/dialogs/send-comp.c:69
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Die Aufgabeninformationen haben sich geändert. Eine aktualisierte Version "
 "verschicken?"
 
 # CHECK
-#: calendar/gui/dialogs/task-details-page.c:398
+#: calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "Das Fertiggestellt-Datum ist falsch"
 
@@ -5093,56 +5139,143 @@ msgstr "% abgeschlossen"
 msgid "Date Completed:"
 msgstr "Abgeschlossen am:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:295 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:549 calendar/gui/e-meeting-model.c:851
-msgid "Needs Action"
-msgstr "Erfordert Maßnahme"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 #: my-evolution/e-summary-preferences.c:630
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Priorität:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/dialogs/task-editor.c:186
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Grundlegend"
 
-#: calendar/gui/dialogs/task-editor.c:196
-#: calendar/gui/dialogs/task-editor.c:241
-#: calendar/gui/dialogs/task-editor.c:366
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: calendar/gui/dialogs/task-page.c:519
-msgid "Due date is wrong"
-msgstr "Das Fälligkeitsdatum ist falsch"
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr "Das Fälligkeitsdatum ist falsch"
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
+msgid "Description:"
+msgstr "Beschreibung:"
+
+#: calendar/gui/dialogs/task-page.glade.h:8
+msgid "Sta_rt Date:"
+msgstr "Anfangsdatum:"
+
+#: calendar/gui/dialogs/task-page.glade.h:11
+msgid "_Due Date:"
+msgstr "Fällig am:"
+
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d Tage"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 Tag"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d Wochen"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 Woche"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d Stunden"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 Stunde"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d Minuten"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 Minute"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d Sekunden"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 Sekunde"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Eine E-Mail verschicken"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Unbekannte auszuführende Aktion"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s vor Terminbeginn"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s nach Terminbeginn"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s zum Terminbeginn"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s vor Terminende"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:858
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
-msgid "Description:"
-msgstr "Beschreibung:"
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s nach Terminende"
 
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Sta_rt Date:"
-msgstr "Anfangsdatum:"
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s zum Terminende"
 
-#: calendar/gui/dialogs/task-page.glade.h:11
-msgid "_Due Date:"
-msgstr "Fällig am:"
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s um %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s für einen unbekannten Auslösertyp."
 
 #: calendar/gui/e-calendar-table.c:415
 msgid "0%"
@@ -5188,76 +5321,76 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2821
-#: calendar/gui/e-week-view.c:1863
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2825
+#: calendar/gui/e-week-view.c:1900
 msgid "Deleting selected objects"
 msgstr "Markierte Objekte werden gelöscht"
 
-#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3704
-#: calendar/gui/e-week-view.c:3483 mail/folder-browser.c:1803
-#: shell/e-shortcuts-view.c:409 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3702
+#: calendar/gui/e-week-view.c:3541 mail/folder-browser.c:1741
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: calendar/gui/e-calendar-table.c:950
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "_Speichern unter..."
 
-#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-day-view.c:3706
-#: calendar/gui/e-week-view.c:3458 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3704
+#: calendar/gui/e-week-view.c:3516 calendar/gui/e-week-view.c:3543
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: calendar/gui/e-calendar-table.c:955 calendar/gui/e-day-view.c:3711
-#: calendar/gui/e-week-view.c:3490 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3709
+#: calendar/gui/e-week-view.c:3548 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
-#: calendar/gui/e-week-view.c:3491 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3710
+#: calendar/gui/e-week-view.c:3549 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3677
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3462
-#: calendar/gui/e-week-view.c:3492 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3675
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-week-view.c:3550 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "Einfügen"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr "_Aufgabe zuweisen"
 
-#: calendar/gui/e-calendar-table.c:962
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: calendar/gui/e-calendar-table.c:963
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:964
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Markierte Aufgaben als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "Markierte Aufgaben _löschen"
 
-#: calendar/gui/e-calendar-table.c:1239 calendar/gui/e-day-view.c:7536
-#: calendar/gui/e-week-view.c:4177
+#: calendar/gui/e-calendar-table.c:1243 calendar/gui/e-day-view.c:7640
+#: calendar/gui/e-week-view.c:4248
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: calendar/gui/e-calendar-table.c:1322
+#: calendar/gui/e-calendar-table.c:1326
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicken, um eine Aufgabe hinzuzufügen"
@@ -5266,8 +5399,8 @@ msgstr "Klicken, um eine Aufgabe hinzuzufügen"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1000
-#: camel/camel-filter-driver.c:1095
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -5296,8 +5429,8 @@ msgid "Start Date"
 msgstr "Anfangsdatum"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:54 shell/e-shell.c:763
-#: shell/e-shortcuts.c:1080
+#: my-evolution/component-factory.c:56 shell/e-shell.c:767
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Zusammenfassung"
 
@@ -5328,133 +5461,207 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:613 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:789
-msgid "am"
-msgstr "AM"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:616 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:791
-msgid "pm"
-msgstr "PM"
+#: calendar/gui/e-day-view-time-item.c:531
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i Minuten-Unterteilungen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1370 calendar/gui/e-day-view-top-item.c:261
-#: calendar/gui/e-week-view-main-item.c:302 calendar/gui/print.c:1505
+#: calendar/gui/e-day-view-top-item.c:262 calendar/gui/e-day-view.c:1374
+#: calendar/gui/e-week-view-main-item.c:303 calendar/gui/print.c:1529
 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.c:1397 calendar/gui/e-day-view-top-item.c:269
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:270 calendar/gui/e-day-view.c:1401
+#: calendar/gui/e-week-view-main-item.c:326
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: calendar/gui/e-day-view.c:3661
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
+msgid "am"
+msgstr "AM"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
+msgid "pm"
+msgstr "PM"
+
+#: calendar/gui/e-day-view.c:3659
 msgid "New _Appointment"
 msgstr "Neuer _Termin"
 
-#: calendar/gui/e-day-view.c:3663 calendar/gui/e-week-view.c:3452
+#: calendar/gui/e-day-view.c:3661 calendar/gui/e-week-view.c:3510
 msgid "New All Day _Event"
 msgstr "Neues ganztägiges _Ereignis"
 
-#: calendar/gui/e-day-view.c:3665 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3663 calendar/gui/e-week-view.c:3511
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/e-day-view.c:3667 calendar/gui/e-week-view.c:3454
+#: calendar/gui/e-day-view.c:3665 calendar/gui/e-week-view.c:3512
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/e-day-view.c:3672 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3670 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Drucken..."
 
-#: calendar/gui/e-day-view.c:3684 calendar/gui/e-week-view.c:3468
+#: calendar/gui/e-day-view.c:3682 calendar/gui/e-week-view.c:3526
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3686 calendar/gui/e-week-view.c:3469
+#: calendar/gui/e-day-view.c:3684 calendar/gui/e-week-view.c:3527
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3691 calendar/gui/e-week-view.c:3473
+#: calendar/gui/e-day-view.c:3689 calendar/gui/e-week-view.c:3531
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen _veröffentlichen"
 
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3477
+#: calendar/gui/e-day-view.c:3694 calendar/gui/e-week-view.c:3535
 #: ui/evolution.xml.h:62
 msgid "_Settings..."
 msgstr "_Einstellungen..."
 
-#: calendar/gui/e-day-view.c:3705 calendar/gui/e-week-view.c:3484
-#: mail/folder-browser.c:1805 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3703 calendar/gui/e-week-view.c:3542
+#: mail/folder-browser.c:1743 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3496
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3554
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen..."
 
-#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3497
+#: calendar/gui/e-day-view.c:3716 calendar/gui/e-week-view.c:3555
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten..."
 
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3502
+#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3560
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3503
+#: calendar/gui/e-day-view.c:3722 calendar/gui/e-week-view.c:3561
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten löschen"
 
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3504
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3562
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten löschen"
 
-#: calendar/gui/e-day-view-time-item.c:498
+#: calendar/gui/e-itip-control.c:704
+msgid "Yes. (Complex Recurrence)"
+msgstr "Ja (Komplexe Wiederholung)."
+
+#: calendar/gui/e-itip-control.c:716
+msgid "Every day"
+msgstr "Täglich"
+
+#: calendar/gui/e-itip-control.c:718
 #, c-format
-msgid "%02i minute divisions"
-msgstr "%02i Minuten-Unterteilungen"
+msgid "Every %d days"
+msgstr "Alle %d Tage"
+
+#: calendar/gui/e-itip-control.c:724
+msgid "Every week"
+msgstr "Wöchentlich"
+
+#: calendar/gui/e-itip-control.c:726
+#, c-format
+msgid "Every %d weeks"
+msgstr "Alle %d Wochen"
+
+#: calendar/gui/e-itip-control.c:729
+msgid "Every week on "
+msgstr "Wöchentlich am "
+
+#: calendar/gui/e-itip-control.c:731
+#, c-format
+msgid "Every %d weeks on "
+msgstr "Alle %d Wochen am "
+
+#: calendar/gui/e-itip-control.c:739
+msgid " and "
+msgstr " und "
 
-#: calendar/gui/e-itip-control.c:585
+# CHECK - muss mit erste(r), zweite(r) usw. übereinstimmen
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr "%s Tag des "
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr "%s %s des "
+
+#: calendar/gui/e-itip-control.c:764
+msgid "every month"
+msgstr "monatlich"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr "alle %d Monate"
+
+#: calendar/gui/e-itip-control.c:775
+msgid "Every year"
+msgstr "Jährlich"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr "Alle %d Jahre"
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr " insgesamt %d Mal"
+
+# CHECK
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ", endet am "
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr "<b>Beginnt:</b> "
 
-#: calendar/gui/e-itip-control.c:595
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Endet:</b>"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>Abgeschlossen:</b>"
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr "<b>Fällig:</b>"
 
-#: calendar/gui/e-itip-control.c:655 calendar/gui/e-itip-control.c:705
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "iCalendar-Informationen"
 
 #. Title
-#: calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "iCalendar-Fehler"
 
-#: calendar/gui/e-itip-control.c:736 calendar/gui/e-itip-control.c:752
-#: calendar/gui/e-itip-control.c:763 calendar/gui/e-itip-control.c:780
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:787
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5462,342 +5669,342 @@ msgstr ""
 "<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
 "wählen Sie dann eine Aktion aus dem Menü unten aus."
 
-#: calendar/gui/e-itip-control.c:802
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Keine</i>"
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:1058
 msgid "Location:"
 msgstr "Standort: "
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:1072
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:831 calendar/gui/e-meeting-model.c:297
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:852
-#: calendar/gui/itip-utils.c:486
+#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:849
+#: calendar/gui/itip-utils.c:404
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-itip-control.c:835 calendar/gui/itip-utils.c:489
+#: calendar/gui/e-itip-control.c:1081 calendar/gui/itip-utils.c:407
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: calendar/gui/e-itip-control.c:839 calendar/gui/e-meeting-model.c:299
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:853
-#: calendar/gui/itip-utils.c:492 calendar/gui/itip-utils.c:518
+#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:850
+#: calendar/gui/itip-utils.c:410 calendar/gui/itip-utils.c:436
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-itip-control.c:843 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:268
-#: calendar/gui/e-meeting-model.c:333 calendar/gui/e-meeting-model.c:810
-#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:629
+#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:807
+#: calendar/gui/e-meeting-model.c:823 camel/camel-gpg-context.c:1531
+#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:634
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:364
-#: mail/mail-display.c:918 widgets/misc/e-charset-picker.c:59
-#: widgets/misc/e-charset-picker.c:446
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:345
+#: mail/mail-display.c:931 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: calendar/gui/e-itip-control.c:896 calendar/gui/e-itip-control.c:924
-#: calendar/gui/e-itip-control.c:950 calendar/gui/e-itip-control.c:963
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:1144 calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1198 calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224 calendar/gui/e-itip-control.c:1237
 msgid "Choose an action:"
 msgstr "Eine Aktion wählen:"
 
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:1145
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:929
-#: calendar/gui/e-itip-control.c:952 calendar/gui/e-itip-control.c:965
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:991
-#: shell/e-shell.c:2088 widgets/misc/e-cell-date-edit.c:262
+#: calendar/gui/e-itip-control.c:1146 calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1200 calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1226 calendar/gui/e-itip-control.c:1239
+#: shell/e-shell.c:2094 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:1173
 msgid "Accept"
 msgstr "Annehmen"
 
-#: calendar/gui/e-itip-control.c:926
+#: calendar/gui/e-itip-control.c:1174
 msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1175
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: calendar/gui/e-itip-control.c:951
+#: calendar/gui/e-itip-control.c:1199
 msgid "Send Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:964
+#: calendar/gui/e-itip-control.c:1212
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: calendar/gui/e-itip-control.c:977
+#: calendar/gui/e-itip-control.c:1225
 msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:990 calendar/gui/itip-utils.c:506
-#: shell/evolution-shell-component.c:1152 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1238 calendar/gui/itip-utils.c:424
+#: shell/evolution-shell-component.c:1162 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1072
+#: calendar/gui/e-itip-control.c:1320
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> wünscht die Anwesenheit von %s bei einer Besprechung"
 
-#: calendar/gui/e-itip-control.c:1079
+#: calendar/gui/e-itip-control.c:1327
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> wünscht Ihre Anwesenheit bei einer Besprechung"
 
-#: calendar/gui/e-itip-control.c:1080
+#: calendar/gui/e-itip-control.c:1328
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1332
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wünscht zu einer vorhandenen Besprechung hinzuzufügen"
 
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1333
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1089
+#: calendar/gui/e-itip-control.c:1337
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wünscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1338
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1345
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1098
+#: calendar/gui/e-itip-control.c:1346
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung widerrufen."
 
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1354
 msgid "Meeting Cancellation"
 msgstr "Besprechungswiderruf"
 
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1428
+#: calendar/gui/e-itip-control.c:1463
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverständliche Nachricht verschickt."
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1362
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> fordert %s auf, eine Aufgabe auszuführen."
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> fordert Sie auf eine Aufgabe auszuführen."
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1395
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1399
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzuzufügen."
 
-#: calendar/gui/e-itip-control.c:1152
+#: calendar/gui/e-itip-control.c:1400
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1404
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wünscht letzte Aufgabeninformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1405
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1412
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1413
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1420
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> hat eine Aufgabe widerrufen."
 
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1421
 msgid "Task Cancellation"
 msgstr "Aufgabenwiderruf"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1429
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1448
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> hat Verfügbarkeitsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1449
 msgid "Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1453
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> fordert Ihre Verfügbarkeitsinformationen an."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1454
 msgid "Free/Busy Request"
 msgstr "Verfügbarkeitsanfrage"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1458
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1459
 msgid "Free/Busy Reply"
 msgstr "Verfügbarkeitsantwort"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1464
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verfügbarkeitsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1540
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: calendar/gui/e-itip-control.c:1352
+#: calendar/gui/e-itip-control.c:1603
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthält ausschließlich nicht unterstützte Anfragen."
 
-#: calendar/gui/e-itip-control.c:1380 calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1634 calendar/gui/e-itip-control.c:1640
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Die Anlage enthält keine gültige Kalendernachricht"
 
-#: calendar/gui/e-itip-control.c:1411
+#: calendar/gui/e-itip-control.c:1665
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalenderinformationen"
 
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1724
+#: calendar/gui/e-itip-control.c:1906 calendar/gui/e-itip-control.c:1998
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt ist ungültig und konnte nicht aktualisiert werden\n"
 
-#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "There was an error on the CORBA system\n"
 msgstr "Es trat ein Fehler im CORBA-System auf\n"
 
-#: calendar/gui/e-itip-control.c:1638 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "Object could not be found\n"
 msgstr "Objekt konnte nicht gefunden werden\n"
 
-#: calendar/gui/e-itip-control.c:1641
+#: calendar/gui/e-itip-control.c:1915
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
 "Sie haben nicht die nötige Berechtigung, um den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1918
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1647
+#: calendar/gui/e-itip-control.c:1921
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1676 calendar/gui/e-itip-control.c:1742
+#: calendar/gui/e-itip-control.c:1950 calendar/gui/e-itip-control.c:2016
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Anwesenheitsstatus konnte nicht aktualisiert werden, da der Eintrag nicht "
 "mehr existiert"
 
-#: calendar/gui/e-itip-control.c:1697
+#: calendar/gui/e-itip-control.c:1971
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Diese Antwort ist von keinem Teilnehmer.  Als Teilnehmer hinzufügen?"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1983
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Anwesenheitsstatus konnte auf Grund eines ungültigen Status nicht "
 "aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1733
+#: calendar/gui/e-itip-control.c:2007
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "Sie haben nicht die nötige Berechtigung, um den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1736
+#: calendar/gui/e-itip-control.c:2010
 msgid "Attendee status updated\n"
 msgstr "Anwesenheitsstatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status could not be updated!\n"
 msgstr "Teilnehmerstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1774
+#: calendar/gui/e-itip-control.c:2048
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:1804 calendar/gui/e-itip-control.c:1854
+#: calendar/gui/e-itip-control.c:2078 calendar/gui/e-itip-control.c:2128
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:2080 calendar/gui/e-itip-control.c:2132
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:1931
+#: calendar/gui/e-itip-control.c:2205
 msgid "Select Calendar Folder"
 msgstr "Ordner für Kalender wählen"
 
-#: calendar/gui/e-itip-control.c:1938
+#: calendar/gui/e-itip-control.c:2212
 msgid "Select Tasks Folder"
 msgstr "Ordner für Aufgaben wählen"
 
@@ -5838,181 +6045,185 @@ msgstr "datum-ende"
 msgid "date-start"
 msgstr "datum-anfang"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Vorsitzende"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1736
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1692
 msgid "Required Participants"
 msgstr "Benötigte Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Optionale Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: calendar/gui/e-meeting-model.c:208 calendar/gui/e-meeting-model.c:225
-#: calendar/gui/e-meeting-model.c:539 calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:537 calendar/gui/e-meeting-model.c:803
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-model.c:210 calendar/gui/e-meeting-model.c:227
-#: calendar/gui/e-meeting-model.c:807
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:804
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:212 calendar/gui/e-meeting-model.c:229
-#: calendar/gui/e-meeting-model.c:808
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:805
 msgid "Resource"
 msgstr "Ressource"
 
-#: calendar/gui/e-meeting-model.c:214 calendar/gui/e-meeting-model.c:231
-#: calendar/gui/e-meeting-model.c:809
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:806
 msgid "Room"
 msgstr "Raum"
 
-#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:260
-#: calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:819
 msgid "Chair"
 msgstr "Vorsitzender"
 
-#: calendar/gui/e-meeting-model.c:245 calendar/gui/e-meeting-model.c:262
-#: calendar/gui/e-meeting-model.c:541 calendar/gui/e-meeting-model.c:823
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:539 calendar/gui/e-meeting-model.c:820
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:247 calendar/gui/e-meeting-model.c:264
-#: calendar/gui/e-meeting-model.c:824
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:821
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:249 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:825
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:822
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:301 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:547 calendar/gui/e-meeting-model.c:848
+msgid "Needs Action"
+msgstr "Erfordert Maßnahme"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:851 calendar/gui/e-meeting-time-sel.c:407
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: calendar/gui/e-meeting-model.c:303 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:855
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:852
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2077
+msgid "%A, %B %d, %Y"
+msgstr "%a, %d. %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2107 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
+msgid "%a %m/%d/%Y"
+msgstr "%a, %d.%m.%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:409 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Außer Haus"
 
-#: calendar/gui/e-meeting-time-sel.c:409
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "No Information"
 msgstr "Keine Information"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:448
 msgid "_Options"
 msgstr "Optionen"
 
-#: calendar/gui/e-meeting-time-sel.c:466
+#: calendar/gui/e-meeting-time-sel.c:468
 msgid "Show _Only Working Hours"
 msgstr "Nur Arbeitszeit anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:480
+#: calendar/gui/e-meeting-time-sel.c:482
 msgid "Show _Zoomed Out"
 msgstr "Weggezoomt anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:498
+#: calendar/gui/e-meeting-time-sel.c:500
 msgid "_Update Free/Busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: calendar/gui/e-meeting-time-sel.c:516
+#: calendar/gui/e-meeting-time-sel.c:518
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:533
+#: calendar/gui/e-meeting-time-sel.c:535
 msgid "_Autopick"
 msgstr "AutoWahl"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:549
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:566
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "_All People and Resources"
 msgstr "Alle Leute und Ressourcen"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "All _People and One Resource"
 msgstr "Alle Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Required People"
 msgstr "Benötigte Leute"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Required People and _One Resource"
 msgstr "Benötigte Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:628
+#: calendar/gui/e-meeting-time-sel.c:630
 msgid "Meeting _start time:"
 msgstr "Anfang der Besprechung:"
 
-#: calendar/gui/e-meeting-time-sel.c:647
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2072
-#: calendar/gui/e-meeting-time-sel-item.c:453
-msgid "%A, %B %d, %Y"
-msgstr "%a, %d. %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2102
-#: calendar/gui/e-meeting-time-sel-item.c:457 e-util/e-time-utils.c:189
-#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
-msgid "%a %m/%d/%Y"
-msgstr "%a, %d.%m.%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:461 e-util/e-time-utils.c:224
-#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1595
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
-#: calendar/gui/e-tasks.c:356 calendar/gui/gnome-cal.c:2011
-#: calendar/gui/gnome-cal.c:2022
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben bei %s werden geöffnet"
 
-#: calendar/gui/e-tasks.c:385 calendar/gui/tasks-control.c:197
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Die Aufgaben in `%s' konnten nicht geladen werden"
 
-#: calendar/gui/e-tasks.c:400
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
-msgstr ""
-"Die Methode, die zum Laden von `%s' benötigt wird, ist nicht unterstützt"
+msgstr "Die zum Laden von »%s« erfoderliche Methode wird nicht unterstützt"
 
-#: calendar/gui/e-tasks.c:414 calendar/gui/gnome-cal.c:1531
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Sie haben keine Berechtigung den Ordner in `%s' zu öffnen"
 
-#: calendar/gui/e-tasks.c:482 calendar/gui/gnome-cal.c:1735
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6033,20 +6244,19 @@ msgstr "Markierte Objekte werden gelöscht..."
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: calendar/gui/e-week-view.c:3451
+#: calendar/gui/e-week-view.c:3509
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
 #: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
-msgstr "Der Ordner in `%s' konnte nicht geöffnet werden"
+msgstr "Der Ordner in »%s« konnte nicht geöffnet werden"
 
 #: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
-msgstr ""
-"Die Methode, die zum Öffnen von `%s' benötigt wird, wird nicht unterstützt"
+msgstr "Die zum Öffnen von »%s« erforderliche Methode wird nicht unterstützt"
 
 #: calendar/gui/gnome-cal.c:1563
 #, c-format
@@ -6077,53 +6287,15 @@ msgstr ""
 "ist abgestürzt. Sie müssen Evolution neu starten, um sie wieder verwenden zu "
 "können"
 
-#: calendar/gui/gnome-cal.c:1993
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender bei %s wird geöffnet"
 
-#: calendar/gui/gnome-cal.c:2033
+#: calendar/gui/gnome-cal.c:2035
 msgid "Opening default tasks folder"
 msgstr "Vorgabe-Aufgabenordner wird geöffnet"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "Ein Bonobo-Bedienelement zur Anzeige einer Aufgabenliste."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Ein Bonobo-Beispiel-Bedienelement zur Anzeige eines Kalenders"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Konfigurations-Bedienelement für den Evolution-Kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
-"konfigurieren"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution Kelender iTip/iMip-Betrachter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution-Komponente für den Umgang mit Mail."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Factory for the Evolution Calendar objects"
-msgstr "Fabrik für die Kalender-Objekte von Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "Fabrik zur Zentralisierung der Dialoge des Kalender-Komponenteneditors"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6180,297 +6352,173 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:344 calendar/gui/itip-utils.c:415
+#: calendar/gui/itip-utils.c:262 calendar/gui/itip-utils.c:333
 msgid "An organizer must be set."
-msgstr "Ein Organisator muss feststehen."
+msgstr "Es muss ein Organisator festgelegt werden."
 
-#: calendar/gui/itip-utils.c:379
+#: calendar/gui/itip-utils.c:297
 msgid "At least one attendee is necessary"
-msgstr "Mindestens ein Teilnehmer wird benötigt"
+msgstr "Es ist mindestens ein Teilnehmer erforderlich"
 
-#: calendar/gui/itip-utils.c:458 calendar/gui/itip-utils.c:567
+#: calendar/gui/itip-utils.c:376 calendar/gui/itip-utils.c:485
 msgid "Event information"
 msgstr "Ereignisinformationen"
 
-#: calendar/gui/itip-utils.c:460 calendar/gui/itip-utils.c:569
+#: calendar/gui/itip-utils.c:378 calendar/gui/itip-utils.c:487
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
-msgid "Journal information"
-msgstr "Journalinformationen"
-
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:588
-msgid "Free/Busy information"
-msgstr "Verfügbarkeitsinformationen"
-
-#: calendar/gui/itip-utils.c:466
-msgid "Calendar information"
-msgstr "Kalenderinformationen"
-
-#: calendar/gui/itip-utils.c:502
-msgid "Updated"
-msgstr "Aktualisiert"
-
-#: calendar/gui/itip-utils.c:510
-msgid "Refresh"
-msgstr "Aktualisieren"
-
-# CHECK
-#: calendar/gui/itip-utils.c:514
-msgid "Counter-proposal"
-msgstr "Gegenvorschlag"
-
-#: calendar/gui/itip-utils.c:582
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Verfügbarkeitsinformationen (%s bis %s)"
-
-#: calendar/gui/itip-utils.c:594
-msgid "iCalendar information"
-msgstr "iCalendar-Informationen"
-
-#: calendar/gui/itip-utils.c:752
-msgid "You must be an attendee of the event."
-msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
-
-#: calendar/gui/print.c:454
-msgid "1st"
-msgstr "1."
-
-#: calendar/gui/print.c:454
-msgid "2nd"
-msgstr "2."
-
-#: calendar/gui/print.c:454
-msgid "3rd"
-msgstr "3."
-
-#: calendar/gui/print.c:454
-msgid "4th"
-msgstr "4."
-
-#: calendar/gui/print.c:454
-msgid "5th"
-msgstr "5."
-
-#: calendar/gui/print.c:455
-msgid "6th"
-msgstr "6."
-
-#: calendar/gui/print.c:455
-msgid "7th"
-msgstr "7."
-
-#: calendar/gui/print.c:455
-msgid "8th"
-msgstr "8."
-
-#: calendar/gui/print.c:455
-msgid "9th"
-msgstr "9."
-
-#: calendar/gui/print.c:455
-msgid "10th"
-msgstr "10."
-
-#: calendar/gui/print.c:456
-msgid "11th"
-msgstr "11."
-
-#: calendar/gui/print.c:456
-msgid "12th"
-msgstr "12."
-
-#: calendar/gui/print.c:456
-msgid "13th"
-msgstr "13."
-
-#: calendar/gui/print.c:456
-msgid "14th"
-msgstr "14."
-
-#: calendar/gui/print.c:456
-msgid "15th"
-msgstr "15."
-
-#: calendar/gui/print.c:457
-msgid "16th"
-msgstr "16."
-
-#: calendar/gui/print.c:457
-msgid "17th"
-msgstr "17."
-
-#: calendar/gui/print.c:457
-msgid "18th"
-msgstr "18."
-
-#: calendar/gui/print.c:457
-msgid "19th"
-msgstr "19."
-
-#: calendar/gui/print.c:457
-msgid "20th"
-msgstr "20."
-
-#: calendar/gui/print.c:458
-msgid "21st"
-msgstr "21."
-
-#: calendar/gui/print.c:458
-msgid "22nd"
-msgstr "22."
-
-#: calendar/gui/print.c:458
-msgid "23rd"
-msgstr "23."
-
-#: calendar/gui/print.c:458
-msgid "24th"
-msgstr "24."
+#: calendar/gui/itip-utils.c:380 calendar/gui/itip-utils.c:489
+msgid "Journal information"
+msgstr "Journalinformationen"
 
-#: calendar/gui/print.c:458
-msgid "25th"
-msgstr "25."
+#: calendar/gui/itip-utils.c:382 calendar/gui/itip-utils.c:506
+msgid "Free/Busy information"
+msgstr "Verfügbarkeitsinformationen"
 
-#: calendar/gui/print.c:459
-msgid "26th"
-msgstr "26."
+#: calendar/gui/itip-utils.c:384
+msgid "Calendar information"
+msgstr "Kalenderinformationen"
 
-#: calendar/gui/print.c:459
-msgid "27th"
-msgstr "27."
+#: calendar/gui/itip-utils.c:420
+msgid "Updated"
+msgstr "Aktualisiert"
 
-#: calendar/gui/print.c:459
-msgid "28th"
-msgstr "28."
+#: calendar/gui/itip-utils.c:428
+msgid "Refresh"
+msgstr "Aktualisieren"
 
-#: calendar/gui/print.c:459
-msgid "29th"
-msgstr "29."
+# CHECK
+#: calendar/gui/itip-utils.c:432
+msgid "Counter-proposal"
+msgstr "Gegenvorschlag"
 
-#: calendar/gui/print.c:459
-msgid "30th"
-msgstr "30."
+#: calendar/gui/itip-utils.c:500
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 
-#: calendar/gui/print.c:460
-msgid "31st"
-msgstr "31."
+#: calendar/gui/itip-utils.c:512
+msgid "iCalendar information"
+msgstr "iCalendar-Informationen"
+
+#: calendar/gui/itip-utils.c:660
+msgid "You must be an attendee of the event."
+msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "So"
 
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:527
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:528
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Gewählter Tag (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1886 calendar/gui/print.c:1890
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1887
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1891 calendar/gui/print.c:1893
-#: calendar/gui/print.c:1894
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1898
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Gewählte Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1906
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Gewählter Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1913
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Gewähltes Jahr (%Y)"
 
-#: calendar/gui/print.c:2247
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Aufgabe"
 
-#: calendar/gui/print.c:2304
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2322
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: calendar/gui/print.c:2336
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: calendar/gui/print.c:2348
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: calendar/gui/print.c:2373
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Kontakte: "
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2612
-#: calendar/gui/tasks-control.c:591 mail/mail-callbacks.c:2908
-#: my-evolution/e-summary.c:619
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:579 mail/mail-callbacks.c:2939
+#: my-evolution/e-summary.c:618
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/print.c:2549
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
-#: calendar/gui/tasks-control.c:148
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "Der URI, den der Aufgabenordner anzeigen wird"
 
-#: calendar/gui/tasks-control.c:463
+#: calendar/gui/tasks-control.c:465
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6478,16 +6526,16 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 "Dieser Vorgang wird alle als abgeschlossen markierte Aufgaben auf Dauer "
-"entfernen. Falls Sie fortfahren, werden Sie diese Nachrichten nie "
+"entfernen. Falls Sie fortfahren, werden Sie diese Aufgaben nicht "
 "wiederherstellen können.\n"
 "\n"
-"Aufgaben wirklich entfernen?"
+"Sollen die Aufgaben wirklich entfernt werden?"
 
-#: calendar/gui/tasks-control.c:470
+#: calendar/gui/tasks-control.c:472
 msgid "Do not ask me again."
 msgstr "Mich nicht mehr fragen."
 
-#: calendar/gui/tasks-control.c:622
+#: calendar/gui/tasks-control.c:608
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
@@ -6526,45 +6574,45 @@ 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."
+"Die zum Laden von »%s« erforderliche Methode wird nicht unterstützt; es "
+"werden keine Objekte aus dem Kalenderordner in den Aufgaben-Ordner migriert."
 
-#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:377
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:379
 msgid "SMTWTFS"
 msgstr "SMDMDFS"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:1
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 msgid "Factory to import iCalendar files into Evolution"
 msgstr "Fabrik zum Import von iCalendar-Dateien in Evolution"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:2
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 msgid "Imports iCalendar files into Evolution"
 msgstr "Importiert iCalendar-Dateien in Evolution"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.h:3
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importiert vCalendar-Dateien in Evolution"
 
-#: calendar/importers/icalendar-importer.c:169
+#: calendar/importers/icalendar-importer.c:172
 #, c-format
 msgid "Can't get storage list from registry: %s"
 msgstr "Speicherliste konnte nicht aus Registrierung abgerufen werden: %s"
 
-#: calendar/importers/icalendar-importer.c:181
+#: calendar/importers/icalendar-importer.c:184
 #, c-format
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr ""
 "»getFolderAtPath« konnte nicht auf dem Speichermedium ausgeführt werden: %s"
 
-#: calendar/importers/icalendar-importer.c:484
+#: calendar/importers/icalendar-importer.c:487
 msgid "Reminder!!"
 msgstr "Erinnerung!!"
 
-#: calendar/importers/icalendar-importer.c:698
+#: calendar/importers/icalendar-importer.c:701
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
-#: calendar/importers/icalendar-importer.c:723
+#: calendar/importers/icalendar-importer.c:726
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6572,10 +6620,15 @@ msgstr ""
 "Evolution hat Gnome Calendar-Dateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: calendar/importers/icalendar-importer.c:730
+#: calendar/importers/icalendar-importer.c:733
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
+#: calendar/pcs/cal-backend-file.c:310
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+"Kalenderdaten konnten nicht gespeichert werden: Fehlerhaft formatierte URI."
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "time-now erwartet 0 Argumente"
@@ -8260,7 +8313,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 "Protokolleintrag konnte nicht geschrieben werden: %s\n"
-"Weitere Operationen auf diesem Server werden nicht wiedergegeben\n"
+"Weitere Operationen auf diesem Server können nicht wiedergegeben\n"
 "werden, wenn Sie die Netzwerkverbindung wiederherstellen."
 
 #: camel/camel-disco-diary.c:248
@@ -8287,82 +8340,114 @@ msgstr "Ordner »%s« wird für den Offline-Modus vorbereitet"
 msgid "You must be working online to complete this operation"
 msgstr "Sie müssen online arbeiten, um diesen Vorgang zu Ende zu bringen"
 
-#: camel/camel-filter-driver.c:767 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Weiterleitung zu »%s« konnte nicht erstellt werden: %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Kindprozess '%s' konnte nicht erstellt werden: %s"
+
+#: camel/camel-filter-driver.c:744
+#, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Ungültiger Nachrichten-Datenstrom von %s empfangen: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:865 camel/camel-filter-driver.c:1238
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:874 camel/camel-filter-driver.c:1244
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausführen des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:941
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner konnte nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:950
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner konnte nicht verarbeitet werden"
 
-#: camel/camel-filter-driver.c:965
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: camel/camel-filter-driver.c:969
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Nachricht konnte nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:970 camel/camel-filter-driver.c:982
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:996 camel/camel-filter-driver.c:1090
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:1057
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:1072
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ungültige Argumente bei (system-flag)"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ungültige Argumente bei (user-tag)"
 
-#: camel/camel-filter-search.c:514
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Weiterleitung zu »%s« konnte nicht erstellt werden: %s"
+msgid "Error executing filter search: %s: %s"
+msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
 
-#: camel/camel-filter-search.c:550
+#: camel/camel-folder-search.c:346
 #, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Kindprozess '%s' konnte nicht erstellt werden: %s"
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Suchausdruck konnte nicht verarbeitet werden: %s:\n"
+"%s"
 
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-folder-search.c:356
 #, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Fehler beim Ausführen eines Suchausdrucks: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
+
+#: camel/camel-folder-search.c:653
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
 
 #: camel/camel-folder.c:583
 #, c-format
@@ -8387,33 +8472,6 @@ msgstr "Nachrichten werden verschoben"
 msgid "Copying messages"
 msgstr "Nachrichten werden kopiert"
 
-#: camel/camel-folder-search.c:343
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Suchausdruck konnte nicht verarbeitet werden: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:353
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Fehler beim Ausführen eines Suchausdrucks: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
-
 #: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
@@ -8504,6 +8562,26 @@ msgstr ""
 "Die Nachrichtensignatur konnte nicht verifiziert werden: Temporäre Datei "
 "konnte nicht erstellt werden: %s"
 
+#: camel/camel-lock-client.c:111
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Weiterleitung zu Sperrhilfsprogramm konnte nicht angelegt werden: %s"
+
+#: camel/camel-lock-client.c:124
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s"
+
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' konnte nicht gesperrt werden: Protokollfehler mit lock-helper"
+
+#: camel/camel-lock-client.c:215
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s' konnte nicht gesperrt werden"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8526,45 +8604,25 @@ msgstr "fcntl(2)-Sperre konnte nicht erhalten werden: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: camel/camel-lock-client.c:111
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Weiterleitung zu Sperrhilfsprogramm konnte nicht angelegt werden: %s"
-
-#: camel/camel-lock-client.c:124
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s"
-
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' konnte nicht gesperrt werden: Protokollfehler mit lock-helper"
-
-#: camel/camel-lock-client.c:215
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' konnte nicht gesperrt werden"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "Maildatei %s konnte nicht überprüft werden: %s"
+msgstr "E-Mail-Datei %s konnte nicht überprüft werden: %s"
 
 #: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "Maildatei %s konnte nicht geöffnet werden: %s"
+msgstr "E-Mail-Datei %s konnte nicht geöffnet werden: %s"
 
 #: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "Temporäre Maildatei %s konnte nicht geöffnet werden: %s"
+msgstr "Temporäre E-Mail-Datei %s konnte nicht geöffnet werden: %s"
 
 #: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
+msgstr "E-Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
 
 #: camel/camel-movemail.c:187
 #, c-format
@@ -8588,17 +8646,17 @@ msgstr "(Unbekannter Fehler)"
 #: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
-msgstr "Fehler beim Lesen der Maildatei: %s"
+msgstr "Fehler beim Lesen der E-Mail-Datei: %s"
 
 #: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
-msgstr "Fehler beim Schreiben der temporären Maildatei: %s"
+msgstr "Fehler beim Schreiben der temporären E-Mail-Datei: %s"
 
 #: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
-msgstr "Fehler beim Kopieren der temporären Maildatei: %s"
+msgstr "Fehler beim Kopieren der temporären E-Mail-Datei: %s"
 
 #: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
@@ -8612,11 +8670,11 @@ msgstr "MIME-Teil konnte nicht entschlüsselt werden: Ungültige Struktur"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "MIME-Teil konnte nicht entschlüsselt werden: Fehler beim Verarbeiten"
 
-#: camel/camel-multipart-signed.c:625
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "Dies ist ein digital signierter Nachrichtenteil"
 
-#: camel/camel-multipart-signed.c:679
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr "Fehler beim Verarbeiten"
 
@@ -8688,11 +8746,11 @@ msgstr ""
 "Dies verbindet mit dem SMTP-Server und verwendet, falls es der Server "
 "unterstützt, ein sicheres CRAM-MD5-Passwort."
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8700,42 +8758,134 @@ msgstr ""
 "Dies verbindet mit dem SMTP-Server und verwendet, falls es der Server "
 "unterstützt, ein sicheres DIGEST-MD5-Passwort."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Server-Herausforderung zu lang (>2048 Oktette)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Server-Herausforderung ungültig\n"
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"Server-Herausforderung enthielt ungültiges \"Quality-of-Protection\"-Token\n"
+"Server-Herausforderung enthielt ungültiges »Quality-of-Protection«-Token\n"
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr "Serverantwort enthielt keine Legitimationsdaten\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Serverantwort enthielt unvollständige Legitimationsdaten\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Antwort des Servers passt nicht\n"
 
-#: camel/camel-sasl-kerberos4.c:40
+# CHECK
+#: camel/camel-sasl-gssapi.c:40
+msgid "GSSAPI"
+msgstr "GSSAPI"
+
+#: camel/camel-sasl-gssapi.c:42
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr ""
+"Dies verbindet mit dem Server und verwendet für die Legitimation Kerberos 5"
+
+#: camel/camel-sasl-gssapi.c:133
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+"Der angegebene Mechanismus wird vom übergebenen Berechtigungsnachweis nicht "
+"unterstützt oder wird von der Implementierung nicht erkannt."
+
+#: camel/camel-sasl-gssapi.c:138
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+"Der übergebene Parameter »target_name« liegt in einer ungültigen Form vor."
+
+#: camel/camel-sasl-gssapi.c:141
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"Der übergebene Parameter »target_name« enthält einen ungültigen oder "
+"nichtunterstützten Namenstyp "
+
+#: camel/camel-sasl-gssapi.c:145
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"Das Eingabe-Token »input_token« enthält andere Kanelbindungen als die vom "
+"Parameter »input_chan_bindings« angegebenen."
+
+#: camel/camel-sasl-gssapi.c:150
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"Das Eingabe-Token »input_token« enthält eine ungültige oder nicht "
+"verifizierbare Signatur."
+
+# CHECK
+#: camel/camel-sasl-gssapi.c:154
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+"Die übergebenen Berechtigungsnachweise sind nicht für die Auslösung eines "
+"Kontextes gültig oder der Berechtigungsnachweis-Handle hat auf keine "
+"Berechtigungsnachweise Bezug genommen."
+
+#: camel/camel-sasl-gssapi.c:159
+msgid ""
+"Indicates that the supplied context handle did not refer to a valid context."
+msgstr ""
+"Zeigt an, dass der übergebene Kontext-Handle zu keinem gültigen Kontext "
+"geführt hat."
+
+#: camel/camel-sasl-gssapi.c:163
+msgid "Indicates that consistency checks performed on the input_token failed."
+msgstr ""
+"Zeigt an, dass für das Eingabe-Token »input_token« durchgeführte "
+"Konsistenzprüfungen fehlschlugen."
+
+#: camel/camel-sasl-gssapi.c:167
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+"Die für den Berechtigungsnachweis durchgeführten Konsistenzüberprüfungen "
+"schlugen fehl."
+
+#: camel/camel-sasl-gssapi.c:170
+msgid "The referenced credentials have expired."
+msgstr ""
+"Die Berechtigungsnachweise, auf die Bezug genommen wurde, sind ausgelaufen."
+
+#: camel/camel-sasl-gssapi.c:177 camel/camel-sasl-gssapi.c:222
+#: camel/camel-sasl-gssapi.c:257 camel/camel-sasl-gssapi.c:273
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr "Ungültige Legitimationsantwort vom Server."
+
+#: camel/camel-sasl-gssapi.c:281
+msgid "Unsupported security layer."
+msgstr "Nicht unterstützte Sicherheitsebene."
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Dies verbindet mit dem Server und verwendet Kerberos 4, um sich zu "
 "legitimieren."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8744,11 +8894,6 @@ msgstr ""
 "Kerberos-Ticket konnte nicht erhalten werden:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1049
-msgid "Bad authentication response from server."
-msgstr "Ungültige Legitimationsantwort vom Server."
-
 #: camel/camel-sasl-login.c:32
 msgid "Login"
 msgstr "Anmelden"
@@ -8797,7 +8942,7 @@ msgstr "POP-vor-SMTP-Authentifikation mit einem unbekannten Übertragungsweg"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP-vor-SMTP-Authentifikation mit einer Nicht-POP-Quelle"
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fehler beim Compilieren eines regulären Ausdrucks: %s: %s"
@@ -8805,17 +8950,17 @@ msgstr "Fehler beim Compilieren eines regulären Ausdrucks: %s: %s"
 #: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
-msgstr "URL »%s« benötigt einen Benutzernamen-Teil"
+msgstr "URL »%s« benötigt eine Benutzernamen-Komponente"
 
 #: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr "URL '%s' braucht einen Rechnernamen-Teil"
+msgstr "URL »%s« benötigt eine Rechnernamen-Komponente"
 
 #: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
-msgstr "URL '%ss' braucht einen Pfad-Teil"
+msgstr "URL »%s« benötigt eine Pfadkomponente"
 
 #: camel/camel-service.c:741
 #, c-format
@@ -8855,7 +9000,7 @@ msgstr "E-Mail-Quelle: Virtueller Ordner"
 
 #: camel/camel-session.c:77
 msgid "For reading mail as a query of another set of folders"
-msgstr "Zum Lesen von Mail in Form einer Abfrage über andere Ordner"
+msgstr "Zum Lesen von E-Mails in Form einer Abfrage über andere Ordner"
 
 #: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
@@ -8919,125 +9064,125 @@ msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Ordner konnte nicht angelegt werden: Ungültige Aktion auf diesem Speicher"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr "Das Zertifikat des Ausstellers konnte nicht abgerufen werden"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr "Die Rückrufliste für das Zertifikat konnte nicht abgerufen werden"
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr "Die Zertifikatsignatur konnte nicht entschlüsselt werden"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 "Die Signatur der Zertifikat-Rückrufliste konnte nicht entschlüsselt werden"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 "Der öffentliche Schlüssel des Ausstellers konnte nicht ermittelt werden"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr "Zertifikat-Signatur fehlerhaft"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr "Signatur der Zertifikat-Rücklaufliste fehlerhaft"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr "Zertifikat noch nicht gültig"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Das Zertifikat ist nicht mehr gültig"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "Die ZRL ist noch nicht gültig"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "Die ZRL ist nicht mehr gültig"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "Fehler in der ZRL"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Speicher erschöpft"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr "Selbst signiertes Zertifikat mit Tiefe null"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr "Selbst signiertes Zertifikat in der Kette"
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr "Zertifikat des Ausstellers konnte lokal nicht abgerufen werden"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 msgid "Unable to verify leaf signature"
 msgstr "Die Leaf-Signatur konnte nicht vertifiziert werden"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Zertifikatkette zu lang"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr "Zertifikat zurückgenommen"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Ungültige Zertifizierungsstelle (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Pfadlänge überschritten"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Ungültiger Verwendungszweck"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "Zertifikat nicht vertrauenswürdig"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Zertifikat abgewiesen"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr "Empfänger/Aussteller passen nicht zusammen"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr "Kennung des Authority Keys/Subject Keys passen nicht zusammen"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr "Serielle Kennung des Authority Keys/Aussteller passen nicht zusammen"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr "Schlüsselverwendung untertützt das Signieren von Zertifikaten nicht"
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr "Fehler bei der Anwendungsüberprüfung"
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:806
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:811
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9050,15 +9195,15 @@ msgstr ""
 "Fingerabdruck:       %s\n"
 "Signatur:                %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:817
 msgid "GOOD"
 msgstr "GUT"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:812
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:817
 msgid "BAD"
 msgstr "SCHLECHT"
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9078,7 +9223,7 @@ msgstr ""
 "Möchten Sie es dennoch akzeptieren?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:816
+#: camel/camel-tcp-stream-ssl.c:821
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9093,7 +9238,7 @@ msgstr ""
 "\n"
 "Möchten Sie akzeptieren?"
 
-#: camel/camel-tcp-stream-ssl.c:860
+#: camel/camel-tcp-stream-ssl.c:865
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9102,7 +9247,7 @@ msgstr ""
 "Zertifikatproblem: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:912
+#: camel/camel-tcp-stream-ssl.c:917
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9111,7 +9256,7 @@ msgstr ""
 "Fehlerhafte Zertifikatdomäne: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:930
+#: camel/camel-tcp-stream-ssl.c:935
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9120,7 +9265,7 @@ msgstr ""
 "Zertifikat nicht mehr gültig: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:952
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9129,7 +9274,7 @@ msgstr ""
 "Zertifikat-Rückrufliste nicht mehr gültig: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL »%s« konnte nicht verarbeitet werden"
@@ -9144,27 +9289,27 @@ msgstr "Fehler beim Speichern von »%s«: %s"
 msgid "No such message %s in %s"
 msgstr "Nachricht %s gibt es in %s nicht"
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Nachrichten können nicht in virtuelle Ordner kopiert oder verschoben werden"
 
-#: camel/camel-vee-store.c:272
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ungültige Aktion"
 
-#: camel/camel-vee-store.c:291
+#: camel/camel-vee-store.c:281
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ordner gibt es nicht"
 
-#: camel/camel-vee-store.c:304
+#: camel/camel-vee-store.c:294
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht umbenannt werden: %s: Ungültige Aktion"
 
-#: camel/camel-vee-store.c:312
+#: camel/camel-vee-store.c:302
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
@@ -9172,12 +9317,12 @@ msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
 #: camel/providers/imap/camel-imap-command.c:452
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verbindung zum Server unerwartet getrennt: %s"
@@ -9297,13 +9442,13 @@ msgstr "%s konnte nicht in den Zwischenspeicher geladen werden: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
-msgstr "Nach neuer Mail sehen"
+msgstr "Nach neuen E-Mails sehen"
 
 #: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
-msgstr "In allen Ordnern nach neuer Mail sehen"
+msgstr "In allen Ordnern nach neuen E-Mails sehen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1134
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1185
 msgid "Folders"
 msgstr "Ordner"
 
@@ -9329,11 +9474,11 @@ msgstr "IMAP"
 
 #: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
-msgstr "Zum Lesen und Speichern von Mail auf IMAP-Servern."
+msgstr "Zum Lesen und Speichern von E-Mails auf IMAP-Servern."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Passwort"
 
@@ -9353,59 +9498,58 @@ msgstr "IMAP-Server %s"
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-Dienst für %s auf %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Verbindung mit IMAP-Server %s im sicheren Modus ist fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS Erweiterung nicht unterstützt."
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 msgid "SSL negotiations failed"
 msgstr "SSL \"Verhandlungen\" fehlgeschlagen"
 
-#: camel/providers/imap/camel-imap-store.c:1072
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "IMAP-Server %s unterstützt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/imap/camel-imap-store.c:1082
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterstützung für Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1106
+#: camel/providers/imap/camel-imap-store.c:1108
 #, 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:1121
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9416,24 +9560,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1495
-#: camel/providers/imap/camel-imap-store.c:1637
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1838
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Der Ordnername »%s« ist ungültig, da er das Zeichen »%c« enthält"
 
-#: camel/providers/imap/camel-imap-store.c:1850
+#: camel/providers/imap/camel-imap-store.c:1851
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unbekannter Eltern-Ordner %s"
 
-#: camel/providers/imap/camel-imap-store.c:1886
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
@@ -9462,11 +9606,11 @@ msgstr "Die ».folders«-Ordner-Zusammenfassungsdatei verwenden (exmh)"
 
 #: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
-msgstr "Mailverzeichnisse im MH-Format"
+msgstr "E-Mail-Verzeichnisse im MH-Format"
 
 #: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
-msgstr "Zum Speichern lokaler Mail in MH-Mailverzeichnissen"
+msgstr "Zum Speichern lokaler E-Mails in MH-artigen E-Mail-Verzeichnissen."
 
 #: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
@@ -9477,8 +9621,8 @@ msgid ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
 "folders managed by Evolution."
 msgstr ""
-"Zum Abrufen (Verschieben) von lokaler Mail aus Standardspools im mbox-Format "
-"in von Evolution verwaltete Ordner."
+"Zum Abrufen (Verschieben) von lokalen E-Mails aus Standardspools im mbox-"
+"Format in von Evolution verwaltete Ordner."
 
 #: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
@@ -9487,11 +9631,11 @@ msgstr "Filter auf neue Nachrichten in INBOX anwenden"
 
 #: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
-msgstr "Mailverzeichnisse im Maildir-Format"
+msgstr "E-Mail-Verzeichnisse im Maildir-Format"
 
 #: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
-msgstr "Zum Speichern lokaler Mail in Maildir-Verzeichnissen."
+msgstr "Zum Speichern lokaler E-Mails in Maildir-Verzeichnissen."
 
 #: camel/providers/local/camel-local-provider.c:95
 msgid "Store status headers in Elm/Pine/Mutt format"
@@ -9506,14 +9650,14 @@ msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"Zum Lesen und Speichern von lokaler Mail in externen Standard-mbox-"
+"Zum Lesen und Speichern von lokaler E-Mails in externen Standard-mbox-"
 "Spooldateien.\n"
 "Kann außerdem zum Einlesen eines Baums mit Elm-, Pine- oder Mutt-Ordnern "
 "verwendet werden."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Speicherungswurzel %s ist kein absoluter Pfad"
@@ -9537,9 +9681,9 @@ msgstr "Lokale Speicher haben keinen Posteingangsordner"
 #: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
-msgstr "Lokale Maildatei %s"
+msgstr "Lokale E-Mail-Datei %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:904
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
@@ -9586,7 +9730,7 @@ msgstr "Ungültiger Inhalt der Nachricht"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9598,14 +9742,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Ordner `%s' existiert nicht."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:169
+#: camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9631,8 +9775,8 @@ msgid "not a maildir directory"
 msgstr "kein maildir-Verzeichnis"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:283
-#: camel/providers/local/camel-spool-store.c:313
+#: camel/providers/local/camel-spool-store.c:287
+#: camel/providers/local/camel-spool-store.c:317
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ordner `%s' konnte nicht abgetastet werden: %s"
@@ -9652,10 +9796,10 @@ msgid "Checking for new messages"
 msgstr "Suchen nach neuen Nachrichten"
 
 #: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:679
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:580
+#: camel/providers/local/camel-mbox-summary.c:671
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
 
@@ -9672,7 +9816,7 @@ msgstr "Postfach konnte nicht geöffnet werden: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
-msgstr "Anhängen von Mail abgebrochen"
+msgstr "Anhängen von E-Mail abgebrochen"
 
 #: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
@@ -9737,78 +9881,78 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ordner `%s' ist nicht leer. Nicht gelöscht."
 
-#: camel/providers/local/camel-mbox-summary.c:351
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ordner konnte nicht geöffnet werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:399
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
-"Schwerwiegender Fehler beim Verarbeiten der Mail nahe Position %ld in Ordner "
-"%s"
+"Schwerwiegender Fehler beim Verarbeiten der E-Mail nahe Position %ld in "
+"Ordner %s"
 
-#: camel/providers/local/camel-mbox-summary.c:455
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ordner konnte nicht geprüft werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:593
-#: camel/providers/local/camel-mbox-summary.c:684
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:585
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Datei konnte nicht geöffnet werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:605
-#: camel/providers/local/camel-spool-summary.c:170
+#: camel/providers/local/camel-mbox-summary.c:597
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Temporäres Postfach konnte nicht angelegt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:618
-#: camel/providers/local/camel-mbox-summary.c:780
+#: camel/providers/local/camel-mbox-summary.c:610
+#: camel/providers/local/camel-mbox-summary.c:772
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:627
+#: camel/providers/local/camel-mbox-summary.c:619
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Temporärer Ordner konnte nicht geschlossen werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:638
+#: camel/providers/local/camel-mbox-summary.c:630
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
+#: camel/providers/local/camel-mbox-summary.c:714
 #: camel/providers/local/camel-mbox-summary.c:722
-#: camel/providers/local/camel-mbox-summary.c:730
+#: camel/providers/local/camel-mbox-summary.c:913
 #: camel/providers/local/camel-mbox-summary.c:921
-#: camel/providers/local/camel-mbox-summary.c:929
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Zusammenfassungs- und Order-Prüffehler, sogar nach einer Synchronisation"
 
-#: camel/providers/local/camel-mbox-summary.c:855
-#: camel/providers/local/camel-spool-summary.c:342
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:890
+#: camel/providers/local/camel-mbox-summary.c:882
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Ordner konnte nicht gespeichert werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:984
-#: camel/providers/local/camel-mbox-summary.c:1010
+#: camel/providers/local/camel-mbox-summary.c:976
+#: camel/providers/local/camel-mbox-summary.c:1002
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fehler beim Schreiben auf temporäres Postfach: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:993
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fehler beim Schreiben auf temporäres Postfach %s: %s"
@@ -9832,64 +9976,64 @@ msgstr "`%s' ist kein Verzeichnis."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH-Verzeichnispfad konnte nicht geöffnet werden: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool »%s« konnte nicht geöffnet werden: %s"
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 "Spool »%s« ist weder eine reguläre Datei noch ein reguläres Verzeichnis"
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:154
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Ordner `%s/%s' existiert nicht."
 
-#: camel/providers/local/camel-spool-store.c:177
+#: camel/providers/local/camel-spool-store.c:181
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "»%s« ist keine Postfachdatei."
 
-#: camel/providers/local/camel-spool-store.c:194
+#: camel/providers/local/camel-spool-store.c:198
 msgid "Store does not support an INBOX"
 msgstr "Speicher unterstütz keinen Eingang"
 
-#: camel/providers/local/camel-spool-store.c:206
+#: camel/providers/local/camel-spool-store.c:210
 #, c-format
 msgid "Spool mail file %s"
-msgstr "Spool-Maildatei %s"
+msgstr "E-Mail-Spooldatei %s"
 
-#: camel/providers/local/camel-spool-store.c:206
+#: camel/providers/local/camel-spool-store.c:210
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool-Ordnerbaum %s"
 
-#: camel/providers/local/camel-spool-store.c:214
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-Ordner können nicht umbenannt werden"
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:226
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-Ordner können nicht gelöscht werden"
 
-#: camel/providers/local/camel-spool-summary.c:183
-#: camel/providers/local/camel-spool-summary.c:193
-#: camel/providers/local/camel-spool-summary.c:203
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Temporärer Ordner %s konnte nicht synchronisiert werden: %s"
 
-#: camel/providers/local/camel-spool-summary.c:219
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Spool-Ordner '%s' konnte nicht synchronisiert werden: %s"
 
-#: camel/providers/local/camel-spool-summary.c:250
-#: camel/providers/local/camel-spool-summary.c:269
-#: camel/providers/local/camel-spool-summary.c:282
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -10015,20 +10159,20 @@ msgstr "Nachrichtenspeicherung"
 
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
-msgstr "Mail auf Server belassen"
+msgstr "E-Mail auf Server belassen"
 
 #: camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Nach %s Tag(en) löschen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
 #: camel/providers/pop3/camel-pop3-provider.c:54
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "Zum Verbinden mit und Herunterladen von Mail von POP-Servern."
+msgstr "Zum Verbinden mit und Abrufen von E-Mails von POP-Servern."
 
 #: camel/providers/pop3/camel-pop3-provider.c:71
 msgid ""
@@ -10048,26 +10192,26 @@ 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:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr ""
 "Verbindung mit POP-Server %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Konnte nicht mit Server %s im sicheren Modus verbunden werden: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Verbindung mit POP-Server %s konnte nicht hergestellt werden"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10076,28 +10220,28 @@ msgstr ""
 "Verbindung mit POP-Server %s konnte nicht hergestellt werden: Der "
 "erforderliche Legitimationsmechanismus wird nicht unterstützt."
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL »%s«-Anmeldung an POP-Server %s fehlgeschlagen: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Anmeldung an POP-Server %s fehlgeschlagen: SASL-Protokollfehler"
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Legitimation beim POP-Server %s fehlgeschlagen: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sBitte geben Sie das POP3-Passwort für %s@%s ein"
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:523
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10106,13 +10250,13 @@ msgstr ""
 "Verbindung mit POP-Server %s konnte nicht hergestellt werden.\n"
 "Fehler beim Übermitteln des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:615
+#: camel/providers/pop3/camel-pop3-store.c:623
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10121,60 +10265,61 @@ msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
-"Zum Ausliefern von Mail durch Übergabe an das Programm »sendmail« auf dem "
+"Zum Zustellen von E-Mails durch Übergabe an das Programm »sendmail« auf dem "
 "lokalen System."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Empfängerliste konnte nicht verarbeitet werden"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
-"Weiterleitung zu sendmail konnte nicht angelegt werden: %s: Mail nicht "
+"Weiterleitung zu sendmail konnte nicht angelegt werden: %s: E-Mail nicht "
 "verschickt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "sendmail konnte nicht abgespalten werden: %s: Mail nicht verschickt"
+msgstr "sendmail konnte nicht abgespalten werden: %s: E-Mail nicht verschickt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nachricht konnte nicht verschickt werden: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail brach mit Signal %s ab: Mail nicht verschickt."
+msgstr "sendmail brach mit Signal %s ab: E-Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr "%s konnte nicht ausgeführt werden: Mail nicht verschickt."
+msgstr "%s konnte nicht ausgeführt werden: E-Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail gab Status %d zurück: Mail nicht verschickt."
+msgstr "sendmail gab Status %d zurück: E-Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
-msgstr "Mailauslieferung über das Programm sendmail"
+msgstr "E-Mail-Zustellung über das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
 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"
+msgstr ""
+"Zum Zustellen von E-Mails über einen E-Mail-Knotenpunkt im Netz per SMTP.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
@@ -10214,7 +10359,7 @@ msgstr "Dienst nicht verfügbar, Übertragungskanal wird geschlossen"
 
 #: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
-msgstr "Angeforderte Mailaktion in Ordnung, abgeschlossen"
+msgstr "Angeforderte E-Mail-Aktion in Ordnung, abgeschlossen"
 
 #: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
@@ -10222,7 +10367,7 @@ msgstr "Benutzer nicht lokal; Weiterleitung erfolgt zu <weiterleitungspfad>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Angeforderte Mailaktion nicht ausgeführt: Postfach nicht verfügbar"
+msgstr "Angeforderte E-Mail-Aktion nicht ausgeführt: Postfach nicht verfügbar"
 
 #: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
@@ -10250,7 +10395,7 @@ msgstr "Angeforderte Aktion nicht ausgeführt: Postfachname nicht erlaubt"
 
 #: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Maileingabe beginnen; Ende mit <CRLF>.<CRLF>"
+msgstr "E-Mail-Eingabe beginnen; Ende mit <CRLF>.<CRLF>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
@@ -10275,44 +10420,44 @@ msgstr "Zeitweiliger Legitimationsfehlschlag"
 
 #: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
-msgstr "Legitimation benötigt"
+msgstr "Legitimation erforderlich"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:298
 msgid "Welcome response error"
 msgstr "Fehler bei Welcome-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Verbindung mit SMTP-Server %s im sicheren Modus ist fehlgeschlagen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid "server does not appear to support SSL"
 msgstr "Server scheint kein SSL zu unterstützen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Zeitüberschreitung bei STARTTLS-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:372
 msgid "STARTTLS response error"
 msgstr "Fehler bei STARTTLS-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "SMTP-Server %s unterstützt den erforderlichen Legitimationsmechanismus %s "
 "nicht."
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, 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:531
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10323,85 +10468,85 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:664
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-Server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
-msgstr "SMTP-Mailauslieferung über %s"
+msgstr "SMTP-E-Mail-Auslieferung über %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht gültig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Nachricht verschicken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:704
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empfänger angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:713
+#: camel/providers/smtp/camel-smtp-transport.c:714
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Nachricht konnte nicht verschickt werden: ein oder mehrere ungültige "
 "Empfänger"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:882
 msgid "SMTP Greeting"
 msgstr "SMTP-Begrüßung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Zeitüberschreitung bei HELO-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 msgid "HELO response error"
 msgstr "Fehler bei HELO-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zeitüberschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr "Ungültige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr "Zeitüberschreitung bei MAIL-FROM-Anfrage: %s: Mail nicht verschickt"
+msgstr "Zeitüberschreitung bei MAIL-FROM-Anfrage: %s: E-Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr "Fehler bei MAIL-FROM-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "Zeitüberschreitung bei RCPT-TO-Anfrage: %s: Mail nicht verschickt"
+msgstr "Zeitüberschreitung bei RCPT-TO-Anfrage: %s: E-Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> fehlgeschlagen"
@@ -10409,7 +10554,7 @@ msgstr "RCPT TO <%s> fehlgeschlagen"
 #: camel/providers/smtp/camel-smtp-transport.c:1253
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
-msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
+msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: E-Mail nicht verschickt."
 
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
@@ -10418,33 +10563,33 @@ msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
 msgid "DATA response error"
 msgstr "Fehler bei DATA-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1314
+#: camel/providers/smtp/camel-smtp-transport.c:1337
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
-"Zeitüberschreitung beim Übermitteln von DATA: Nachrichtenabschluss: %s Mail "
-"nicht verschickt"
+"Zeitüberschreitung beim Übermitteln von DATA: Nachrichtenabschluss: %s E-"
+"Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1357
 msgid "DATA termination response error"
 msgstr "Fehler bei DATA-Terminierungsantwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1380
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeitüberschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1400
 msgid "RSET response error"
 msgstr "Fehler bei RSET-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1423
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Zeitüberschreitung bei QUIT-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1443
 msgid "QUIT response error"
 msgstr "Fehler bei QUIT-Antwort"
 
@@ -10464,29 +10609,29 @@ msgid "%.0fG"
 msgstr "%.0f GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:364 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:505
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Das markierte Element aus der Anlagenliste entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:535
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Anlage hinzufügen..."
 
-#: composer/e-msg-composer-attachment-bar.c:536
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Der Nachricht eine Datei beilegen"
 
-#: composer/e-msg-composer-attachment.c:165
-#: composer/e-msg-composer-attachment.c:181
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Datei konnte nicht beigelegt werden: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:173
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Datei %s konnte nicht beigelegt werden: keine reguläre Datei"
@@ -10499,20 +10644,98 @@ msgstr "Eigenschaften der Anlage"
 msgid "File name:"
 msgstr "Dateiname:"
 
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME-Typ:"
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "MIME-Typ:"
+
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:66
+msgid "Suggest automatic display of attachment"
+msgstr "Automatische Anzeige der Anlage vorschlagen"
+
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr "Hey, Sie! Sie brauchen einen Zugang, um E-Mails zu verschicken!"
+
+#: composer/e-msg-composer-hdrs.c:479
+msgid "Click here for the address book"
+msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:511
+msgid "Reply-To:"
+msgstr "Antwort an:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:522
+msgid "From:"
+msgstr "Von:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:528
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: composer/e-msg-composer-hdrs.c:542
+msgid "To:"
+msgstr "An:"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Enter the recipients of the message"
+msgstr "Geben Sie die Empfänger der Nachricht ein"
+
+#: composer/e-msg-composer-hdrs.c:546
+msgid "Cc:"
+msgstr "Kopie an:"
+
+#: composer/e-msg-composer-hdrs.c:547
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+"Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
+
+#: composer/e-msg-composer-hdrs.c:550
+msgid "Bcc:"
+msgstr "Blindkopie an:"
+
+#: composer/e-msg-composer-hdrs.c:551
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Geben Sie die Adressen ein, die eine Kopie erhalten, die nicht in der "
+"Empfängerliste auftaucht."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:558
+msgid "Post To:"
+msgstr "Ablegen in:"
+
+#: composer/e-msg-composer-hdrs.c:560
+msgid "Posting destination"
+msgstr "Zielordner"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:67
-msgid "Suggest automatic display of attachment"
-msgstr "Automatische Anzeige der Anlage vorschlagen"
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Datei(en) beilegen"
 
-#: composer/e-msg-composer.c:523
+#: composer/e-msg-composer.c:530
 msgid "Could not create a PGP signature context"
 msgstr "Es konnte kein PGP-Signaturkontext angelegt werden"
 
-#: composer/e-msg-composer.c:802
+#: composer/e-msg-composer.c:809
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10521,30 +10744,30 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1183
+#: composer/e-msg-composer.c:1172
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, überschreiben?"
 
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1190
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:1224
+#: composer/e-msg-composer.c:1213
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1248
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1256
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1263
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10553,7 +10776,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1270
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10562,7 +10785,7 @@ msgstr ""
 "Datei konnte nicht verkürzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10571,7 +10794,7 @@ msgstr ""
 "Dateideskriptor %s konnte nicht kopiert werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1299
+#: composer/e-msg-composer.c:1288
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10580,7 +10803,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1382
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10589,7 +10812,7 @@ msgstr ""
 "entdeckt.\n"
 "Möchten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1556
+#: composer/e-msg-composer.c:1544
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10601,31 +10824,31 @@ msgstr ""
 "Wollen Sie die Änderungen speichern?"
 
 # CHECK
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1549
 msgid "_Discard Changes"
 msgstr "Änderungen verwerfen"
 
-#: composer/e-msg-composer.c:1565
+#: composer/e-msg-composer.c:1553
 msgid "Warning: Modified Message"
 msgstr "Warnung: Geänderte Nachricht"
 
-#: composer/e-msg-composer.c:1597
+#: composer/e-msg-composer.c:1585
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:1955
+#: composer/e-msg-composer.c:1943
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:1995 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1255
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
-#: composer/e-msg-composer.c:2179 composer/e-msg-composer.c:2794
+#: composer/e-msg-composer.c:2162 composer/e-msg-composer.c:2761
 msgid "Compose a message"
 msgstr "Eine Nachricht verfassen"
 
-#: composer/e-msg-composer.c:2825
+#: composer/e-msg-composer.c:2792
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10633,7 +10856,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "Adresswähler-Control konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:2851
+#: composer/e-msg-composer.c:2818
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10645,7 +10868,7 @@ msgstr ""
 "Bitte stellen Sie sicher, dass die korrekte gtkhtml- und\n"
 "libgtkhtml-Version installiert ist.\n"
 
-#: composer/e-msg-composer.c:2911
+#: composer/e-msg-composer.c:2878
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10653,7 +10876,7 @@ msgstr ""
 "Das Editorfenster konnte nicht erzeugt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:3899
+#: composer/e-msg-composer.c:3894
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10661,93 +10884,6 @@ msgstr ""
 "<b>(Der Editor enthält einen nicht-Text Nachrichtenrumpf, der nicht "
 "bearbeitet werden kann.)<b>"
 
-#: composer/e-msg-composer-hdrs.c:375
-msgid "Click here for the address book"
-msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:407
-msgid "Reply-To:"
-msgstr "Antwort an:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:418
-msgid "From:"
-msgstr "Von:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:424
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: composer/e-msg-composer-hdrs.c:438
-msgid "To:"
-msgstr "An:"
-
-#: composer/e-msg-composer-hdrs.c:439
-msgid "Enter the recipients of the message"
-msgstr "Geben Sie die Empfänger der Nachricht ein"
-
-#: composer/e-msg-composer-hdrs.c:442
-msgid "Cc:"
-msgstr "Kopie an:"
-
-#: composer/e-msg-composer-hdrs.c:443
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-"Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
-
-#: composer/e-msg-composer-hdrs.c:446
-msgid "Bcc:"
-msgstr "Blindkopie an:"
-
-#: composer/e-msg-composer-hdrs.c:447
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Geben Sie die Adressen ein, die eine Kopie erhalten, die nicht in der "
-"Empfängerliste auftaucht."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:454
-msgid "Post To:"
-msgstr "Ablegen in:"
-
-#: composer/e-msg-composer-hdrs.c:456
-msgid "Posting destination"
-msgstr "Zielordner"
-
-#: composer/e-msg-composer-select-file.c:103
-#: composer/e-msg-composer-select-file.c:120
-msgid "Attach file(s)"
-msgstr "Datei(en) beilegen"
-
-#: composer/evolution-composer.c:417
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"Das Editorfenster konnte nicht erzeugt werden, da Sie\n"
-"in der Mailkomponente noch keine Identität konfiguriert\n"
-"haben."
-
-#: composer/evolution-composer.c:432
-msgid "Cannot initialize the Evolution composer."
-msgstr "Der Maileditor von Evolution konnte nicht initialisiert werden."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Die Groupware-Suite Evolution"
@@ -10796,6 +10932,108 @@ msgstr "Betreff enthält"
 msgid "Subject does not contain"
 msgstr "Betreff enthält nicht"
 
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+"<b>Im Moment ist Ihr Status »Nicht im Büro«.</b>\n"
+"\n"
+"Wollen Sie Ihren Status in »Im Büro« ändern?"
+
+#: designs/OOA/ooa.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>Nicht-im-Büro-Nachricht:</b>"
+
+#: designs/OOA/ooa.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>Status:</b> "
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+"<small>Die unten angegebene Nachricht wird automatisch an jede Person "
+"verschickt,\n"
+"die Ihnen eine E-Mail schickt, während Sie nicht im Büro sind.</small>"
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr "Ich bin im Moment im Büro"
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr "Ich bin im Moment nicht im Büro"
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "Nein, den Status nicht ändern"
+
+#: designs/OOA/ooa.glade.h:12
+msgid "Out of Office Assistant"
+msgstr "Nicht-im-Büro-Assistent"
+
+#: designs/OOA/ooa.glade.h:13
+msgid "Yes, Change Status"
+msgstr "Ja, den Status ändern"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: designs/read_receipts/read.glade.h:2
+msgid "<b>Receiving Email</b>"
+msgstr "<b>Abrufen von E-Mail</b>"
+
+#: designs/read_receipts/read.glade.h:3
+msgid "<b>Sending Email:</b>"
+msgstr "<b>Verschicken von E-Mail:</b>"
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr "In jedem Fall eine Lesebestätigung verschicken"
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr "Nachfragen, ob eine Lesebestätigung verschickt werden soll"
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr "Keinesfalls eine Lesebestätigung verschicken"
+
+#: designs/read_receipts/read.glade.h:9
+msgid "Read Receipts"
+msgstr "Lesebestätigungen"
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr "Für alle verschickten Nachrichten eine Lesebestätigung anfordern"
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+"Sofern die Nachricht an eine Mailingliste und nicht an mich persönlich "
+"geschickt wurde"
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+"Wie soll Evolution verfahren, wenn Sie eine E-Mail erhalten, für die eine "
+"Lesebestätigung angefordert wurde?"
+
 #: e-util/e-component-listener.c:128
 msgid ""
 "ping_timeout_callback: could not determine if the CORBA object is nil or not"
@@ -10808,22 +11046,22 @@ msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
-"Eine Datei mit diesem Namen existiert bereits.\n"
+"Es existiert bereits eine Datei mit diesem Namen.\n"
 "Überschreiben?"
 
-#: e-util/e-passwords.c:344
+#: e-util/e-passwords.c:345
 msgid "Remember this password"
 msgstr "Dieses Passwort speichern"
 
-#: e-util/e-passwords.c:346
+#: e-util/e-passwords.c:347
 msgid "Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort erinnern"
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr "Private Einträge synchronisieren:"
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 msgid "Sync Categories:"
 msgstr "Kategorien synchronisieren"
 
@@ -10898,13 +11136,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1630
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1627
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10914,7 +11152,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:65 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -10977,7 +11215,7 @@ msgstr "Vor %d %s"
 msgid "Select a time to compare against"
 msgstr "Wählen Sie eine Vergleichszeit"
 
-#: filter/filter-editor.c:115 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filterregeln"
 
@@ -10999,15 +11237,91 @@ msgstr "Eine Datei wählen"
 msgid "Then"
 msgstr "Dann"
 
-#: filter/filter-folder.c:153
+#: filter/filter-folder.c:155
 msgid "You must specify a folder."
 msgstr "Sie müssen einen Ordner angeben"
 
-#: filter/filter-folder.c:241 filter/vfolder-rule.c:406
-#: mail/mail-account-gui.c:1475 mail/mail-account-gui.c:1489
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1504 mail/mail-account-gui.c:1518
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Fehler im regulären Ausdruck '%s':\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64
+msgid "Important"
+msgstr "Wichtig"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
+msgid "Work"
+msgstr "Arbeit"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+msgid "Personal"
+msgstr "Persönlich"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
+msgid "To Do"
+msgstr "Zu erledigen"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+msgid "Later"
+msgstr "Später"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Der Filter muss benannt werden."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Regelname: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Namenlos"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Wenn"
+
+#: filter/filter-rule.c:790
+msgid "Execute actions"
+msgstr "Aktionen ausführen"
+
+#: filter/filter-rule.c:794
+msgid "if all criteria are met"
+msgstr "wenn alle Kriterien zutreffen"
+
+#: filter/filter-rule.c:799
+msgid "if any criteria are met"
+msgstr "falls irgendein Kriterium zutreffen"
+
+#: filter/filter-rule.c:894
+msgid "incoming"
+msgstr "Eingang"
+
+#: filter/filter-rule.c:894
+msgid "outgoing"
+msgstr "Ausgang"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Vergleichen mit"
@@ -11054,7 +11368,7 @@ msgstr ""
 "Das Datum der Nachricht wird mit dem Datum,\n"
 "an dem der Filter angewandt wird, verglichen."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:115
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Virtuelle Ordner"
 
@@ -11087,88 +11401,12 @@ msgid "with all active remote folders"
 msgstr "mit allen aktiven Ordnern aus dem Netz"
 
 #: filter/filter.glade.h:31
-msgid "with all local and active remote folders"
-msgstr "mit allen lokalen Ordnern und aktiven Ordnern aus dem Netz"
-
-#: filter/filter.glade.h:32
-msgid "with all local folders"
-msgstr "mit allen lokalen Ordnern"
-
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Fehler im regulären Ausdruck '%s':\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:68
-#: mail/mail-config.glade.h:63
-msgid "Important"
-msgstr "Wichtig"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:69
-#: mail/mail-config.glade.h:132
-msgid "Work"
-msgstr "Arbeit"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:86
-msgid "Personal"
-msgstr "Persönlich"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:71
-#: mail/mail-config.glade.h:123
-msgid "To Do"
-msgstr "Zu erledigen"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:67
-msgid "Later"
-msgstr "Später"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:62
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Der Filter muss benannt werden."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Regelname: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Namenlos"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Wenn"
-
-#: filter/filter-rule.c:790
-msgid "Execute actions"
-msgstr "Aktionen ausführen"
-
-#: filter/filter-rule.c:794
-msgid "if all criteria are met"
-msgstr "wenn alle Kriterien zutreffen"
-
-#: filter/filter-rule.c:799
-msgid "if any criteria are met"
-msgstr "falls irgendein Kriterium zutreffen"
-
-#: filter/filter-rule.c:894
-msgid "incoming"
-msgstr "Eingang"
+msgid "with all local and active remote folders"
+msgstr "mit allen lokalen Ordnern und aktiven Ordnern aus dem Netz"
 
-#: filter/filter-rule.c:894
-msgid "outgoing"
-msgstr "Ausgang"
+#: filter/filter.glade.h:32
+msgid "with all local folders"
+msgstr "mit allen lokalen Ordnern"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
@@ -11228,7 +11466,7 @@ msgstr "Ausdruck"
 msgid "Follow Up"
 msgstr "Folgenachricht"
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1840
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1778
 msgid "Label"
 msgstr "Etikett"
 
@@ -11277,7 +11515,7 @@ msgstr "Beantwortet an"
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1799
+#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1823
 msgid "Sender"
 msgstr "Absender"
 
@@ -11305,7 +11543,7 @@ msgstr "Bestimmte Kopfzeile"
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:906
+#: filter/libfilter-i18n.h:38 mail/mail-format.c:903
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
 #: mail/message-tags.glade.h:4
 msgid "Subject"
@@ -11428,59 +11666,64 @@ msgstr "Regelname "
 msgid "Score Rules"
 msgstr "Bewertungsregeln"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Der VOrdner muss benannt werden."
 
-#: filter/vfolder-rule.c:220
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "Sie müssen mindestens einen Ordner als Quelle angeben."
 
-#: filter/vfolder-rule.c:499
+#: filter/vfolder-rule.c:492
 msgid "VFolder source"
 msgstr "vOrdner-Quelle"
 
-#: importers/elm-importer.c:95
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:103
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importiert Ihre alte Elm-Mail."
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:104
+#: mail/importers/netscape-importer.c:1237 mail/importers/pine-importer.c:114
 msgid "Importing..."
 msgstr "Importieren..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1239 mail/importers/pine-importer.c:116
 msgid "Please wait"
 msgstr "Bitte warten"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:183
+#: mail/importers/netscape-importer.c:1794 mail/importers/pine-importer.c:330
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importieren von %s als %s"
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:389
+#: mail/importers/netscape-importer.c:1906 mail/importers/pine-importer.c:439
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wird abgetastet"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:113
-#: mail/folder-browser-ui.c:357
+#: importers/pine-importer.c:637 mail/component-factory.c:114
+#: mail/folder-browser-ui.c:357 mail/importers/elm-importer.c:523
+#: mail/importers/netscape-importer.c:2104 mail/importers/pine-importer.c:586
 msgid "Mail"
-msgstr "Mail"
+msgstr "E-Mail"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:544
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
-"Evolution hat Elm-Maildateien gefunden.\n"
+"Evolution hat Elm-E-Mail-Dateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:565
 msgid "Elm"
 msgstr "Elm"
 
@@ -11492,12 +11735,12 @@ msgstr ""
 "Evolution hat GnomeCard-Dateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:74
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritätsfilter \"%s\""
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11526,7 +11769,7 @@ msgstr ""
 "Überprüfen Sie die importierten Filter, um sicherzustellen,\n"
 "dass alles wie erwartet funktioniert."
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11539,7 +11782,7 @@ msgstr ""
 "unterstützt ist.\n"
 "Diese Filter werden verloren gehen."
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11553,325 +11796,400 @@ msgstr ""
 "unterstützt wird.\n"
 "Diese Filter werden verloren gehen."
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1236
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1092
-#: shell/e-local-storage.c:184
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1861
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Müll"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:2014
 msgid "Scanning mail filters"
-msgstr "Mailfilter werden durchsucht"
+msgstr "E-Mail-Filter werden durchsucht"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2025 mail/importers/pine-importer.c:534
 msgid "Scanning directory"
 msgstr "Verzeichnis wird abgetastet"
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2034
+#: shell/e-shell-startup-wizard.c:519
 msgid "Starting import"
 msgstr "Import beginnt"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2109
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2114
 msgid "Mail Filters"
-msgstr "Mail-Filter"
+msgstr "E-Mail-Filter"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2138
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
-"Evolution hat Netscape-Maildateien gefunden.\n"
+"Evolution hat Netscape-E-Mail-Dateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:113
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importiert Ihre alten Pine-Daten"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:613
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
-"Evolution hat Pine-Maildateien gefunden.\n"
+"Evolution hat Pine-E-Mail-Dateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:632
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/component-factory.c:113
-msgid "Folder containing mail"
-msgstr "Mail enthaltender Ordner"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Editor-Einstellungen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr ""
+"Konfigurations-Bedienelement für die von Evolution verwendeten Schriftarten."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Konfigurations-Bedienelement für die Evolution E-Mail-Zugänge."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Konfigurations-Bedienelement für den Evolution-Mailer."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Konfigurations-Bedienelement für den Evolution Nachrichten-Editor."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
+"der Anzeige von Nachrichten festlegen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
+"Nachrichteneditor konfigurieren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Configure the fonts used by Evolution here"
+msgstr "Hier können Sie die von Evolution verwendeten Schriften konfigurieren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Configure your email accounts here"
+msgstr "Hier können Sie Ihre E-Mail-Zugänge konfigurieren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution component for handling mail."
+msgstr "Evolution-Komponente für den Umgang mit E-Mail."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution mail composer."
+msgstr "Evolution-E-Mail-Editor."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution mail executive summary component."
+msgstr "Evolutions E-Mail-Chefsesselansicht-Komponente."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Evolution mail folder display component."
+msgstr "Evolution-Komponente zur Anzeige von E-Mail-Ordnern."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "Factory for the controls exported by the Evolution Mailer"
+msgstr "Fabrik für die vom Evolution-Mailer exportierten Steuerungen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "Font Preferences"
+msgstr "Schrift-Einstellungen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Mail Accounts"
+msgstr "E-Mail-Zugänge"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "E-Mail-Einstellungen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:18
+msgid "Mail configuration interface"
+msgstr "E-Mail-Konfigurationsoberfläche"
 
 #: mail/component-factory.c:114
+msgid "Folder containing mail"
+msgstr "Ordner, der E-Mails enthält"
+
+#: mail/component-factory.c:115
 msgid "Public Mail"
-msgstr "Öffentliche Mail"
+msgstr "Öffentliche E-Mail"
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:115
 msgid "Public folder containing mail"
-msgstr "Öffentlicher Ordner, der Mail enthält"
+msgstr "Öffentlicher Ordner, der E-Mails enthält"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:116
 msgid "Virtual Trash"
 msgstr "Virtueller Müll"
 
-#: mail/component-factory.c:115
+#: mail/component-factory.c:116
 msgid "Virtual Trash folder"
 msgstr "Virtueller Müllordner"
 
-#: mail/component-factory.c:143
+#: mail/component-factory.c:144
 msgid "This folder cannot contain messages."
 msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:438
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: mail/component-factory.c:437
+#: mail/component-factory.c:438
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:822
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
-"Einige Ihrer Mail-Einstellungen scheinen ungültig, bitte stellen Sie sicher, "
-"dass alles in Ordnung ist."
+"Einige Ihrer E-Mail-Einstellungen scheinen ungültig zu sein, bitte stellen "
+"Sie sicher, dass alles in Ordnung ist."
 
-#: mail/component-factory.c:988
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
-msgstr "Sie haben keine Mailtransport-Methode eingestellt"
+msgstr "Sie haben keine Methode für den Transport von E-Mails eingestellt"
 
-#: mail/component-factory.c:1012
+#: mail/component-factory.c:1021
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Es sind noch nicht verschickte Nachrichten vorhanden. Wollen Sie Evolution "
 "dennoch beenden?"
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1061
 msgid "New Mail Message"
-msgstr "Neue Mail-Nachricht"
+msgstr "Neue E-Mail-Nachricht"
 
-#: mail/component-factory.c:1052
+#: mail/component-factory.c:1061
 msgid "_Mail Message"
 msgstr "Nachricht _verschicken"
 
-#: mail/component-factory.c:1053
+#: mail/component-factory.c:1062
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1070
 msgid "New Message Post"
 msgstr "Neue Ordner-Nachricht"
 
 # CHECK
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1070
 msgid "_Post Message"
 msgstr "_Ordner-Nachricht"
 
-#: mail/component-factory.c:1062
+#: mail/component-factory.c:1071
 msgid "Post a new mail message"
 msgstr "Eine neue E-Mail-Nachricht für einen Ordner verfassen"
 
-#: mail/component-factory.c:1090
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Die Mail-Komponente von Evolution konnte nicht initialisiert werden."
-
-#: mail/component-factory.c:1099
-msgid "Cannot initialize Evolution's mail config component."
-msgstr ""
-"Evolutions Mail-Konfigurations-Komponente konnte nicht initialisiert werden"
-
-#: mail/component-factory.c:1105
-msgid "Cannot initialize Evolution's folder info component."
-msgstr ""
-"Evolutions Ordnerinformations-Komponente konnte nicht initialisiert werden"
-
-#: mail/component-factory.c:1346 mail/component-factory.c:1376
+#: mail/component-factory.c:1328 mail/component-factory.c:1358
 msgid "Connecting..."
 msgstr "Verbindung wird hergestellt..."
 
-#: mail/component-factory.c:1387
+#: mail/component-factory.c:1369
 msgid "Cannot register storage with shell"
 msgstr "Speicher konnte nicht bei der Shell registriert werden"
 
-#: mail/folder-browser.c:346 mail/mail-display.c:388 mail/mail-display.c:907
+#: mail/folder-browser-ui.c:483
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Eigenschaften von \"%s\""
+
+#: mail/folder-browser-ui.c:485
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:920
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/folder-browser.c:801
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d neu"
 
-#: mail/folder-browser.c:804 mail/folder-browser.c:812
-#: mail/folder-browser.c:815
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:806
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr "%d verborgen"
 
-#: mail/folder-browser.c:808
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr "%d sichtbar"
 
-#: mail/folder-browser.c:813
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr "%d markiert"
 
-#: mail/folder-browser.c:818
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d nicht verschickt"
 
-#: mail/folder-browser.c:820
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d verschickt"
 
-#: mail/folder-browser.c:822
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d insgesamt"
 
-#: mail/folder-browser.c:1187
+#: mail/folder-browser.c:1167
 msgid "Create _Virtual Folder From Search..."
-msgstr "_Virtuellen Ordner aus Suche erstellen..."
+msgstr "_Virtuellen Ordner aus Suche anlegen..."
 
-#: mail/folder-browser.c:1776
+#: mail/folder-browser.c:1714
 msgid "VFolder on _Subject"
 msgstr "VOrdner über _Betreff"
 
-#: mail/folder-browser.c:1777
+#: mail/folder-browser.c:1715
 msgid "VFolder on Se_nder"
 msgstr "VOrdner über Abse_nder"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1716
 msgid "VFolder on _Recipients"
 msgstr "VOrdner über _Empfänger"
 
-#: mail/folder-browser.c:1779
+#: mail/folder-browser.c:1717
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner über Mailing_liste"
 
-#: mail/folder-browser.c:1783
+#: mail/folder-browser.c:1721
 msgid "Filter on Sub_ject"
 msgstr "Filter über _Betreff"
 
-#: mail/folder-browser.c:1784
+#: mail/folder-browser.c:1722
 msgid "Filter on Sen_der"
 msgstr "Filter über _Absender"
 
-#: mail/folder-browser.c:1785
+#: mail/folder-browser.c:1723
 msgid "Filter on Re_cipients"
 msgstr "Filter über _Empfänger"
 
-#: mail/folder-browser.c:1786 mail/folder-browser.c:2109
+#: mail/folder-browser.c:1724 mail/folder-browser.c:2048
 msgid "Filter on _Mailing List"
 msgstr "Filter über _Mailingliste"
 
-#: mail/folder-browser.c:1804
+#: mail/folder-browser.c:1742
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/folder-browser.c:1806
+#: mail/folder-browser.c:1744
 msgid "_Print"
 msgstr "_Drucken"
 
-#: mail/folder-browser.c:1810 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1748 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1811 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1812 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1750 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/folder-browser.c:1813
+#: mail/folder-browser.c:1751
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: mail/folder-browser.c:1817
+#: mail/folder-browser.c:1755
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/folder-browser.c:1818
+#: mail/folder-browser.c:1756
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: mail/folder-browser.c:1819
+#: mail/folder-browser.c:1757
 msgid "Cl_ear Flag"
 msgstr "Markierung _löschen"
 
 #. separator here?
-#: mail/folder-browser.c:1823 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1761 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Als gelesen mar_kieren"
 
-#: mail/folder-browser.c:1824
+#: mail/folder-browser.c:1762
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: mail/folder-browser.c:1825
+#: mail/folder-browser.c:1763
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/folder-browser.c:1826
+#: mail/folder-browser.c:1764
 msgid "_Mark as Unimportant"
 msgstr "Als unwichtig _markieren"
 
-#: mail/folder-browser.c:1831
+#: mail/folder-browser.c:1769
 msgid "U_ndelete"
 msgstr "Lösche_n rückgängig"
 
-#: mail/folder-browser.c:1835
+#: mail/folder-browser.c:1773
 msgid "Mo_ve to Folder..."
 msgstr "In Ordner _verschieben..."
 
-#: mail/folder-browser.c:1836 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1774 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1844
+#: mail/folder-browser.c:1782
 msgid "Add Sender to Address_book"
 msgstr "Absender zum Adress_buch hinzufügen"
 
-#: mail/folder-browser.c:1848
+#: mail/folder-browser.c:1786
 msgid "Appl_y Filters"
 msgstr "Filter _anwenden"
 
-#: mail/folder-browser.c:1852
+#: mail/folder-browser.c:1790
 msgid "Crea_te Rule From Message"
-msgstr "_Regel aus Nachricht erstellen"
+msgstr "_Regel aus Nachricht anlegen"
 
-#: mail/folder-browser.c:2110
+#: mail/folder-browser.c:2049
 msgid "VFolder on M_ailing List"
 msgstr "VOrdner über M_ailingliste"
 
-#: mail/folder-browser.c:2112
+#: mail/folder-browser.c:2051
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter über _Mailingliste (%s)"
 
-#: mail/folder-browser.c:2113
+#: mail/folder-browser.c:2052
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VOrdner über M_ailingliste (%s)"
@@ -11880,143 +12198,23 @@ msgstr "VOrdner über M_ailingliste (%s)"
 msgid "Default"
 msgstr "Vorgabe"
 
-#: mail/folder-browser-ui.c:484
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Eigenschaften von \"%s\""
-
-#: mail/folder-browser-ui.c:486
-msgid "Properties"
-msgstr "Eigenschaften"
-
 #: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Ordner-Informationen werden entnommen"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Editor-Einstellungen"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr ""
-"Konfigurations-Bedienelement für die von Evolution verwendeten Schriftarten."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Konfigurations-Bedienelement für die Evolution Mail-Zugänge."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Konfigurations-Bedienelement für den Evolution-Mailer."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Konfigurations-Bedienelement für den Evolution Nachrichten-Editor."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
-"der Anzeige von Nachrichten festlegen"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
-"Nachrichteneditor konfigurieren"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Configure the fonts used by Evolution here"
-msgstr "Hier können Sie die von Evolution verwendeten Schriften konfigurieren"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Configure your email accounts here"
-msgstr "Hier können Sie Ihre E-Mail-Zugänge konfigurieren"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Evolution-Komponente für den Umgang mit Mail."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution mail composer."
-msgstr "Evolution-Mailersteller."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolutions Mail-Chefsesselansicht-Komponente."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Evolution mail folder display component."
-msgstr "Evolution-Komponente zur Mailordneranzeige."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Evolution-Mailordner-Fabrik-Komponente."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Fabrik für den Evolution-Maileditor."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "Fabrik für die Mailzusammenfassungs-Komponente."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "Font Preferences"
-msgstr "Schrift-Einstellungen"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
-#: mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Mail Accounts"
-msgstr "Mail-Zugänge"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19
-#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:70
-msgid "Mail Preferences"
-msgstr "Mail-Einstellungen"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-#: mail/GNOME_Evolution_Mail.server.in.in.h:18
-msgid "Mail configuration interface"
-msgstr "Mailkonfigurations-Oberfläche"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "Factory for the controls exported by the Evolution Mailer"
-msgstr "Fabrik für die von Evolution-Mailer exportierten Steuerungen"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Fabrik, zum Import von mbox-Dateien in Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
 msgid "Imports mbox files into Evolution"
 msgstr "Importiert mbox-Dateien in Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
 msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr ""
 "Fabrik zum Import von mit Outlook Express 4 erstellten E-Mails in Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importiert Outlook-Express-4-Dateien in Evolution."
@@ -12058,69 +12256,69 @@ msgstr "mh"
 
 #: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
-msgstr "Sie haben nicht alle benötigten Felder ausgefüllt."
+msgstr "Sie haben nicht alle erforderlichen Felder ausgefüllt."
 
 #. give our dialog an OK button and title
 #: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Rechner:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:126
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: mail/mail-account-gui.c:1850
+#: mail/mail-account-gui.c:1881
 msgid "You may not create two accounts with the same name."
 msgstr "Sie können keine zwei Zugänge mit demselben Namen anlegen."
 
-#: mail/mail-accounts.c:217
+#: mail/mail-accounts.c:222
 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:225
+#: mail/mail-accounts.c:230
 msgid "Don't delete"
 msgstr "Nicht löschen"
 
-#: mail/mail-accounts.c:300 mail/mail-accounts.c:338
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-accounts.c:303 mail/mail-accounts.c:342 mail/mail-accounts.c:382
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:666
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: mail/mail-accounts.c:300 mail/mail-accounts.c:340
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:668
+#: mail/mail-accounts.c:303 mail/mail-accounts.c:342 mail/mail-accounts.c:384
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:666
 msgid "Enable"
 msgstr "Aktivieren"
 
 #. translators: default account indicator
-#: mail/mail-accounts.c:380
+#: mail/mail-accounts.c:424
 msgid "[Default]"
 msgstr "[Vorgabe]"
 
-#: mail/mail-accounts.c:425 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:811
+#: mail/mail-accounts.c:472 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:809
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: mail/mail-accounts.c:430 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:478 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Zugangsname"
 
-#: mail/mail-accounts.c:432 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:480 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokoll"
 
 #: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
-msgstr "Mail an %s"
+msgstr "E-Mail an %s"
 
 #: mail/mail-autofilter.c:238
 #, c-format
@@ -12168,49 +12366,49 @@ msgid ""
 "receive or compose mail.\n"
 "Would you like to configure it now?"
 msgstr ""
-"Sie haben den Mailclient nicht konfiguriert.\n"
-"Sie müssen dies tun, bevor Sie Mail verschicken,\n"
+"Sie haben den E-Mail-Client nicht konfiguriert.\n"
+"Sie müssen dies tun, bevor Sie E-Mails verschicken,\n"
 "abrufen oder verfassen können.\n"
 "Möchten Sie ihn jetzt konfigurieren?"
 
-#: mail/mail-callbacks.c:214
+#: mail/mail-callbacks.c:213
 msgid ""
 "You need to configure an account\n"
 "before you can compose mail."
 msgstr ""
 "Sie müssen einen Zugang einrichten,\n"
-"bevor Sie Mail erstellen können."
+"bevor Sie E-Mails verfassen können."
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:227
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 "Sie müssen eine Identität einrichten,\n"
-"bevor Sie Mail erstellen können."
+"bevor Sie E-Mails verfassen können."
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:234
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 "Sie müssen einen Mailtransport einrichten,\n"
-"bevor Sie Mail erstellen können."
+"bevor Sie E-Mails verfassen können."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:257
+#: mail/mail-callbacks.c:256
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
 msgstr ""
 "Sie verschicken eine HTML-formatierte Nachricht. Bitte stellen Sie sicher,\n"
-"dass die folgenden Empfänger HTML-E-Mails abrufen können und wollen:\n"
+"dass die folgenden Empfänger HTML-Mails abrufen können und wollen:\n"
 
-#: mail/mail-callbacks.c:269
+#: mail/mail-callbacks.c:268
 msgid "Send anyway?"
 msgstr "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:289
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12218,7 +12416,7 @@ msgstr ""
 "Diese Nachricht hat keinen Betreff.\n"
 "Wirklich verschicken?"
 
-#: mail/mail-callbacks.c:317
+#: mail/mail-callbacks.c:315
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -12227,25 +12425,25 @@ msgstr ""
 "ist, die Adressen der Liste zu verbergen, wird die Nachricht lediglich an "
 "Blindkopie-Empfängeradressen übermittlt."
 
-#: mail/mail-callbacks.c:321
+#: mail/mail-callbacks.c:319
 msgid "This message contains only Bcc recipients."
 msgstr "Diese Nachricht enthält ausschließlich Blindkopie-Empfänger."
 
-#: mail/mail-callbacks.c:326
+#: mail/mail-callbacks.c:324
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"Es ist möglich, dass der Mailserver die Empfänger kenntlich macht, indem er "
-"eine Apparently-To-Kopfzeile hinzufügt.\n"
+"Es ist möglich, dass der E-Mail-Server die Empfänger kenntlich macht, indem "
+"er eine Apparently-To-Kopfzeile hinzufügt.\n"
 "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:460
+#: mail/mail-callbacks.c:472
 msgid "You must specify recipients in order to send this message."
 msgstr "Sie müssen Empfänger angeben, um diese Nachricht zu verschicken."
 
-#: mail/mail-callbacks.c:716
+#: mail/mail-callbacks.c:727
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12253,28 +12451,28 @@ msgstr ""
 "Der Entwürfe-Ordner für diesen Zugang konnte nicht geöffnet werden.\n"
 "Möchten Sie den voreingestellten Entwürfe-Ordner verwenden?"
 
-#: mail/mail-callbacks.c:1177
+#: mail/mail-callbacks.c:1192
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1196
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Am %a, %Y-%m-%d um %H.%M schrieb %%s:"
 
-#: mail/mail-callbacks.c:1679 mail/message-browser.c:143
+#: mail/mail-callbacks.c:1703 mail/message-browser.c:143
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:1681 mail/message-browser.c:145
+#: mail/mail-callbacks.c:1705 mail/message-browser.c:145
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:2325
+#: mail/mail-callbacks.c:2349
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sind Sie sicher, dass Sie alle %d Nachrichten bearbeiten wollen?"
 
-#: mail/mail-callbacks.c:2341
+#: mail/mail-callbacks.c:2365
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12282,7 +12480,7 @@ msgstr ""
 "Sie können nur im Entwürfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:2377
+#: mail/mail-callbacks.c:2398
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -12290,17 +12488,17 @@ msgstr ""
 "Sie können nur Nachrichten im\n"
 "Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:2387
+#: mail/mail-callbacks.c:2408
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle %d Nachrichten nochmals verschicken wollen?"
 
-#: mail/mail-callbacks.c:2407
+#: mail/mail-callbacks.c:2429
 msgid "No Message Selected"
 msgstr "Keine Nachricht markiert"
 
-#: mail/mail-callbacks.c:2448
+#: mail/mail-callbacks.c:2470
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12309,7 +12507,7 @@ msgstr ""
 "In »%s« konnte nicht gespeichert werden:\n"
 "  %s"
 
-#: mail/mail-callbacks.c:2453
+#: mail/mail-callbacks.c:2475
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12318,15 +12516,15 @@ msgstr ""
 "»%s« ist bereits vorhanden.\n"
 "Soll es überschrieben werden?"
 
-#: mail/mail-callbacks.c:2494
+#: mail/mail-callbacks.c:2516
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:2496
+#: mail/mail-callbacks.c:2518
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:2664
+#: mail/mail-callbacks.c:2686
 msgid ""
 "This operation will permanently erase all messages marked as\n"
 "deleted. If you continue, you will not be able to recover these messages.\n"
@@ -12334,12 +12532,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 "Dieser Vorgang wird alle als gelöscht markierten Nachrichten dauerhaft "
-"entfernen. Falls Sie fortfahren, werden Sie diese Nachrichten nie "
+"entfernen. Falls Sie fortfahren, werden Sie diese Nachrichten nicht "
 "wiederherstellen können.\n"
 "\n"
 "Sollen die Nachrichten wirklich entfernt werden?"
 
-#: mail/mail-callbacks.c:2750
+#: mail/mail-callbacks.c:2772
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12348,72 +12546,60 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2758
+#: mail/mail-callbacks.c:2780
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2800
+#: mail/mail-callbacks.c:2822
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: mail/mail-callbacks.c:2855
+#: mail/mail-callbacks.c:2878
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:2914
+#: mail/mail-callbacks.c:2945
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:3106
+#: mail/mail-callbacks.c:3135
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle %d Nachrichten in getrennten Fenstern öffnen "
 "wollen?"
 
-#: mail/mail-composer-prefs.c:226
-msgid ""
-"Please specify signature filename\n"
-"in Advanced section of signature settings."
-msgstr ""
-"Bitte geben Sie im Abschnitt »Komplex« der Signatur-\n"
-"einstellungen einen Dateinamen für die Signatur an."
-
-#: mail/mail-composer-prefs.c:245 mail/mail-composer-prefs.c:247
-#: mail/mail-composer-prefs.c:376 mail/mail-composer-prefs.c:431
-msgid "[script]"
-msgstr "[Skript]"
+#: mail/mail-composer-prefs.c:225 mail/mail-composer-prefs.c:326
+#: mail/mail-config.c:1218
+msgid "Unnamed"
+msgstr "Namenlose"
 
-#: mail/mail-composer-prefs.c:320
+#: mail/mail-composer-prefs.c:311
 msgid "You must specify a valid script name."
 msgstr "Sie müssen einen gültigen Namen für das Skript angeben."
 
-#: mail/mail-composer-prefs.c:335 mail/mail-config.c:1421
-msgid "Unnamed"
-msgstr "Namenlose"
+#: mail/mail-composer-prefs.c:367 mail/mail-composer-prefs.c:429
+msgid "[script]"
+msgstr "[Skript]"
 
-#: mail/mail-composer-prefs.c:815
+#: mail/mail-composer-prefs.c:813
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
-#: mail/mail-composer-prefs.c:859
+#: mail/mail-composer-prefs.c:855
 msgid "Add script signature"
 msgstr "Skript-Signatur hinzufügen"
 
-#: mail/mail-composer-prefs.c:878
+#: mail/mail-composer-prefs.c:875
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
-#: mail/mail-config.c:1125
-msgid "Checking Service"
-msgstr "Dienst wird überprüft"
-
-#: mail/mail-config.c:1203 mail/mail-config.c:1207
-msgid "Connecting to server..."
-msgstr "Verbindung zu Server..."
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identität"
 
-#: mail/mail-config-druid.c:147
+#: mail/mail-config-druid.c:382
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12424,30 +12610,41 @@ msgstr ""
 "ausgefüllt werden, sofern Sie diese Informationen nicht in den E-Mails, die "
 "Sie verschicken, einschließen wollen."
 
-#: mail/mail-config-druid.c:149
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+msgid "Receiving Mail"
+msgstr "Abrufen von E-Mail"
+
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Bitte geben Sie unten Informationen zu Ihrem Server für eingehende Mail an. "
-"Falls Sie nicht sich sicher sind,\n"
-"wenden Sie sich an Ihren Systemadministrator oder Internetprovider."
+"Bitte geben Sie unten Informationen zu Ihrem Server für eingehende E-Mails "
+"an. Falls Sie nicht sich sicher sind, wenden Sie sich bitte an Ihren "
+"Systemadministrator oder Internet-Provider."
 
-#: mail/mail-config-druid.c:151
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Bitte wählen Sie aus den folgenden Optionen"
 
-#: mail/mail-config-druid.c:153
+#: mail/mail-config-druid.c:400
+msgid "Sending Mail"
+msgstr "Verschicken von E-Mail"
+
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Bitte geben Sie unten Informationen zur Art ein, auf die Sie Mail "
-"verschicken werden. Falls Sie\n"
-"sich nicht sicher sind, wenden Sie sich an Ihren Systemadministrator oder "
-"Internetprovider."
+"Bitte geben Sie unten Informationen zur Art ein, auf die Sie E-Mails "
+"verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich bitte "
+"an Ihren Systemadministrator oder Internet-Provider."
+
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Zugangsverwaltung"
 
-#: mail/mail-config-druid.c:155
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12455,18 +12652,21 @@ msgid ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 msgstr ""
-"Sie haben Ihre Mailkonfiguration fast abgeschlossen. Die Identität, der "
+"Sie haben Ihre E-Mail-Konfiguration fast abgeschlossen. Die Identität, der "
 "Server für eingehende und die\n"
-"Transportmethode für ausgehende Mail, die sie angegeben haben, werden zu "
+"Transportmethode für ausgehende E-Mails, die sie angegeben haben, werden zu "
 "einem Evolution-\n"
 "Mailzugang zusammengefasst. Bitte geben Sie in dem Feld unten einen Namen "
 "für diesen Zugang ein.\n"
 "Dieser Name wird nur zur Anzeige auf dem Bildschirm verwendet."
 
-#. set window title
-#: mail/mail-config-druid.c:645
-msgid "Evolution Account Assistant"
-msgstr "Evolution-Zugangsdruide"
+#: mail/mail-config.c:922
+msgid "Checking Service"
+msgstr "Dienst wird überprüft"
+
+#: mail/mail-config.c:1000 mail/mail-config.c:1004
+msgid "Connecting to server..."
+msgstr "Verbindung zu Server..."
 
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
@@ -12483,7 +12683,7 @@ msgstr "(SSL wird von dieser Binärversion von Evolution nicht unterstützt)"
 #: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
-"Beim Verschicken verschlüsselter Mail _immer vor mir selber verschlüsseln"
+"Beim Verschicken verschlüsselter E-Mails _immer vor mir selbst verschlüsseln"
 
 #: mail/mail-config.glade.h:8
 msgid "Account Editor"
@@ -12493,10 +12693,6 @@ msgstr "Zugangs-Editor"
 msgid "Account Information"
 msgstr "Zugangsinformation"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Zugangsverwaltung"
-
 #: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr "Sk_ript hinzufügen"
@@ -12508,7 +12704,7 @@ msgstr "Signatur hinzufügen..."
 #: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
-"Beim Verschicken verschlüsselter Mail _immer für mich selber verschlüsseln"
+"Beim Verschicken verschlüsselter E-Mails _immer vor mir selbst verschlüsseln"
 
 #: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
@@ -12565,15 +12761,15 @@ msgstr ""
 
 #: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
-msgstr "Nach neuer Mail sehen"
+msgstr "Nach neuen E-Mails sehen"
 
 #: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
-msgstr "_Farbe für falsch geschriebene Wörter:"
+msgstr "_Farbe für falschgeschriebene Wörter:"
 
 #: mail/mail-config.glade.h:31
 msgid "Composing Messages"
-msgstr "Nachrichten erstellen"
+msgstr "Nachrichten verfassen"
 
 #: mail/mail-config.glade.h:32
 msgid "Configuration"
@@ -12586,15 +12782,15 @@ msgid ""
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
-"Herzlichen Glückwunsch! Ihre Mailkonfiguration ist \n"
+"Herzlichen Glückwunsch! Ihre E-Mail-Konfiguration ist \n"
 "abgeschlossen.\n"
 "\n"
-"Sie können jetzt mit Evolution Mail verschicken und\n"
+"Sie können jetzt mit Evolution E-Mails verschicken und\n"
 "abrufen.\n"
 "\n"
-"Klicken Sie auf »Beenden«, um Ihre Einstellungen zu\n"
+"Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu\n"
 "speichern."
 
 #: mail/mail-config.glade.h:39
@@ -12611,7 +12807,7 @@ msgstr "Voreingestellte Zeichen_kodierung:"
 
 #: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
-msgstr "Mail wird gelöscht"
+msgstr "E-Mail wird gelöscht"
 
 #: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
@@ -12626,7 +12822,7 @@ msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "_Besprechungsanfragen nicht unterzeichnen (zur Kompatibilität mit Outlook)"
 
-#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Fertig"
 
@@ -12655,78 +12851,78 @@ msgid "Empty _trash folders on exit"
 msgstr "Müllordner beim Beenden _leeren"
 
 #: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Evolution-Zugangsdruide"
+
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Befehl ausführen..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "_Feste Breite:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Font Properties"
 msgstr "Schriftart-Eigenschaften"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Format messages in _HTML"
 msgstr "Nachrichten in _HTML formatieren"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Digitale Kennung erhalten..."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Identität"
-
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "An Ort und Stelle"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etikette und Farben"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Bilder laden"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
-msgstr "Mailkonfiguration"
+msgstr "E-Mail-Konfiguration"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Nachrichten-Editor"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Nachrichtenanzeige"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
-msgstr "Mailbenachrichtigung"
+msgstr "E-Mail-Benachrichtigung"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12734,145 +12930,145 @@ msgstr ""
 "Hinweis: Sie werden erst nach dem Passwort gefragt, wenn Sie das erste Mal "
 "eine Verbindung mit dem Server aufbauen"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "On Screen fonts"
 msgstr "Bildschirmschriftarten"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Optionale Information"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_Schlüsselkennung:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschließlich _Blindkopie-Empfängern "
 "nachfragen"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr "Druckschriftarten"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Qmail-maildir "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Quote original message"
 msgstr "Originalnachricht zitieren"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "An dieses Passwort _erinnern"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr "A_ntwort an:"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
-msgstr "Erhalten von E-Mail"
+msgstr "Abrufen von E-Mail"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr "Empfangs-_Optionen"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "Dieses Passwort s_peichern"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Benötigte Information"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr "Vorgaben wiederherstellen"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "Sich_erheit"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Sichere MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "HTML Feste-Breite-Schriftart wählen"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "HTML Feste-Breite-Schriftart zum Drucken wählen"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "HTML Variable-Breite-Schriftart wählen"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "HTML Variable-Breite-Schriftart zum Drucken wählen"
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "E-Mail wird verschickt"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Ordner für verschickte _Nachrichten:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Nachrichten in \"Verschickt\" und \"Entwürfe\""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
-msgstr "Server benötigt _Legitimation"
+msgstr "Server erfordert _Legitimation"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Server-Konfiguration"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "Tastenkürzel-_Typ:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "_Dateiname angeben:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "_Rechtschreibprüfung"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "Standard Unix mbox"
-msgstr "Standard-Unix-mbox"
+msgstr "Standard-UNIX-mbox"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12882,7 +13078,7 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zur Identifikation verwendet."
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:123
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -12892,7 +13088,7 @@ msgstr ""
 "konfigurieren. Diese Liste der Sprachen enthält ausschließlich die Sprachen, "
 "für die ein Wörterbuch installiert ist."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:125
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12900,179 +13096,179 @@ msgstr ""
 "Geben Sie einen Namen an, den Sie mit diesem Zugang assoziieren,\n"
 "wie zum Beispiel »Arbeit« oder »Persönlich«."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "Variable Breite:"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
-"Willkommen zum Evolution-Mailkonfigurations-Druiden!\n"
+"Willkommen zum Evolution-E-Mail-Konfigurationsassistenten!\n"
 "\n"
 "Klicken Sie auf »Weiter«, um zu beginnen."
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:134
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "Signatur _hinzufügen"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "Bilder _immer aus dem Netz laden"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bei Verwendung dieses Zugangs ausgehende Nachrichten _immer signieren"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:141
 msgid "_Automatically check for new mail"
-msgstr "_Automatisch nach neuer Mail sehen"
+msgstr "_Automatisch nach neuen E-Mails sehen"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Automatisch Smiley-Bilder einfügen"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
-msgstr "Beep bei Eintreffen von neuer Mail"
+msgstr "Bei Eintreffen neuer E-Mail _Piepston ausgeben"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 msgid "_Certificate ID:"
 msgstr "Kennung des _Zertifikats:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 msgid "_Confirm when expunging a folder"
 msgstr "Säubern eines Ordners _bestätigen"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
 msgid "_Default signature:"
 msgstr "_Vorgabe-Signatur:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
 msgid "_Defaults"
 msgstr "_Vorgaben"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
-msgstr "_Bei Eintreffen neuer Mail nicht benachrichtigen"
+msgstr "_Bei Eintreffen neuer E-Mail nicht benachrichtigen"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Aktivieren"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:152
 msgid "_Fixed-width:"
 msgstr "_Feste Breite:"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:154
 msgid "_Full name:"
 msgstr "_Voller Name:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:156
 msgid "_HTML Mail"
 msgstr "_HTML-Mail"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr "_Identität"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:159
 msgid "_Load images if sender is in addressbook"
 msgstr "Bilder _laden, falls Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Dies zu meinem _Vorgabezugang machen"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Name:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "Bilder _nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
-msgstr "_Klangdatei bei Eintreffen neuer Mail abspielen"
+msgstr "Beim Eintreffen neuer E-Mail _Klangdatei abspielen"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "_nachfragen"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
-msgstr "_Erhalten von Mail"
+msgstr "_Abrufen von E-Mail"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
-msgstr "Vo_rgaben wiederherstellen"
+msgstr "Vorgaben _wiederherstellen"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Sending Mail"
-msgstr "_Verschicken von Mail"
+msgstr "_Verschicken von E-Mail"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Show animated images"
 msgstr "_Animierte Bilder zeigen"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Signatures"
 msgstr "_Signaturen"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Use secure connection (SSL):"
 msgstr "Sichere Verbindung (_SSL) verwenden:"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Variable-width:"
 msgstr "_Variable Breite:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_every"
 msgstr "_alle"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "color"
 msgstr "Farbe"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "Beschreibung"
 
@@ -13096,83 +13292,83 @@ msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME-Entschlüsselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:193
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
-"Eine Datei mit Namen »%s« existiert bereits.\n"
+"Es existiert bereits eine Datei mit Namen »%s«.\n"
 "Soll diese überschrieben werden?"
 
-#: mail/mail-display.c:195
+#: mail/mail-display.c:196
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
-#: mail/mail-display.c:330
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Anlage speichern"
 
-#: mail/mail-display.c:403
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Temporäre Datei '%s' konnte nicht angelegt werden: %s"
 
-#: mail/mail-display.c:451
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr "Anlage speichern..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "An Ort und Stelle betrachten"
 
-#: mail/mail-display.c:453
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Öffnen in %s..."
 
-#: mail/mail-display.c:509
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "An Ort und Stelle betrachten (über %s)"
 
-#: mail/mail-display.c:513
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:533
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:1333
+#: mail/mail-display.c:1341
 msgid "Downloading images"
 msgstr "Bilder werden heruntergeladen"
 
-#: mail/mail-display.c:1510
+#: mail/mail-display.c:1518
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-display.c:1852
+#: mail/mail-display.c:1855
 msgid "Overdue:"
 msgstr "Überfallig:"
 
-#: mail/mail-display.c:1856
+#: mail/mail-display.c:1859
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "am %d. %B %Y, %H:%M"
 
-#: mail/mail-display.c:2209
+#: mail/mail-display.c:2210
 msgid "Open Link in Browser"
 msgstr "Link in Browser öffnen"
 
-#: mail/mail-display.c:2210
+#: mail/mail-display.c:2211
 msgid "Copy Link Location"
 msgstr "Linkziel kopieren"
 
-#: mail/mail-display.c:2212
+#: mail/mail-display.c:2213
 msgid "Save Link as (FIXME)"
 msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:2214
+#: mail/mail-display.c:2215
 msgid "Save Image as..."
 msgstr "Bild speichern unter..."
 
@@ -13181,108 +13377,108 @@ msgstr "Bild speichern unter..."
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
 
-#: mail/mail-format.c:639
+#: mail/mail-format.c:635
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:681 mail/mail-format.c:1367 mail/mail-format.c:1436
-#: mail/mail-format.c:1556 mail/mail-format.c:1680 mail/mail-format.c:1705
+#: mail/mail-format.c:677 mail/mail-format.c:1331 mail/mail-format.c:1400
+#: mail/mail-format.c:1520 mail/mail-format.c:1644 mail/mail-format.c:1669
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "MIME-Nachricht konnte nicht verarbeitet werden. Wird als Quellcode angezeigt."
 
-#: mail/mail-format.c:759 mail/message-list.etspec.h:2
+#: mail/mail-format.c:754 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:843
+#: mail/mail-format.c:840
 msgid "Bad Address"
 msgstr "Ungültige Adresse"
 
-#: mail/mail-format.c:884 mail/message-list.etspec.h:7
+#: mail/mail-format.c:881 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:888
+#: mail/mail-format.c:885
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:14
+#: mail/mail-format.c:890 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:898
+#: mail/mail-format.c:895
 msgid "Cc"
 msgstr "Kopie"
 
-#: mail/mail-format.c:903
+#: mail/mail-format.c:900
 msgid "Bcc"
 msgstr "Blindkopie"
 
-#: mail/mail-format.c:1479
+#: mail/mail-format.c:1443
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Diese Nachricht ist digital signiert. Klicken Sie auf das Schlosssymbol, um "
 "weitere Informationen zu erhalten."
 
-#: mail/mail-format.c:1507
+#: mail/mail-format.c:1471
 msgid "Could not create a PGP verfication context"
 msgstr "Es konnte kein PGP-Überprüfungskontext angelegt werden"
 
-#: mail/mail-format.c:1515
+#: mail/mail-format.c:1479
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
 "nachgewiesen."
 
-#: mail/mail-format.c:1522
+#: mail/mail-format.c:1486
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Diese Nachricht ist digital unterzeichnet, aber konnte nicht als authentisch "
 "nachgewiesen werden."
 
-#: mail/mail-format.c:1786
+#: mail/mail-format.c:1750
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:1761
 #, 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:1800
+#: mail/mail-format.c:1764
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:1827
+#: mail/mail-format.c:1791
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf Daten im Netz (%s)"
 
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:1835
+#: mail/mail-format.c:1799
 msgid "Malformed external-body part."
 msgstr "Ungültiger external-body-Teil."
 
-#: mail/mail-local.c:536 mail/mail-local.c:538
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokale Ordner/%s"
 
-#: mail/mail-local.c:666
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Ordner wird umkonfiguriert"
 
-#: mail/mail-local.c:747
+#: mail/mail-local.c:748
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13291,37 +13487,37 @@ msgstr ""
 "Metainformationen zum Ordner konnten nicht gespeichert werden; Sie\n"
 "können ihn wahrscheinlich nicht mehr öffnen: %s: %s"
 
-#: mail/mail-local.c:803
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Metainformationen zum Ordner können nicht in %s gespeichert werden: %s"
 
-#: mail/mail-local.c:855
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ordner-Metadaten %s können nicht gelöscht werden: %s"
 
-#: mail/mail-local.c:1325
+#: mail/mail-local.c:1329
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:1347
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr "Datei %s konnte nicht geladen werden"
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s neu konfigurieren"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "Sie können das Format eines nichtlokalen Ordners nicht ändern."
 
-#: mail/mail-mt.c:256
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13330,7 +13526,7 @@ msgstr ""
 "Fehler beim `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13339,7 +13535,7 @@ msgstr ""
 "Fehler beim Ausführen eines Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "In Arbeit"
 
@@ -13349,7 +13545,7 @@ msgstr "Ordner wird gefiltert"
 
 #: mail/mail-ops.c:264
 msgid "Fetching Mail"
-msgstr "Abrufen von Mail"
+msgstr "Abrufen von E-Mail"
 
 #: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
@@ -13486,46 +13682,46 @@ msgstr "Verbindung mit %s wird getrennt"
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird neu aufgebaut"
 
-#: mail/mail-search.c:128
+#: mail/mail-search-dialogue.c:121 widgets/misc/e-search-bar.c:518
+msgid "_Search"
+msgstr "_Suchen"
+
+#: mail/mail-search.c:148
 msgid "(Untitled Message)"
 msgstr "(Unbenannte Nachricht)"
 
-#: mail/mail-search.c:219
+#: mail/mail-search.c:230
 msgid "Untitled Message"
 msgstr "Unbenannte Nachricht"
 
-#: mail/mail-search.c:221
+#: mail/mail-search.c:232
 msgid "Empty Message"
 msgstr "Leere Nachricht"
 
-#: mail/mail-search.c:269
+#: mail/mail-search.c:280
 msgid "Find in Message"
 msgstr "In Nachricht suchen"
 
-#: mail/mail-search.c:272
+#: mail/mail-search.c:283
 msgid "Search"
 msgstr "Suchen"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:309
 msgid "Case Sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: mail/mail-search.c:300
+#: mail/mail-search.c:311
 msgid "Search Forward"
 msgstr "Vorwärts suchen"
 
-#: mail/mail-search.c:320
+#: mail/mail-search.c:331
 msgid "Find:"
 msgstr "Suchen:"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:334
 msgid "Matches:"
 msgstr "Passt auf:"
 
-#: mail/mail-search-dialogue.c:120 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "_Suchen"
-
 #: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Stornieren..."
@@ -13547,7 +13743,7 @@ msgstr "Typ: %s"
 
 #: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
-msgstr "Mail erhalten und verschicken"
+msgstr "E-Mails abrufen und verschicken"
 
 #: mail/mail-send-recv.c:299
 msgid "Cancel All"
@@ -13561,33 +13757,33 @@ msgstr "Aktualisieren..."
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-session.c:214
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#: mail/mail-session.c:247
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: mail/mail-session.c:249
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:280
 msgid "_Remember this password"
 msgstr "An dieses Passwort e_rinnern"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:281
 msgid "_Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort e_rinnern"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:81
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Signaturdatei konnte nicht gespeichert werden: %s"
 
-#: mail/mail-signature-editor.c:175
+#: mail/mail-signature-editor.c:182
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13598,23 +13794,23 @@ msgstr ""
 "Möchten Sie Ihre Änderungen speichern?"
 
 # CHECK
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:185
 msgid "_Discard changes"
 msgstr "Änderungen verwerfen"
 
-#: mail/mail-signature-editor.c:182
+#: mail/mail-signature-editor.c:189
 msgid "Save signature"
 msgstr "Signatur speichern"
 
-#: mail/mail-signature-editor.c:327
+#: mail/mail-signature-editor.c:345
 msgid "Edit signature"
 msgstr "Signatur bearbeiten"
 
-#: mail/mail-signature-editor.c:363
+#: mail/mail-signature-editor.c:384
 msgid "Enter a name for this signature."
 msgstr "Geben Sie einen Namen für diese Signatur ein."
 
-#: mail/mail-signature-editor.c:366 my-evolution/e-summary-preferences.c:622
+#: mail/mail-signature-editor.c:387 my-evolution/e-summary-preferences.c:622
 msgid "Name:"
 msgstr "Name:"
 
@@ -13631,17 +13827,17 @@ msgstr "Weitergeleitete Nachricht"
 msgid "Forwarded Message"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "VOrdner wird eingerichtet: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "VOrdner werden aktualisiert für URI: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13654,25 +13850,25 @@ msgstr ""
 "   '%s'\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:776 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/mail-vfolder.c:833
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vOrdner"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:875
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:891
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Es wurde versucht, einen vOrdner '%s' zu editieren, der nicht existiert."
 
-#: mail/mail-vfolder.c:944
+#: mail/mail-vfolder.c:946
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
@@ -13721,31 +13917,31 @@ msgstr "Höher"
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: mail/message-list.c:1070
+#: mail/message-list.c:1076
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1077
+#: mail/message-list.c:1083
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:1086
+#: mail/message-list.c:1092
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1098
+#: mail/message-list.c:1104
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1106
+#: mail/message-list.c:1112
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %H.%M"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1114
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2594
+#: mail/message-list.c:2602
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
@@ -13863,31 +14059,27 @@ msgstr "Ordner \"%s\" wird abonniert"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1272 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Ordner"
 
-#: mail/subscribe-dialog.c:1427
+#: mail/subscribe-dialog.c:1429
 msgid "Scanning folders..."
 msgstr "Ordner werden abgetastet..."
 
-#: mail/subscribe-dialog.c:1549
+#: mail/subscribe-dialog.c:1551
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gewählt"
 
-#: mail/subscribe-dialog.c:1624
+#: mail/subscribe-dialog.c:1626
 msgid "Please select a server."
 msgstr "Bitte wählen Sie einen Server."
 
-#: mail/subscribe-dialog.glade.h:3
+#: mail/subscribe-dialog.glade.h:4
 msgid "All folders"
 msgstr "_Alle Ordner"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "Apri file"
-msgstr "Apri-Datei"
-
 #: mail/subscribe-dialog.glade.h:5 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -13918,130 +14110,12 @@ msgid "S_elect server: "
 msgstr "Wählen Sie einen _Server:"
 
 #: mail/subscribe-dialog.glade.h:11
-msgid "Salve file"
-msgstr "Datei retten"
-
-#: mail/subscribe-dialog.glade.h:12
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: mail/subscribe-dialog.glade.h:13
-msgid "_Unsubscribe"
-msgstr "Ab_bestellen"
-
-#: my-evolution/component-factory.c:54
-msgid "Folder containing the Evolution Summary"
-msgstr "Ordner mit der Evolution-Übersicht"
-
-#: my-evolution/e-summary.c:199
-msgid "%A, %B %e %Y"
-msgstr "%A, %e. %B %Y"
-
-#: my-evolution/e-summary.c:514
-msgid "Please wait..."
-msgstr "Bitte warten..."
-
-#: my-evolution/e-summary.c:592 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Zusammenfassung drucken"
-
-#: my-evolution/e-summary.c:626
-msgid "Printing of Summary failed"
-msgstr "Drucken der Übersicht fehlgeschlagen"
-
-#: my-evolution/e-summary-calendar.c:377 my-evolution/e-summary-calendar.c:397
-msgid "Appointments"
-msgstr "Termine"
-
-#: my-evolution/e-summary-calendar.c:378
-msgid "No appointments"
-msgstr "Keine Termine"
-
-#: my-evolution/e-summary-calendar.c:414
-msgid "%k:%M %d %B"
-msgstr "%k.%M %d. %B"
-
-#: my-evolution/e-summary-calendar.c:416
-msgid "%l:%M %d %B"
-msgstr "%l.%M %d. %B"
-
-#: my-evolution/e-summary-calendar.c:434
-msgid "No description"
-msgstr "Keine Beschreibung"
-
-#: my-evolution/e-summary-mail.c:156
-msgid "Mail summary"
-msgstr "Mail-Zusammenfassung"
-
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1119
-msgid "Local Folders"
-msgstr "Lokale Ordner"
-
-#: my-evolution/e-summary-preferences.c:356
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com: Wort des Tages"
-
-#: my-evolution/e-summary-preferences.c:374
-msgid "Quotes of the Day"
-msgstr "Zitate des Tages"
-
-#: my-evolution/e-summary-preferences.c:612
-msgid "Add a news feed"
-msgstr "Einen Kanal hinzufügen"
-
-#: my-evolution/e-summary-preferences.c:618
-msgid "Enter the URL of the news feed you wish to add"
-msgstr "Geben Sie die Adresse des Kanals ein, den Sie hinzufügen wollen"
-
-#: my-evolution/e-summary-rdf.c:303
-msgid "Error downloading RDF"
-msgstr "Fehler beim Herunterladen des RDF"
-
-#: my-evolution/e-summary-rdf.c:446
-msgid "News Feed"
-msgstr "Nachrichtenkanal"
-
-#: my-evolution/e-summary-shown.c:518
-msgid "All"
-msgstr "Alle"
-
-#. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:530
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr "Angezeigt"
-
-#: my-evolution/e-summary-tasks.c:327
-msgid "No tasks"
-msgstr "Keine Aufgaben"
-
-#: my-evolution/e-summary-tasks.c:371
-msgid "(No Description)"
-msgstr "(keine Beschreibung)"
-
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr "Mein Wetter"
-
-#: my-evolution/e-summary-weather.c:269
-msgid "There was an error downloading data for"
-msgstr "Ein Fehler ist aufgetreten beim Herunterladen der Daten für"
-
-#: my-evolution/e-summary-weather.c:490
-msgid "Weather"
-msgstr "Wetter"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:592
-msgid "KBOS"
-msgstr "KBOS"
+#: mail/subscribe-dialog.glade.h:12
+msgid "_Unsubscribe"
+msgstr "Ab_bestellen"
 
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configuration control for the Evolution Summary."
@@ -23844,6 +23918,120 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zürich"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Ordner mit der Evolution-Übersicht"
+
+#: my-evolution/e-summary-calendar.c:377 my-evolution/e-summary-calendar.c:397
+msgid "Appointments"
+msgstr "Termine"
+
+#: my-evolution/e-summary-calendar.c:378
+msgid "No appointments"
+msgstr "Keine Termine"
+
+#: my-evolution/e-summary-calendar.c:414
+msgid "%k:%M %d %B"
+msgstr "%k.%M %d. %B"
+
+#: my-evolution/e-summary-calendar.c:416
+msgid "%l:%M %d %B"
+msgstr "%l.%M %d. %B"
+
+#: my-evolution/e-summary-calendar.c:434
+msgid "No description"
+msgstr "Keine Beschreibung"
+
+#: my-evolution/e-summary-mail.c:156
+msgid "Mail summary"
+msgstr "E-Mail-Zusammenfassung"
+
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
+#: shell/e-local-storage.c:1119
+msgid "Local Folders"
+msgstr "Lokale Ordner"
+
+#: my-evolution/e-summary-preferences.c:356
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com: Wort des Tages"
+
+#: my-evolution/e-summary-preferences.c:374
+msgid "Quotes of the Day"
+msgstr "Zitate des Tages"
+
+#: my-evolution/e-summary-preferences.c:612
+msgid "Add a news feed"
+msgstr "Einen Kanal hinzufügen"
+
+#: my-evolution/e-summary-preferences.c:618
+msgid "Enter the URL of the news feed you wish to add"
+msgstr "Geben Sie die Adresse des Kanals ein, den Sie hinzufügen wollen"
+
+#: my-evolution/e-summary-rdf.c:303
+msgid "Error downloading RDF"
+msgstr "Fehler beim Herunterladen des RDF"
+
+#: my-evolution/e-summary-rdf.c:447
+msgid "News Feed"
+msgstr "Nachrichtenkanal"
+
+#: my-evolution/e-summary-shown.c:518
+msgid "All"
+msgstr "Alle"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:530
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr "Angezeigt"
+
+#: my-evolution/e-summary-tasks.c:327
+msgid "No tasks"
+msgstr "Keine Aufgaben"
+
+#: my-evolution/e-summary-tasks.c:371
+msgid "(No Description)"
+msgstr "(keine Beschreibung)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Mein Wetter"
+
+#: my-evolution/e-summary-weather.c:269
+msgid "There was an error downloading data for"
+msgstr "Ein Fehler ist aufgetreten beim Herunterladen der Daten für"
+
+#: my-evolution/e-summary-weather.c:490
+msgid "Weather"
+msgstr "Wetter"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:594
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:197
+msgid "%A, %B %e %Y"
+msgstr "%A, %e. %B %Y"
+
+#: my-evolution/e-summary.c:523
+msgid "Please wait..."
+msgstr "Bitte warten..."
+
+#: my-evolution/e-summary.c:591 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Zusammenfassung drucken"
+
+#: my-evolution/e-summary.c:625
+msgid "Printing of Summary failed"
+msgstr "Drucken der Übersicht fehlgeschlagen"
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
@@ -25110,6 +25298,23 @@ msgstr "_Planung"
 msgid "_Weather"
 msgstr "_Wetter"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configuration control for Evolution folder settings."
+msgstr ""
+"Konfigurations-Bedienelement für die Ordnereinstellungen von Evolution."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Hier können Sie spezielle Ordner und Offline-Ordner konfigurieren"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Folder Settings"
+msgstr "Ordner-Einstellungen"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "The Evolution shell."
+msgstr "Die Evolution-Shell."
+
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Details anzeigen"
@@ -25140,8 +25345,8 @@ msgstr "Einen Ordner hinzufügen"
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:466
-#: shell/e-shell-view.c:470 shell/e-shortcuts.c:1082
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:495
+#: shell/e-shell-view.c:499 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Eingang"
 
@@ -25153,29 +25358,11 @@ msgstr "Ausgang"
 msgid "Sent"
 msgstr "Verschickt"
 
-#: shell/e-setup.c:131
-msgid "Evolution installation"
-msgstr "Installation von Evolution"
-
-#: shell/e-setup.c:135
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Diese neue Version von Evolution muss zusätzliche Dateien in Ihr\n"
-"persönliches Evolution-Verzeichnis installieren"
-
-#: shell/e-setup.c:136
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Bitte klicken Sie auf »OK«, um die Dateien zu installieren, oder auf "
-"»Abbrechen« zum Beenden."
-
-#: shell/e-setup.c:176
+#: shell/e-setup.c:147
 msgid "Could not update files correctly"
 msgstr "Dateien konnte nicht korrekt aktualisiert werden"
 
-#: shell/e-setup.c:199
+#: shell/e-setup.c:168
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -25186,7 +25373,7 @@ msgstr ""
 "konnte nicht angelegt werden.\n"
 "Fehler: %s"
 
-#: shell/e-setup.c:214
+#: shell/e-setup.c:179
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -25195,7 +25382,7 @@ msgstr ""
 "Ein Fehler trat auf beim Kopieren von Dateien nach\n"
 "'%s'."
 
-#: shell/e-setup.c:287
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -25205,7 +25392,7 @@ msgstr ""
 "Verzeichnis %s konnte nicht angelegt werden:\n"
 "%s"
 
-#: shell/e-setup.c:305
+#: shell/e-setup.c:262
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -25217,7 +25404,7 @@ msgstr ""
 "erlauben Sie den Lese- und Schreibzugriff und\n"
 "starten Sie Evolution neu."
 
-#: shell/e-setup.c:311
+#: shell/e-setup.c:268
 #, c-format
 msgid ""
 "File %s\n"
@@ -25228,7 +25415,7 @@ msgstr ""
 "sollte gelöscht werden, damit Evolution korrekt funktioniert.\n"
 "Bitte löschen Sie diese Datei und starten Sie Evolution neu."
 
-#: shell/e-setup.c:334
+#: shell/e-setup.c:291
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -25239,22 +25426,7 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:348
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-"Evolution hat ein altes Verzeichnis\n"
-"\"Executive-Summary\" gefunden. Dies\n"
-"muss entfernt werden, bevor Evolution\n"
-"starten kann.\n"
-"Möchten Sie, dass dieses Verzeichnis\n"
-"entfernt wird?"
-
-#: shell/e-setup.c:373
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -25270,49 +25442,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Das Team:"
 
-#: shell/e-shell.c:174
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"Komponente %s konnte nicht aktiviert werden:\n"
-"Der Fehler im Aktivierungssystem lautet:\n"
-"%s"
-
-#: shell/e-shell.c:754
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Lokaler Speicher konnte nicht eingestellt werden -- %s"
-
-#: shell/e-shell.c:1825
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Die Evolution-Komponente, die Ordner des Typs \"%s\" betreut, brach\n"
-"unerwartet ab. Sie müssen Evolution beenden und neu starten, um\n"
-"wieder auf diese Daten zugreifen zu können."
-
-#: shell/e-shell.c:2090
-msgid "Invalid arguments"
-msgstr "Ungültige Argumente"
-
-#: shell/e-shell.c:2092
-msgid "Cannot register on OAF"
-msgstr "Registrierung bei OAF konnte nicht stattfinden"
-
-#: shell/e-shell.c:2094
-msgid "Configuration Database not found"
-msgstr "Konfigurationsdatenbank nicht gefunden"
-
-#: shell/e-shell.c:2096 shell/e-storage.c:576
-msgid "Generic error"
-msgstr "Allgemeiner Fehler"
-
 #: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Extra Ordner zur Vervollständigung"
@@ -25383,17 +25512,17 @@ msgstr ""
 "Ordner konnte nicht gelöscht werden:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:402
-#, c-format
-msgid "Delete \"%s\""
-msgstr "\"%s\" löschen"
-
-#: shell/e-shell-folder-commands.c:403
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Ordner »%s« wirklich löschen?"
 
-#: shell/e-shell-folder-commands.c:483
+#: shell/e-shell-folder-commands.c:413
+#, c-format
+msgid "Delete \"%s\""
+msgstr "\"%s\" löschen"
+
+#: shell/e-shell-folder-commands.c:486
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25402,26 +25531,26 @@ msgstr ""
 "Ordner konnte nicht umbenannt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:532
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner \"%s\" umbenennen in:"
 
-#: shell/e-shell-folder-commands.c:538
+#: shell/e-shell-folder-commands.c:541
 msgid "Rename folder"
 msgstr "Ordner umbenennen"
 
-#: shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:170
+#: shell/e-shell-folder-commands.c:550
+#: shell/e-shell-folder-creation-dialog.c:169
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Der angegebene Ordnername ist nicht gültig: %s"
 
-#: shell/e-shell-folder-commands.c:581
+#: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr "Der markierte Ordner gehört keinem anderen Benutzer"
 
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:587
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25430,7 +25559,7 @@ msgstr ""
 "Ordner konnte nicht umbenannt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:127
+#: shell/e-shell-folder-creation-dialog.c:126
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25439,11 +25568,11 @@ msgstr ""
 "Der angegebene Ordner konnte nicht erstellt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:292
+#: shell/e-shell-folder-creation-dialog.c:307
 msgid "Create New Folder"
 msgstr "Neuen Ordner anlegen"
 
-#: shell/e-shell-folder-title-bar.c:654 shell/e-shell-folder-title-bar.c:655
+#: shell/e-shell-folder-title-bar.c:593 shell/e-shell-folder-title-bar.c:594
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
@@ -25465,7 +25594,7 @@ msgstr ""
 "Sie können \"Automatisch\" wählen, wenn Sie ihn nicht wissen, und Evolution "
 "wird versuchen, ihn selber zu bestimmen."
 
-#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:816
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:687
 msgid "Please select the information that you would like to import:"
 msgstr "Bitte wählen Sie die Informationen, die Sie importieren wollen:"
 
@@ -25482,17 +25611,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Wählen Sie einen Importeur"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datei %s existiert nicht"
 
-#: shell/e-shell-importer.c:491 shell/e-shell-importer.c:508
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:557
 msgid "Evolution Error"
 msgstr "Evolution-Fehler"
 
-#: shell/e-shell-importer.c:507
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25502,11 +25631,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/e-shell-importer.c:516
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25515,17 +25644,17 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Fehler beim Starten von %s"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:556
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:573
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25534,31 +25663,31 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:627
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:674
+#: shell/e-shell-importer.c:676
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:679
+#: shell/e-shell-importer.c:681
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: shell/e-shell-importer.c:688
+#: shell/e-shell-importer.c:690
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:713
+#: shell/e-shell-importer.c:715
 msgid "Import data and settings from older programs"
 msgstr "Daten und Einstellungen aus älteren Programmen importieren"
 
-#: shell/e-shell-importer.c:717
+#: shell/e-shell-importer.c:719
 msgid "Import a single file"
 msgstr "Eine einzelne Datei importieren"
 
-#: shell/e-shell-importer.c:783 shell/e-shell-startup-wizard.c:642
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:516
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25566,24 +25695,24 @@ msgstr ""
 "Bitte warten...\n"
 "Suche nach existierenden Einstellungen"
 
-#: shell/e-shell-importer.c:786 shell/e-shell-startup-wizard.c:645
+#: shell/e-shell-importer.c:788
 msgid "Starting Intelligent Importers"
 msgstr "Intelligente Importeure werden gestartet"
 
-#: shell/e-shell-importer.c:910 shell/e-shell-startup-wizard.c:770
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:642
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1082
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1083
 msgid "Select a destination folder for importing this data"
 msgstr "Geben Sie einen Zielordner für das Importieren dieser Daten an"
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:191
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Importieren"
 
@@ -25591,7 +25720,7 @@ msgstr "Importieren"
 msgid "Closing connections..."
 msgstr "Verbindungen werden geschlossen..."
 
-#: shell/e-shell-offline-sync.c:160
+#: shell/e-shell-offline-sync.c:163
 #, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25600,12 +25729,12 @@ msgstr ""
 "Fehler beim Synchronisieren von »%s«:\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:238
+#: shell/e-shell-offline-sync.c:232
 msgid "Syncing Folder"
 msgstr "Ordner wird synchronisiert"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:315
+#: shell/e-shell-offline-sync.c:311
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "»%s« wird synchronisiert (%d von %d)..."
@@ -25614,45 +25743,39 @@ msgstr "»%s« wird synchronisiert (%d von %d)..."
 msgid "Evolution Settings"
 msgstr "Evolution-Einstellungen "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:352
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+msgid "Please select a user."
+msgstr "Bitte wählen Sie einen Benutzer."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 msgid "Opening Folder"
 msgstr "Ordner wird geöffnet"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:359
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Ordner »%s« wird geöffnet"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "in »%s«..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:444
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Gemeinschaftsordner konnte nicht geöffnet werden: %s."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:497
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 msgid "Cannot find the specified shared folder."
 msgstr "Der angegebene Gemeinschaftsordner kann nicht erstellt werden."
 
-#: shell/e-shell-startup-wizard.c:156
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Das Evolution-Mailerdruiden-Interface konnte nicht gestartet werden\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:167
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Das Evolution-Mailerdruiden-Interface konnte nicht gestartet werden\n"
-
 #: shell/e-shell-user-creatable-items-handler.c:582
 #: shell/e-shell-user-creatable-items-handler.c:636
-#: widgets/misc/e-charset-picker.c:105
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "Neu"
 
@@ -25665,232 +25788,275 @@ msgid "Folder name cannot contain the Return character."
 msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
 
 #: shell/e-shell-utils.c:129
-msgid "Folder name cannot contain slashes."
-msgstr "Ordnername kann keine Slashes enthalten."
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "Ordnername darf das Slash-Zeichen »/« nicht enthalten."
 
 #: shell/e-shell-utils.c:135
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Ordnername darf das Raute-Zeichen »#« nicht enthalten."
+
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' und '..' sind reservierte Ordnernamen."
 
-#: shell/e-shell-view.c:233
+#: shell/e-shell-view-menu.c:89
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+"Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
+"sein."
+
+#: shell/e-shell-view-menu.c:97
+#, c-format
+msgid "Error executing %s."
+msgstr "Fehler beim Ausführen von %s."
+
+#: shell/e-shell-view-menu.c:193
+msgid "Bug buddy is not installed."
+msgstr "Bug-Buddy ist nicht installiert."
+
+#: shell/e-shell-view-menu.c:201
+msgid "Bug buddy could not be run."
+msgstr "Der Fehlermelder konnte nicht starten"
+
+#: shell/e-shell-view-menu.c:247
+msgid "About Ximian Evolution"
+msgstr "Über Ximian Evolution"
+
+#: shell/e-shell-view-menu.c:502
+msgid "Go to folder..."
+msgstr "Gehe zu Ordner..."
+
+#: shell/e-shell-view-menu.c:503
+msgid "Select the folder that you want to open"
+msgstr "Wählen Sie den Ordner, den Sie öffnen wollen"
+
+#: shell/e-shell-view-menu.c:617
+msgid "Create New Shortcut"
+msgstr "Neue Verknüpfung anlegen"
+
+#: shell/e-shell-view-menu.c:618
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "Wählen Sie den Ordner, auf den die Verknüpfung zeigen soll:"
+
+#: shell/e-shell-view-menu.c:778
+msgid "_Work Online"
+msgstr "_Online arbeiten"
+
+#: shell/e-shell-view-menu.c:791 ui/evolution.xml.h:67
+msgid "_Work Offline"
+msgstr "Offline _arbeiten"
+
+#: shell/e-shell-view-menu.c:804 ui/evolution.xml.h:42
+msgid "Work Offline"
+msgstr "Offline arbeiten"
+
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:1995
+#: shell/e-shell-view.c:2054
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1997
+#: shell/e-shell-view.c:2056
 msgid "(None)"
 msgstr "(keine)"
 
-#: shell/e-shell-view.c:2040
+#: shell/e-shell-view.c:2100
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um "
 "offline zu arbeiten."
 
-#: shell/e-shell-view.c:2047
+#: shell/e-shell-view.c:2107
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution geht gerade offline."
 
-#: shell/e-shell-view.c:2053
+#: shell/e-shell-view.c:2113
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um "
 "online zu arbeiten."
 
-#: shell/e-shell-view-menu.c:91
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-"Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
-"sein."
-
-#: shell/e-shell-view-menu.c:99
+#: shell/e-shell.c:176
 #, c-format
-msgid "Error executing %s."
-msgstr "Fehler beim Ausführen von %s."
-
-#: shell/e-shell-view-menu.c:195
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Das Werkzeug zur Fehlermeldung konnte nicht gefunden werden"
-
-#: shell/e-shell-view-menu.c:203
-msgid "Bug buddy could not be run."
-msgstr "Der Fehlermelder konnte nicht starten"
-
-#: shell/e-shell-view-menu.c:249
-msgid "About Ximian Evolution"
-msgstr "Über Ximian Evolution"
-
-#: shell/e-shell-view-menu.c:504
-msgid "Go to folder..."
-msgstr "Gehe zu Ordner..."
-
-#: shell/e-shell-view-menu.c:505
-msgid "Select the folder that you want to open"
-msgstr "Wählen Sie den Ordner, den Sie öffnen wollen"
-
-#: shell/e-shell-view-menu.c:619
-msgid "Create New Shortcut"
-msgstr "Neue Verknüpfung anlegen"
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"Komponente %s konnte nicht aktiviert werden:\n"
+"Der Fehler im Aktivierungssystem lautet:\n"
+"%s"
 
-#: shell/e-shell-view-menu.c:620
-msgid "Select the folder you want the shortcut to point to:"
-msgstr "Wählen Sie den Ordner, auf den die Verknüpfung zeigen soll:"
+#: shell/e-shell.c:758
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Lokaler Speicher konnte nicht eingestellt werden -- %s"
 
-#: shell/e-shell-view-menu.c:778
-msgid "_Work Online"
-msgstr "_Online arbeiten"
+#: shell/e-shell.c:1831
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"Die Evolution-Komponente, die Ordner des Typs \"%s\" betreut, brach\n"
+"unerwartet ab. Sie müssen Evolution beenden und neu starten, um\n"
+"wieder auf diese Daten zugreifen zu können."
 
-#: shell/e-shell-view-menu.c:791 ui/evolution.xml.h:67
-msgid "_Work Offline"
-msgstr "Offline _arbeiten"
+#: shell/e-shell.c:2096
+msgid "Invalid arguments"
+msgstr "Ungültige Argumente"
 
-#: shell/e-shell-view-menu.c:804 ui/evolution.xml.h:42
-msgid "Work Offline"
-msgstr "Offline arbeiten"
+#: shell/e-shell.c:2098
+msgid "Cannot register on OAF"
+msgstr "Registrierung bei OAF konnte nicht stattfinden"
 
-#: shell/e-shortcuts.c:647
-msgid "Error saving shortcuts."
-msgstr "Fehler beim Speichern von Verknüpfungen."
+#: shell/e-shell.c:2100
+msgid "Configuration Database not found"
+msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: shell/e-shortcuts.c:1094
-msgid "Shortcuts"
-msgstr "Verknüpfungen"
+#: shell/e-shell.c:2102 shell/e-storage.c:576
+msgid "Generic error"
+msgstr "Allgemeiner Fehler"
 
-#: shell/e-shortcuts-view.c:79
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Neue Verknüpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:80
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Gruppenname:"
 
-#: shell/e-shortcuts-view.c:174
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Wollen Sie wirklich Gruppe `%s' aus\n"
-"der Verknüpfungsleiste entfernen?"
-
 #: shell/e-shortcuts-view.c:179
-msgid "Don't remove"
-msgstr "Nicht entfernen"
+#, c-format
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+msgstr "Wollen Sie die Gruppe »%s« aus der Verknüpfungsleiste entfernen?"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Verknüpfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Markierte Verknüpfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "Kleine Icons"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Die Verknüpfungen als kleine Icons anzeigen"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "Große Icons"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Die Verknüpfungen als große Icons zeigen"
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "Neue Gruppe..."
 
-#: shell/e-shortcuts-view.c:258
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Eine neue Verknüpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "Diese Gruppe _entfernen..."
 
-#: shell/e-shortcuts-view.c:261
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Diese Verknüpfungsgruppe entfernen"
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "Diese Gruppe _umbenennen..."
 
-#: shell/e-shortcuts-view.c:264
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Diese Verknüpfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "Die Verknüpfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:270
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Die Verknüpfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:281
 msgid "Create _Default Shortcuts"
 msgstr "_Vorgabe-Verknüpfungen anlegen"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:282
 msgid "Create Default Shortcuts"
 msgstr "Vorgabe-Verknüpfungen anlegen"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Verknüpfung umbenennen"
 
-#: shell/e-shortcuts-view.c:396
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Markierte Verknüpfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:409
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Den mit dieser Verknüpfung verbundenen Ordner öffnen"
 
-#: shell/e-shortcuts-view.c:411 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "In neuem _Fenster öffnen"
 
-#: shell/e-shortcuts-view.c:411
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 "Den mit dieser Verknüpfung verbundenen Ordner in einem neuen Fenster öffnen"
 
-#: shell/e-shortcuts-view.c:414
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: shell/e-shortcuts-view.c:414
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Diese Verknüpfung umbenennen"
 
-#: shell/e-shortcuts-view.c:416
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "_Entfernen"
 
-#: shell/e-shortcuts-view.c:416
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Fehler beim Speichern von Verknüpfungen."
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Verknüpfungen"
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Kontrollkästchen"
+
 #: shell/e-storage.c:574
 msgid "No error"
 msgstr "Kein Fehler"
 
 #: shell/e-storage.c:578
 msgid "A folder with the same name already exists"
-msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
+msgstr "Es existiert bereits ein ein Ordner mit diesem Namen"
 
 #: shell/e-storage.c:580
 msgid "The specified folder type is not valid"
@@ -25902,7 +26068,7 @@ msgstr "E-/A-Fehler"
 
 #: shell/e-storage.c:584
 msgid "Not enough space to create the folder"
-msgstr "Nicht genügend Platz, um den Ordner zu erstellen"
+msgstr "Nicht genügend Platz, um den Ordner anzulegen"
 
 #: shell/e-storage.c:586
 msgid "The folder is not empty"
@@ -25940,10 +26106,6 @@ msgstr "Ein Ordnersperre mit diesem Namen konnte nicht erzeugt werden"
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Diese Aktion kann im Offline-Modus nicht ausgeführt werden"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kontrollkästchen"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25958,128 +26120,124 @@ msgstr "%s (zu %d%% abgeschlossen)"
 msgid "<click here to select a folder>"
 msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 
-#: shell/evolution-shell-component.c:1154
+#: shell/evolution-shell-component-utils.c:123
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Unbekannter Fehler."
+
+#: shell/evolution-shell-component-utils.c:126
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Der Fehler im Komponentensystem ist:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:133
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Der Fehler vom Aktivierungssystem ist:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1164
 msgid "CORBA error"
 msgstr "CORBA-Fehler"
 
-#: shell/evolution-shell-component.c:1156
+#: shell/evolution-shell-component.c:1166
 msgid "Interrupted"
 msgstr "Unterbrochen"
 
-#: shell/evolution-shell-component.c:1158
+#: shell/evolution-shell-component.c:1168
 msgid "Invalid argument"
 msgstr "Ungültiges Argument"
 
-#: shell/evolution-shell-component.c:1160
+#: shell/evolution-shell-component.c:1170
 msgid "Already has an owner"
 msgstr "Hat bereits einen Besitzer"
 
-#: shell/evolution-shell-component.c:1162
+#: shell/evolution-shell-component.c:1172
 msgid "No owner"
 msgstr "Kein Besitzer"
 
-#: shell/evolution-shell-component.c:1164
+#: shell/evolution-shell-component.c:1174
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: shell/evolution-shell-component.c:1166
+#: shell/evolution-shell-component.c:1176
 msgid "Unsupported type"
 msgstr "Nicht unterstützter Typ"
 
-#: shell/evolution-shell-component.c:1168
+#: shell/evolution-shell-component.c:1178
 msgid "Unsupported schema"
 msgstr "Nicht unterstütztes Schema"
 
-#: shell/evolution-shell-component.c:1170
+#: shell/evolution-shell-component.c:1180
 msgid "Unsupported operation"
 msgstr "Nicht unterstützte Aktion"
 
-#: shell/evolution-shell-component.c:1172
+#: shell/evolution-shell-component.c:1182
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: shell/evolution-shell-component.c:1176
+#: shell/evolution-shell-component.c:1186
 msgid "Exists"
 msgstr "Existiert"
 
-#: shell/evolution-shell-component.c:1178
+#: shell/evolution-shell-component.c:1188
 msgid "Invalid URI"
 msgstr "Ungültiger URI"
 
-#: shell/evolution-shell-component.c:1182
+#: shell/evolution-shell-component.c:1192
 msgid "Has subfolders"
 msgstr "Hat Unterordner"
 
-#: shell/evolution-shell-component.c:1184
+#: shell/evolution-shell-component.c:1194
 msgid "No space left"
 msgstr "Keine Platz mehr frei"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1196
 msgid "Old owner has died"
 msgstr "Alter Besitzer ist gestorben"
 
-#: shell/evolution-shell-component-utils.c:123
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Unbekannter Fehler."
-
-#: shell/evolution-shell-component-utils.c:126
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Der Fehler im Komponentensystem ist:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:133
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Der Fehler vom Aktivierungssystem ist:\n"
-"%s"
-
-#: shell/evolution-test-component.c:62
+#: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Testtyp"
 
-#: shell/evolution-test-component.c:702
+#: shell/evolution-test-component.c:703
 msgid "Evolution Test Component"
 msgstr "Evolution-Test-Komponente"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Aktive Verbindungen"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Klicken Sie auf OK, um diese Verbindungen zu schließen und offline zu gehen"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Rechner"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr "Die folgenden Verbindungen sind zur Zeit aktiv:"
 
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr "Dialog1"
+
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
 msgstr "Ka_lender:"
@@ -26124,68 +26282,47 @@ msgstr "_Ordnername:"
 msgid "_User:"
 msgstr "_Benutzer:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution-Setupdruide"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Dateien werden importiert"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Zeitzone "
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Willkommen"
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
-"Willkommen bei Evolution. Die nächsten Dialoge werden Ihnen helfen\n"
-"E-Mail-Zugänge einzurichten und Dateien aus anderen Programmen\n"
-"zu importieren. \n"
+"Willkommen bei Evolution. Die folgenden Dialoge werden Ihnen helfen,\n"
+"Ihre E-Mail-Zugänge einzurichten und Dateien aus anderen Anwendungen\n"
+"zu importieren.\n"
 "\n"
-"Um fortzufahren auf \"Weiter\" klicken. "
+"Klicken Sie auf »Weiter«, um fortzufahren. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
-"Sie haben alle Informationen, die zum Einrichten von Evolution\n"
-"benötigt werden, eingegeben.\n"
+"Sie haben alle Informationen eingegeben, die zum\n"
+"Einrichten von Evolution erforderlich sind.\n"
 "\n"
-"Klicken Sie auf »Beenden«, um Ihre Einstellungen zu speichern."
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr ""
-"Konfigurations-Bedienelement für die Ordnereinstellungen von Evolution."
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Hier können Sie spezielle Ordner und Offline-Ordner konfigurieren"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Folder Settings"
-msgstr "Ordner-Einstellungen"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "The Evolution shell."
-msgstr "Die Evolution-Shell."
+"Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu speichern."
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -26220,7 +26357,7 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 "Willkommen zum Evolution-Importdruiden.\n"
-"Dieser Druide führt Sie durch das Importieren externer\n"
+"Dieser Assistent führt Sie durch das Importieren externer\n"
 "Dateien in Evolution."
 
 #: shell/importer/intelligent.c:189
@@ -26239,25 +26376,26 @@ msgstr "Mich nicht mehr fragen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kann Daten aus den folgenden Dateien importieren:"
 
-#: shell/main.c:104 shell/main.c:474
+#: shell/main.c:109 shell/main.c:506
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:110
+#: shell/main.c:115
 msgid "Evolution is now exiting ..."
 msgstr "Evolution wird beendet..."
 
-#: shell/main.c:209
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:216
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -26275,8 +26413,8 @@ msgstr ""
 "noch nicht fertiggestellt oder arbeiten nicht korrekt.\n"
 "\n"
 "Falls Sie eine stabile Evolution-Version benötigen, empfehlen wir Ihnen\n"
-"dringend, diese Version zu deinstallieren und sich stattdessen für eine\n"
-"1.0.x Version zu entscheiden (1.0.8)\n"
+"dringend, diese Version zu deinstallieren und sich stattdessen für Version\n"
+"%s zu entscheiden\n"
 "\n"
 "Falls Sie Fehler finden, so berichten Sie uns bitte unter bugzilla.ximian."
 "com\n"
@@ -26286,7 +26424,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unserer harten Arbeit gefällt\n"
 "und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: shell/main.c:230
+#: shell/main.c:240
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26294,40 +26432,40 @@ msgstr ""
 "Danke\n"
 "Das Ximian Evolution-Team\n"
 
-#: shell/main.c:238
+#: shell/main.c:248
 msgid "Don't tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: shell/main.c:357
+#: shell/main.c:335
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Auf die Ximian-Evolution-Shell konnte nicht zugegriffen werden."
 
-#: shell/main.c:366
+#: shell/main.c:344
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Die Ximian-Evolution-Shell konnte nicht initialisiert werden: %s"
 
-#: shell/main.c:446
+#: shell/main.c:476
 msgid "Disable splash screen"
 msgstr "Splashscreen deaktivieren"
 
-#: shell/main.c:448
+#: shell/main.c:478
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
-#: shell/main.c:450
+#: shell/main.c:480
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: shell/main.c:452
+#: shell/main.c:482
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: shell/main.c:454
+#: shell/main.c:485
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Aktualisierung der Konfigurationsdateien von Evolution 1.0.x erzwingen"
 
-#: shell/main.c:478
+#: shell/main.c:510
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26336,13 +26474,13 @@ msgstr ""
 "%s: --online und --offline können nicht gemeinsam übergeben werden.\n"
 " Verwenden Sie %s --help, um weitere Informationen zu erhalten.\n"
 
-#: tools/evolution-addressbook-abuse.c:80
+#: tools/evolution-addressbook-abuse.c:81
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
-msgstr "Fehler beim Laden des Standard-Adressbuchs."
+msgstr "Fehler beim Laden des voreingestellten Adressbuchs."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Eingabedatei"
@@ -26351,7 +26489,7 @@ msgstr "Eingabedatei"
 msgid "Output File"
 msgstr "Ausgabedatei"
 
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Kein Dateiname angegeben."
 
@@ -26441,8 +26579,8 @@ msgstr "Den aktuellen Kontakt anzeigen"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:93 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
 msgid "_Actions"
 msgstr "A_ktionen"
@@ -26561,7 +26699,7 @@ msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:152
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
 msgid "Save"
 msgstr "Speichern"
 
@@ -26675,7 +26813,7 @@ msgstr "My Evolution anpassen"
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
-msgstr "Den aktuellen Mailvorgang abbrechen"
+msgstr "Den aktuellen E-Mail-Vorgang abbrechen"
 
 #: ui/evolution-mail-global.xml.h:3
 msgid "Compose _New Message"
@@ -26683,11 +26821,11 @@ msgstr "_Neue Nachricht verfassen"
 
 #: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit rules for filtering new mail"
-msgstr "Regeln zum Filtern neuer Mail anlegen oder bearbeiten"
+msgstr "Regeln zum Filtern neuer E-Mails anlegen/bearbeiten"
 
 #: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
-msgstr "Definitionen virtueller Ordner anlegen oder bearbeiten"
+msgstr "Definitionen virtueller Ordner anlegen/bearbeiten"
 
 #: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
@@ -26704,7 +26842,7 @@ msgstr ""
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
-msgstr "Ein Fenster zum Erstellen einer Mailnachricht öffnen"
+msgstr "Ein Fenster zum Verfassen einer E-Mail-Nachricht öffnen"
 
 #: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
@@ -26853,22 +26991,6 @@ msgstr "Eigenschaften..."
 msgid "_Threaded Message List"
 msgstr "Nachrichtenliste in _Thread-Ordnung"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Dieses Fenster schließen"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
-msgid "_Close"
-msgstr "Schließen"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
-msgid "_View"
-msgstr "_Ansicht"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Absender zum Adressbuch _hinzufügen"
@@ -26907,19 +27029,19 @@ msgstr "_Virtuellen Ordner aus Nachricht erzeugen"
 
 #: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
-msgstr "Eine Regel erstellen, um Nachrichten von diesem Absender zu filtern"
+msgstr "Eine Regel anlegen, um Nachrichten von diesem Absender zu filtern"
 
 #: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Eine Regel erstellen, um Nachrichten an diese Empfänger zu filtern"
+msgstr "Eine Regel anlegen, um Nachrichten an diese Empfänger zu filtern"
 
 #: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Eine Regel erstellen, um Nachrichten an diese Mailingliste zu filtern"
+msgstr "Eine Regel anlegen, um Nachrichten an diese Mailingliste zu filtern"
 
 #: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
-msgstr "Eine Regel erstellen, um Nachrichten mit diesem Betreff zu filtern"
+msgstr "Eine Regel anlegen, um Nachrichten mit diesem Betreff zu filtern"
 
 #: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
@@ -27088,7 +27210,8 @@ msgstr "Die markierte Nachricht in einem neuen Fenster öffnen"
 #: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
-"Die markierte Nachrichte im Maileditor öffnen, um sie nochmals zu verschicken"
+"Die markierte Nachrichte im E-Mail-Editor öffnen, um sie nochmals zu "
+"verschicken"
 
 #: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
@@ -27266,6 +27389,22 @@ msgstr "Werkzeuge"
 msgid "_Undelete"
 msgstr "Löschen rückgängig"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Dieses Fenster schließen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:46
+msgid "_Close"
+msgstr "Schließen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+msgid "_View"
+msgstr "_Ansicht"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Beilegen"
@@ -27355,7 +27494,7 @@ msgstr "Verschicken"
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
-msgstr "Die Mail im HTML-Format verschicken"
+msgstr "Die E-Mail im HTML-Format verschicken"
 
 #: ui/evolution-message-composer.xml.h:26
 msgid "Send this message"
@@ -27840,43 +27979,43 @@ msgstr ""
 "heranzuzoomen, und wählen Sie eine Zeitzone.\n"
 " Mit der rechten Maustaste können Sie wegzoomen."
 
-#: widgets/menus/gal-view-menus.c:287
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "Aktuelle Ansicht"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:349
+#: widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Benutzerdefinierte Ansicht"
 
-#: widgets/menus/gal-view-menus.c:358
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr "Benutzerdefinierte Ansicht speichern"
 
-#: widgets/menus/gal-view-menus.c:371
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Ansichten definieren"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:423
+#: widgets/misc/e-calendar-item.c:434
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1069
+#: widgets/misc/e-calendar-item.c:1107
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "Jetzt"
 
-#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "Heute"
 
-#: widgets/misc/e-cell-date-edit.c:802
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
@@ -27885,81 +28024,81 @@ msgstr "Die Zeit muss folgendes Format haben: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschließlich) sein"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Mitteleuropäisch"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Griechisch"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "Westeuropäisch"
 
-#: widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "Vereinfach"
 
-#: widgets/misc/e-charset-picker.c:93
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
 # CHECK
-#: widgets/misc/e-charset-picker.c:96
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr "Visuell"
 
-#: widgets/misc/e-charset-picker.c:165
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Unbekannter Zeichensatz: %s"
 
-#: widgets/misc/e-charset-picker.c:207
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Geben Sie den zu verwendenden Zeichensatz an"
 
-#: widgets/misc/e-charset-picker.c:282
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Anderer..."
 
-#: widgets/misc/e-charset-picker.c:402
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Zeichenkodierung"
 
@@ -27967,11 +28106,11 @@ msgstr "Zeichenkodierung"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:187
+#: widgets/misc/e-filter-bar.c:190
 msgid "Search Editor"
 msgstr "Editor für Suchen"
 
-#: widgets/misc/e-filter-bar.c:209
+#: widgets/misc/e-filter-bar.c:212
 msgid "Save Search"
 msgstr "Suche speichren"
 
@@ -28003,31 +28142,31 @@ msgstr "Frage"
 msgid "Message"
 msgstr "Meldung"
 
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:524
 msgid "_Find Now"
 msgstr "Jetzt _suchen"
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:525
 msgid "_Clear"
 msgstr "_Löschen"
 
-#: widgets/misc/e-search-bar.c:823
+#: widgets/misc/e-search-bar.c:826
 msgid "Item ID"
 msgstr "Objektkennung"
 
-#: widgets/misc/e-search-bar.c:830
+#: widgets/misc/e-search-bar.c:833
 msgid "Subitem ID"
 msgstr "Kennung des Unterobjekts"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:840
 msgid "Text"
 msgstr "Text"
 
-#: widgets/misc/e-search-bar.c:915
+#: widgets/misc/e-search-bar.c:918
 msgid "Clear"
 msgstr "Löschen"
 
-#: widgets/misc/e-search-bar.c:917
+#: widgets/misc/e-search-bar.c:920
 msgid "Find Now"
 msgstr "Jetzt suchen"
 
@@ -28040,3 +28179,127 @@ msgstr "Der persönliche Adressbuch-Server"
 #: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Der persönliche Kalender-Server; Kalenderfabrik"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Das Editorfenster konnte nicht erzeugt werden, da Sie\n"
+#~ "in der Mailkomponente noch keine Identität konfiguriert\n"
+#~ "haben."
+
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Der Maileditor von Evolution konnte nicht initialisiert werden."
+
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr ""
+#~ "Die Mail-Komponente von Evolution konnte nicht initialisiert werden."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr ""
+#~ "Evolutions Mail-Konfigurations-Komponente konnte nicht initialisiert "
+#~ "werden"
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr ""
+#~ "Evolutions Ordnerinformations-Komponente konnte nicht initialisiert werden"
+
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "Evolution unterstützt E-Mail-Benachrichtigungen für Erinnerungen leider "
+#~ "noch nicht. Daher können Sie die Optionen für diese Erinnerung nicht "
+#~ "bearbeiten."
+
+# CHECK ME
+#~ msgid "st"
+#~ msgstr "1."
+
+# CHECK ME
+#~ msgid "nd"
+#~ msgstr "2."
+
+# CHECK ME
+#~ msgid "rd"
+#~ msgstr "3."
+
+#~ msgid "th"
+#~ msgstr "."
+
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Evolution-Mailordner-Fabrik-Komponente."
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Fabrik für den Evolution-Maileditor."
+
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Fabrik für die Mailzusammenfassungs-Komponente."
+
+#~ msgid ""
+#~ "Please specify signature filename\n"
+#~ "in Advanced section of signature settings."
+#~ msgstr ""
+#~ "Bitte geben Sie im Abschnitt »Komplex« der Signatur-\n"
+#~ "einstellungen einen Dateinamen für die Signatur an."
+
+#~ msgid "Apri file"
+#~ msgstr "Apri-Datei"
+
+#~ msgid "Salve file"
+#~ msgstr "Datei retten"
+
+#~ msgid "Evolution installation"
+#~ msgstr "Installation von Evolution"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Diese neue Version von Evolution muss zusätzliche Dateien in Ihr\n"
+#~ "persönliches Evolution-Verzeichnis installieren"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Bitte klicken Sie auf »OK«, um die Dateien zu installieren, oder auf "
+#~ "»Abbrechen« zum Beenden."
+
+#~ msgid ""
+#~ "Evolution has detected an old\n"
+#~ "Executive-Summary directory.\n"
+#~ "This needs to be removed before\n"
+#~ "Evolution will run.\n"
+#~ "Do you want me to remove this directory?"
+#~ msgstr ""
+#~ "Evolution hat ein altes Verzeichnis\n"
+#~ "\"Executive-Summary\" gefunden. Dies\n"
+#~ "muss entfernt werden, bevor Evolution\n"
+#~ "starten kann.\n"
+#~ "Möchten Sie, dass dieses Verzeichnis\n"
+#~ "entfernt wird?"
+
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Das Evolution-Mailerdruiden-Interface konnte nicht gestartet werden\n"
+#~ "(%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr ""
+#~ "Das Evolution-Mailerdruiden-Interface konnte nicht gestartet werden\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Ordnername kann keine Slashes enthalten."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Das Werkzeug zur Fehlermeldung konnte nicht gefunden werden"
+
+#~ msgid "Don't remove"
+#~ msgstr "Nicht entfernen"
+
+#~ msgid "Active connections"
+#~ msgstr "Aktive Verbindungen"
+
+#~ msgid "Host"
+#~ msgstr "Rechner"
-- 
cgit v1.2.3