Syncing up for the 0.16.100 internal release.

svn path=/trunk/; revision=14551
author: Ettore Perazzoli <ettore@src.gnome.org> 2001-11-01 07:07:32 +0800
committer: Ettore Perazzoli <ettore@src.gnome.org> 2001-11-01 07:07:32 +0800
commit: 1d7f11a189c5c4fa7797b33bdb93822e352319d1 (patch)
tree: 23a559420d8a89436254040f077f29c65b06ef1d /po/de.po
parent: 9450e20fe2e22030f1674c36935fd1603d2c065a (diff)
download: gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar
gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar.gz
gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar.bz2
gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar.lz
gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar.xz
gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar.zst
gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.zip
1 files changed, 2255 insertions, 1682 deletions
diff --git a/po/de.po b/po/de.po
index be75ade329..389f7ee215 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.8cvs\n"
-"POT-Creation-Date: 2001-10-28 18:45+0100\n"
+"POT-Creation-Date: 2001-10-31 17:21-0500\n"
 "PO-Revision-Date: 2001-10-28 19:07+01:00\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -18,6 +18,16 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Factory, um VCard-Dateien in Evolution zu importieren."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "Importiert VCard-Dateien in Evolution."
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Factory, um VCard-Dateien in Evolution zu importieren."
@@ -26,291 +36,296 @@ msgstr "Factory, um VCard-Dateien in Evolution zu importieren."
 msgid "Imports VCard files into Evolution."
 msgstr "Importiert VCard-Dateien in Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "Einsortieren unter"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Name"
 msgstr "Name"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "E-Mail"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1630
 msgid "Primary"
 msgstr "Primär"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:63
 msgid "Prim"
 msgstr "Prim"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/contact-editor/e-contact-editor.c:1615
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1588
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1683
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:70
 msgid "Bus"
 msgstr "Geschäft"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1619
 msgid "Callback"
 msgstr "Rückruf"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:1621
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Comp"
 msgstr "Fa."
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1622
+#: addressbook/gui/contact-editor/e-contact-editor.c:1684
 msgid "Home"
 msgstr "Zu Hause"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1626
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1620
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1618
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "Geschäftliches Fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus Fax"
 msgstr "Gesch. Fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1617
 msgid "Business 2"
 msgstr "Geschäftlich 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:76
 msgid "Bus 2"
 msgstr "Geschäft 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1623
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1625
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/contact-editor/e-contact-editor.c:1627
+#: addressbook/gui/contact-editor/e-contact-editor.c:1685
 #: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Andere"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1628
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "Funk"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:484
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "E-Mail 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/component/e-address-popup.c:494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "E-Mail 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Url"
 msgstr "URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "Abteilung"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Dep"
 msgstr "Abt"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "Büro"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Büro"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "Beruf"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Prof"
 msgstr "Beruf"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:911
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Chef"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Ass"
 msgstr "Ass"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Spitzn."
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "Lebenspartner"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "Notiz"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Calendar URI"
 msgstr "Kalender-URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "KalURI"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "Verfügbarkeits-Adresse"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
 msgstr "VURL"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniversary"
 msgstr "Jahrestag"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Anniv"
 msgstr "JTag"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Birth Date"
 msgstr "Geburtsdatum"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: 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-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
 msgid "Family Name"
 msgstr "Familienname"
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card-simple.c:787
+#, c-format
+msgid "%x"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3712
 msgid "Card: "
 msgstr "Karte: "
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3714
 msgid ""
 "\n"
 "Name: "
@@ -318,7 +333,7 @@ msgstr ""
 "\n"
 "Name: "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "  Prefix:     "
@@ -326,7 +341,7 @@ msgstr ""
 "\n"
 "  Präfix:     "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Given:      "
@@ -334,7 +349,7 @@ msgstr ""
 "\n"
 "  Vorname:     "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Additional: "
@@ -342,7 +357,7 @@ msgstr ""
 "\n"
 "  Zusätzlich: "
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Family:     "
@@ -350,7 +365,7 @@ msgstr ""
 "\n"
 "  Familienname:     "
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Suffix:     "
@@ -358,7 +373,7 @@ msgstr ""
 "\n"
 "  Suffix:     "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Birth Date: "
@@ -366,7 +381,7 @@ msgstr ""
 "\n"
 "Geburtsdatum: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3744
 msgid ""
 "\n"
 "Address:"
@@ -374,7 +389,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3747
+#: addressbook/backend/ebook/e-card.c:3746
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -382,7 +397,7 @@ msgstr ""
 "\n"
 "  Postfach:  "
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Ext:         "
@@ -390,7 +405,7 @@ msgstr ""
 "\n"
 "  Suffix:        "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Street:      "
@@ -398,7 +413,7 @@ msgstr ""
 "\n"
 "  Straße:     "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  City:        "
@@ -406,7 +421,7 @@ msgstr ""
 "\n"
 "  Ort:     "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Region:      "
@@ -414,7 +429,7 @@ msgstr ""
 "\n"
 "  Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Postal Code: "
@@ -422,7 +437,7 @@ msgstr ""
 "\n"
 "  Postleitzahl: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Country:     "
@@ -430,7 +445,7 @@ msgstr ""
 "\n"
 "  Land:     "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3765
 msgid ""
 "\n"
 "Delivery Label: "
@@ -438,7 +453,7 @@ msgstr ""
 "\n"
 "Postvermerk: "
 
-#: addressbook/backend/ebook/e-card.c:3778
+#: addressbook/backend/ebook/e-card.c:3777
 msgid ""
 "\n"
 "Telephones:\n"
@@ -446,7 +461,7 @@ msgstr ""
 "\n"
 "Telefone:\n"
 
-#: addressbook/backend/ebook/e-card.c:3781
+#: addressbook/backend/ebook/e-card.c:3780
 msgid ""
 "\n"
 "Telephone:"
@@ -454,7 +469,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3805
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "E-mail:\n"
@@ -462,7 +477,7 @@ msgstr ""
 "\n"
 "E-Mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3808
+#: addressbook/backend/ebook/e-card.c:3807
 msgid ""
 "\n"
 "E-mail:"
@@ -470,7 +485,7 @@ msgstr ""
 "\n"
 "E-Mail:"
 
-#: addressbook/backend/ebook/e-card.c:3827
+#: addressbook/backend/ebook/e-card.c:3826
 msgid ""
 "\n"
 "Mailer: "
@@ -478,7 +493,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "Time Zone: "
@@ -486,7 +501,7 @@ msgstr ""
 "\n"
 "Zeitzone: "
 
-#: addressbook/backend/ebook/e-card.c:3841
+#: addressbook/backend/ebook/e-card.c:3840
 msgid ""
 "\n"
 "Geo Location: "
@@ -494,7 +509,7 @@ msgstr ""
 "\n"
 "Geographischer Ort: "
 
-#: addressbook/backend/ebook/e-card.c:3845
+#: addressbook/backend/ebook/e-card.c:3844
 msgid ""
 "\n"
 "Business Role: "
@@ -502,7 +517,7 @@ msgstr ""
 "\n"
 "Berufsbezeichnung: "
 
-#: addressbook/backend/ebook/e-card.c:3857
+#: addressbook/backend/ebook/e-card.c:3856
 msgid ""
 "\n"
 "Org: "
@@ -510,7 +525,7 @@ msgstr ""
 "\n"
 "Firma: "
 
-#: addressbook/backend/ebook/e-card.c:3858
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "  Name:  "
@@ -518,7 +533,7 @@ msgstr ""
 "\n"
 "  Name:  "
 
-#: addressbook/backend/ebook/e-card.c:3859
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Unit:  "
@@ -526,7 +541,7 @@ msgstr ""
 "\n"
 "  Einheit:  "
 
-#: addressbook/backend/ebook/e-card.c:3860
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit2: "
@@ -534,7 +549,7 @@ msgstr ""
 "\n"
 "  Einheit2: "
 
-#: addressbook/backend/ebook/e-card.c:3861
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit3: "
@@ -542,7 +557,7 @@ msgstr ""
 "\n"
 "  Einheit3: "
 
-#: addressbook/backend/ebook/e-card.c:3862
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit4: "
@@ -550,7 +565,7 @@ msgstr ""
 "\n"
 "  Einheit4: "
 
-#: addressbook/backend/ebook/e-card.c:3866
+#: addressbook/backend/ebook/e-card.c:3865
 msgid ""
 "\n"
 "Categories: "
@@ -558,7 +573,7 @@ msgstr ""
 "\n"
 "Kategorien: "
 
-#: addressbook/backend/ebook/e-card.c:3867
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Comment: "
@@ -576,7 +591,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3880
+#: addressbook/backend/ebook/e-card.c:3879
 msgid ""
 "\n"
 "Unique String: "
@@ -584,7 +599,7 @@ msgstr ""
 "\n"
 "Eindeutige Zeichenkette: "
 
-#: addressbook/backend/ebook/e-card.c:3883
+#: addressbook/backend/ebook/e-card.c:3882
 msgid ""
 "\n"
 "Public Key: "
@@ -592,11 +607,11 @@ msgstr ""
 "\n"
 "Öffentlicher Schlüssel: "
 
-#: addressbook/backend/ebook/e-card.c:4236
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/backend/ebook/e-card.c:4244
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard für %s"
@@ -605,16 +620,18 @@ msgstr "VCard für %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1433
-#: addressbook/gui/component/addressbook-factory.c:49
-#: calendar/conduits/calendar/calendar-conduit.c:1378
-#: calendar/conduits/todo/todo-conduit.c:1074
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1537
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: 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/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2059
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 msgid "Searching..."
 msgstr "Suchen..."
 
@@ -627,60 +644,60 @@ msgstr "Laden..."
 msgid "Error in search expression."
 msgstr "Fehler im Suchausdruck."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:467
+#: addressbook/backend/pas/pas-backend-ldap.c:475
 msgid "Connecting to LDAP server..."
 msgstr "Verbindung zu LDAP-Server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:477
+#: addressbook/backend/pas/pas-backend-ldap.c:485
 msgid "Unable to connect to LDAP server."
 msgstr "Verbindung IMAP-Server konnte nicht aufgebaut werden."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:493
+#: addressbook/backend/pas/pas-backend-ldap.c:501
 msgid "Waiting for connection to LDAP server..."
 msgstr "Warten auf Verbindung zum LDAP-Server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:862
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 msgid "Adding card to LDAP server..."
 msgstr "Karte zu LDAP-Server hinzufügen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 msgid "Removing card from LDAP server..."
 msgstr "Karte von LDAP-Server entfernen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1072
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr "Karte auf LDAP-Server ändern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2004
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr "Empfangen von LDAP-Suchergebnissen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2009
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
 msgid "Restarting search."
 msgstr "Suche wird neu gestartet."
 
-#: addressbook/conduit/address-conduit.c:241
+#: addressbook/conduit/address-conduit.c:284
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor konnte nicht geladen werden\n"
 
-#: addressbook/conduit/address-conduit.c:254
+#: addressbook/conduit/address-conduit.c:297
 msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
-#: addressbook/conduit/address-conduit.c:997
-#: calendar/conduits/calendar/calendar-conduit.c:930
-#: calendar/conduits/todo/todo-conduit.c:645
+#: addressbook/conduit/address-conduit.c:1093
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
-#: addressbook/conduit/address-conduit.c:998
-#: calendar/conduits/calendar/calendar-conduit.c:931
-#: calendar/conduits/todo/todo-conduit.c:646
+#: addressbook/conduit/address-conduit.c:1094
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
-#: addressbook/conduit/address-conduit.c:1028
-#: addressbook/conduit/address-conduit.c:1031
+#: addressbook/conduit/address-conduit.c:1124
+#: addressbook/conduit/address-conduit.c:1127
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
@@ -724,38 +741,39 @@ msgstr "Factory für das Adress-Popup des Adressbuchs"
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory für die beispielhafte Adressbuch-Kontrolle"
 
-#: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:300
-#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:310
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "Ordner mit Kontaktinformationen"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP-Server:"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "LDAP-Server mit Kontaktinformationen"
 
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
 msgid "New _Contact"
 msgstr "Neuer _Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "Neu Kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact _List"
 msgstr "Neue Kontakt_liste"
 
@@ -788,7 +806,7 @@ msgid "Base"
 msgstr "Base"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
 msgid "Basic"
 msgstr "Grundlegend"
 
@@ -803,7 +821,9 @@ msgstr "E-Mail-Adresse:"
 #: addressbook/gui/component/addressbook-config.glade.h:10
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution wird diese E-Mail-Adresse benutzen, um Sie beim Server zu legitimieren"
+msgstr ""
+"Evolution wird diese E-Mail-Adresse benutzen, um Sie beim Server zu "
+"legitimieren"
 
 #: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "One"
@@ -883,7 +903,7 @@ msgstr "Hinzufügen"
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Bearbeiten"
@@ -900,11 +920,21 @@ msgstr "_Port:"
 msgid "_Server name:"
 msgstr "_Servername:"
 
-#: addressbook/gui/component/addressbook.c:464
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+msgid "Could not initialize gnome-vfs"
+msgstr "gnome-vfs konnte nicht initialisiert werden"
+
+#: addressbook/gui/component/addressbook-storage.c:167
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Kontakte"
+
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch kann nicht geöffnet werden"
 
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -914,7 +944,7 @@ msgstr ""
 "bedeutet entweder, dass Sie einen ungültigen URI eingegeben\n"
 "haben oder dass der LDAP-Server unerreichbar ist."
 
-#: addressbook/gui/component/addressbook.c:478
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -927,7 +957,7 @@ msgstr ""
 "nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
 "haben.\n"
 
-#: addressbook/gui/component/addressbook.c:486
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -935,42 +965,42 @@ 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:619
+#: addressbook/gui/component/addressbook.c:623
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Passwort für %s (Benutzer %s) eingeben"
 
-#: addressbook/gui/component/addressbook.c:724
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Irgend ein Feld enthält"
 
-#: addressbook/gui/component/addressbook.c:725
+#: addressbook/gui/component/addressbook.c:761
 msgid "Name contains"
 msgstr "Name enthält"
 
-#: addressbook/gui/component/addressbook.c:726
+#: addressbook/gui/component/addressbook.c:762
 msgid "Email contains"
 msgstr "E-Mail enthält"
 
-#: addressbook/gui/component/addressbook.c:727
+#: addressbook/gui/component/addressbook.c:763
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategorie ist"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:728 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Komplex..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:959
+#: addressbook/gui/component/addressbook.c:1005
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -983,51 +1013,51 @@ msgstr "Die URI, die der Suchdienst anzeigen wird"
 msgid "(none)"
 msgstr "(keine)"
 
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 msgid "Primary Email"
 msgstr "Primäre E-Mail"
 
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:587
 msgid "Select an Action"
 msgstr "Eine Aktion wählen"
 
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:593
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Einen neuen Kontakt \"%s\" anlegen"
 
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Adresse zu bestehendem Kontakt \"%s\" hinzufügen"
 
-#: addressbook/gui/component/e-address-popup.c:860
+#: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
 msgstr "Anfrage beim Adressbuch..."
 
-#: addressbook/gui/component/e-address-popup.c:935
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
 msgid "Edit Contact Info"
 msgstr "Kontaktinfo bearbeiten"
 
-#: addressbook/gui/component/e-address-popup.c:964
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
 msgid "Add to Contacts"
 msgstr "Zu Kontakten hinzufügen"
 
-#: addressbook/gui/component/e-address-popup.c:1007
+#: addressbook/gui/component/e-address-popup.c:1046
 msgid "Merge E-Mail Address"
 msgstr "E-Mail-Adresse einfließen lassen"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Disable Queries"
 msgstr "Abfragen deaktivieren"
 
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
 msgid "Enable Queries (Dangerous!)"
 msgstr "Abfragen aktivieren (gefährlich!)"
 
@@ -1039,35 +1069,35 @@ msgstr "Evolution Namenauswahlschnittstelle für das Adressbuch."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory für die Namenauswahl-Schnittstelle des Adressbuchs"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:777
 #: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
 msgid "Remove All"
 msgstr "Alle Entfernen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
 msgid "Send HTML Mail?"
 msgstr "HTML-Mail verschicken?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
 msgid "Edit Contact List"
 msgstr "Kontaktliste bearbeiten"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
 msgid "Unnamed Contact List"
 msgstr "Namenlose Kontaktliste"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d nicht gezeigt)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
 msgid "Unnamed Contact"
 msgstr "Namenloser Kontakt"
 
@@ -1088,7 +1118,15 @@ msgstr ""
 "Beschreibung der Umstände, unter denen dieser Fehler auftrat,\n"
 "an Jon Trowbridge <trow@ximian.com>. Danke."
 
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:532
+msgid ""
+"Evolution is unable to get the addressbook local storage.\n"
+"Under normal circumstances, this should never happen.\n"
+"You may need to exit and restart Evolution in order to\n"
+"correct this problem."
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "Kontakte aus Adressbuch wählen"
 
@@ -1148,12 +1186,12 @@ msgstr "Zusammenarbeit"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/contact-editor/e-contact-editor.c:1264
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "Details"
 
@@ -1174,7 +1212,9 @@ msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
 "of that information here."
-msgstr "Falls diese Person Verfügbarkeits- oder andere Kalenderinformationen im Internet veröffentlicht, geben Sie die Adresse dieser Informationen hier ein."
+msgstr ""
+"Falls diese Person Verfügbarkeits- oder andere Kalenderinformationen im "
+"Internet veröffentlicht, geben Sie die Adresse dieser Informationen hier ein."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
@@ -1220,8 +1260,8 @@ msgstr "Kontakte..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:690 filter/filter.glade.h:8
-#: mail/folder-browser.c:1461 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1496 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1280,49 +1320,56 @@ msgid "_Web page address:"
 msgstr "Adresse der _Webseite:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Sind Sie sicher, dass Sie diesen Account löschen wollen?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Kontakt löschen?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt gehört in folgende Kategorien:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2227
+#: addressbook/gui/contact-editor/e-contact-editor.c:2255
 #, 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:284
+#: 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:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
 msgid "Edit Full"
 msgstr "Voll bearbeiten"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "Full Name"
 msgstr "Voller Name"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "E-mail"
 msgstr "E-Mail"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:203
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2391,7 +2438,7 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:230
 msgid "Contact List Editor"
 msgstr "Kontaktlisten-Editor"
 
@@ -2441,13 +2488,13 @@ msgstr ""
 "Kontakts gibt es bereits in diesem Ordner. Möchten Sie ihn\n"
 "trotzdem hinzufügen?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Suchen"
 
@@ -2466,9 +2513,9 @@ msgstr "%d Karten"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:700
-#: addressbook/gui/widgets/e-addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1434
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
@@ -2479,18 +2526,18 @@ msgid "Open"
 msgstr "Öffnen"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:763
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Kontakt weiterleiten"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:764
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:765
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: 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:66
 #: ui/my-evolution.xml.h:2
@@ -2498,94 +2545,99 @@ msgid "Print"
 msgstr "Drucken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:767
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Print Envelope"
 msgstr "Umschlag drucken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:769 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Löschen"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:972
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "Erfolg"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1875
-#: shell/e-storage.c:529 shell/evolution-shell-component.c:1009
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
-#: shell/evolution-shell-component.c:1000
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "Karte nicht gefunden"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "Kartenkennung existiert bereits"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstützt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1205
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:483 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "Storniert"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "Anderer Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: calendar/gui/dialogs/save-comp.c:50
+msgid "Do you want to save changes?"
+msgstr "Wollen Sie die Änderungen speichern?"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen der Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "Fehler beim Hinzufügen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1307
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
 #. 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:407
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 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"
 
@@ -2593,84 +2645,84 @@ 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:412
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 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:877
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* Hier klicken, um einen Kontakt hinzuzufügen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "Primäres Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "Telefon des Assistenten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "Geschäftliches Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "Rückruf-Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "Firmentelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "Telefon zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "Geschäftliche Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "Adresse zu Hause"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "Geschäftliches Telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "Telefon zu Hause 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "Anderes Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "Andere Adresse"
 
-#: addressbook/gui/widgets/e-minicard-control.c:183
+#: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
 msgstr "und %d andere Karten."
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:187
 msgid "and one other card."
 msgstr "und eine andere Karte."
 
-#: addressbook/gui/widgets/e-minicard-control.c:307
+#: addressbook/gui/widgets/e-minicard-control.c:316
 msgid "Save in addressbook"
 msgstr "In Adressbuch speichern"
 
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
@@ -2856,94 +2908,109 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift..."
 
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
 msgid "Print cards"
 msgstr "Karten drucken"
 
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
 msgid "Print card"
 msgstr "Karte drucken"
 
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
 msgid "Print envelope"
 msgstr "Umschlag drucken"
 
-#: calendar/cal-util/cal-util.c:425 calendar/cal-util/cal-util.c:447
+#: calendar/cal-util/cal-component.c:1202
+#, fuzzy
+msgid "Untitled appointment"
+msgstr "Termin _bearbeiten"
+
+#: calendar/cal-util/cal-util.c:495 calendar/cal-util/cal-util.c:517
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "Hoch"
 
-#: calendar/cal-util/cal-util.c:427 calendar/cal-util/cal-util.c:449
-#: calendar/gui/calendar-model.c:1705
+#: calendar/cal-util/cal-util.c:497 calendar/cal-util/cal-util.c:519
+#: calendar/gui/calendar-model.c:1703
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:429 calendar/cal-util/cal-util.c:451
+#: calendar/cal-util/cal-util.c:499 calendar/cal-util/cal-util.c:521
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:409 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "Niedrig"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:445
+#: calendar/cal-util/cal-util.c:515
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: calendar/conduits/calendar/calendar-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1012
-#: calendar/conduits/calendar/calendar-conduit.c:1015
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/conduits/todo/todo-conduit.c:708
-#: calendar/conduits/todo/todo-conduit.c:711
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
 msgstr "Eine beispielhafte Bonobo-Komponente, die einen Kalender anzeigt."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Eine beispielhafte Bonobo-Komponente, die einen Kalender anzeigt."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Evolutions Chefsesselansichts-Komponente für den Kalender."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "iTip-/iMip-Betrachter für den Evolution-Kalender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution-Komponente für die Verwaltung des Kalenders."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "Factory für die Kalenderzusammenfassungs-Komponente."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution Tasks control"
+msgstr "Factory für den Evolution-Maileditor."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Factory für die Kalender-iTip-Ansichts-Control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Factory für die beispielhafte Kalender-Control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Fabrik, die Kalender-Komponenteneditor-Dialoge zentralisiert"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Fabrik, um eine Komponenteneditor-Fabrik zu erzeugen"
 
@@ -2955,9 +3022,30 @@ msgstr "Alarm-Benachrichtigungsdienst"
 msgid "Factory for the alarm notification service"
 msgstr "Factory für den Alarm-Benachrichtigungsdienst."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:350
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm am %A, %d. %b %Y %H.%M"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Einstellungen"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Indizieren:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#, fuzzy
+msgid "invalid time"
+msgstr "Ungültiges Argument"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "Alarme"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -2976,11 +3064,11 @@ msgstr "Weiterschlaf-Zeit (Minuten)"
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:663
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:723
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2993,7 +3081,7 @@ msgstr ""
 "wird statt dessen eine normales Erinnerungsdialogfenster\n"
 "anzeigen."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:774
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3010,118 +3098,115 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "GNOME konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "gnome-vfs konnte nicht initialisiert werden"
-
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
 msgid "Could not create the alarm notify service"
 msgstr "Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Factory für Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:446
 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:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Die Kalender-Ansicht konnte nicht erstellt werden. Bitte überprüfen Sie Ihre "
 "ORBit und OAF Einstellungen. "
 
-#: calendar/gui/calendar-model.c:417 calendar/gui/calendar-model.c:998
-#: calendar/gui/e-calendar-table.c:386
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:420 calendar/gui/calendar-model.c:1000
-#: calendar/gui/e-calendar-table.c:387
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/calendar-model.c:423 calendar/gui/e-calendar-table.c:385
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "Öffentlich"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:529
+#: calendar/gui/calendar-model.c:536
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "E"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:531
+#: calendar/gui/calendar-model.c:538
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1151
-#: calendar/gui/e-calendar-table.c:459
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "Frei"
 
-#: calendar/gui/calendar-model.c:598 calendar/gui/e-calendar-table.c:460
-#: calendar/gui/e-meeting-time-sel.c:405 shell/evolution-shell-component.c:994
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:480
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:481
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1203
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:338
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/calendar-model.c:1056
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3132,54 +3217,54 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1197 calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1448
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1482
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
 #: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:246 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1459 widgets/misc/e-dateedit.c:1574
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:297 calendar/gui/e-meeting-model.c:523
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:299
-#: calendar/gui/e-meeting-model.c:720
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "Nein"
 
 #. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2014 calendar/gui/e-day-view.c:1675
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
 #: calendar/gui/e-week-view.c:1182
 msgid "Searching"
 msgstr "Suchen"
 
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Tagesansicht"
 
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Werkwochenansicht"
 
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Wochenansicht"
 
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Monatsansicht"
 
@@ -3195,26 +3280,27 @@ msgstr "Beschreibung enthält"
 msgid "Comment contains"
 msgstr "Kommentar enthält"
 
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
 msgid "Unmatched"
 msgstr "Nicht passend"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
-#: shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Ordner mit Terminen und Ereignissen"
 
-#: calendar/gui/component-factory.c:69 my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:257 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Ordner mit To-Do-Einträgen"
 
@@ -3222,7 +3308,7 @@ msgstr "Ordner mit To-Do-Einträgen"
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3441
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Neuer _Termin"
 
@@ -3235,7 +3321,7 @@ msgstr "Eine neue Aufgabe anlegen"
 msgid "New _Task"
 msgstr "Neue _Aufgabe"
 
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
@@ -3308,115 +3394,110 @@ msgstr "Stunden"
 msgid "minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
 msgid "1 day"
 msgstr "1 Tag"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
 msgid "1 week"
 msgstr "1 Woche"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
 msgid "1 hour"
 msgstr "1 Stunde"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
 msgid "1 minute"
 msgstr "1 Minute"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
 msgid "1 second"
 msgstr "1 Sekunde"
 
-#: calendar/gui/dialogs/alarm-page.c:371
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
-#: calendar/gui/dialogs/alarm-page.c:375
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Eine Nachricht anzeigen"
 
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Ein Programm ausführen"
 
-#: calendar/gui/dialogs/alarm-page.c:389
+#: calendar/gui/dialogs/alarm-page.c:391
 msgid "Unknown action to be performed"
 msgstr "Unbekannte auszuführende Aktion"
 
-#: calendar/gui/dialogs/alarm-page.c:401
+#: calendar/gui/dialogs/alarm-page.c:403
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s vor Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/dialogs/alarm-page.c:406
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nach Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:409
+#: calendar/gui/dialogs/alarm-page.c:411
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s zum Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:418
+#: calendar/gui/dialogs/alarm-page.c:420
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s vor Terminende"
 
-#: calendar/gui/dialogs/alarm-page.c:421
+#: calendar/gui/dialogs/alarm-page.c:423
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nach Terminende"
 
-#: calendar/gui/dialogs/alarm-page.c:426
+#: calendar/gui/dialogs/alarm-page.c:428
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s zum Terminende"
 
-#: calendar/gui/dialogs/alarm-page.c:437
-#, c-format
-msgid "%s at an unknown time"
-msgstr "%s zu einer unbekannten Zeit"
-
-#: calendar/gui/dialogs/alarm-page.c:443
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
-#: calendar/gui/dialogs/alarm-page.c:450
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
@@ -3437,7 +3518,7 @@ msgstr "Erinnerungen"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
@@ -3520,7 +3601,7 @@ msgid "First day of wee_k:"
 msgstr "Erster Tag der _Woche:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "Freitag"
 
@@ -3533,7 +3614,7 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "Montag"
 
@@ -3542,7 +3623,7 @@ msgid "O_verdue tasks:"
 msgstr "_Überfällige Aufgaben:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -3563,7 +3644,7 @@ msgid "Su_n"
 msgstr "S_o"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -3580,7 +3661,7 @@ msgid "Tas_ks due today:"
 msgstr "Heute fällige _Aufgaben:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -3601,12 +3682,12 @@ msgid "Time format:"
 msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "Dienstag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -3675,124 +3756,129 @@ msgstr "_Mi"
 msgid "before the start of the appointment"
 msgstr "vor Terminbeginn"
 
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 "Der Status der Besprechung hat sich geändert. Aktualisierte Version "
 "verschicken?"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 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:63
+#: calendar/gui/dialogs/cancel-comp.c:62
 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:68
+#: calendar/gui/dialogs/cancel-comp.c:67
 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 "
 "wollen?"
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Dieses Ereignis wurde gelöscht."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Diese Aufgabe wurde gelöscht."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
 msgid "This journal entry has been deleted."
 msgstr "Dieser Journaleintrag wurde gelöscht."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese vergessen und den Editor "
 "schließen?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor schließen?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Dieses Ereignis wurde geändert."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
 msgstr "Diese Aufgabe wurde geändert."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
 msgid "This journal entry has been changed."
 msgstr "Dieser Journaleintrag wurde geändert."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese vergessen und den Editor "
 "aktualisieren?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 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-util.c:178 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " an "
 
-#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (Fällig am "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "Fällig am "
 
-#: calendar/gui/dialogs/comp-editor.c:631
+#: calendar/gui/dialogs/comp-editor.c:303
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Dateien konnte nicht korrekt aktualisiert werden"
+
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/comp-editor.c:636
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:639
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:642
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:656
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/comp-editor.c:1006 mail/mail-callbacks.c:1846
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1876
 #: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Datei überschreiben?"
 
-#: calendar/gui/dialogs/comp-editor.c:1010 mail/mail-callbacks.c:1853
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1883
 #: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
@@ -3801,54 +3887,54 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits.\n"
 "Überschreiben?"
 
-#: calendar/gui/dialogs/comp-editor.c:1073 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1228
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version kann nicht erhalten werden!"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sind Sie sicher, dass Sie den Termin \"%s\" löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sind Sie sicher, dass Sie diesen unbenannten Termin löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sind Sie sicher, dass Sie die Aufgabe `%s' löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sind Sie sicher, dass Sie diese unbenannte Aufgabe löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sind Sie sicher, dass Sie den Journaleintrag `%s' löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Sind Sie sicher, dass Sie diesen unbenannten Journaleintrag löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Sind Sie sicher, dass Sie %d Termine löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Sind Sie sicher, dass Sie %d Aufgaben löschen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Sind Sie sicher, dass Sie %d Journaleinträge löschen wollen?"
@@ -3865,25 +3951,25 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:352
 msgid "Scheduling"
 msgstr "Planung"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "Besprechung"
 
@@ -3902,11 +3988,12 @@ msgid "Classification"
 msgstr "Klassifikation"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "_Vertraulich"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Datum & Zeit"
 
@@ -3915,22 +4002,22 @@ msgid "F_ree"
 msgstr "_Frei"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Privat"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Öffentlich"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.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:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Zusammenfassung:"
 
@@ -3942,15 +4029,20 @@ msgstr "_Endzeit:"
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Ein Organisator wird benötigt."
 
-#: calendar/gui/dialogs/meeting-page.c:612
+#: calendar/gui/dialogs/meeting-page.c:443
+#, fuzzy
+msgid "At least one attendee is required."
+msgstr "Mindestens ein Teilnehmer wird benötigt."
+
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "Diese Person nimmt schon an der Besprechung teil!"
 
-#: calendar/gui/dialogs/meeting-page.c:685
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
@@ -3961,49 +4053,56 @@ msgstr "Anwesender"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Gemeinsamer Name"
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Hier klicken, um einen Kontakt hinzuzufügen *"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegiert durch"
+msgid "Common Name"
+msgstr "Gemeinsamer Name"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegiert an"
+msgid "Delegated From"
+msgstr "Delegiert durch"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Sprache"
+msgid "Delegated To"
+msgstr "Delegiert an"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Mitglied"
+msgid "Language"
+msgstr "Sprache"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "UAwg"
+msgid "Member"
+msgstr "Mitglied"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "UAwg"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Position"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:49
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/mail-config.glade.h:85
+#: 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 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4018,36 +4117,37 @@ msgid "_Change Organizer"
 msgstr "Organisator _ändern"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Invite Others"
-msgstr "Andere _einladen"
+#: calendar/gui/e-meeting-time-sel.c:427
+msgid "_Invite Others..."
+msgstr "Andere einladen..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "_Anderer Organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
 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:926
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "bei"
 
-#: calendar/gui/dialogs/recurrence-page.c:952 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "Tag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1082
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "am"
 
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1096
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1263
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "Auftreten"
 
@@ -4111,23 +4211,19 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Wollen Sie die Änderungen speichern?"
-
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
 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:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Die Aufgabeninformationen haben sich geändert. Eine aktualisierte Version "
 "verschicken?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
 msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 "Der Journaleintrag hat sich geändert. Eine aktualisierte Version schicken?"
@@ -4147,7 +4243,7 @@ msgid "Progress"
 msgstr "Fortschritt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:951
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL:"
 
@@ -4159,144 +4255,153 @@ msgstr "_Priorität:"
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:227
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Anfangsdatum:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "Vertraulich"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Fällig am:"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:434
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:435
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:436
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:439
+#: calendar/gui/e-calendar-table.c:437
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:936 calendar/gui/e-day-view.c:3462
-#: calendar/gui/e-week-view.c:3320 mail/folder-browser.c:1440
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Ausgewählte Kontakte löschen"
+
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1475
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: calendar/gui/e-calendar-table.c:940 calendar/gui/e-day-view.c:3471
-#: calendar/gui/e-week-view.c:3329 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 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:942 calendar/gui/e-day-view.c:3473
-#: calendar/gui/e-week-view.c:3331 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:944 calendar/gui/e-day-view.c:3448
-#: calendar/gui/e-day-view.c:3475 calendar/gui/e-week-view.c:3307
-#: calendar/gui/e-week-view.c:3333 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "Einfügen"
 
-#: calendar/gui/e-calendar-table.c:949
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:951
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "Diese Aufgabe _löschen"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "Aufgaen als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:956
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "Ausgewählte Aufgaben _löschen"
 
-#: calendar/gui/e-calendar-table.c:1216
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1224
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicken, um eine Aufgabe hinzuzufügen"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:131 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d. %m %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:134 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:139
+#: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4311,154 +4416,459 @@ msgstr ""
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:837
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:721
+#: camel/camel-filter-driver.c:835
 msgid "Complete"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Abschlussdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Fällig am"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Enddatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geographische Lage"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Priorität"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1455
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1465 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Aufgabensorte"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3302
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "Neues ganztägiges _Ereignis"
 
-#: calendar/gui/e-day-view.c:3453 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3455 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3322
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
 msgid "_Delete this Appointment"
 msgstr "Diesen Termin _löschen"
 
-#: calendar/gui/e-day-view.c:3483 calendar/gui/e-week-view.c:3347
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-day-view.c:3485 calendar/gui/e-week-view.c:3349
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten löschen"
 
-#: calendar/gui/e-day-view.c:3487 calendar/gui/e-week-view.c:3351
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten löschen"
 
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:524
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:529
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:534
+msgid "Free/Busy info begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:538
+msgid "Begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Ende der Besprechung:"
+
+#: calendar/gui/e-itip-control.c:553
+msgid "Free/Busy info ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (Abgeschlossen "
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "Kalender-Information"
+
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Kalender"
+
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "ein unbekannter Absender"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:721
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Eine Aktion wählen"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "Datum"
+
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:254
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "Angenommen"
+
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Vorläufig"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "Abgelehnt"
+
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Verfügbarkeitsinformationen _veröffentlichen"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Kalender-Information"
+
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: calendar/gui/e-itip-control.c:867
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Die letzten Besprechungsinformationen erhalten"
+
+#: calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Optionale Information"
+
+#: calendar/gui/e-itip-control.c:872
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:873
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Besprechung"
+
+#: calendar/gui/e-itip-control.c:877
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:878
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Ende der Besprechung:"
+
+#: calendar/gui/e-itip-control.c:882
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "Die letzten Besprechungsinformationen erhalten"
+
+#: calendar/gui/e-itip-control.c:883
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:887
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:888
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Besprechung"
+
+#: calendar/gui/e-itip-control.c:892
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:893
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Eine Aktion wählen"
+
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "In Nachricht suchen"
+
+#: calendar/gui/e-itip-control.c:917
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "Die letzten Aufgabeninformationen erhalten"
+
+#: calendar/gui/e-itip-control.c:918
+#, fuzzy
+msgid "Task Information"
+msgstr "Information"
+
+#: calendar/gui/e-itip-control.c:922
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:923
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:927
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:928
+#, fuzzy
+msgid "Task Update"
+msgstr "war nach"
+
+#: calendar/gui/e-itip-control.c:932
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "Die letzten Aufgabeninformationen erhalten"
+
+#: calendar/gui/e-itip-control.c:933
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:937
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:938
+#, fuzzy
+msgid "Task Reply"
+msgstr "Antworten"
+
+#: calendar/gui/e-itip-control.c:942
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:943
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Aktion abbrechen"
+
+#: calendar/gui/e-itip-control.c:948
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Kalendermitteilung"
+
+#: calendar/gui/e-itip-control.c:967
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Verfügbarkeitsinformationen _veröffentlichen"
+
+#: calendar/gui/e-itip-control.c:968
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Verfügbarkeitsinformationen _veröffentlichen"
+
+#: calendar/gui/e-itip-control.c:972
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:973
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "_Verfügbarkeits-Adresse:"
+
+#: calendar/gui/e-itip-control.c:977
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:978
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "_Verfügbarkeits-Adresse:"
+
+#: calendar/gui/e-itip-control.c:983
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Vorige Nachricht"
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
+
+#: calendar/gui/e-itip-control.c:1071
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "Diese Nachricht enthält ausschließlich BCC-Empfänger."
+
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1130
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1276
 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:1137
+#: calendar/gui/e-itip-control.c:1284
 msgid "Attendee status ould not be updated!\n"
 msgstr "Anwesenheitsstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1286
 msgid "Attendee status updated\n"
 msgstr "Anwesenheitsstatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1288
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Anwesenheitsstatus kann nicht aktualisiert werden, da der Eintrag nicht mehr "
 "existiert"
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1316
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Der Eintrag konnte nicht aus Ihrer Kalenderdatei entfernt werden!\n"
 
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:1205 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1568
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 "Keine Ihrer Identitäten kann in der Anwesenheitsliste gefunden werden!\n"
@@ -4500,218 +4910,213 @@ msgstr "datum-ende"
 msgid "date-start"
 msgstr "datum-anfang"
 
-#: calendar/gui/e-meeting-model.c:218 calendar/gui/e-meeting-model.c:235
-#: calendar/gui/e-meeting-model.c:519 calendar/gui/e-meeting-model.c:687
+#: calendar/gui/e-meeting-model.c:94
+msgid "Chair Persons"
+msgstr "Vorsitzende"
+
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+msgid "Required Participants"
+msgstr "Benötigte Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:96
+msgid "Optional Participants"
+msgstr "Optionale Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:97
+msgid "Non-Participants"
+msgstr "Nicht-Teilnehmer"
+
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-model.c:220 calendar/gui/e-meeting-model.c:237
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:239
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "Ressource"
 
-#: calendar/gui/e-meeting-model.c:224 calendar/gui/e-meeting-model.c:241
-#: calendar/gui/e-meeting-model.c:690
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "Raum"
 
-#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:691
-#: calendar/gui/e-meeting-model.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: calendar/gui/e-meeting-model.c:253 calendar/gui/e-meeting-model.c:270
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "Vorsitzender"
 
-#: calendar/gui/e-meeting-model.c:255 calendar/gui/e-meeting-model.c:272
-#: calendar/gui/e-meeting-model.c:521 calendar/gui/e-meeting-model.c:704
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:274
-#: calendar/gui/e-meeting-model.c:705
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:259 calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:706
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:305 calendar/gui/e-meeting-model.c:328
-#: calendar/gui/e-meeting-model.c:529 calendar/gui/e-meeting-model.c:732
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:733
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:332
-#: calendar/gui/e-meeting-model.c:734
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:334
-#: calendar/gui/e-meeting-model.c:735 calendar/gui/e-meeting-time-sel.c:404
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:408
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: calendar/gui/e-meeting-model.c:313 calendar/gui/e-meeting-model.c:336
-#: calendar/gui/e-meeting-model.c:736
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-meeting-model.c:340
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/e-meeting-model.c:1348 calendar/gui/e-meeting-model.c:1461
-msgid "Chair Persons"
-msgstr "Vorsitzende"
-
-#: calendar/gui/e-meeting-model.c:1349 calendar/gui/e-meeting-model.c:1416
-#: calendar/gui/e-meeting-model.c:1463
-msgid "Required Participants"
-msgstr "Benötigte Teilnehmer"
-
-#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1465
-msgid "Optional Participants"
-msgstr "Optionale Teilnehmer"
-
-#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1467
-msgid "Non-Participants"
-msgstr "Nicht-Teilnehmer"
-
 #. 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:473
-#: calendar/gui/e-meeting-time-sel.c:1956
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
 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:477
-#: calendar/gui/e-meeting-time-sel.c:1984 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:345
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 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:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1583
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:406
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Out of Office"
 msgstr "Außer Haus"
 
-#: calendar/gui/e-meeting-time-sel.c:407
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "No Information"
 msgstr "Keine Information"
 
-#: calendar/gui/e-meeting-time-sel.c:423
-msgid "_Invite Others..."
-msgstr "Andere einladen..."
-
-#: calendar/gui/e-meeting-time-sel.c:443
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "Optionen"
 
-#: calendar/gui/e-meeting-time-sel.c:460
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Nur Arbeitszeit anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:477
 msgid "Show _Zoomed Out"
 msgstr "Weggezoomt anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "_Update Free/Busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid "_Autopick"
 msgstr "AutoWahl"
 
-#: calendar/gui/e-meeting-time-sel.c:540
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:557
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_All People and Resources"
 msgstr "Alle Leute und Ressourcen"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:574
 msgid "All _People and One Resource"
 msgstr "Alle Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:583
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_Required People"
 msgstr "Benötigte Leute"
 
-#: calendar/gui/e-meeting-time-sel.c:596
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Required People and _One Resource"
 msgstr "Benötigte Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:619
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Meeting _start time:"
 msgstr "Anfang der Besprechung:"
 
-#: calendar/gui/e-meeting-time-sel.c:638
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben bei %s werden geöffnet"
 
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Die Aufgaben in `%s' konnten nicht geladen werden"
 
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 "Die Methode, die zum Laden von `%s' benötigt wird, ist nicht unterstützt"
 
-#: calendar/gui/e-week-view.c:3300 calendar/gui/e-week-view.c:3338
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Der Ordner in `%s' konnte nicht geöffnet werden"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1510
 #, 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"
 
-#: calendar/gui/gnome-cal.c:1684
+#: calendar/gui/gnome-cal.c:1865
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender bei %s wird geöffnet"
@@ -4772,230 +5177,275 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
 msgid "Atleast one attendee is necessary"
 msgstr "Mindestens ein Teilnehmer wird benötigt."
 
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Ein Organisator muss feststehen."
 
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "Komponenteneditor-Fabrik konnte nicht angelegt werden"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "So"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Angewählter Tag (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Angewählte Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "Angewählter Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "Angewähltes Jahr (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "Aufgabe"
+
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "Status:"
+
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Priorität:"
+
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Abgeschlossen am:"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Kategorien: "
+
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "_Kontakte:"
+
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2308 my-evolution/e-summary.c:607
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2337 my-evolution/e-summary.c:614
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "Der URI, den der Aufgabenordner anzeigen wird"
 
-#: calendar/gui/tasks-migrate.c:106
+#: calendar/gui/tasks-control-factory.c:75
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Die Kalender-Ansicht konnte nicht erstellt werden. Bitte überprüfen Sie Ihre "
+"ORBit und OAF Einstellungen. "
+
+#: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
@@ -5003,7 +5453,7 @@ msgstr ""
 "Evolution hat die Aufgaben aus Ihrem Kalenderordner entnommen und sie "
 "automatisch in den neuen Aufgaben-Ordner migriert."
 
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -5015,7 +5465,7 @@ msgstr ""
 "Einige Aufgaben konnten nicht migriert werden, so dass sich dieser Vorgang "
 "vielleicht noch einmal wiederholen wird."
 
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -5024,7 +5474,7 @@ msgstr ""
 "`%s' konnte nicht geöffnet werden; es migrieren keine Einträge aus dem "
 "Kalenderordner in den Aufgaben-Ordner."
 
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -5033,85 +5483,85 @@ msgstr ""
 "Die zum Laden von `%s' benötigte Methode ist nicht unterstützt; keine "
 "Objekte aus dem Kalenderordner werden in den Aufgaben-Ordner migriert werden."
 
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
 msgstr "SMDMDFS"
 
-#: calendar/pcs/query.c:235
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:259
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "make-time erwartet 1 Argument"
 
-#: calendar/pcs/query.c:264
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time erwartet eine Zeichenkette als 1. Argument"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "make-time erwartet eine Datum-/Zeit-Zeichenkette nach ISO 8601 als 1. "
 "Argument"
 
-#: calendar/pcs/query.c:301
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day erwartet zwei Argumente"
 
-#: calendar/pcs/query.c:306
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:313
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day erwartet eine Ganzzahl als 2. Argument"
 
-#: calendar/pcs/query.c:340
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin erwartet 1 Argument"
 
-#: calendar/pcs/query.c:345
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:372
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end erwartet 1 Argument"
 
-#: calendar/pcs/query.c:377
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:413
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:509
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:514
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:521
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? erwartet einen time_t-Wert als 2. Argument"
 
-#: calendar/pcs/query.c:651
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contains? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:656
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? erwartet eine Zeichenkette als 1. Argument"
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? erwartet eine Zeichenkette als 2. Argument"
 
-#: calendar/pcs/query.c:680
+#: calendar/pcs/query.c:679
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -5119,11 +5569,11 @@ msgstr ""
 "contains? erwartet als 1. Argument entweder \"any\", \"summary\" oder "
 "\"description\""
 
-#: calendar/pcs/query.c:722
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? erwartet mindestens 1 Argument"
 
-#: calendar/pcs/query.c:734
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5131,19 +5581,19 @@ msgstr ""
 "has-categories? erwartet Zeichenketten als Argumente oder aber ein einziges "
 "Argument, das dem Wahrheitswert 'falsch' (#f) entspricht"
 
-#: calendar/pcs/query.c:822
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:867
+#: calendar/pcs/query.c:866
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? erwartet 1 Argument"
 
-#: calendar/pcs/query.c:872
+#: calendar/pcs/query.c:871
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Auswertung des Suchausdrucks ergab keinen Wahrheitswert"
 
@@ -5167,7 +5617,7 @@ msgstr "Verschlüsseln wird von dieser Verschlüsselung nicht unterstützt"
 msgid "Decryption is not supported by this cipher"
 msgstr "Entziffern wird von dieser Verschlüsselung nicht unterstützt"
 
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -5178,7 +5628,7 @@ msgstr ""
 "Weitere Operationen auf diesem Server werden nicht wiedergegeben\n"
 "werden, wenn Sie die Netzwerkverbindung wiederherstellen."
 
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -5189,15 +5639,15 @@ msgstr ""
 "%s\n"
 "Änderungen an diesem Ordner werden nicht resynchronisiert werden."
 
-#: camel/camel-disco-diary.c:285
+#: camel/camel-disco-diary.c:277
 msgid "Resynchronizing with server"
 msgstr "Resynchronisieren mit dem Server"
 
-#: camel/camel-disco-store.c:336
+#: camel/camel-disco-store.c:343
 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:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
@@ -5210,6 +5660,7 @@ msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner kann nicht verarbeitet werden"
 
 #: camel/camel-filter-driver.c:686
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
@@ -5222,26 +5673,26 @@ msgstr "Fehlgeschlagen bei Nachricht %d"
 msgid "Cannot open message"
 msgstr "Nachricht kann nicht geöffnet werden"
 
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:830
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:787
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:792 camel/camel-filter-driver.c:810
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:919
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:925
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausführen des Filters: %s: %s"
@@ -5251,26 +5702,26 @@ msgstr "Fehler beim Ausführen des Filters: %s: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nicht unterstützte Operation: Nachricht anhängen: für %s"
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nicht unterstützte Operation: Suche nach Ausdruck: für %s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nicht unterstützte Operation: nach UIDs suchen: für %s"
 
-#: camel/camel-folder.c:1269
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "Machrichten werden verschoben"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5279,7 +5730,7 @@ msgstr ""
 "Suchausdruck kann nicht verarbeitet werden: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5288,112 +5739,112 @@ msgstr ""
 "Fehler beim Ausführen eines Suchausdrucks: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
 
-#: camel/camel-folder-search.c:639
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
 
-#: camel/camel-folder-search.c:749 camel/camel-folder-search.c:793
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ungültiger Typ in body-contains, Zeichenkette wurde erwartet"
 
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Pipe zu Sperrhilfsprogramm konnte nicht angelegt werden: %s"
 
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:124
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Sperrhilfsprogramm kann nicht abgespalten werden: %s"
 
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: 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:212
+#: camel/camel-lock-client.c:215
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' konnte nicht gesperrt werden"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Lockdatei für %s konnte nicht angelegt werden: %s"
 
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Zeitüberschreitung beim Versuch, eine Lockdatei auf %s zu erhalten. "
 "Versuchen Sie es später noch einmal."
 
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Maildatei %s konnte nicht überprüft werden: %s"
 
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Maildatei %s konnte nicht geöffnet werden: %s"
 
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Temporäre Maildatei %s konnte nicht geöffnet werden: %s"
 
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Mail konnte nicht in temporärer Datei %s gespeichert werden: %s"
 
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Pipe konnte nicht angelegt werden: %s"
 
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
 msgstr "forK() konnte nicht durchgeführt werden: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-Programm fehlgeschlagen: %s"
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
 msgid "(Unknown error)"
 msgstr "(Unbekannter Fehler)"
 
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fehler beim Lesen der Maildatei: %s"
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fehler beim Schreiben der temporären Maildatei: %s"
 
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Fehler beim Kopieren der temporären Maildatei: %s"
@@ -5408,92 +5859,92 @@ msgstr "Bitte geben Sie Ihre %s-Passphrase für %s ein."
 msgid "Please enter your %s passphrase"
 msgstr "Bitte geben Sie Ihre %s-Passphrase ein."
 
-#: camel/camel-pgp-context.c:554
+#: camel/camel-pgp-context.c:561
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Nachricht kann nicht signiert werden: kein signierbarer Klartext"
 
-#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 msgid "Cannot sign this message: no password provided"
 msgstr "Nachricht konnte nicht signiert werden: kein Passwort angegeben"
 
-#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Nachricht kann nicht signiert werden: Pipe zu GPG/PGP konnte nicht gelegt "
 "werden: %s"
 
-#: camel/camel-pgp-context.c:728
+#: camel/camel-pgp-context.c:741
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Nachricht kann nicht signiert werden: kein Klartext zum Klarsignieren"
 
-#: camel/camel-pgp-context.c:920
+#: camel/camel-pgp-context.c:939
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Nachricht kann nicht verifiziert werden: kein verifizierbarer Klartext"
 
-#: camel/camel-pgp-context.c:926
+#: camel/camel-pgp-context.c:945
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Diese Nachricht kann nicht verifiziert werden: Pipe zu GPG/PGP konnte nicht "
 "angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:937
+#: camel/camel-pgp-context.c:956
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 "Nachricht kann nicht verifiziert werden: Pipe zu GPG/PGP konnte nicht gelegt "
 "werden: %s"
 
-#: camel/camel-pgp-context.c:1104
+#: camel/camel-pgp-context.c:1129
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Nachricht kann nicht verschlüsselt werden: kein signierbarer Klartext"
 
-#: camel/camel-pgp-context.c:1114
+#: camel/camel-pgp-context.c:1139
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Nachricht kann nicht verschlüsselt werden: kein Passwort angegeben"
 
-#: camel/camel-pgp-context.c:1121
+#: camel/camel-pgp-context.c:1146
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Diese Nachricht kann nicht verschlüsselt werden: Pipe zu GPG/PGP konnte "
 "nicht gelegt werden: %s"
 
-#: camel/camel-pgp-context.c:1130
+#: camel/camel-pgp-context.c:1155
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Nachricht kann nicht verschlüsselt werden: keine Empfänger angegeben"
 
-#: camel/camel-pgp-context.c:1292
+#: camel/camel-pgp-context.c:1323
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 "Nachricht kann nicht entschlüsselt werden: kein entschlüsselbarer "
 "chiffrierter Text"
 
-#: camel/camel-pgp-context.c:1300
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Nachricht kann nicht entschlüsselt werden: kein Passwort angegeben"
 
-#: camel/camel-pgp-context.c:1307
+#: camel/camel-pgp-context.c:1338
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Nachricht kann nicht entschlüsselt werden: Pipe zu GPG/PGP konnte nicht "
 "gelegt werden: %s"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s konnte nicht geladen werden: Laden von Modulen wird von diesem System "
 "nicht unterstützt."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s konnte nicht geladen werden: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s konnte nicht geladen werden: Kein Initialisationscode im Modul."
@@ -5513,7 +5964,7 @@ msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
@@ -5523,12 +5974,12 @@ msgid "(unknown host)"
 msgstr "(unbekannter Rechner)"
 
 #: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:484
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verbindung zum Server unerwartet getrennt: %s"
@@ -5641,7 +6092,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr "Ungültige Legitimationsantwort vom Server."
 
@@ -5658,8 +6109,8 @@ msgid "Unknown authentication state."
 msgstr "Unbekannter Legitimationszustand."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:52
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Passwort"
 
@@ -5688,55 +6139,55 @@ msgstr "POP-vor-SMTP-Authentifikation mit einer Nicht-POP-Quelle"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fehler beim Compilieren eines regulären Ausdrucks: %s: %s"
 
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' benötigt einen Benutzernamen-Teil"
 
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' braucht einen Rechnernamen-Teil"
 
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%ss' braucht einen Pfad-Teil"
 
-#: camel/camel-service.c:612
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "%s wird aufgelöst"
 
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fehler beim Auflösen eines Namens: %s"
 
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: Rechner nicht gefunden"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: unbekannter Grund"
 
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "E-Mail-Quelle: Virtueller Ordner"
 
-#: camel/camel-session.c:78
+#: 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"
 
-#: camel/camel-session.c:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle für Protokoll `%s' verfügbar"
 
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5782,16 +6233,18 @@ msgstr "Nachricht konnte nicht dekodiert werden."
 msgid "Failed to verify certificates."
 msgstr "Zertifikate konnten nicht verifiziert werden."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Auf Ordner kann nicht zugegriffen werden: Ungültige Aktion auf diesem Speicher"
+msgstr ""
+"Auf Ordner kann nicht zugegriffen werden: Ungültige Aktion auf diesem "
+"Speicher"
 
-#: camel/camel-store.c:279
+#: camel/camel-store.c:280
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Ordner kann nicht angelegt werden: Ungültige Aktion auf diesem Speicher"
 
-#: camel/camel-tcp-stream-openssl.c:541
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5801,7 +6254,7 @@ msgstr ""
 "Betreff: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5816,7 +6269,7 @@ msgstr ""
 "\n"
 "Möchten Sie trotzdem akzeptieren?"
 
-#: camel/camel-tcp-stream-ssl.c:405
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5835,37 +6288,37 @@ msgstr ""
 "Bundesland/-staat: %s\n"
 "Land: %s"
 
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' konnte nicht geparst werden"
 
-#: camel/camel-vee-folder.c:586
+#: camel/camel-vee-folder.c:588
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nachricht %s gibt es in %s nicht"
 
-#: camel/camel-vee-folder.c:747
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "Nachricht gibt es nicht: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ordner kann nicht gelöscht werden: %s: Ungültige Aktion"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ordner kann nicht gelöscht werden: %s: Ordner gibt es nicht"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht umbenannt werden: %s: Ungültige Aktion"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
@@ -5898,52 +6351,52 @@ msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung für %s konnte nicht geladen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "Der Ordner wurde zerstört und auf dem Server neu erstellt."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "Suchen nach geänderten Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzei nicht verfügbar"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "Überblickinformation für neue Nachrichten wird abgerufen"
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "Suchen nach neuen Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Cache-Verzeichnis konnte nicht geöffnet werden: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nachricht %s konnte nicht gecacht werden: %s"
@@ -5956,7 +6409,7 @@ msgstr "Nach neuer Mail sehen"
 msgid "Check for new messages in all folders"
 msgstr "In allen Ordnern nach neuer Mail sehen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "Ordner"
 
@@ -5990,29 +6443,29 @@ msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschlüsselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:519
 #, 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:527
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterstützung für Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:553
 #, 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:566
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6023,88 +6476,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "Mailverzeichnisse im MH-Format"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Zum Speichern lokaler Mail in MH-Mailverzeichnissen"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "Lokale Auslieferung"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Zum Empfangen lokaler Mail aus Spools im Standard-mbox-Format."
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr "Filter auf neue Nachrichten in INBOX anwenden"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Maildir-format mail directories"
 msgstr "Mailverzeichnisse im Maildir-Format"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
 msgid "For storing local mail in maildir directories."
 msgstr "Zum Speichern lokaler Mail in Maildir-Verzeichnissen."
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "Standard-Unix-mbox-Spools"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Zum Lesen und Speichern lokaler Mail in normalen mbox-Spooldateien."
 
-#: camel/providers/local/camel-local-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Speicherungswurzel %s ist kein absoluter Pfad"
 
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Speicherwurzel `%s' ist kein reguläres Verzeichnis."
 
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ordner kann nicht abgerufen werden: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "Lokale Speicher haben keinen Posteingangsordner"
 
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokale Maildatei %s"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
 
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ordner-Zusammenfassungsdatei `%s' konnte nicht gelöscht werden: %s"
 
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ordner-Indexdatei `%s' konnte nicht gelöscht werden: %s"
@@ -6115,28 +6570,28 @@ msgid "Could not save summary: %s: %s"
 msgstr "Zusammenfassung konnte nicht gespeichert werden: %s: %s"
 
 #: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Nachricht kann nicht zur Zusammenfassung hinzugefügt werden: Grund unbekannt"
 
-#: camel/providers/local/camel-maildir-folder.c:182
+#: camel/providers/local/camel-maildir-folder.c:181
 msgid "Maildir append message cancelled"
 msgstr "Anhängen von Nachricht an Maildir abgebrochen"
 
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nachricht kann nicht an maildir-Ordner angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-mh-folder.c:207
+#: camel/providers/local/camel-mh-folder.c:215
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6145,20 +6600,20 @@ msgstr ""
 "Nachricht kann nicht erhalten werden: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-mbox-folder.c:331
+#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "Keine solche Nachricht"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
 msgid "Invalid message contents"
 msgstr "Ungültiger Inhalt der Nachricht"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -6167,15 +6622,15 @@ msgstr ""
 "Ordner `%s' konnte nicht geöffnet werden:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-mh-store.c:96
 #, 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:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -6184,19 +6639,19 @@ msgstr ""
 "Ordner `%s' konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ist kein maildir-Verzeichnis."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ordner `%s' konnte nicht gelöscht werden: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "kein maildir-Verzeichnis"
 
@@ -6211,33 +6666,33 @@ msgstr "Ordner `%s' konnte nicht abgetastet werden: %s"
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir-Verzeichnispfad kann nicht geöffnet werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ordnersperre auf %s kann nicht erzeugt werden: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Postfach kann nicht geöffnet werden: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
 msgid "Mail append cancelled"
 msgstr "Anhängen von Mail abgebrochen"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nachricht kann nicht an mbox-Datei angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6246,17 +6701,17 @@ msgstr ""
 "Nachricht kann nicht erhalten werden: %s aus Ordner %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nachrichtenerstellung fehlgeschlagen: Defektes Postfach?"
 
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -6265,7 +6720,7 @@ msgstr ""
 "Datei `%s' konnte nicht geöffnet werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -6274,14 +6729,14 @@ msgstr ""
 "Datei `%s' konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ist keine reguläre Datei."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -6290,111 +6745,111 @@ msgstr ""
 "Ordner `%s' konnte nicht gelöscht werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ordner `%s' ist nicht leer. Nicht gelöscht."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:249
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:379
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
 msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
 
-#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, 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:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fataler Mailparser-Fehler nahe Position %ld in Ordner %s"
 
-#: camel/providers/local/camel-mbox-summary.c:371
-#: camel/providers/local/camel-spool-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ordner kann nicht geprüft werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, 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:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Temporäres Postfach konnte nicht angelegt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 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:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, 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:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fehler beim Schreiben auf temporäres Postfach %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, 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:640
+#: camel/providers/local/camel-mbox-summary.c:639
 #, 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:651
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %s"
 
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
 msgid "MH append message cancelled"
 msgstr "Anhängen der Nachricht mit MH abgebrochen"
 
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nachricht kann nicht an mh-Ordner angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ist kein Verzeichnis."
@@ -6404,49 +6859,49 @@ msgstr "`%s' ist kein Verzeichnis."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH-Verzeichnispfad kann nicht geöffnet werden: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Nachricht kann nicht an Spool-Datei angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Spool '%s' existiert nicht oder ist keine reguläre Datei"
 
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Ordner `%s/%s' existiert nicht."
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool-Maildatei %s"
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-Ordner können nicht umbenannt werden"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-Ordner können nicht gelöscht werden"
 
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, 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:822
+#: camel/providers/local/camel-spool-summary.c:821
 #, 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:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6455,68 +6910,68 @@ msgstr ""
 "Spool-Ordner %s konnte nicht synchronisiert werden: %s\n"
 "Ordner könnte beschädigt sein, Kopie in '%s' gespeichert"
 
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "Datei konnte nicht werden: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Bitte geben Sie das NNTP-Passwort für %s@%s ein"
 
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
 msgstr "Server lehnte Benutzername ab"
 
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
 msgstr "Benutzername konnte nicht an Server gesendet werden"
 
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
 msgstr "Server lehnte Benutzername/Passwort ab"
 
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Nachricht %s nicht gefunden."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr "Gruppenliste konnte nicht vom Server abgerufen werden."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "grouplist-Datei für %s konnte nicht geladen werden: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "grouplist-Datei für %s konnte nicht gespeichert werden: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET-News"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Dies ist eine Quelle zum Lesen von und zum Posten in USENET-Newsgroups."
 
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Verzeichnis für Newsserver konnte nicht geöffnet werden: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-News über %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -6524,72 +6979,72 @@ msgstr ""
 "Diese Option führt die Legitimation am NNTP-Server mit einem "
 "unverschlüsselten Passwort durch."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ".newsrc-Datei für %s konnte nicht geöffnet oder erstellt werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "Abrufen der POP-Zusammenfassung"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "POP-Server konnte nicht auf neue Nachrichten überprüft werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Ordner konnte nicht geöffnet werden: Nachrichtenliste war unvollständig."
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "Gelöschte Nachrichten werden ausgeräumt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nachricht konnte nicht abgeholt werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nachricht konnte nicht vom POP-Server %s abgerufen werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "Keine Nachricht mit UID %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Abrufen der POP-Nachricht %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "Nachrichtenspeicherung"
 
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "Mail auf Server belassen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Nach %s Tag(en) löschen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Zum Verbinden mit und Herunterladen von Mail von POP-Servern."
 
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6597,7 +7052,7 @@ msgstr ""
 "Diese Option wird mit dem POP-Server unter einem unverschlüsselten Passwort "
 "verbinden. Viele POP-Server unterstützen nur dies."
 
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -6607,34 +7062,34 @@ 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-provider.c:92
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Dies verbindet mit dem POP-Server und benutzt Kerberos 4, um sich zu "
 "legitimieren."
 
-#: camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Legitimation beim KPOP-Server konnte nicht erfolgen: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Verbindung zu Server konnte nicht hergestellt werden: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Verbindung zu POP-Server auf %s konnte nicht hergestellt werden."
 
-#: camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sBitte geben Sie das POP3-Passwort für %s@%s ein"
 
-#: camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6643,12 +7098,12 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Benutzernamens: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
-#: camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
 msgid "(Unknown)"
 msgstr "(Unbekannt)"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -6656,7 +7111,7 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Keine Unterstützung für den verlangten Legitimationsmechanismus."
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -6665,22 +7120,22 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
 
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
 #, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "Unerwartete Antwort von POP-Server: %s"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
 #: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -6688,175 +7143,175 @@ msgstr ""
 "Zum Ausliefern von Mail durch Übergabe an das Programm \"sendmail\" auf dem "
 "lokalen System."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Pipe zu sendmail konnte nicht angelegt werden: %s: Mail nicht verschickt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail konnte nicht geforkt werden: %s: Mail nicht verschickt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nachricht konnte nicht verschickt werden: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail brach mit Signal %s ab: Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s konnte nicht ausgeführt werden: Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail gab Status %d zurück: Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 msgid "Could not find 'From' address in message"
 msgstr "'Von'-Adresse konnte nicht in Nachricht gefunden werden"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr "Mailauslieferung über das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaxfehler, Befehl nicht erkannt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaxfehler in Parametern oder Argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "Befehl nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "Befehlsparameter nicht implementiert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "Systemstatus- oder Systemhilfe-Antwort"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "Hilfemeldung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "Dienst ist bereit"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "Dienst schließt Übertragungskanal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst nicht verfügbar, Übertragungskanal wird geschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr "Angeforderte Mailaktion in Ordnung, abgeschlossen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "Benutzer nicht lokal; Weiterleitung erfolgt zu <weiterleitungspfad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Angeforderte Mailaktion nicht ausgeführt: Postfach nicht verfügbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Angeforderte Aktion nicht ausgeführt: Postfach nicht verfügbar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "Angeforderte Aktion abgebrochen: Fehler bei Verarbeitung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "Benutzer nicht lokal; probieren Sie es mit <weiterleitungspfad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Angeforderte Aktion nicht ausgeführt: unzureichender Systemspeicher"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Angeforderte Aktion nicht ausgeführt: Speicherzuteilung überschritten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Angeforderte Aktion nicht ausgeführt: Postfachname nicht erlaubt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Maileingabe beginnen; Ende mit <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "Transaktion fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "Ein Passwordübergang ist notwendig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "Legitimationsmechanismus ist zu schwach"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "Für den verlangten Legitimationsmechanismus ist Verschlüsselung erforderlich."
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "Zeitweiliger Legitimationsfehlschlag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "Legitimation benötigt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Willkommen-Antwortfehler: %s: vielleicht nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 "SMTP-Server %s unterstützt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, 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:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -6867,129 +7322,129 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-Server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-Mailauslieferung über %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
 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:594 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "Nachricht verschicken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empfänger angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "SMTP-Begrüßung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Zeitüberschreitung bei HELO-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO-Antwortfehler: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zeitüberschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "Ungültige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei MAIL-FROM-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL-FROM-Antwortfehler: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei RCPT-TO-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT-TO-Antwortfehler: %s: Mail nicht verschickt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Zeitüberschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA-Antwortfehler: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zeitüberschreitung beim Senden von DATA: Nachrichtenabschluss: %s Mail nicht "
 "verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA-Antwortfehler: Nachrichtenabschluss: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeitüberschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET-Antwort-Fehler: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Zeitüberschreitung bei QUIT-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT-Antwortfehler: %s: nicht fatal"
@@ -7121,7 +7576,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:690
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7130,29 +7585,29 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:837
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: composer/e-msg-composer.c:846
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Warnung!"
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:886
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, überschreiben?"
 
-#: composer/e-msg-composer.c:872
+#: composer/e-msg-composer.c:908
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:891
+#: composer/e-msg-composer.c:927
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:998
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7160,16 +7615,16 @@ msgstr ""
 "Der Entwürfe-Ordner für diesen Zugang konnte nicht geöffnet werden.\n"
 "Möchten Sie den vorgegebenen Entwürfe-Ordner verwenden?"
 
-#: composer/e-msg-composer.c:1015
+#: composer/e-msg-composer.c:1048
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1023
+#: composer/e-msg-composer.c:1056
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7178,7 +7633,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1037
+#: composer/e-msg-composer.c:1070
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7187,7 +7642,7 @@ msgstr ""
 "Datei konnte nicht verkürzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1046
+#: composer/e-msg-composer.c:1079
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7196,7 +7651,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1148
+#: composer/e-msg-composer.c:1181
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -7205,7 +7660,7 @@ msgstr ""
 "entdeckt.\n"
 "Möchten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1299
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7215,23 +7670,23 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre Änderungen speichern?"
 
-#: composer/e-msg-composer.c:1306
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr "Warnung: Geänderte Nachricht"
 
-#: composer/e-msg-composer.c:1329
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:1478
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr "Datei einfügen"
 
-#: composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2293
+#: composer/e-msg-composer.c:1888 composer/e-msg-composer.c:2329
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:2310
+#: composer/e-msg-composer.c:2346
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -7239,7 +7694,7 @@ msgstr ""
 "Erstellungsfenster konnte nicht angelegt werden:\n"
 "Adresswähler-Control konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:2333
+#: composer/e-msg-composer.c:2369
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -7247,7 +7702,7 @@ msgstr ""
 "Es konnte kein Erstellungsfenster angelegt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/evolution-composer.c:349
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7256,11 +7711,11 @@ msgstr ""
 "in der Mailkomponente noch keine Identität konfiguriert\n"
 "haben."
 
-#: composer/evolution-composer.c:364
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutions Maileditor kann nicht initialisiert werden."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7308,15 +7763,24 @@ msgstr "Betreff enthält"
 msgid "Subject does not contain"
 msgstr "Betreff enthält nicht"
 
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Dieses Passwort speichern"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr "Für den Rest dieser Sitzung an dieses Passwort erinnern"
+
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:359
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y / %I.%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y / %H.%M"
 
@@ -7367,30 +7831,30 @@ msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
+#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
+#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
+#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
+#: widgets/misc/e-dateedit.c:1391 widgets/misc/e-dateedit.c:1618
 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:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
+#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
+#: widgets/misc/e-dateedit.c:1388 widgets/misc/e-dateedit.c:1615
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:317
+#: e-util/e-time-utils.c:320
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -7526,24 +7990,25 @@ msgstr "Dann"
 msgid "Add action"
 msgstr "Aktion hinzufügen"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 "Sie haben vergessen, einen Ordner zu wählen.\n"
-"Bitte gehen Sie zurück und wählen Sie einen gültigen Ordner zum Ausliefern der Mail."
+"Bitte gehen Sie zurück und wählen Sie einen gültigen Ordner zum Ausliefern "
+"der Mail."
 
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
-#: mail/mail-account-gui.c:824
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
-#: filter/filter-folder.c:258
+#: filter/filter-folder.c:267
 msgid "Enter folder URI"
 msgstr "Ordner-URI eingeben"
 
-#: filter/filter-folder.c:305
+#: filter/filter-folder.c:314
 msgid "<click here to select a folder>"
 msgstr "<hier klicken, um einen Ordner zu wählen>"
 
@@ -7560,39 +8025,39 @@ msgstr ""
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:696
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "Regelname: "
 
-#: filter/filter-rule.c:700
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:717
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "Wenn"
 
-#: filter/filter-rule.c:735
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "Aktionen ausführen"
 
-#: filter/filter-rule.c:739
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:744
+#: filter/filter-rule.c:756
 msgid "if any criteria are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "Kriterium hinzufügen"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "Eingang"
 
-#: filter/filter-rule.c:840
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "Ausgang"
 
@@ -7785,7 +8250,7 @@ msgstr "Beantwortet an"
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1353
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1383
 msgid "Sender"
 msgstr "Absender"
 
@@ -7817,7 +8282,7 @@ msgstr "beginnt mit"
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:901
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Betreff"
@@ -7830,15 +8295,15 @@ msgstr "war nach"
 msgid "was before"
 msgstr "war vor"
 
-#: filter/rule-editor.c:148
+#: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regeln"
 
-#: filter/rule-editor.c:241
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "Regel hinzufügen"
 
-#: filter/rule-editor.c:302
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "Regel bearbeiten"
 
@@ -7846,42 +8311,42 @@ msgstr "Regel bearbeiten"
 msgid "Score Rules"
 msgstr "Bewertungsregeln"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
 msgid "You need to to specify at least one folder as a source."
 msgstr "Sie müssen mindestens einen Ordner als Quelle angeben."
 
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importiert Ihre alte Elm-Mail."
 
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importieren..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importieren von %s als %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wird abgetastet"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:93
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "Mail"
 
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -7889,19 +8354,15 @@ msgstr ""
 "Evolution hat Elm-Maildateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:230
-msgid "GnomeCard:"
-msgstr "GnomeCard:"
-
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7909,23 +8370,23 @@ msgstr ""
 "Evolution hat GnomeCard-Dateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Verzeichnis wird abgetastet"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "Import beginnt"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7933,11 +8394,11 @@ msgstr ""
 "Evolution hat Netscape-Maildateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importiert Ihre alten Pine-Daten"
 
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -7945,7 +8406,7 @@ msgstr ""
 "Evolution hat Pine-Maildateien gefunden.\n"
 "Möchten Sie sie in Evolution importieren?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine"
 msgstr "Pine"
 
@@ -7981,240 +8442,249 @@ msgstr "Factory für die Mailzusammenfassungs-Komponente."
 msgid "Mail configuration interface"
 msgstr "Mailkonfigurations-Oberfläche"
 
-#: mail/component-factory.c:93
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "Mail enthaltender Ordner"
 
-#: mail/component-factory.c:94
+#: mail/component-factory.c:101
 msgid "Mail storage folder (internal)"
 msgstr "Mailspeicher-Ordner (intern)"
 
-#: mail/component-factory.c:95
+#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtueller Müll"
 
-#: mail/component-factory.c:95
+#: mail/component-factory.c:102
 msgid "Virtual Trash folder"
 msgstr "Virtueller Müllordner"
 
-#: mail/component-factory.c:122
+#: mail/component-factory.c:129
 #, c-format
 msgid "Cannot connect to store: %s"
 msgstr "Verbindung zum Speicher konnte nicht hergestellt werden: %s"
 
-#: mail/component-factory.c:140
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
 
-#: mail/component-factory.c:372
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: mail/component-factory.c:372
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: mail/component-factory.c:726
+#: mail/component-factory.c:805
 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."
+msgstr ""
+"Einige Ihrer Mail-Einstellungen scheinen ungültig, bitte stellen Sie sicher, "
+"dass alles in Ordnung ist."
 
-#: mail/component-factory.c:886
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "Neue Mail-Nachricht"
 
-#: mail/component-factory.c:886
+#: mail/component-factory.c:973
 msgid "New _Mail Message"
 msgstr "Neue _Mail-Nachricht"
 
-#: mail/component-factory.c:910
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:919
+#: mail/component-factory.c:1006
 msgid "Cannot initialize Evolution's mail config component."
-msgstr "Evolutions Mail-Konfigurations-Komponente kann nicht initialisiert werden"
+msgstr ""
+"Evolutions Mail-Konfigurations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:1012
 msgid "Cannot initialize Evolution's folder info component."
-msgstr "Evolutions Ordnerinformations-Komponente kann nicht initialisiert werden"
+msgstr ""
+"Evolutions Ordnerinformations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1090
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser-ui.c:270
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschaften von \"%s\""
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: mail/folder-browser.c:287 mail/mail-display.c:298
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d new"
 msgstr "%d neu"
 
-#: mail/folder-browser.c:762 mail/folder-browser.c:767
-#: mail/folder-browser.c:789
+#: mail/folder-browser.c:772 mail/folder-browser.c:777
+#: mail/folder-browser.c:799
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d hidden"
 msgstr "%d verborgen"
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:778
 #, c-format
 msgid "%d selected"
 msgstr "%d ausgewählt"
 
-#: mail/folder-browser.c:791
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d unsent"
 msgstr "%d nicht verschickt"
 
-#: mail/folder-browser.c:793
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d sent"
 msgstr "%d verschickt"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:805
 #, c-format
 msgid "%d total"
 msgstr "%d insgesamt"
 
-#: mail/folder-browser.c:1042
+#: mail/folder-browser.c:1077
 msgid "Create vFolder from Search"
 msgstr "vOrdner aus Suche erzeugen"
 
-#: mail/folder-browser.c:1423
+#: mail/folder-browser.c:1458
 msgid "VFolder on _Subject"
 msgstr "VOrdner über _Betreff"
 
-#: mail/folder-browser.c:1424
+#: mail/folder-browser.c:1459
 msgid "VFolder on Se_nder"
 msgstr "VOrdner über Absender"
 
-#: mail/folder-browser.c:1425
+#: mail/folder-browser.c:1460
 msgid "VFolder on _Recipients"
 msgstr "VOrdner über Empfänger"
 
-#: mail/folder-browser.c:1426
+#: mail/folder-browser.c:1461
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner über Mailing_liste"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1465
 msgid "Filter on Sub_ject"
 msgstr "Filter über _Betreff"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1466
 msgid "Filter on Sen_der"
 msgstr "Filter über _Absender"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1467
 msgid "Filter on Re_cipients"
 msgstr "Filter über _Empfänger"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1468
 msgid "Filter on _Mailing List"
 msgstr "Filter über _Mailingliste"
 
-#: mail/folder-browser.c:1441 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1476 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/folder-browser.c:1442 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: mail/folder-browser.c:1443
+#: mail/folder-browser.c:1478
 msgid "_Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:1447 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1485
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1489
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1490
 msgid "Mark as Unim_portant"
 msgstr "Als _unwichtig markieren"
 
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1494
 msgid "_Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: mail/folder-browser.c:1460
+#: mail/folder-browser.c:1495
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "Löschen rückgängig"
 
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1501
 msgid "Add Sender to Address Book"
 msgstr "Absender zu Adressbuch hinzufügen"
 
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1504
 msgid "Apply Filters"
 msgstr "Filter anwenden"
 
-#: mail/folder-browser.c:1471
+#: mail/folder-browser.c:1506
 msgid "Create Ru_le From Message"
 msgstr "_Regel aus Nachricht erzeugen"
 
-#: mail/folder-browser.c:1621
+#: mail/folder-browser.c:1656
 msgid "Filter on Mailing List"
 msgstr "Filter über Mailingliste"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1657
 msgid "VFolder on Mailing List"
 msgstr "VOrdner über Mailingliste"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1659
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter über Mailingliste (%s)"
 
-#: mail/folder-browser.c:1625
+#: mail/folder-browser.c:1660
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VOrdner über Mailingliste (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "_Vorgabe"
+
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
 msgstr "Ordner-Informationen werden entnommen"
@@ -8292,15 +8762,15 @@ msgstr "Evolution-News-Editor"
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-account-gui.c:949
+#: mail/mail-account-gui.c:959
 msgid "Could not save signature file."
 msgstr "Signaturdatei konnte nicht gespeichert werden."
 
-#: mail/mail-account-gui.c:1026
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "Signatur speichern"
 
-#: mail/mail-account-gui.c:1032
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8310,7 +8780,7 @@ msgstr ""
 "\n"
 "Möchten Sie Ihre Änderungen speichern?"
 
-#: mail/mail-account-gui.c:1617
+#: mail/mail-account-gui.c:1651
 msgid "You may not create two accounts with the same name."
 msgstr "Sie können keine zwei Zugänge mit demselben Namen anlegen."
 
@@ -8326,52 +8796,52 @@ msgstr "Deaktivieren"
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 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:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Nicht löschen"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Account wirklich löschen?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Sind Sie sicher, dass Sie diesen News-Account löschen wollen?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 msgid "Mail Settings"
 msgstr "Mail-Einstellungen"
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail an %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr "Betreff ist %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8383,7 +8853,7 @@ msgstr ""
 "empfangen oder erstellen können.\n"
 "Möchten Sie ihn jetzt konfigurieren?"
 
-#: mail/mail-callbacks.c:187
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8391,7 +8861,7 @@ msgstr ""
 "Sie müssen eine Identität einrichten,\n"
 "bevor Sie Mail erstellen können."
 
-#: mail/mail-callbacks.c:201
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8399,12 +8869,12 @@ msgstr ""
 "Sie müssen einen Mailtransport einrichten,\n"
 "bevor Sie Mail erstellen können."
 
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Mailtransport-Methode eingestellt"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:266
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -8412,11 +8882,11 @@ msgstr ""
 "Sie verschicken eine HTML-formatierte Nachricht, aber die folgenden "
 "Empfänger wollen keine HTML-formatierte Mail:\n"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:280
 msgid "Send anyway?"
 msgstr "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8424,7 +8894,7 @@ msgstr ""
 "Diese Nachricht hat keinen Betreff.\n"
 "Wirklich verschicken?"
 
-#: mail/mail-callbacks.c:367
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8433,11 +8903,11 @@ msgstr ""
 "der Liste zu verbergen, wird die Nachricht nur BCC-Empfängeradressen "
 "enthalten."
 
-#: mail/mail-callbacks.c:371
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "Diese Nachricht enthält ausschließlich BCC-Empfänger."
 
-#: mail/mail-callbacks.c:375
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -8447,41 +8917,41 @@ msgstr ""
 "eine Apparently-To-Kopfzeile hinzufügt.\n"
 "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:469
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr "Diese Nachricht enthält ungültige Empfänger:"
 
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:503
 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:600
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Sie müssen einen Account einrichten, bevor Sie diese Mail verschicken können."
 
-#: mail/mail-callbacks.c:837
+#: mail/mail-callbacks.c:836
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: mail/mail-callbacks.c:842
+#: mail/mail-callbacks.c:841
 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:1240
+#: mail/mail-callbacks.c:1263
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:1242
+#: mail/mail-callbacks.c:1265
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:1702
+#: mail/mail-callbacks.c:1732
 #, 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:1727
+#: mail/mail-callbacks.c:1757
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8489,7 +8959,7 @@ msgstr ""
 "Sie können nur im Entwürfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:1766
+#: mail/mail-callbacks.c:1796
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8497,29 +8967,29 @@ msgstr ""
 "Sie können nur Nachrichten im\n"
 "Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:1780
+#: mail/mail-callbacks.c:1810
 #, 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:1806
+#: mail/mail-callbacks.c:1836
 msgid "No Message Selected"
 msgstr "Keine Nachricht ausgewählt"
 
-#: mail/mail-callbacks.c:1900
+#: mail/mail-callbacks.c:1930
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:1902
+#: mail/mail-callbacks.c:1932
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:2071 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2101 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Warnung"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2108
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8532,11 +9002,11 @@ msgstr ""
 "\n"
 "Nachrichten wirklich entfernen?"
 
-#: mail/mail-callbacks.c:2085
+#: mail/mail-callbacks.c:2115
 msgid "Do not ask me again."
 msgstr "Mich nicht mehr fragen."
 
-#: mail/mail-callbacks.c:2193
+#: mail/mail-callbacks.c:2223
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8545,19 +9015,19 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2205
+#: mail/mail-callbacks.c:2235
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2269
+#: mail/mail-callbacks.c:2298
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:2315
+#: mail/mail-callbacks.c:2344
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2446
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8619,10 +9089,15 @@ msgstr ""
 "Dieser Name wird nur für die Bildschirmanzeige verwendet."
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Zugangsdruide"
 
+#: mail/mail-config.c:316
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Zugang"
+
 #: mail/mail-config.c:1643
 #, c-format
 msgid ""
@@ -8634,6 +9109,14 @@ msgstr ""
 "%s\n"
 "Es wird keine Verknüpfung angelegt."
 
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1654
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "Inbox"
+
 #: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr "Dienst wird überprüft"
@@ -8656,7 +9139,8 @@ msgstr "(SSL wird von dieser Binärversion von Evolution nicht unterstützt)"
 
 #: mail/mail-config.glade.h:4
 msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr "Beim Verschicken verschlüsselter Mail _immer vor mir selber verschlüsseln"
+msgstr ""
+"Beim Verschicken verschlüsselter Mail _immer vor mir selber verschlüsseln"
 
 #: mail/mail-config.glade.h:5
 msgid "Account"
@@ -8676,7 +9160,8 @@ msgstr "Zugänge"
 
 #: mail/mail-config.glade.h:9
 msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Beim Verschicken verschlüsselter Mail immer vor mir selber _verschlüsseln"
+msgstr ""
+"Beim Verschicken verschlüsselter Mail immer vor mir selber _verschlüsseln"
 
 #: mail/mail-config.glade.h:10
 msgid "Always _sign outgoing messages when using this account"
@@ -8748,7 +9233,7 @@ msgstr "Anzeige"
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 msgid "Drafts"
 msgstr "Entwürfe"
 
@@ -8756,8 +9241,8 @@ msgstr "Entwürfe"
 msgid "E_nable"
 msgstr "_Aktivieren"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
@@ -8831,7 +9316,9 @@ msgstr "Pretty Good Privacy"
 
 #: mail/mail-config.glade.h:55
 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"
+msgstr ""
+"Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
+"nachfragen"
 
 #: mail/mail-config.glade.h:56
 msgid "Prompt when sending messages with an _empty subject"
@@ -8895,6 +9382,7 @@ msgid "Sending Mail"
 msgstr "Verschicken von Mail"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
 msgid "Sent"
 msgstr "Verschickt"
 
@@ -9142,23 +9630,23 @@ msgstr "Verbergen"
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:1132
+#: mail/mail-display.c:1135
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-display.c:1611
+#: mail/mail-display.c:1617
 msgid "Open Link in Browser"
 msgstr "Link in Browser öffnen"
 
-#: mail/mail-display.c:1613
+#: mail/mail-display.c:1619
 msgid "Copy Link Location"
 msgstr "Linkziel kopieren"
 
-#: mail/mail-display.c:1616
+#: mail/mail-display.c:1622
 msgid "Save Link as (FIXME)"
 msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:1619
+#: mail/mail-display.c:1625
 msgid "Save Image as..."
 msgstr "Bild speichern unter..."
 
@@ -9176,30 +9664,47 @@ msgstr ""
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Ungültige Adresse"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:3
+#: mail/mail-format.c:883 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:907
+#: mail/mail-format.c:886
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:10
+#: mail/mail-format.c:890 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:894
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:898
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/mail-format.c:1799
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1822
+msgid "Evolution does not recognize this type of signed message."
+msgstr ""
+
+#: mail/mail-format.c:1830
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1838
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
 #: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
@@ -9229,11 +9734,11 @@ msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 msgid "Malformed external-body part."
 msgstr "Ungültiger external-body-Teil."
 
-#: mail/mail-local.c:589
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "Ordner wird umkonfiguriert"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9242,42 +9747,42 @@ msgstr ""
 "Metainformationen zum Ordner können nicht gespeichert werden; Sie\n"
 "werden ihn wahrscheinlich nie mehr öffnen können: %s: %s"
 
-#: mail/mail-local.c:723
+#: mail/mail-local.c:763
 #, 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:769
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ordner-Metadaten %s können nicht gelöscht werden: %s"
 
-#: mail/mail-local.c:1136
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:1151
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s kann nicht umkonfiguriert werden, da er kein lokaler Ordner ist"
 
-#: mail/mail-local.c:1173
+#: mail/mail-local.c:1318
 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:1262
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "Sie können das Format eines nichtlokalen Ordners nicht ändern."
 
-#: mail/mail-local.c:1271
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s neu konfigurieren"
 
-#: mail/mail-mt.c:251
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9286,7 +9791,7 @@ msgstr ""
 "Fehler beim `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9295,7 +9800,7 @@ msgstr ""
 "Fehler beim Ausführen eines Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:862
+#: mail/mail-mt.c:901
 msgid "Working"
 msgstr "In Arbeit"
 
@@ -9307,48 +9812,43 @@ msgstr "Ordner wird gefiltert"
 msgid "Fetching Mail"
 msgstr "Abrufen von Mail"
 
-#: mail/mail-ops.c:491 mail/mail-ops.c:520
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr "Trotzdem wurde die Nachricht erfolgreich verschickt."
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:675
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:694
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:696 mail/mail-send-recv.c:525
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:789
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Machrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:891
-#, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Ordner `%s' kann nicht in sich selbst kopiert werden."
-
 #: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "Verschiebe"
@@ -9362,6 +9862,12 @@ msgstr "Kopiere"
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
+#. Fill in the new fields
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
+#, fuzzy
+msgid "Trash"
+msgstr "Türkisch"
+
 #: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
@@ -9459,74 +9965,74 @@ msgstr "Verbindung mit %s wird neu aufgebaut"
 msgid "_Search"
 msgstr "_Suchen"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Unbenannte Nachricht)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Unbenannte Nachricht"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Leere Nachricht"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "In Nachricht suchen"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Vorwärts suchen"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Suchen:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Passt auf:"
 
-#: mail/mail-send-recv.c:140
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Stornieren..."
 
-#: mail/mail-send-recv.c:244
+#: mail/mail-send-recv.c:245
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pfad: %s, Typ: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:249
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr "Mail erhalten und verschicken"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 msgid "Cancel All"
 msgstr "Alles abbrechen"
 
-#: mail/mail-send-recv.c:336
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: mail/mail-send-recv.c:337 mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-send-recv.c:521
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Storniert"
 
@@ -9534,15 +10040,6 @@ msgstr "Storniert"
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#. Remember the password?
-#: mail/mail-session.c:258
-msgid "Remember this password"
-msgstr "Dieses Passwort speichern"
-
-#: mail/mail-session.c:259
-msgid "Remember this password for the remainder of this session"
-msgstr "Für den Rest dieser Sitzung an dieses Passwort erinnern"
-
 #: mail/mail-session.c:310
 #, c-format
 msgid "Enter Password for %s"
@@ -9552,12 +10049,12 @@ msgstr "Passwort für %s eingeben"
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: mail/mail-tools.c:249
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:253
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
@@ -9565,17 +10062,17 @@ msgstr "Weitergeleitete Nachricht"
 msgid "Forwarded Message"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-vfolder.c:86
+#: mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "VOrdner wird eingerichtet: %s"
 
-#: mail/mail-vfolder.c:204
+#: mail/mail-vfolder.c:203
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "VOrdner werden aktualisiert für URI: %s"
 
-#: mail/mail-vfolder.c:415
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9588,24 +10085,30 @@ msgstr ""
 "   '%s'\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:735
+#: mail/mail-vfolder.c:723
+#, fuzzy
+msgid "VFolders"
+msgstr "Ordner"
+
+#: mail/mail-vfolder.c:816
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:750
+#: mail/mail-vfolder.c:832
 #, 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."
+msgstr ""
+"Es wurde versucht, einen vOrdner '%s' zu editieren, der nicht existiert."
 
-#: mail/mail-vfolder.c:804
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr "(Kein Betreff)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Nachricht"
@@ -9666,7 +10169,7 @@ msgstr "%a %I:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2327
+#: mail/message-list.c:2330
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
@@ -9702,16 +10205,16 @@ msgstr "Ordner \"%s\" wird abonniert"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Ordner"
 
-#: mail/subscribe-dialog.c:1519
+#: mail/subscribe-dialog.c:1520
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gewählt"
 
-#: mail/subscribe-dialog.c:1580
+#: mail/subscribe-dialog.c:1581
 msgid "Please select a server."
 msgstr "Bitte wählen Sie einen Server."
 
@@ -9751,88 +10254,91 @@ msgstr "Ab_bestellen"
 msgid "Evolution component for the executive summary."
 msgstr "Evolution-Komponente für die Chefsesselansicht"
 
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "Ordner mit der Evolution-Übersicht"
 
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
 msgid "Cannot initialize Evolution's Summary component."
-msgstr "Evolutions Mail-Zusammenfassungskomponente kann nicht initialisiert werden"
+msgstr ""
+"Evolutions Mail-Zusammenfassungskomponente kann nicht initialisiert werden"
 
-#: my-evolution/e-summary-calendar.c:341 my-evolution/e-summary-calendar.c:359
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "Termine"
 
-#: my-evolution/e-summary-calendar.c:342
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "Keine Termine"
 
-#: my-evolution/e-summary-calendar.c:378
+#: my-evolution/e-summary-calendar.c:377
 msgid "%k:%M %d %B"
 msgstr "%k.%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:380
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%l.%M %d. %B"
 
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
-#. 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
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
 #: my-evolution/e-summary-preferences.c:80
-msgid "KBOS:ZSAM:EGAA"
-msgstr "EDDI:EDDH:EDDK:EDDM"
+#: my-evolution/e-summary-weather.c:661
+msgid "KBOS"
+msgstr ""
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com: Wort des Tages"
 
-#: my-evolution/e-summary-preferences.c:465
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "Zitate des Tages"
 
-#: my-evolution/e-summary-preferences.c:931
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "Einen Newsstrom hinzufügen"
 
-#: my-evolution/e-summary-preferences.c:939
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Geben Sie die Adresse des Newsstromes ein, den Sie hinzufügen wollen"
 
-#: my-evolution/e-summary-preferences.c:943
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "Name:"
 
-#: my-evolution/e-summary-preferences.c:1489
+#: my-evolution/e-summary-preferences.c:1504
 msgid "Summary Settings"
 msgstr "Einstellungen der Zusammenfassung"
 
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 #: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "Fehler beim Herunterladen des RDF"
 
-#: my-evolution/e-summary-rdf.c:527
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "Nachrichtenkanal"
 
-#: my-evolution/e-summary-tasks.c:242
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "Keine Aufgaben"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:287
 msgid "(No Description)"
 msgstr "(keine Beschreibung)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "Mein Wetter"
 
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 "<dd><b>Es konnte keine Verbindung mit dem Wetterserver aufgenommen werden</"
@@ -9842,31 +10348,23 @@ msgstr ""
 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:650
-msgid "KBOS:EGAA:RJTT"
-msgstr "EDDI:EDDH:EDDK:EDDM"
-
-#: my-evolution/e-summary-weather.c:711
+#: my-evolution/e-summary-weather.c:722
 msgid "Regions"
 msgstr "Regionen"
 
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e. %B %Y"
 
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Zusammenfassung drucken"
 
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "Drucken der Übersicht fehlgeschlagen"
 
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Chefsesselansichts-Komponente konnte Bonobo nicht initialisieren.\n"
 
@@ -11177,11 +11675,25 @@ msgstr "Details anzeigen"
 msgid "Cancel Operation"
 msgstr "Aktion abbrechen"
 
-#: shell/e-setup.c:125
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-local-storage.c:175
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:636
+#, fuzzy
+msgid "Local Folders"
+msgstr "Besondere Ordner"
+
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Installation von Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11189,17 +11701,17 @@ msgstr ""
 "Diese neue Version von Evolution muss zusätzliche Dateien in Ihr\n"
 "persönliches Evolution-Verzeichnis installieren"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Bitte klicken Sie \"OK\", um die Dateien zu installieren, oder \"Abbrechen\" "
 "zum Beenden."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Dateien konnte nicht korrekt aktualisiert werden"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11211,7 +11723,7 @@ msgstr ""
 "kann nicht angelegt werden.\n"
 "Fehler: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -11220,7 +11732,7 @@ msgstr ""
 "Ein Fehler trat auf beim Kopieren von Dateien nach\n"
 "'%s'."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11231,7 +11743,7 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11246,7 +11758,7 @@ msgstr ""
 "Möchten Sie, dass dieses Verzeichnis\n"
 "entfernt wird?"
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11258,6 +11770,19 @@ msgstr ""
 "es, damit Evolution seine Benutzerdateien\n"
 "installieren kann."
 
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Ordner kann nicht in sich selbst verschoben werden."
@@ -11309,7 +11834,7 @@ msgstr "\"%s\" löschen"
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Sind Sie sicher, dass Sie den Ordner '%s' entfernen wollen?"
 
-#: shell/e-shell-folder-commands.c:456
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11318,15 +11843,21 @@ msgstr ""
 "Ordner kann nicht umbenannt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-commands.c:536
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner \"%s\" umbenennen in:"
 
-#: shell/e-shell-folder-commands.c:492
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Ordner umbenennen"
 
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Der angegebene Ordnername ist nicht gültig: %s"
+
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
@@ -11336,32 +11867,11 @@ msgstr ""
 "Der angegebene Ordner kann nicht erstellt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "Kein Ordnername angegeben."
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "Ordner darf das Verzeichnistrennzeichen nicht enthalten."
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' und '..' sind reservierte Ordnernamen."
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Der angegebene Ordnername ist nicht gültig: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Neuen Ordner anlegen"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11369,19 +11879,19 @@ msgstr ""
 "Der Typ des ausgewählten Ordners ist für die \n"
 "gewählte Operation nicht gültig."
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Neu..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr "Wählen Sie den Importeur, der ausgeführt werden soll"
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11395,13 +11905,13 @@ 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-importer.c:151
 msgid "Please select the information that you would like to import"
 msgstr "Bitte wählen Sie die Informationen, die Sie importieren wollen"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11412,7 +11922,7 @@ msgstr ""
 "Importeur nicht bereit.\n"
 "Es wird 5 Sekunden bis zum nächsten Versuch gewartet"
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11421,16 +11931,16 @@ msgstr ""
 "Importieren von %s\n"
 "Importiert wird Objekt %d."
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datei %s existiert nicht"
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr "Sie können nur in lokale Ordner importieren"
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11440,11 +11950,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11453,17 +11963,17 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Fehler beim Starten von %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11472,31 +11982,31 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr "Daten und Einstellungen aus älteren Programmen importieren"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
 msgstr "Eine einzelne Datei importieren"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -11504,41 +12014,48 @@ msgstr ""
 "Bitte warten...\n"
 "Suche nach existierenden Einstellungen"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "Intelligente Importeure werden gestartet"
 
-#: shell/e-shell-importer.c:846 shell/e-shell-startup-wizard.c:700
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: shell/e-shell-importer.c:1009
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: shell/e-shell-importer.c:1010
+#: shell/e-shell-importer.c:1012
 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:1122 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importieren"
 
-#: shell/e-shell-offline-handler.c:560
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Verbindungen werden geschlossen..."
 
-#: shell/e-shell-startup-wizard.c:160 shell/e-shell-startup-wizard.c:169
-#, c-format
+#: shell/e-shell-startup-wizard.c:159
+#, fuzzy, c-format
 msgid ""
-"(%s:%d)Could not start the Evolution Mailer Assistant interface\n"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr ""
+"(%s:%d)Das Evolution-Mailerdruiden-Interface konnte nicht gestartet werden\n"
 "%s"
+
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "(%s:%d)Das Evolution-Mailerdruiden-Interface konnte nicht gestartet werden\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:742
+#: shell/e-shell-startup-wizard.c:754
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11546,11 +12063,28 @@ msgstr ""
 "Bitte wählen Sie die Informationen,\n"
 "die Sie importieren wollen"
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-utils.c:114
+msgid "No folder name specified."
+msgstr "Kein Ordnername angegeben."
+
+#: shell/e-shell-utils.c:121
+msgid "Folder name cannot contain the Return character."
+msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
+
+#: shell/e-shell-utils.c:127
+#, fuzzy
+msgid "Folder name cannot contain slashes."
+msgstr "Dieser Ordner kann keine Nachrichten aufnehmen."
+
+#: shell/e-shell-utils.c:133
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' und '..' sind reservierte Ordnernamen."
+
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Der Fehlermelder kann nicht gefunden werden"
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
@@ -11576,7 +12110,9 @@ msgstr "Wählen Sie den Ordner, auf den die Verknüpfung zeigen soll:"
 
 #: shell/e-shell-view-menu.c:562
 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."
+msgstr ""
+"Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
+"sein."
 
 #: shell/e-shell-view-menu.c:570
 #, c-format
@@ -11584,11 +12120,15 @@ msgid "Error executing %s."
 msgstr "Fehler beim Ausführen von %s."
 
 #: shell/e-shell-view-menu.c:672
-msgid "Work Online"
+#, fuzzy
+msgid "_Work Online"
 msgstr "Online arbeiten"
 
-#: shell/e-shell-view-menu.c:685 shell/e-shell-view-menu.c:698
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "Offline _arbeiten"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
@@ -11596,49 +12136,39 @@ msgstr "Offline arbeiten"
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1586
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(keine)"
 
-#: shell/e-shell-view.c:1591
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution %s"
-
-#: shell/e-shell-view.c:1593
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution ist zur Zeit online. Klicken Sie diesen Knopf, um offline "
 "zu arbeiten."
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution geht gerade offline."
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution ist gerade offline. Klicken Sie auf diesen Knopf, um online "
 "zu arbeiten."
 
-#: shell/e-shell.c:652
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
 
-#: shell/e-shell.c:1642
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -11649,35 +12179,31 @@ msgstr ""
 "unerwartet ab. Sie müssen Evolution beenden und neu starten, um\n"
 "wieder auf diese Daten zugreifen zu können."
 
-#: shell/e-shell.c:1865 widgets/misc/e-cell-date-edit.c:249
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:1867
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Ungültige Argumente"
 
-#: shell/e-shell.c:1869
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF kann nicht stattfinden"
 
-#: shell/e-shell.c:1871
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: shell/e-shell.c:1873 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Neue Verknüpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Gruppenname:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11686,116 +12212,112 @@ msgstr ""
 "Wollen Sie wirklich Gruppe `%s' aus\n"
 "der Verknüpfungsleiste entfernen?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Nicht entfernen"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 msgid "Rename Shortcut Group"
 msgstr "Verknüpfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 msgid "Rename selected shortcut group to:"
 msgstr "Ausgewählte Verknüpfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "Kleine Icons"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Die Verknüpfungen als kleine Icons anzeigen"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "Große Icons"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Die Verknüpfungen als große Icons zeigen"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "Neue Gruppe..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Eine neue Verknüpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "Diese Gruppe _entfernen..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Diese Verknüpfungsgruppe entfernen"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "Diese Gruppe _umbenennen..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
 msgstr "Diese Verknüpfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "Die Verknüpfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Die Verknüpfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
 msgstr "Verknüpfung umbenennen"
 
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
 msgstr "Ausgewählte Verknüpfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr "Den mit dieser Verknüpfung verbundenen Ordner öffnen"
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "In neuem _Fenster öffnen"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 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:390
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
 msgstr "Diese Verknüpfung umbenennen"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "_Entfernen"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verknüpfung aus der Verknüpfungsleiste entfernen"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von Verknüpfungen."
 
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "Verknüpfungen"
 
-#: shell/e-shortcuts.c:1053
-msgid "Inbox"
-msgstr "Inbox"
-
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -11804,132 +12326,133 @@ msgstr ""
 "Ordner kann nicht übertragen werden:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Kein Name)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ungültig"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Nicht genügend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr "Der Ordner ist nicht leer"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:515
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Funktion für diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Operation nicht unterstützt"
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "Der angegebene Typ wird für diese Speicherweise nicht unterstützt"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "Der angegebene Ordner kann nicht geändert oder entfernt werden"
 
-#: shell/e-storage.c:525
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Ein Ordner kann nicht das Kinder eines seiner Nachkommen werden"
 
-#: shell/e-storage.c:527
+#: shell/e-storage.c:526
 msgid "Cannot create a folder with that name"
 msgstr "Ein Ordnersperre mit diesem Namen kann nicht erzeugt werden"
 
-#: shell/e-task-widget.c:192
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
-#: shell/evolution-shell-component.c:974
+#: shell/evolution-shell-component.c:1009
 msgid "CORBA error"
 msgstr "CORBA-Fehler"
 
-#: shell/evolution-shell-component.c:976
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr "Unterbrochen"
 
-#: shell/evolution-shell-component.c:978
+#: shell/evolution-shell-component.c:1013
 msgid "Invalid argument"
 msgstr "Ungültiges Argument"
 
-#: shell/evolution-shell-component.c:980
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr "Hat bereits einen Besitzer"
 
-#: shell/evolution-shell-component.c:982
+#: shell/evolution-shell-component.c:1017
 msgid "No owner"
 msgstr "Kein Besitzer"
 
-#: shell/evolution-shell-component.c:984
+#: shell/evolution-shell-component.c:1019
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: shell/evolution-shell-component.c:986
+#: shell/evolution-shell-component.c:1021
 msgid "Unsupported type"
 msgstr "Nicht unterstützter Typ"
 
-#: shell/evolution-shell-component.c:988
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr "Nicht unterstütztes Schema"
 
-#: shell/evolution-shell-component.c:990
+#: shell/evolution-shell-component.c:1025
 msgid "Unsupported operation"
 msgstr "Nicht unterstützte Aktion"
 
-#: shell/evolution-shell-component.c:992
+#: shell/evolution-shell-component.c:1027
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: shell/evolution-shell-component.c:996
+#: shell/evolution-shell-component.c:1031
 msgid "Exists"
 msgstr "Existiert"
 
-#: shell/evolution-shell-component.c:998
+#: shell/evolution-shell-component.c:1033
 msgid "Invalid URI"
 msgstr "Ungültiger URI"
 
-#: shell/evolution-shell-component.c:1002
+#: shell/evolution-shell-component.c:1037
 msgid "Has subfolders"
 msgstr "Hat Unterordner"
 
-#: shell/evolution-shell-component.c:1004
+#: shell/evolution-shell-component.c:1039
 msgid "No space left"
 msgstr "Keine Platz mehr frei"
 
-#: shell/evolution-shell-component.c:1006
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr "Alter Besitzer ist gestorben"
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -11940,7 +12463,7 @@ msgstr ""
 "\n"
 "Unbekannter Fehler."
 
-#: shell/evolution-shell-component-utils.c:128
+#: shell/evolution-shell-component-utils.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -11953,7 +12476,7 @@ msgstr ""
 "Der Fehler im Komponentensystem ist:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:135
+#: shell/evolution-shell-component-utils.c:134
 #, c-format
 msgid ""
 "%s\n"
@@ -12065,84 +12588,68 @@ msgstr ""
 "Dieser Druide führt Sie durch das Importieren externer\n"
 "Dateien in Evolution."
 
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
 msgid "Importers"
 msgstr "Importeure"
 
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
 msgid "Don't import"
 msgstr "Nicht importieren"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
 msgid "Don't ask me again"
 msgstr "Mich nicht mehr fragen"
 
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kann Daten aus den folgenden Dateien importieren:"
 
-#: shell/main.c:86
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Evolution wird beendet..."
 
-#: shell/main.c:190
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\n"
-"Ximian Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. \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"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
-"Hallo. Viele Dank dafür, dass Sie sich die Zeit genommen haben, diese\n"
-"Vorschauversion der Groupware-Suite Ximian Evolution herunterzuladen.\n"
-"\n"
-"Ximian Evolution ist noch nicht fertig. Es ist nahe dran, aber es gibt noch\n"
-"Stellen, wo Funktionen entweder fehlen oder nur halbwegs arbeiten.\n"
-"\n"
-"Falls Sie Fehler finden, melden Sie sie uns bitte auf bugzilla.ximian.com.\n"
-"Auf dieses Produkt gibt es keinerlei Garantie und es ist nicht für\n"
-"Individuen bestimmt, die zu gewalttätigen Wutanfällen neigen.\n"
-"\n"
-"Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
-"werden, und wir hoffen auf Ihre Mitarbeit!\n"
-
-#: shell/main.c:211
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Danke.\n"
-"das Ximian-Evolution-Team\n"
-
-#: shell/main.c:265
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Auf die Ximian-Evolution-Shell kann nicht zugegriffen werden."
 
-#: shell/main.c:274
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Die Ximian-Evolution-Shell kann nicht initialisiert werden: %s"
 
-#: shell/main.c:344
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "Splashscreen deaktivieren"
 
-#: shell/main.c:345
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: shell/main.c:387
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Das Bonobo-Komponentensystem kann nicht initialisiert werden."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Fehler beim Laden der Datei: %s"
+
+#: tools/evolution-addressbook-export.c:46
+#, fuzzy
+msgid "Output File"
+msgstr "Datei öffnen"
+
+#: tools/evolution-addressbook-import.c:67
+#, fuzzy
+msgid "Input File"
+msgstr "Datei einfügen"
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "Kein Ordnername angegeben."
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12422,11 +12929,12 @@ msgstr "Drucken..."
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Speichern"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "Speichern und schließen"
 
@@ -12442,7 +12950,7 @@ msgstr "Diesen Eintrag auf Platte speichern"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Datei"
@@ -12464,7 +12972,7 @@ msgstr "Den Kontakt speichern und das Dialogfenster schließen"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -12524,10 +13032,6 @@ msgstr "Eine Besprechung für diesen Eintrag ansetzen"
 msgid "Customise My Evolution"
 msgstr "My Evolution anpassen"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Den aktuellen Mailvorgang abbrechen"
@@ -13097,7 +13601,7 @@ msgstr "Dieses Fenster schließen"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "Schließen"
@@ -13129,7 +13633,8 @@ msgstr ""
 "Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "F_ormat"
+#, fuzzy
+msgid "For_mat"
 msgstr "Format"
 
 #: ui/evolution-message-composer.xml.h:9
@@ -13181,7 +13686,7 @@ msgid "Save in folder..."
 msgstr "In Ordner speichern..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "Die aktuelle Datei speichern"
 
@@ -13274,7 +13779,7 @@ msgid "_From Field"
 msgstr "_Von-Feld"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "Einfügen"
 
@@ -13290,7 +13795,7 @@ msgstr "Antwort-an-Feld"
 msgid "_Security"
 msgstr "_Sicherheit"
 
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Hilfe"
 
@@ -13526,10 +14031,6 @@ msgstr "_Verknüpfung"
 msgid "_Shortcut Bar"
 msgstr "Verknüpfungsleiste"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "Offline _arbeiten"
-
 #: ui/my-evolution.xml.h:1
 msgid "Change the settings for the summary"
 msgstr "Die Eigenschaften für die Übersicht ändern"
@@ -13604,136 +14105,136 @@ msgstr ""
 "heranzuzoomen, und wählen Sie eine Zeitzone.\n"
 " Mit der rechten Maustaste können Sie wegzoomen."
 
-#: widgets/menus/gal-view-menus.c:189
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "Aktuelle Ansicht"
 
-#: widgets/menus/gal-view-menus.c:216
+#: widgets/menus/gal-view-menus.c:222
 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:428
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:225 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:230 widgets/misc/e-dateedit.c:438
 msgid "Now"
 msgstr "Jetzt"
 
-#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:238 widgets/misc/e-dateedit.c:444
 msgid "Today"
 msgstr "Heute"
 
-#: widgets/misc/e-cell-date-edit.c:742
+#: widgets/misc/e-cell-date-edit.c:769
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
 
-#: widgets/misc/e-cell-percent.c:78
+#: widgets/misc/e-cell-percent.c:77
 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:59
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Mitteleuropäisch"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Griechisch"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "Westeuropäisch"
 
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "Vereinfach"
 
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
 msgid "New"
 msgstr "Neu"
 
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Unbekannter Zeichensatz: %s"
 
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "Geben Sie den zu verwendenden Zeichensatz an"
 
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "Anderer..."
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "Zeichenkodierung"
 
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "Editor für Suchen"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "Suche speichren"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 msgid "Add to Saved Searches"
 msgstr "Zu gespeicherten Suchen hinzufügen"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "Löschen"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Alle zeigen"
 
@@ -13776,14 +14277,86 @@ msgstr "Der persönliche Adressbuchserver"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Der persönliche Kalenderserver; Kalender-Factory"
 
-#: wombat/wombat.c:193
+#: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME VFS konnte nicht initialisiert werden"
 
-#: wombat/wombat.c:205
+#: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 
-#: wombat/wombat.c:218
+#: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "Alarm am %A, %d. %b %Y %H.%M"
+
+#~ msgid "%s at an unknown time"
+#~ msgstr "%s zu einer unbekannten Zeit"
+
+#~ msgid "_Invite Others"
+#~ msgstr "Andere _einladen"
+
+#~ msgid "_Confidential"
+#~ msgstr "Vertraulich"
+
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard:"
+
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Ordner `%s' kann nicht in sich selbst kopiert werden."
+
+#~ msgid "KBOS:ZSAM:EGAA"
+#~ msgstr "EDDI:EDDH:EDDK:EDDM"
+
+#~ msgid "KBOS:EGAA:RJTT"
+#~ msgstr "EDDI:EDDH:EDDK:EDDM"
+
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "Ordner darf das Verzeichnistrennzeichen nicht enthalten."
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution %s"
+
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Ximian Evolution groupware suite.\n"
+#~ "\n"
+#~ "Ximian Evolution is not yet complete. It's getting close, but there are\n"
+#~ "places where features are either missing or only half working. \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"
+#~ "individuals prone to violent fits of anger.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we\n"
+#~ "eagerly await your contributions!\n"
+#~ msgstr ""
+#~ "Hallo. Viele Dank dafür, dass Sie sich die Zeit genommen haben, diese\n"
+#~ "Vorschauversion der Groupware-Suite Ximian Evolution herunterzuladen.\n"
+#~ "\n"
+#~ "Ximian Evolution ist noch nicht fertig. Es ist nahe dran, aber es gibt "
+#~ "noch\n"
+#~ "Stellen, wo Funktionen entweder fehlen oder nur halbwegs arbeiten.\n"
+#~ "\n"
+#~ "Falls Sie Fehler finden, melden Sie sie uns bitte auf bugzilla.ximian."
+#~ "com.\n"
+#~ "Auf dieses Produkt gibt es keinerlei Garantie und es ist nicht für\n"
+#~ "Individuen bestimmt, die zu gewalttätigen Wutanfällen neigen.\n"
+#~ "\n"
+#~ "Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
+#~ "werden, und wir hoffen auf Ihre Mitarbeit!\n"
+
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Danke.\n"
+#~ "das Ximian-Evolution-Team\n"
+
+#~ msgid "F_ormat"
+#~ msgstr "Format"
author	Ettore Perazzoli <ettore@src.gnome.org>	2001-11-01 07:07:32 +0800
committer	Ettore Perazzoli <ettore@src.gnome.org>	2001-11-01 07:07:32 +0800
commit	1d7f11a189c5c4fa7797b33bdb93822e352319d1 (patch)
tree	23a559420d8a89436254040f077f29c65b06ef1d /po/de.po
parent	9450e20fe2e22030f1674c36935fd1603d2c065a (diff)
download	gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar.gz gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar.bz2 gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar.lz gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar.xz gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.tar.zst gsoc2013-evolution-1d7f11a189c5c4fa7797b33bdb93822e352319d1.zip