Updated German translation

svn path=/trunk/; revision=4860

2 files changed, 1985 insertions, 690 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 6a71904c00..ace0048290 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-17  Kai Lahmann <kl@linuxfaqs.de>
+
+	* de.po: Updated German translation
+
 2000-08-16  Valek Filippov  <frob@df.ru>
 
 	* ru.po: updated russian translation.
diff --git a/po/de.po b/po/de.po
index f5ecf9224d..5dcca6319d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,25 +5,162 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 0.2\n"
-"POT-Creation-Date: 2000-07-23 13:52+0200\n"
+"Project-Id-Version: evolution 0.4\n"
+"POT-Creation-Date: 2000-08-16 20:51+0200\n"
 "PO-Revision-Date: 2000-07-15 17:12+02:00\n"
-"Last-Translator: Matthias Warkus <mawa@iname.com>\n"
-"Language-Team: de <de@li.org>\n"
+"Last-Translator: Kai Lahmann <kl@linuxfaqs.de>\n"
+"Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:41
 #: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/gui/component/addressbook-factory.c:59 calendar/gui/main.c:68
+#: addressbook/backend/ebook/test-client-list.c:29
+#: addressbook/backend/ebook/test-client.c:54
+#: addressbook/conduit/address-conduit.c:1201
+#: addressbook/demo/addressbook-factory.c:32
+#: addressbook/gui/component/addressbook-factory.c:59
+#: addressbook/gui/minicard/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1669
+#: calendar/conduits/todo/todo-conduit.c:1298 calendar/gui/main.c:68
 msgid "Could not initialize Bonobo"
 msgstr "Konnte Bonobo nicht initialisieren"
 
-#.
+#. This array must be in the same order as enumerations
+#. in GnomePilotConduitSyncType as they are used as index.
+#. Custom type implies Disabled state.
+#: addressbook/conduit/address-conduit-control-applet.c:54
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:55
+#: calendar/conduits/todo/todo-conduit-control-applet.c:55
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+#: addressbook/conduit/address-conduit-control-applet.c:55
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:56
+#: calendar/conduits/todo/todo-conduit-control-applet.c:56
+msgid "Synchronize"
+msgstr "Synchronisiere"
+
+#: addressbook/conduit/address-conduit-control-applet.c:56
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:57
+#: calendar/conduits/todo/todo-conduit-control-applet.c:57
+msgid "Copy From Pilot"
+msgstr "Kopiere vom Pilot"
+
+#: addressbook/conduit/address-conduit-control-applet.c:57
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:58
+#: calendar/conduits/todo/todo-conduit-control-applet.c:58
+msgid "Copy To Pilot"
+msgstr "Kopiele zum Pilot"
+
+#: addressbook/conduit/address-conduit-control-applet.c:58
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:59
+#: calendar/conduits/todo/todo-conduit-control-applet.c:59
+msgid "Merge From Pilot"
+msgstr "Füge vom Pilot ein"
+
+#: addressbook/conduit/address-conduit-control-applet.c:59
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:60
+#: calendar/conduits/todo/todo-conduit-control-applet.c:60
+msgid "Merge To Pilot"
+msgstr "Füge zum Pilot hinzu"
+
+#: addressbook/conduit/address-conduit-control-applet.c:143
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:144
+#: calendar/conduits/todo/todo-conduit-control-applet.c:144
+msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#: addressbook/conduit/address-conduit-control-applet.c:145
+msgid "Gpilotd address conduit"
+msgstr "Gpilitd Adressen-Verbindung"
+
+#: addressbook/conduit/address-conduit-control-applet.c:146
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:147
+#: calendar/conduits/todo/todo-conduit-control-applet.c:147
+msgid "(C) 1998 the Free Software Foundation"
+msgstr "(C) 1998 Free Software Foundation"
+
+#: addressbook/conduit/address-conduit-control-applet.c:148
+msgid "Configuration utility for the address conduit.\n"
+msgstr "Konfigurationstool für die Adressen-Verbindung.\n"
+
+#: addressbook/conduit/address-conduit-control-applet.c:149
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:150
+#: calendar/conduits/todo/todo-conduit-control-applet.c:150
+msgid "gnome-unknown.xpm"
+msgstr "gnome-unknown.xpm"
+
+#: addressbook/conduit/address-conduit-control-applet.c:190
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:191
+#: calendar/conduits/todo/todo-conduit-control-applet.c:191
+msgid "Synchronize Action"
+msgstr "synchronisiere Aktion"
+
+#: addressbook/conduit/address-conduit-control-applet.c:261
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:262
+#: calendar/conduits/todo/todo-conduit-control-applet.c:262
+msgid "Conduit state"
+msgstr "Verbindungs-Status"
+
+#: addressbook/conduit/address-conduit-control-applet.c:315
+#: addressbook/conduit/address-conduit-control-applet.c:328
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:316
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:329
+#: calendar/conduits/todo/todo-conduit-control-applet.c:316
+#: calendar/conduits/todo/todo-conduit-control-applet.c:329
+msgid ""
+"No pilot configured, please choose the\n"
+"'Pilot Link Properties' capplet first."
+msgstr ""
+"Kein Pilot konfiguriert, bitte wählen Sie\n"
+"erst das Pilot-Verbindungs-Tool."
+
+#: addressbook/conduit/address-conduit-control-applet.c:334
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:335
+#: calendar/conduits/todo/todo-conduit-control-applet.c:335
+msgid "Not connected to the gnome-pilot daemon"
+msgstr "Nicht mit dem gnome-pilot Daemon verbunden"
+
+#: addressbook/conduit/address-conduit-control-applet.c:339
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:340
+#: calendar/conduits/todo/todo-conduit-control-applet.c:340
+msgid ""
+"An error occured when trying to fetch\n"
+"pilot list from the gnome-pilot daemon"
+msgstr ""
+"Beim Versuch die Pilot-Liste von gnome-pilot\n"
+"Daemon zu erhalten ist ein Fehler aufgetreten"
+
+#: addressbook/conduit/address-conduit.c:128
+#: addressbook/conduit/address-conduit.c:142
+msgid "BLARG\n"
+msgstr "BLARG\n"
+
+#: addressbook/conduit/address-conduit.c:459
+#, c-format
+msgid "Address holds %ld address entries"
+msgstr "Adresse hat %ld Adress-Einträge"
+
+#: addressbook/conduit/address-conduit.c:485
+#: addressbook/conduit/address-conduit.c:487
+msgid "Could not start addressbook server"
+msgstr "Konnte den Adressbuchserver nicht starten"
+
+#: addressbook/conduit/address-conduit.c:500
+#: addressbook/conduit/address-conduit.c:503
+msgid "Could not read pilot's Address application block"
+msgstr "Konnte den Adress-Anwendungsblock des Pilot nicht lesen"
+
+#: addressbook/conduit/address-conduit.c:841
+msgid "Error while communicating with address server"
+msgstr "Fehler bei der Kommunikation mit den Adressserver"
+
+#. 
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
-#.
 #: addressbook/contact-editor/categories-strings.h:7
 msgid "categories"
 msgstr "Kategorien"
@@ -37,68 +174,72 @@ msgid "Available Categories:"
 msgstr "Verfügbare Kategorien:"
 
 #: addressbook/contact-editor/e-contact-editor.c:643
-#: calendar/gui/event-editor.c:1118
+#: calendar/gui/dialogs/task-editor.c:217 calendar/gui/event-editor.c:1168
 msgid "FIXME: _Appointment"
 msgstr "FIXME: Termin"
 
 #: addressbook/contact-editor/e-contact-editor.c:644
-#: calendar/gui/event-editor.c:1119
+#: calendar/gui/dialogs/task-editor.c:218 calendar/gui/event-editor.c:1169
 msgid "FIXME: Meeting Re_quest"
 msgstr "FIXME: Besprechungs-Anfrage"
 
 #: addressbook/contact-editor/e-contact-editor.c:646
-#: calendar/gui/event-editor.c:1121
+#: calendar/gui/dialogs/task-editor.c:216 calendar/gui/event-editor.c:1171
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Nachricht senden"
 
 #: addressbook/contact-editor/e-contact-editor.c:647
-#: calendar/gui/event-editor.c:1122
+#: calendar/gui/dialogs/task-editor.c:219 calendar/gui/event-editor.c:1172
 msgid "FIXME: _Contact"
 msgstr "FIXME: Kontakt"
 
 #: addressbook/contact-editor/e-contact-editor.c:648
-#: calendar/gui/event-editor.c:1123
+#: calendar/gui/dialogs/task-editor.c:213
+#: calendar/gui/dialogs/task-editor.c:220 calendar/gui/event-editor.c:1173
 msgid "FIXME: _Task"
 msgstr "FIXME: Aufgabe"
 
 #: addressbook/contact-editor/e-contact-editor.c:649
-#: calendar/gui/event-editor.c:1124
+#: calendar/gui/dialogs/task-editor.c:214
+#: calendar/gui/dialogs/task-editor.c:221 calendar/gui/event-editor.c:1174
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Aufgaben-Anfrage"
 
 #: addressbook/contact-editor/e-contact-editor.c:650
-#: calendar/gui/event-editor.c:1125
+#: calendar/gui/dialogs/task-editor.c:222 calendar/gui/event-editor.c:1175
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Journal-Eintrag"
 
 #: addressbook/contact-editor/e-contact-editor.c:651
-#: calendar/gui/event-editor.c:1126
+#: calendar/gui/dialogs/task-editor.c:223 calendar/gui/event-editor.c:1176
 msgid "FIXME: _Note"
 msgstr "FIXME: Notiz"
 
 #: addressbook/contact-editor/e-contact-editor.c:653
 #: addressbook/contact-editor/e-contact-editor.c:758
-#: calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:332 calendar/gui/event-editor.c:1178
+#: calendar/gui/event-editor.c:1285
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Formular wählen..."
 
 #: addressbook/contact-editor/e-contact-editor.c:658
-#: calendar/gui/event-editor.c:1133
+#: calendar/gui/dialogs/task-editor.c:230 calendar/gui/event-editor.c:1183
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: Memo-Stil"
 
 #: addressbook/contact-editor/e-contact-editor.c:660
-#: calendar/gui/event-editor.c:1135
+#: calendar/gui/dialogs/task-editor.c:232 calendar/gui/event-editor.c:1185
 msgid "FIXME: Define Print _Styles..."
 msgstr "FIXME: Druckstile definieren..."
 
 #: addressbook/contact-editor/e-contact-editor.c:667
-#: calendar/gui/event-editor.c:1142
+#: calendar/gui/dialogs/task-editor.c:239 calendar/gui/event-editor.c:1192
 msgid "FIXME: S_end"
 msgstr "FIXME: Senden"
 
 #: addressbook/contact-editor/e-contact-editor.c:671
-#: calendar/gui/event-editor.c:1146
+#: calendar/gui/dialogs/task-editor.c:243 calendar/gui/event-editor.c:1196
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Anlagen speichern..."
 
@@ -108,149 +249,153 @@ msgid "_Delete"
 msgstr "Löschen"
 
 #: addressbook/contact-editor/e-contact-editor.c:674
-#: calendar/gui/event-editor.c:1149
+#: calendar/gui/dialogs/task-editor.c:246 calendar/gui/event-editor.c:1199
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: In Ordner verschieben..."
 
 #: addressbook/contact-editor/e-contact-editor.c:675
-#: calendar/gui/event-editor.c:1150
+#: calendar/gui/dialogs/task-editor.c:247 calendar/gui/event-editor.c:1200
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: In Ordner kopieren..."
 
 #: addressbook/contact-editor/e-contact-editor.c:677
-#: calendar/gui/event-editor.c:1152
+#: calendar/gui/dialogs/task-editor.c:249 calendar/gui/event-editor.c:1202
 msgid "Page Set_up"
 msgstr "Seite einrichten"
 
 #: addressbook/contact-editor/e-contact-editor.c:678
-#: calendar/gui/event-editor.c:1153
+#: calendar/gui/dialogs/task-editor.c:250 calendar/gui/event-editor.c:1203
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Druckvorschau"
 
 #: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/event-editor.c:1174
+#: calendar/gui/dialogs/task-editor.c:271 calendar/gui/event-editor.c:1224
 msgid "FIXME: Paste _Special..."
 msgstr "FIXME: Besonderes einfügen..."
 
 #: addressbook/contact-editor/e-contact-editor.c:704
-#: calendar/gui/event-editor.c:1179
+#: calendar/gui/dialogs/task-editor.c:276 calendar/gui/event-editor.c:1229
 msgid "FIXME: Mark as U_nread"
 msgstr "FIXME: Als ungelesen markieren"
 
 #: addressbook/contact-editor/e-contact-editor.c:708
-#: calendar/gui/event-editor.c:1183
+#: calendar/gui/dialogs/task-editor.c:280 calendar/gui/event-editor.c:1233
 msgid "_Object"
 msgstr "Objekt"
 
 #: addressbook/contact-editor/e-contact-editor.c:713
 #: addressbook/contact-editor/e-contact-editor.c:720
-#: calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195
+#: calendar/gui/dialogs/task-editor.c:285
+#: calendar/gui/dialogs/task-editor.c:293 calendar/gui/event-editor.c:1238
+#: calendar/gui/event-editor.c:1245
 msgid "FIXME: _Item"
 msgstr "FIXME: Eintrag"
 
 #: addressbook/contact-editor/e-contact-editor.c:714
 #: addressbook/contact-editor/e-contact-editor.c:721
-#: calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196
+#: calendar/gui/dialogs/task-editor.c:286
+#: calendar/gui/dialogs/task-editor.c:294 calendar/gui/event-editor.c:1239
+#: calendar/gui/event-editor.c:1246
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Ungelesener Eintrag"
 
 #: addressbook/contact-editor/e-contact-editor.c:715
-#: calendar/gui/event-editor.c:1190
+#: calendar/gui/dialogs/task-editor.c:288 calendar/gui/event-editor.c:1240
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Erster Eintrag im Ordner"
 
 #: addressbook/contact-editor/e-contact-editor.c:722
-#: calendar/gui/event-editor.c:1197
+#: calendar/gui/dialogs/task-editor.c:296 calendar/gui/event-editor.c:1247
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: Letzter Eintrag im Ordner"
 
 #: addressbook/contact-editor/e-contact-editor.c:727
-#: calendar/gui/event-editor.c:1202
+#: calendar/gui/dialogs/task-editor.c:301 calendar/gui/event-editor.c:1252
 msgid "FIXME: _Standard"
 msgstr "FIXME: Standard"
 
 #: addressbook/contact-editor/e-contact-editor.c:729
-#: calendar/gui/event-editor.c:1204
+#: calendar/gui/dialogs/task-editor.c:303 calendar/gui/event-editor.c:1254
 msgid "FIXME: __Formatting"
 msgstr "FIXME: Formatieren"
 
 #: addressbook/contact-editor/e-contact-editor.c:732
-#: calendar/gui/event-editor.c:1207
+#: calendar/gui/dialogs/task-editor.c:306 calendar/gui/event-editor.c:1257
 msgid "FIXME: _Customize..."
 msgstr "FIXME: Anpassen..."
 
 #: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/event-editor.c:1212
+#: calendar/gui/dialogs/task-editor.c:311 calendar/gui/event-editor.c:1262
 msgid "Pre_vious"
 msgstr "Voriger"
 
 #: addressbook/contact-editor/e-contact-editor.c:738
-#: calendar/gui/event-editor.c:1213
+#: calendar/gui/dialogs/task-editor.c:312 calendar/gui/event-editor.c:1263
 msgid "Ne_xt"
 msgstr "Nächster"
 
 #: addressbook/contact-editor/e-contact-editor.c:740
-#: calendar/gui/event-editor.c:1217
+#: calendar/gui/dialogs/task-editor.c:314 calendar/gui/event-editor.c:1267
 msgid "_Toolbars"
 msgstr "Werkzeugleisten"
 
 #: addressbook/contact-editor/e-contact-editor.c:745
-#: calendar/gui/event-editor.c:1222
+#: calendar/gui/dialogs/task-editor.c:319 calendar/gui/event-editor.c:1272
 msgid "FIXME: _File..."
 msgstr "FIXME: Datei..."
 
 #: addressbook/contact-editor/e-contact-editor.c:746
-#: calendar/gui/event-editor.c:1223
+#: calendar/gui/dialogs/task-editor.c:320 calendar/gui/event-editor.c:1273
 msgid "FIXME: It_em..."
 msgstr "FIXME: Eintrag..."
 
 #: addressbook/contact-editor/e-contact-editor.c:747
-#: calendar/gui/event-editor.c:1224
+#: calendar/gui/dialogs/task-editor.c:321 calendar/gui/event-editor.c:1274
 msgid "FIXME: _Object..."
 msgstr "FIXME: Objekt..."
 
 #: addressbook/contact-editor/e-contact-editor.c:752
-#: calendar/gui/event-editor.c:1229
+#: calendar/gui/dialogs/task-editor.c:326 calendar/gui/event-editor.c:1279
 msgid "FIXME: _Font..."
 msgstr "FIXME: Schriftart..."
 
 #: addressbook/contact-editor/e-contact-editor.c:753
-#: calendar/gui/event-editor.c:1230
+#: calendar/gui/dialogs/task-editor.c:327 calendar/gui/event-editor.c:1280
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: Absatz..."
 
 #: addressbook/contact-editor/e-contact-editor.c:760
-#: calendar/gui/event-editor.c:1237
+#: calendar/gui/dialogs/task-editor.c:334 calendar/gui/event-editor.c:1287
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Dieses Formular entwerfen"
 
 #: addressbook/contact-editor/e-contact-editor.c:761
-#: calendar/gui/event-editor.c:1238
+#: calendar/gui/dialogs/task-editor.c:335 calendar/gui/event-editor.c:1288
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: Ein Formular entwerfen..."
 
 #: addressbook/contact-editor/e-contact-editor.c:763
-#: calendar/gui/event-editor.c:1240
+#: calendar/gui/dialogs/task-editor.c:337 calendar/gui/event-editor.c:1290
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Formular veröffentlichen..."
 
 #: addressbook/contact-editor/e-contact-editor.c:764
-#: calendar/gui/event-editor.c:1241
+#: calendar/gui/dialogs/task-editor.c:338 calendar/gui/event-editor.c:1291
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Formular veröffentlichen als..."
 
 #: addressbook/contact-editor/e-contact-editor.c:766
-#: calendar/gui/event-editor.c:1243
+#: calendar/gui/dialogs/task-editor.c:340 calendar/gui/event-editor.c:1293
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Skriptdebugger"
 
 #: addressbook/contact-editor/e-contact-editor.c:771
-#: calendar/gui/event-editor.c:1248
+#: calendar/gui/dialogs/task-editor.c:345 calendar/gui/event-editor.c:1298
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: Rechtschreibung..."
 
 #: addressbook/contact-editor/e-contact-editor.c:773
-#: calendar/gui/event-editor.c:1253
+#: calendar/gui/dialogs/task-editor.c:350 calendar/gui/event-editor.c:1303
 msgid "_Forms"
 msgstr "Formulare"
 
@@ -303,28 +448,28 @@ msgid "FIXME: Forward as _vCard"
 msgstr "FIXME: Als vCard weiterleiten"
 
 #: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/event-editor.c:1266
+#: calendar/gui/dialogs/task-editor.c:367 calendar/gui/event-editor.c:1316
 msgid "FIXME: For_ward"
 msgstr "FIXME: Weiterleiten"
 
 #: addressbook/contact-editor/e-contact-editor.c:805
-#: calendar/gui/event-editor.c:1279
+#: calendar/gui/dialogs/task-editor.c:380 calendar/gui/event-editor.c:1329
 msgid "_Insert"
 msgstr "Einfügen"
 
 #: addressbook/contact-editor/e-contact-editor.c:806
-#: calendar/gui/event-editor.c:1280
+#: calendar/gui/dialogs/task-editor.c:381 calendar/gui/event-editor.c:1330
 msgid "F_ormat"
 msgstr "Format"
 
-#. FIXME: add Favorites here
 #: addressbook/contact-editor/e-contact-editor.c:807
-#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:493
+#: calendar/gui/dialogs/task-editor.c:382 calendar/gui/event-editor.c:1331
+#: shell/e-shell-view-menu.c:513
 msgid "_Tools"
 msgstr "Werkzeuge"
 
 #: addressbook/contact-editor/e-contact-editor.c:808
-#: calendar/gui/event-editor.c:1282
+#: calendar/gui/dialogs/task-editor.c:383 calendar/gui/event-editor.c:1332
 msgid "Actio_ns"
 msgstr "Aktionen"
 
@@ -333,169 +478,191 @@ msgid "Save and Close"
 msgstr "Speichern und schließen"
 
 #: addressbook/contact-editor/e-contact-editor.c:840
-#: calendar/gui/event-editor.c:1321
+#: calendar/gui/event-editor.c:1371
 msgid "Save the appointment and close the dialog box"
 msgstr "Den Termin speichern und das Dialogfenster schließen"
 
 #: addressbook/contact-editor/e-contact-editor.c:844
-#: calendar/gui/calendar-commands.c:673
+#: calendar/gui/calendar-commands.c:654
 msgid "Print..."
 msgstr "Drucken..."
 
 #: addressbook/contact-editor/e-contact-editor.c:845
-#: calendar/gui/event-editor.c:1326
+#: calendar/gui/dialogs/task-editor.c:415 calendar/gui/event-editor.c:1376
 msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
 #: addressbook/contact-editor/e-contact-editor.c:848
-#: calendar/gui/event-editor.c:1327
+#: calendar/gui/dialogs/task-editor.c:416 calendar/gui/event-editor.c:1377
 msgid "FIXME: Insert File..."
 msgstr "FIXME: Datei einfügen..."
 
 #: addressbook/contact-editor/e-contact-editor.c:849
-#: calendar/gui/event-editor.c:1328
+#: calendar/gui/dialogs/task-editor.c:417 calendar/gui/event-editor.c:1378
 msgid "Insert a file as an attachment"
 msgstr "Eine Datei als Anlage einfügen"
 
 #. Delete
 #: addressbook/contact-editor/e-contact-editor.c:852
-#: addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
-#: mail/folder-browser-factory.c:45
+#: addressbook/demo/addressbook.c:84
+#: addressbook/gui/component/addressbook.c:424
+#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/event-editor-dialog.glade.h:93 calendar/gui/gncal-todo.c:508
+#: mail/folder-browser-factory.c:50 mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
+#: mail/mail-view.c:147
 msgid "Delete"
 msgstr "Löschen"
 
 #: addressbook/contact-editor/e-contact-editor.c:853
-#: calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327
+#: calendar/gui/dialogs/task-editor.c:426 calendar/gui/event-editor.c:1387
+#: calendar/gui/gncal-todo.c:336
 msgid "Delete this item"
 msgstr "Diesen Eintrag löschen"
 
-#: addressbook/contact-editor/e-contact-editor.c:856
-#: calendar/gui/event-editor.c:1339
+#: addressbook/contact-editor/e-contact-editor.c:857
+#: calendar/gui/dialogs/task-editor.c:428 calendar/gui/event-editor.c:1389
 msgid "FIXME: Previous"
 msgstr "FIXME: Voriger"
 
-#: addressbook/contact-editor/e-contact-editor.c:857
-#: calendar/gui/event-editor.c:1340
+#: addressbook/contact-editor/e-contact-editor.c:858
+#: calendar/gui/dialogs/task-editor.c:429 calendar/gui/event-editor.c:1390
 msgid "Go to the previous item"
 msgstr "Zum vorigen Eintrag gehen"
 
-#: addressbook/contact-editor/e-contact-editor.c:859
-#: calendar/gui/event-editor.c:1341
+#: addressbook/contact-editor/e-contact-editor.c:860
+#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1391
 msgid "FIXME: Next"
 msgstr "FIXME: Nächster"
 
-#: addressbook/contact-editor/e-contact-editor.c:860
-#: calendar/gui/event-editor.c:1342
+#: addressbook/contact-editor/e-contact-editor.c:861
+#: calendar/gui/dialogs/task-editor.c:431 calendar/gui/event-editor.c:1392
 msgid "Go to the next item"
 msgstr "Zum nächsten Eintrag gehen"
 
-#: addressbook/contact-editor/e-contact-editor.c:862
-#: calendar/gui/event-editor.c:1343
+#: addressbook/contact-editor/e-contact-editor.c:864
+#: calendar/gui/dialogs/task-editor.c:432 calendar/gui/event-editor.c:1393
 msgid "FIXME: Help"
 msgstr "FIXME: Hilfe"
 
-#: addressbook/contact-editor/e-contact-editor.c:863
-#: calendar/gui/event-editor.c:1344
+#: addressbook/contact-editor/e-contact-editor.c:865
+#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1394
 msgid "See online help"
 msgstr "Onlinehilfe einsehen"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1320
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/contact-editor/e-contact-editor.c:1383
+#: addressbook/contact-editor/e-contact-editor.c:1321
+#: addressbook/contact-editor/e-contact-editor.c:1425
 msgid "Business"
 msgstr "Geschäftlich"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1322
 msgid "Business 2"
 msgstr "Geschäftlich 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1323
 msgid "Business Fax"
 msgstr "Geschäftliches Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1324
 msgid "Callback"
 msgstr "Rückruf"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1325
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1326
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/contact-editor/e-contact-editor.c:1384
+#: addressbook/contact-editor/e-contact-editor.c:1327
+#: addressbook/contact-editor/e-contact-editor.c:1426
 msgid "Home"
 msgstr "Zu Hause"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:1328
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1329
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/contact-editor/e-contact-editor.c:1330
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/contact-editor/e-contact-editor.c:1331
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
-#: addressbook/contact-editor/e-contact-editor.c:1385
+#: addressbook/contact-editor/e-contact-editor.c:1332
+#: addressbook/contact-editor/e-contact-editor.c:1427
+#: mail/mail-config.glade.h:27
 msgid "Other"
 msgstr "Andere"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1333
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1334
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1293
+#: addressbook/contact-editor/e-contact-editor.c:1335
 msgid "Primary"
 msgstr "Primär"
 
-#: addressbook/contact-editor/e-contact-editor.c:1294
+#: addressbook/contact-editor/e-contact-editor.c:1336
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1295
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1296
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "TTY/TDD"
-msgstr ""
+msgstr "TTY/TTD"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1340
+#: addressbook/contact-editor/e-contact-editor.c:1382
 msgid "Primary Email"
 msgstr "Primäre E-Mail"
 
-#: addressbook/contact-editor/e-contact-editor.c:1341
+#: addressbook/contact-editor/e-contact-editor.c:1383
 msgid "Email 2"
 msgstr "E-Mail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1342
+#: addressbook/contact-editor/e-contact-editor.c:1384
 msgid "Email 3"
 msgstr "E-Mail 3"
 
-#.
+#. 
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Sind Sie sich sicher,dass Sie\n"
+"diesen Kontakt löschen wollen?"
+
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+msgid "Delete Contact?"
+msgstr "Kontakt löschen?"
+
+#. 
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
-#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:7
 msgid "_Add"
 msgstr "Hinzufügen"
@@ -510,6 +677,8 @@ msgid "New phone type"
 msgstr "Neuer Telefon-Typ"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
+#: calendar/gui/event-editor-dialog.glade.h:91 mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:16 mail/mail-config.glade.h:22
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -566,6 +735,7 @@ msgid "C_ontacts..."
 msgstr "Kontakte..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "Ca_tegories..."
 msgstr "Kategorien..."
 
@@ -578,6 +748,7 @@ msgid "_Company:"
 msgstr "Firma:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "General"
 msgstr "Allgemein"
 
@@ -622,14 +793,14 @@ msgid "No_tes:"
 msgstr "Notizen:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
 msgid "Details"
 msgstr "Details"
 
-#.
+#. 
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
-#.
 #: addressbook/contact-editor/fullname-strings.h:7
 msgid "Check Full Name"
 msgstr "Vollen Namen prüfen"
@@ -684,55 +855,67 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/gui/component/addressbook.c:420
-#: calendar/gui/calendar-commands.c:544
+#: addressbook/demo/addressbook.c:78
+#: addressbook/gui/component/addressbook.c:418
+#: calendar/gui/calendar-commands.c:511 notes/component-factory.c:27
 msgid "New"
 msgstr "Neu"
 
-#: addressbook/gui/component/addressbook.c:420
+#: addressbook/demo/addressbook.c:78
+#: addressbook/gui/component/addressbook.c:418
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: addressbook/gui/component/addressbook.c:424
+#: addressbook/demo/addressbook.c:82
+#: addressbook/gui/component/addressbook.c:422
 msgid "Find"
 msgstr "Suchen"
 
-#: addressbook/gui/component/addressbook.c:424
+#: addressbook/demo/addressbook.c:82
+#: addressbook/gui/component/addressbook.c:422
 msgid "Find a contact"
 msgstr "Einen Kontakt suchen"
 
-#: addressbook/gui/component/addressbook.c:425
-#: addressbook/gui/component/addressbook.c:492
-#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43
+#: addressbook/demo/addressbook.c:83
+#: addressbook/gui/component/addressbook.c:423
+#: calendar/gui/calendar-commands.c:516 mail/folder-browser-factory.c:48
+#: mail/mail-view.c:145
 msgid "Print"
 msgstr "Drucken"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/demo/addressbook.c:83
+#: addressbook/gui/component/addressbook.c:423
 msgid "Print contacts"
 msgstr "Kontakte drucken"
 
-#: addressbook/gui/component/addressbook.c:426
+#: addressbook/demo/addressbook.c:84
+#: addressbook/gui/component/addressbook.c:424
 msgid "Delete a contact"
 msgstr "Einen Kontakt löschen"
 
-#: addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:1039
-msgid "As _Table"
-msgstr "Als Tabelle"
-
-#: addressbook/gui/component/addressbook.c:506
+#: addressbook/demo/addressbook.c:103
+#: addressbook/gui/component/addressbook.c:509
 msgid "_New Contact"
 msgstr "Neuer Kontakt"
 
-#: addressbook/gui/component/addressbook.c:514
+#: addressbook/gui/component/addressbook.c:492
+msgid "_Print Contacts..."
+msgstr "Kontakte _drucken..."
+
+#: addressbook/gui/component/addressbook.c:502
+#: addressbook/gui/component/addressbook.c:972
+msgid "As _Table"
+msgstr "Als Tabelle"
+
+#: addressbook/gui/component/addressbook.c:517
 msgid "N_ew Directory Server"
 msgstr "Neuer Verzeichnisserver"
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:600
 msgid "Unable to open addressbook"
 msgstr "Kann das Adressbuch nicht öffnen"
 
-#: addressbook/gui/component/addressbook.c:598
+#: addressbook/gui/component/addressbook.c:605
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -754,31 +937,30 @@ msgstr ""
 "müssen Sie OpenLDAP herunterladen, installieren, und\n"
 "Evolution neu compilieren und installieren.\n"
 
-#: addressbook/gui/component/addressbook.c:943
-#: addressbook/gui/minicard/e-minicard.c:330
+#: addressbook/gui/component/addressbook.c:876
+#: addressbook/gui/minicard/e-minicard.c:332
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
 
-#: addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/component/addressbook.c:943
 msgid "* Click here to add a contact *"
 msgstr "* Hier klicken, um einen Kontakt hinzuzufügen *"
 
-#: addressbook/gui/component/addressbook.c:1046
+#: addressbook/gui/component/addressbook.c:979
 msgid "As _Minicards"
 msgstr "Als _Minikarten"
 
-#: addressbook/gui/component/addressbook.c:1097
+#: addressbook/gui/component/addressbook.c:1030
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
-#.
+#. 
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
-#.
 #: addressbook/gui/component/alphabet.glade.h:7
 msgid "window2"
-msgstr ""
+msgstr "windows2"
 
 #: addressbook/gui/component/alphabet.glade.h:8
 msgid "123"
@@ -813,7 +995,7 @@ msgid "g"
 msgstr "g"
 
 #: addressbook/gui/component/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:98
+#: calendar/cal-util/timeutil.c:131
 msgid "h"
 msgstr "h"
 
@@ -889,11 +1071,14 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#.
+#: addressbook/gui/component/e-ldap-storage.c:88
+msgid "External Directories"
+msgstr "Externe Listen"
+
+#. 
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
-#.
 #: addressbook/gui/component/ldap-server-dialog.glade.h:7
 #: composer/e-msg-composer-attachment.glade.h:9
 msgid "Description:"
@@ -916,6 +1101,30 @@ msgstr ""
 msgid "Name:"
 msgstr "Name:"
 
+#. 
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+msgid "Select Names"
+msgstr "Namen wählen"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "Find..."
+msgstr "Suchen..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+msgid "Select name from List:"
+msgstr "Wähle Namen aus der Liste"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:10
+msgid "Message Recipients"
+msgstr "Nachrichten-Empfänger"
+
+#: addressbook/gui/minicard/e-minicard-control.c:276
+msgid "Save in addressbook"
+msgstr "Speichere im Adressbuch"
+
 #: addressbook/gui/minicard/e-minicard-view.c:110
 msgid ""
 "\n"
@@ -930,11 +1139,28 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#.
+#: addressbook/gui/minicard/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/minicard/test-minicard-view.c:101
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright (C) 2000, Helix Code, Inc."
+
+#: addressbook/gui/minicard/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
+#: addressbook/gui/search/e-addressbook-search-dialog.c:127
+#: mail/folder-browser.c:349
+msgid "Search"
+msgstr "Suchen"
+
+#. 
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
-#.
 #: addressbook/printing/e-contact-print.glade.h:7
 msgid "Page Setup:"
 msgstr "Seite einrichten:"
@@ -1033,8 +1259,9 @@ msgstr "Typ:"
 
 #: addressbook/printing/e-contact-print.glade.h:31
 #: addressbook/printing/e-contact-print.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:81
 msgid "label26"
-msgstr ""
+msgstr "label26"
 
 #: addressbook/printing/e-contact-print.glade.h:32
 #: addressbook/printing/e-contact-print.glade.h:44
@@ -1111,51 +1338,91 @@ msgstr "Auf geraden Seiten umkehren"
 msgid "Header/Footer"
 msgstr "Kopf-/Fußzeile"
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:596
 msgid "am"
 msgstr "AM"
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:595
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/calendar-commands.c:56
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:146
+msgid "Gpilotd calendar conduit"
+msgstr "Gpilotd Kalender-Verbindung"
+
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:149
+msgid "Configuration utility for the calendar conduit.\n"
+msgstr "Konfigurationstool für die Kalender-Verbindung.\n"
+
+#: calendar/conduits/calendar/calendar-conduit.c:399
+#: calendar/conduits/calendar/calendar-conduit.c:1109
+#: calendar/conduits/todo/todo-conduit.c:443
+#: calendar/conduits/todo/todo-conduit.c:1025
+msgid "Error while communicating with calendar server"
+msgstr "Fehler bei er Kommunikation mit den Kalender-Server"
+
+#: calendar/conduits/calendar/calendar-conduit.c:776
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:707
+#: calendar/conduits/todo/todo-conduit.c:709
+msgid "Could not start gnomecal server"
+msgstr "Konnte den gnomecal-Server nicht starten"
+
+#: calendar/conduits/calendar/calendar-conduit.c:806
+#: calendar/conduits/calendar/calendar-conduit.c:809
+msgid "Could not read pilot's DateBook application block"
+msgstr "Konnte den DateBook-Anwendungsblock des Pilot nicht lesen"
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:146
+msgid "Gpilotd todo conduit"
+msgstr "Gnopilotd Todo-Verbindung"
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:149
+msgid "Configuration utility for the todo conduit.\n"
+msgstr "Konfigurationstool für die Todo-Verbindung.\n"
+
+#: calendar/conduits/todo/todo-conduit.c:737
+#: calendar/conduits/todo/todo-conduit.c:740
+msgid "Could not read pilot's ToDo application block"
+msgstr "Konnte den ToDo-Anwendungsblock des Pilot nicht lesen"
+
+#: calendar/gui/calendar-commands.c:59
 msgid "Outline:"
 msgstr "Umrandung:"
 
-#: calendar/gui/calendar-commands.c:57
+#: calendar/gui/calendar-commands.c:60
 msgid "Headings:"
 msgstr "Überschriften:"
 
-#: calendar/gui/calendar-commands.c:58
+#: calendar/gui/calendar-commands.c:61
 msgid "Empty days:"
 msgstr "Leere Tage:"
 
-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:62
 msgid "Appointments:"
 msgstr "Termine:"
 
-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:63
 msgid "Highlighted day:"
 msgstr "Markierter Tag:"
 
-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:64
 msgid "Day numbers:"
 msgstr "Tagesnummern:"
 
-#: calendar/gui/calendar-commands.c:62
+#: calendar/gui/calendar-commands.c:65
 msgid "Current day's number:"
 msgstr "Nummer des aktuellen Tages:"
 
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:66
 msgid "To-Do item that is not yet due:"
 msgstr "Noch nicht fälliger To-Do-Eintrag:"
 
-#: calendar/gui/calendar-commands.c:64
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is due today:"
 msgstr "Heute fälliger To-Do-Eintrag:"
 
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:68
 msgid "To-Do item that is overdue:"
 msgstr "Überfälliger To-Do-Eintrag:"
 
@@ -1167,174 +1434,238 @@ msgstr "GNOME-Kalender"
 msgid "The GNOME personal calendar and schedule manager."
 msgstr "Der persönliche GNOME-Kalender und -Terminplaner."
 
-#: calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:401 tests/ui-tests/message-browser.c:676
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
-#: calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:423
 msgid "Open calendar"
 msgstr "Kalender öffnen"
 
-#: calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:462
 msgid "Save calendar"
 msgstr "Kalender speichern"
 
-#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713
-#: calendar/gui/gncal-todo.c:717
+#: calendar/gui/calendar-commands.c:489 calendar/gui/gncal-todo.c:722
+#: calendar/gui/gncal-todo.c:726
 msgid "Day"
 msgstr "Tag"
 
-#: calendar/gui/calendar-commands.c:522
+#: calendar/gui/calendar-commands.c:489
 msgid "Show 1 day"
 msgstr "Einen Tag zeigen"
 
-#: calendar/gui/calendar-commands.c:525
+#: calendar/gui/calendar-commands.c:492
 msgid "5 Days"
 msgstr "5 Tage"
 
-#: calendar/gui/calendar-commands.c:525
+#: calendar/gui/calendar-commands.c:492
 msgid "Show the working week"
 msgstr "Die Arbeitswoche zeigen"
 
-#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712
+#: calendar/gui/calendar-commands.c:495 calendar/gui/gncal-todo.c:721
 msgid "Week"
 msgstr "Woche"
 
-#: calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:495
 msgid "Show 1 week"
 msgstr "1 Woche zeigen"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:498
 msgid "Month"
 msgstr "Monat"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:498
 msgid "Show 1 month"
 msgstr "1 Monat zeigen"
 
-#: calendar/gui/calendar-commands.c:535
+#: calendar/gui/calendar-commands.c:502
 msgid "Year"
 msgstr "Jahr"
 
-#: calendar/gui/calendar-commands.c:535
+#: calendar/gui/calendar-commands.c:502
 msgid "Show 1 year"
 msgstr "1 Jahr zeigen"
 
-#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
+#: calendar/gui/calendar-commands.c:511 calendar/gui/calendar-commands.c:663
 msgid "Create a new appointment"
 msgstr "Neuen Termin anlegen"
 
-#: calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674
+#: calendar/gui/calendar-commands.c:516 calendar/gui/calendar-commands.c:655
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: calendar/gui/calendar-commands.c:552
+#: calendar/gui/calendar-commands.c:520
 msgid "Prev"
 msgstr "Zurück"
 
-#: calendar/gui/calendar-commands.c:552
+#: calendar/gui/calendar-commands.c:520
 msgid "Go back in time"
 msgstr "In der Zeit zurückgehen"
 
-#: calendar/gui/calendar-commands.c:553
+#: calendar/gui/calendar-commands.c:521
 msgid "Today"
 msgstr "Heute"
 
-#: calendar/gui/calendar-commands.c:553
+#: calendar/gui/calendar-commands.c:521
 msgid "Go to present time"
 msgstr "Zur Gegenwart springen"
 
-#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
+#: calendar/gui/calendar-commands.c:522
 msgid "Next"
 msgstr "Vor"
 
-#: calendar/gui/calendar-commands.c:554
+#: calendar/gui/calendar-commands.c:522
 msgid "Go forward in time"
 msgstr "In der Zeit vorangehen"
 
-#: calendar/gui/calendar-commands.c:558
+#: calendar/gui/calendar-commands.c:526
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: calendar/gui/calendar-commands.c:558
+#: calendar/gui/calendar-commands.c:526
 msgid "Go to a specific date"
 msgstr "Zu einem bestimmten Datum gehen"
 
 #. file menu
-#: calendar/gui/calendar-commands.c:659
+#: calendar/gui/calendar-commands.c:640
 msgid "New Ca_lendar"
 msgstr "Neuer Kalender"
 
-#: calendar/gui/calendar-commands.c:660
+#: calendar/gui/calendar-commands.c:641
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: calendar/gui/calendar-commands.c:663
+#: calendar/gui/calendar-commands.c:644
 msgid "Open Ca_lendar"
 msgstr "Kalender öffnen"
 
-#: calendar/gui/calendar-commands.c:664
+#: calendar/gui/calendar-commands.c:645
 msgid "Open a calendar"
 msgstr "Einen Kalender öffnen"
 
-#: calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
+#: calendar/gui/calendar-commands.c:649 calendar/gui/calendar-commands.c:650
 msgid "Save Calendar As"
 msgstr "Kalender speichern unter"
 
-#: calendar/gui/calendar-commands.c:682
+#: calendar/gui/calendar-commands.c:663
 msgid "_New appointment..."
 msgstr "Neuer Termin..."
 
-#: calendar/gui/calendar-commands.c:687
-msgid "New appointment for _today..."
-msgstr "Neuer Termin für heute..."
-
-#: calendar/gui/calendar-commands.c:688
-msgid "Create a new appointment for today"
-msgstr "Einen neuen Termin für heute anlegen"
-
-#: calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:714
+#: calendar/gui/calendar-commands.c:671 calendar/gui/prop.c:716
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704
+#: calendar/gui/calendar-commands.c:678 calendar/gui/calendar-commands.c:679
 msgid "About Calendar"
 msgstr "Über den Kalender"
 
 #. i18n: This "%s%s" indicates possession. Languages where the order is
 #. * the inverse should translate it to "%2$s%1$s".
-#.
-#: calendar/gui/calendar-commands.c:746
+#: calendar/gui/calendar-commands.c:721
 #, c-format
 msgid "%s%s"
 msgstr "%2$s%1$s"
 
-#: calendar/gui/calendar-commands.c:746
+#: calendar/gui/calendar-commands.c:721
 msgid "'s calendar"
 msgstr "Kalender für "
 
-#: calendar/gui/control-factory.c:136
+#: calendar/gui/calendar-model.c:323
+msgid "Public"
+msgstr "Öffentlich"
+
+#: calendar/gui/calendar-model.c:326
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+msgid "Private"
+msgstr "Privat"
+
+#: calendar/gui/calendar-model.c:329
+msgid "Confidential"
+msgstr "Vertraulich"
+
+#: calendar/gui/calendar-model.c:332 calendar/gui/calendar-model.c:499
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: calendar/gui/calendar-model.c:419
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/calendar-model.c:419
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/calendar-model.c:421
+msgid "E"
+msgstr "O"
+
+#: calendar/gui/calendar-model.c:421
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/calendar-model.c:493
+msgid "Transparent"
+msgstr "Transparent"
+
+#: calendar/gui/calendar-model.c:496
+msgid "Opaque"
+msgstr "Schräg"
+
+#: calendar/gui/calendar-model.c:747
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Das Datum muss in folgendem Format eingegeben werden:\n"
+"\n"
+"%s"
+
+#: calendar/gui/calendar-model.c:820
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Die Geographische Position muss in dem folgenden Format eingegeben werden:\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/calendar-model.c:865
+msgid "The percent value must be between 0 and 100"
+msgstr "Der Prozentzatz muss zwischen 0 und 100 liegen"
+
+#: calendar/gui/calendar-model.c:898
+msgid "The priority must be between 0 and 10"
+msgstr "Die Priorität muss zwischen 0 und 10 liegen"
+
+#: calendar/gui/control-factory.c:132
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:181
+#: calendar/gui/dialogs/alarm-notify-dialog.c:183
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm am %A, %d. %b %Y um %H.%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:188
+#: calendar/gui/dialogs/alarm-notify-dialog.c:190
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Hinweis auf Ihren Termin am %A, %d. %b %Y um %H.%M"
 
-#.
+#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+msgid "No summary available."
+msgstr "Keine Zusammenfassung verfügbar."
+
+#. 
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
-#.
 #: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Close"
 msgstr "Schließen"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1070
 msgid "Snooze"
 msgstr "Weiterschlafen"
 
@@ -1346,6 +1677,259 @@ msgstr "Termin bearbeiten"
 msgid "Snooze time (minutes)"
 msgstr "Weiterschlaf-Zeit (Minuten)"
 
+#: calendar/gui/dialogs/task-editor.c:245 calendar/gui/event-editor.c:1198
+msgid "FIXME: _Delete"
+msgstr "FIXME: Löschen"
+
+#: calendar/gui/dialogs/task-editor.c:287
+#: calendar/gui/dialogs/task-editor.c:295
+msgid "FIXME: In_complete Task"
+msgstr "FIXME: Unvollständige Aufgabe"
+
+#: calendar/gui/dialogs/task-editor.c:347 calendar/gui/event-editor.c:1300
+msgid "FIXME: Chec_k Names"
+msgstr "FIXME: Namen prüfen"
+
+#: calendar/gui/dialogs/task-editor.c:348 calendar/gui/event-editor.c:1301
+msgid "FIXME: Address _Book..."
+msgstr "FIXME Adressbuch..."
+
+#: calendar/gui/dialogs/task-editor.c:355
+msgid "FIXME: _New Task"
+msgstr "FIXME: Neue Aufgabe"
+
+#: calendar/gui/dialogs/task-editor.c:357
+msgid "FIXME: S_end Status Report"
+msgstr "FIXME: Statusbericht Senden"
+
+#: calendar/gui/dialogs/task-editor.c:358
+msgid "FIXME: _Mark Complete"
+msgstr "FIXME: Als fertig markieren"
+
+#: calendar/gui/dialogs/task-editor.c:360 calendar/gui/event-editor.c:1310
+msgid "FIXME: Rec_urrence..."
+msgstr "FIXME: Wiederholung..."
+
+#: calendar/gui/dialogs/task-editor.c:361
+msgid "FIXME: S_kip Occurrence"
+msgstr "FIXME: Vorkommnis streichen"
+
+#: calendar/gui/dialogs/task-editor.c:363
+msgid "FIXME: Assig_n Task"
+msgstr "FIXME: Aufgabe zuordnen"
+
+#: calendar/gui/dialogs/task-editor.c:365
+msgid "FIXME: _Reply"
+msgstr "FIXME: Antworten"
+
+#: calendar/gui/dialogs/task-editor.c:366
+msgid "FIXME: Reply to A_ll"
+msgstr "FIXME: Annen Antworten"
+
+#: calendar/gui/dialogs/task-editor.c:409 calendar/gui/event-editor.c:1370
+msgid "FIXME: Save and Close"
+msgstr "FIXME: Speichern und schließen"
+
+#: calendar/gui/dialogs/task-editor.c:410
+msgid "Save the task and close the dialog box"
+msgstr "Die Aufgabe speichern und das Dialogfenster schließen"
+
+#: calendar/gui/dialogs/task-editor.c:414 calendar/gui/event-editor.c:1375
+msgid "FIXME: Print..."
+msgstr "FIXME: Drucken..."
+
+#: calendar/gui/dialogs/task-editor.c:419 calendar/gui/event-editor.c:1380
+msgid "FIXME: Recurrence..."
+msgstr "FIXME: Wiederholung..."
+
+#: calendar/gui/dialogs/task-editor.c:420 calendar/gui/event-editor.c:1381
+msgid "Configure recurrence rules"
+msgstr "Wiederholungsregeln konfigurieren"
+
+#: calendar/gui/dialogs/task-editor.c:422
+msgid "FIXME: Assign Task..."
+msgstr "FIXME: Aufgabe zuordnen..."
+
+#: calendar/gui/dialogs/task-editor.c:423
+msgid "Assign the task to someone"
+msgstr "Die Aufgabe jemandem zuordnen"
+
+#: calendar/gui/dialogs/task-editor.c:425 calendar/gui/event-editor.c:1386
+msgid "FIXME: Delete"
+msgstr "FIXME: Löschen"
+
+#. 
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+msgid "S_ubject:"
+msgstr "Betreff:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+msgid "Owner:"
+msgstr "Eingentümer:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Sta_rt Date:"
+msgstr "Startdatum:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+msgid "_Due Date:"
+msgstr "Fällig am:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+msgid "_Status:"
+msgstr "Status:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Cancelled\n"
+msgstr ""
+"Nicht gestartet\n"
+"In Arbeit\n"
+"Fertig\n"
+"Gestrichen\n"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+msgid "Not Started"
+msgstr "Nicht gestartet"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+msgid "_Priority:"
+msgstr "Priorität:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+msgstr ""
+"Hoch\n"
+"Normal\n"
+"Niedrig\n"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+msgid "High"
+msgstr "Hoch"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+msgid "% Comp_lete:"
+msgstr "% Fertig:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+msgid "_Contacts..."
+msgstr "Kontakte..."
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+msgid "Task"
+msgstr "Aufgabe"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
+msgid "Date Completed:"
+msgstr "Fertigstellungsdatum:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+msgid "Location:"
+msgstr "Ort:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
+msgid "Resources:"
+msgstr "Resourcen:"
+
+#: calendar/gui/e-calendar-table.c:189
+msgid "Comment"
+msgstr "Kommentar"
+
+#: calendar/gui/e-calendar-table.c:194
+msgid "Completed"
+msgstr "Fertig"
+
+#: calendar/gui/e-calendar-table.c:199
+msgid "Created"
+msgstr "Erstellt"
+
+#: calendar/gui/e-calendar-table.c:204
+msgid "Description"
+msgstr "Beschreibung"
+
+#: calendar/gui/e-calendar-table.c:209
+msgid "Timestamp"
+msgstr "Zeitstempel"
+
+#: calendar/gui/e-calendar-table.c:214
+msgid "Start Date"
+msgstr "Startdatum"
+
+#: calendar/gui/e-calendar-table.c:219
+msgid "End Date"
+msgstr "Enddatum"
+
+#: calendar/gui/e-calendar-table.c:224
+msgid "Geographical Position"
+msgstr "Geografische Position"
+
+#: calendar/gui/e-calendar-table.c:229
+msgid "Last Modification Date"
+msgstr "Letztes Änderungsdatum"
+
+#: calendar/gui/e-calendar-table.c:234
+msgid "Location"
+msgstr "Ort"
+
+#: calendar/gui/e-calendar-table.c:239
+msgid "Organizer"
+msgstr "Organisator"
+
+#: calendar/gui/e-calendar-table.c:244
+msgid "% Complete"
+msgstr "% Fertig"
+
+#: calendar/gui/e-calendar-table.c:249 calendar/gui/gncal-todo.c:436
+#: calendar/gui/prop.c:609 mail/message-list.c:507
+msgid "Priority"
+msgstr "Priorität"
+
+#: calendar/gui/e-calendar-table.c:260
+msgid "TaskPad"
+msgstr "TaskPad"
+
+#: calendar/gui/e-calendar-table.c:265
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-calendar-table.c:270
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "Reminder"
+msgstr "Errinnerung"
+
+#: calendar/gui/e-calendar-table.c:369
+msgid "Open..."
+msgstr "Öffnen..."
+
+#: calendar/gui/e-calendar-table.c:370
+msgid "Open the task"
+msgstr "Die Aufgabe öffnen"
+
+#: calendar/gui/e-calendar-table.c:372
+msgid "Mark Complete"
+msgstr "Aus fertig markieren"
+
+#: calendar/gui/e-calendar-table.c:373
+msgid "Mark the task complete"
+msgstr "Die Aufgabe als fertig markieren"
+
+#: calendar/gui/e-calendar-table.c:376
+msgid "Delete the task"
+msgstr "Die Aufgabe löschen"
+
 #: calendar/gui/e-day-view-time-item.c:391
 #, c-format
 msgid "%02i minute divisions"
@@ -1378,102 +1962,341 @@ msgstr "Dieses Auftreten löschen"
 msgid "Delete all occurrences"
 msgstr "Jedes Auftreten löschen"
 
-#: calendar/gui/event-editor.c:289
+#: calendar/gui/event-editor.c:291
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/event-editor.c:294
+#: calendar/gui/event-editor.c:296
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/event-editor.c:298
+#: calendar/gui/event-editor.c:300
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/event-editor.c:301
+#: calendar/gui/event-editor.c:303
 #, c-format
 msgid "Task - %s"
 msgstr "Auftrag - %s"
 
-#: calendar/gui/event-editor.c:304
+#: calendar/gui/event-editor.c:306
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journal-Eintrag  - %s"
 
 #. Owner, summary
-#: calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688
+#: calendar/gui/event-editor.c:622 calendar/gui/event-editor.c:718
 msgid "?"
 msgstr "?"
 
-#: calendar/gui/event-editor.c:1148
-msgid "FIXME: _Delete"
-msgstr "FIXME: Löschen"
-
-#: calendar/gui/event-editor.c:1215
+#: calendar/gui/event-editor.c:1265
 msgid "FIXME: Ca_lendar..."
 msgstr "FIXME: Kalender..."
 
-#: calendar/gui/event-editor.c:1250
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Namen prüfen"
-
-#: calendar/gui/event-editor.c:1251
-msgid "FIXME: Address _Book..."
-msgstr "FIXME Adressbuch..."
-
-#: calendar/gui/event-editor.c:1258
+#: calendar/gui/event-editor.c:1308
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: Neuer Termin"
 
-#: calendar/gui/event-editor.c:1260
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: Wiederholung..."
-
-#: calendar/gui/event-editor.c:1262
+#: calendar/gui/event-editor.c:1312
 msgid "FIXME: Invite _Attendees..."
 msgstr "FIXME: Teilnehmer einladen..."
 
-#: calendar/gui/event-editor.c:1263
+#: calendar/gui/event-editor.c:1313
 msgid "FIXME: C_ancel Invitation..."
 msgstr "FIXME: Einladung rückgängig machen..."
 
-#: calendar/gui/event-editor.c:1265
+#: calendar/gui/event-editor.c:1315
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Als vCalendar weiterleiten"
 
-#: calendar/gui/event-editor.c:1320
-msgid "FIXME: Save and Close"
-msgstr "FIXME: Speichern und schließen"
-
-#: calendar/gui/event-editor.c:1325
-msgid "FIXME: Print..."
-msgstr "FIXME: Drucken..."
-
-#: calendar/gui/event-editor.c:1330
-msgid "FIXME: Recurrence..."
-msgstr "FIXME: Wiederholung..."
-
-#: calendar/gui/event-editor.c:1331
-msgid "Configure recurrence rules"
-msgstr "Wiederholungsregeln konfigurieren"
-
-#: calendar/gui/event-editor.c:1333
+#: calendar/gui/event-editor.c:1383
 msgid "FIXME: Invite Attendees..."
 msgstr "FIXME: Teilnehmer einladen..."
 
-#: calendar/gui/event-editor.c:1334
+#: calendar/gui/event-editor.c:1384
 msgid "Invite attendees to a meeting"
 msgstr "Teilnehmer zu einer Besprechung einladen"
 
-#: calendar/gui/event-editor.c:1336
-msgid "FIXME: Delete"
-msgstr "FIXME: Löschen"
-
-#: calendar/gui/event-editor.c:1745
+#: calendar/gui/event-editor.c:1828
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
+#. todo
+#. 
+#. build some of the recur stuff by hand to take into account
+#. the start-on-monday preference?
+#. 
+#. get the apply button to work right
+#. 
+#. make the properties stuff unglobal
+#. 
+#. figure out why alarm units aren't sticking between edits
+#. 
+#. closing the dialog window with the wm caused a crash
+#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
+#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
+#. 
+#. 
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#: calendar/gui/event-editor-dialog.glade.h:7
+msgid "event-editor-dialog"
+msgstr "Ereignis-Editor-Dialog"
+
+#: calendar/gui/event-editor-dialog.glade.h:8
+msgid "_Summary:"
+msgstr "Zusammenfassung:"
+
+#: calendar/gui/event-editor-dialog.glade.h:9
+msgid "_Owner:"
+msgstr "Eigentümer:"
+
+#: calendar/gui/event-editor-dialog.glade.h:10
+msgid "Time"
+msgstr "Zeit"
+
+#: calendar/gui/event-editor-dialog.glade.h:11
+msgid "Start time:"
+msgstr "Startzeit:"
+
+#: calendar/gui/event-editor-dialog.glade.h:12
+msgid "End time:"
+msgstr "Endzeit:"
+
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "A_ll day event"
+msgstr "Ganztägiges Ereignis"
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+msgid "Classification"
+msgstr "Einordnung"
+
+#: calendar/gui/event-editor-dialog.glade.h:15
+msgid "Pu_blic"
+msgstr "Öffentlich"
+
+#: calendar/gui/event-editor-dialog.glade.h:16
+msgid "Pri_vate"
+msgstr "Privat"
+
+#: calendar/gui/event-editor-dialog.glade.h:17
+msgid "_Confidential"
+msgstr "Vertraulich"
+
+#: calendar/gui/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:31
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days\n"
+msgstr ""
+"Minuten\n"
+"Stunden\n"
+"Tage\n"
+
+#: calendar/gui/event-editor-dialog.glade.h:35
+msgid "_Display"
+msgstr "Anzeige"
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+msgid "_Audio"
+msgstr "Ton"
+
+#: calendar/gui/event-editor-dialog.glade.h:37
+msgid "_Program"
+msgstr "Programm"
+
+#: calendar/gui/event-editor-dialog.glade.h:38
+msgid "_Mail"
+msgstr "E-Mail"
+
+#: calendar/gui/event-editor-dialog.glade.h:39
+msgid "Mail _to:"
+msgstr "E-Mail an:"
+
+#: calendar/gui/event-editor-dialog.glade.h:40
+msgid "_Run program:"
+msgstr "Starte Programm:"
+
+#: calendar/gui/event-editor-dialog.glade.h:42
+msgid "Recurrence rule"
+msgstr "Wiederholung"
+
+#: calendar/gui/event-editor-dialog.glade.h:43 shell/e-shell-view.c:875
+msgid "None"
+msgstr "Keine"
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "Daily"
+msgstr "Täglich"
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "Weekly"
+msgstr "Wöchentlich"
+
+#: calendar/gui/event-editor-dialog.glade.h:46
+msgid "Monthly"
+msgstr "Monatlich"
+
+#: calendar/gui/event-editor-dialog.glade.h:47
+msgid "Yearly"
+msgstr "Jährlich"
+
+#: calendar/gui/event-editor-dialog.glade.h:48
+msgid "label23"
+msgstr "label23"
+
+#: calendar/gui/event-editor-dialog.glade.h:49
+#: calendar/gui/event-editor-dialog.glade.h:52
+#: calendar/gui/event-editor-dialog.glade.h:82
+msgid "Every "
+msgstr "Jeden"
+
+#: calendar/gui/event-editor-dialog.glade.h:50
+msgid "day(s)"
+msgstr "Tag(e)"
+
+#: calendar/gui/event-editor-dialog.glade.h:51
+msgid "label24"
+msgstr "label24"
+
+#: calendar/gui/event-editor-dialog.glade.h:53
+msgid "week(s)"
+msgstr "Woche(n)"
+
+#: calendar/gui/event-editor-dialog.glade.h:54
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Mo"
+
+#: calendar/gui/event-editor-dialog.glade.h:55
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Di"
+
+#: calendar/gui/event-editor-dialog.glade.h:56
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Mi"
+
+#: calendar/gui/event-editor-dialog.glade.h:57
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Do"
+
+#: calendar/gui/event-editor-dialog.glade.h:58
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Fr"
+
+#: calendar/gui/event-editor-dialog.glade.h:59
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Sa"
+
+#. Initialize by default to three-letter day names
+#: calendar/gui/event-editor-dialog.glade.h:60
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "So"
+
+#: calendar/gui/event-editor-dialog.glade.h:61
+msgid "label25"
+msgstr "label25"
+
+#: calendar/gui/event-editor-dialog.glade.h:62
+#: calendar/gui/event-editor-dialog.glade.h:63
+msgid "Recur on the"
+msgstr "Erneut am"
+
+#: calendar/gui/event-editor-dialog.glade.h:64
+msgid "th day of the month"
+msgstr "Tag des Monats"
+
+#: calendar/gui/event-editor-dialog.glade.h:65
+msgid ""
+"1st\n"
+"2nd\n"
+"3rd\n"
+"4th\n"
+"5th\n"
+msgstr ""
+"erster\n"
+"zweiter\n"
+"dritter\n"
+"vierter\n"
+"fünfter\n"
+
+#: calendar/gui/event-editor-dialog.glade.h:71
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday\n"
+msgstr ""
+"Montag\n"
+"Dienstag\n"
+"Mittwoch\n"
+"Donnerstag\n"
+"Freitag\n"
+"Samstag\n"
+"Sonntag\n"
+
+#: calendar/gui/event-editor-dialog.glade.h:79
+msgid "Every"
+msgstr "Jeden"
+
+#: calendar/gui/event-editor-dialog.glade.h:80
+msgid "month(s)"
+msgstr "Monat(e)"
+
+#: calendar/gui/event-editor-dialog.glade.h:83
+msgid "year(s)"
+msgstr "Jahr(e)"
+
+#: calendar/gui/event-editor-dialog.glade.h:84
+msgid "label27"
+msgstr "label27"
+
+#: calendar/gui/event-editor-dialog.glade.h:85
+msgid "Ending date"
+msgstr "Enddatum"
+
+#: calendar/gui/event-editor-dialog.glade.h:86
+msgid "Repeat forever"
+msgstr "Ewig wiederholen"
+
+#: calendar/gui/event-editor-dialog.glade.h:87
+msgid "End on "
+msgstr "Endet am "
+
+#: calendar/gui/event-editor-dialog.glade.h:88
+msgid "End after"
+msgstr "Ende nach"
+
+#: calendar/gui/event-editor-dialog.glade.h:89
+msgid "occurrence(s)"
+msgstr "Vorkommniss(en)"
+
+#: calendar/gui/event-editor-dialog.glade.h:90
+msgid "Exceptions"
+msgstr "Ausnahmen"
+
+#: calendar/gui/event-editor-dialog.glade.h:92
+msgid "Change"
+msgstr "Änderung"
+
+#: calendar/gui/event-editor-dialog.glade.h:94
+msgid "Recurrence"
+msgstr "Wiederholung"
+
 #: calendar/gui/getdate.y:391
 msgid "january"
 msgstr "Januar"
@@ -1687,142 +2510,108 @@ msgstr "zwölfter"
 msgid "ago"
 msgstr "her"
 
-#: calendar/gui/gncal-todo.c:137
+#: calendar/gui/gncal-todo.c:140
 msgid "Create to-do item"
 msgstr "To-Do-Eintrag erzeugen"
 
-#: calendar/gui/gncal-todo.c:137
+#: calendar/gui/gncal-todo.c:140
 msgid "Edit to-do item"
 msgstr "To-Do-Eintrag bearbeiten"
 
-#: calendar/gui/gncal-todo.c:171
+#: calendar/gui/gncal-todo.c:176
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
-#: calendar/gui/gncal-todo.c:181
+#: calendar/gui/gncal-todo.c:186
 msgid "Due Date:"
 msgstr "Fällig am:"
 
-#: calendar/gui/gncal-todo.c:190
+#: calendar/gui/gncal-todo.c:195
 msgid "Priority:"
 msgstr "Priorität:"
 
-#: calendar/gui/gncal-todo.c:207
+#: calendar/gui/gncal-todo.c:212
 msgid "Item Comments:"
 msgstr "Kommentar zum Eintrag:"
 
-#: calendar/gui/gncal-todo.c:325
+#: calendar/gui/gncal-todo.c:334
 msgid "Add to-do item..."
 msgstr "To-Do-Eintrag hinzufügen..."
 
-#: calendar/gui/gncal-todo.c:326
+#: calendar/gui/gncal-todo.c:335
 msgid "Edit this item..."
 msgstr "Diesen Eintrag bearbeiten..."
 
-#: calendar/gui/gncal-todo.c:425
+#: calendar/gui/gncal-todo.c:434
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:606
+#: calendar/gui/gncal-todo.c:435 calendar/gui/prop.c:608
 msgid "Due Date"
 msgstr "Fällig am"
 
-#: calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:607
-#: mail/message-list.c:474
-msgid "Priority"
-msgstr "Priorität"
-
-#: calendar/gui/gncal-todo.c:428
+#: calendar/gui/gncal-todo.c:437
 msgid "Time Left"
 msgstr "Verbleibende Zeit"
 
 #. Label
-#: calendar/gui/gncal-todo.c:440
+#: calendar/gui/gncal-todo.c:449
 msgid "To-do list"
 msgstr "To-do-Liste"
 
 #. Add
-#: calendar/gui/gncal-todo.c:479
+#: calendar/gui/gncal-todo.c:488
 #: composer/e-msg-composer-address-dialog.glade.h:13
 msgid "Add..."
 msgstr "Hinzufügen..."
 
 #. Edit
-#: calendar/gui/gncal-todo.c:488
+#: calendar/gui/gncal-todo.c:497
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: calendar/gui/gncal-todo.c:712
+#: calendar/gui/gncal-todo.c:721
 msgid "Weeks"
 msgstr "Wochen"
 
-#: calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717
+#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
 msgid "Days"
 msgstr "Tage"
 
-#: calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
+#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
 msgid "Hours"
 msgstr "Stunden"
 
-#: calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
+#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
 msgid "Hour"
 msgstr "Stunde"
 
-#: calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
+#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
 msgid "Minutes"
 msgstr "Minuten"
 
-#: calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
+#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
 msgid "Minute"
 msgstr "Minute"
 
-#: calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
+#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
 msgid "Seconds"
 msgstr "Sekunden"
 
-#: calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
+#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
 msgid "Second"
 msgstr "Sekunde"
 
-#: calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
-#: calendar/gui/gnome-cal.c:1120
+#: calendar/gui/gnome-cal.c:461 calendar/gui/gnome-cal.c:1078
+#: calendar/gui/gnome-cal.c:1134
 msgid "Reminder of your appointment at "
 msgstr "Erinnerung an Ihren Termin am "
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124
+#: calendar/gui/gnome-cal.c:1083 calendar/gui/gnome-cal.c:1138
 msgid "Ok"
 msgstr "OK"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "So"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Mo"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Di"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Mi"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Do"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Fr"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Sa"
-
 #: calendar/gui/goto.c:82
 msgid "Year:"
 msgstr "Jahr:"
@@ -1846,246 +2635,246 @@ msgstr ""
 msgid "Go to today"
 msgstr "Zum heutigen Tag"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:271
+#: calendar/gui/print.c:294
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Su"
 msgstr "So"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:868
+#: calendar/gui/print.c:937
 msgid "TODO Items"
 msgstr "To-Do-Einträge"
 
 #. Day
-#: calendar/gui/print.c:980
+#: calendar/gui/print.c:1038
 msgid "Current day (%a %b %d %Y)"
 msgstr "Aktueller Tag (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1000 calendar/gui/print.c:1014
-#: calendar/gui/print.c:1015
+#: calendar/gui/print.c:1058 calendar/gui/print.c:1072
+#: calendar/gui/print.c:1073
 msgid "%a"
 msgstr "%a"
 
-#: calendar/gui/print.c:1001 calendar/gui/print.c:1002
-#: calendar/gui/print.c:1016 calendar/gui/print.c:1017
+#: calendar/gui/print.c:1059 calendar/gui/print.c:1060
+#: calendar/gui/print.c:1074 calendar/gui/print.c:1075
 msgid "%b"
 msgstr "%b"
 
-#: calendar/gui/print.c:1004
+#: calendar/gui/print.c:1062
 #, c-format
 msgid "Current week (%s %s %d - %s %d %d)"
 msgstr "Aktuelle Woche (%s %s %d - %s %d %d)"
 
-#: calendar/gui/print.c:1021
+#: calendar/gui/print.c:1079
 #, c-format
 msgid "Current week (%s %s %d - %s %s %d %d)"
 msgstr "Aktuelle Woche (%s %s %d - %s %s %d %d)"
 
-#: calendar/gui/print.c:1027
+#: calendar/gui/print.c:1085
 #, c-format
 msgid "Current week (%s %s %d %d - %s %s %d %d)"
 msgstr "Aktuelle Woche (%s %s %d %d - %s %s %d %d)"
 
 #. Month
-#: calendar/gui/print.c:1040
+#: calendar/gui/print.c:1098
 msgid "Current month (%a %Y)"
 msgstr "Aktueller Monat (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1047
+#: calendar/gui/print.c:1105
 msgid "Current year (%Y)"
 msgstr "Aktuelles Jahr (%Y)"
 
-#: calendar/gui/print.c:1084
+#: calendar/gui/print.c:1142
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:1249
+#: calendar/gui/print.c:1307
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/prop.c:332
+#: calendar/gui/prop.c:334
 msgid "Time display"
 msgstr "Zeitanzeige"
 
 #. Time format
-#: calendar/gui/prop.c:336
+#: calendar/gui/prop.c:338
 msgid "Time format"
 msgstr "Zeitformat"
 
-#: calendar/gui/prop.c:337
+#: calendar/gui/prop.c:339
 msgid "12-hour (AM/PM)"
 msgstr "12 Stunden (AM/PM)"
 
-#: calendar/gui/prop.c:338
+#: calendar/gui/prop.c:340
 msgid "24-hour"
 msgstr "24 Stunden"
 
 #. Weeks start on
-#: calendar/gui/prop.c:348
+#: calendar/gui/prop.c:350
 msgid "Weeks start on"
 msgstr "Wochen beginnen mit"
 
-#: calendar/gui/prop.c:349
+#: calendar/gui/prop.c:351
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: calendar/gui/prop.c:350
+#: calendar/gui/prop.c:352
 msgid "Monday"
 msgstr "Montag"
 
 #. Day range
-#: calendar/gui/prop.c:360
+#: calendar/gui/prop.c:362
 msgid "Day range"
 msgstr "Tagesbereich"
 
-#: calendar/gui/prop.c:371
+#: calendar/gui/prop.c:373
 msgid ""
 "Please select the start and end hours you want\n"
 "to be displayed in the day view and week view.\n"
@@ -2098,119 +2887,119 @@ msgstr ""
 "außerhalb dieses Bereichs werden normalerweise\n"
 "nicht dargestellt."
 
-#: calendar/gui/prop.c:387
+#: calendar/gui/prop.c:389
 msgid "Day start:"
 msgstr "Tagesbeginn:"
 
-#: calendar/gui/prop.c:398
+#: calendar/gui/prop.c:400
 msgid "Day end:"
 msgstr "Tagesende:"
 
-#: calendar/gui/prop.c:521
+#: calendar/gui/prop.c:523
 msgid "Colors for display"
 msgstr "Farben für Anzeige"
 
-#: calendar/gui/prop.c:524
+#: calendar/gui/prop.c:526
 msgid "Colors"
 msgstr "Farben"
 
-#: calendar/gui/prop.c:601
+#: calendar/gui/prop.c:603
 msgid "Show on TODO List:"
 msgstr "Auf To-Do-Liste zeigen:"
 
-#: calendar/gui/prop.c:608
+#: calendar/gui/prop.c:610
 msgid "Time Until Due"
 msgstr "Zeit bis Fälligkeit"
 
-#: calendar/gui/prop.c:639
+#: calendar/gui/prop.c:641
 msgid "To Do List style options:"
 msgstr "Stiloptionen der To-Do-Liste:"
 
-#: calendar/gui/prop.c:644
+#: calendar/gui/prop.c:646
 msgid "Highlight overdue items"
 msgstr "Überfällige Einträge markieren"
 
-#: calendar/gui/prop.c:647
+#: calendar/gui/prop.c:649
 msgid "Highlight not yet due items"
 msgstr "Noch nicht fällige Einträge markieren"
 
-#: calendar/gui/prop.c:650
+#: calendar/gui/prop.c:652
 msgid "Highlight items due today"
 msgstr "Heute fällig Einträge markieren"
 
-#: calendar/gui/prop.c:680
+#: calendar/gui/prop.c:682
 msgid "To Do List Properties"
 msgstr "Eigenschaften der To-Do-Liste"
 
-#: calendar/gui/prop.c:683
+#: calendar/gui/prop.c:685
 msgid "To Do List"
 msgstr "To-Do-Liste"
 
-#: calendar/gui/prop.c:782
+#: calendar/gui/prop.c:784
 msgid "Alarms"
 msgstr "Alarme"
 
 #. build miscellaneous box
-#: calendar/gui/prop.c:785
+#: calendar/gui/prop.c:787
 msgid "Alarm Properties"
 msgstr "Alarm-Eigenschaften"
 
-#: calendar/gui/prop.c:795
+#: calendar/gui/prop.c:797
 msgid "Beep on display alarms"
 msgstr "Bei angezeigtem Alarm piepsen"
 
-#: calendar/gui/prop.c:805
+#: calendar/gui/prop.c:807
 msgid "Audio alarms timeout after"
 msgstr "Audio-Alarme schweigen nach"
 
-#: calendar/gui/prop.c:816 calendar/gui/prop.c:833
+#: calendar/gui/prop.c:818 calendar/gui/prop.c:835
 msgid " seconds"
 msgstr " Sekunden"
 
-#: calendar/gui/prop.c:822
+#: calendar/gui/prop.c:824
 msgid "Enable snoozing for "
 msgstr "Weiterschlafen aktivieren für "
 
 #. populate default frame/box
-#: calendar/gui/prop.c:838
+#: calendar/gui/prop.c:840
 msgid "Defaults"
 msgstr "Voreinstellungen"
 
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945
+#: composer/e-msg-composer-address-dialog.c:182
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: composer/e-msg-composer-address-dialog.c:184
+#: composer/e-msg-composer-address-dialog.c:183
 msgid "Cut selected item into clipboard"
 msgstr "Gewähltes Element in die Zwischenablage ausschneiden"
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946
+#: composer/e-msg-composer-address-dialog.c:186
+#: mail/folder-browser-factory.c:46
 msgid "Copy"
 msgstr "Kopieren"
 
-#: composer/e-msg-composer-address-dialog.c:188
+#: composer/e-msg-composer-address-dialog.c:187
 msgid "Copy selected item into clipboard"
 msgstr "Gewähltes Element in die Zwischenablage ausschneiden"
 
-#: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947
+#: composer/e-msg-composer-address-dialog.c:190
+#: composer/e-msg-composer-address-dialog.c:198
 msgid "Paste"
 msgstr "Einfügen"
 
-#: composer/e-msg-composer-address-dialog.c:192
-#: composer/e-msg-composer-address-dialog.c:200
+#: composer/e-msg-composer-address-dialog.c:191
+#: composer/e-msg-composer-address-dialog.c:199
 msgid "Paste item from clipboard"
 msgstr "Element aus der Zwischenablage einfügen"
 
-#: composer/e-msg-composer-address-dialog.c:528
+#: composer/e-msg-composer-address-dialog.c:525
 msgid "Select recipients' addresses"
 msgstr "Empfängeradresse auswählen"
 
-#.
+#. 
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
-#.
 #: composer/e-msg-composer-address-dialog.glade.h:7
 msgid "Recipient list:"
 msgstr "Empfängerliste:"
@@ -2224,6 +3013,7 @@ msgid "Name"
 msgstr "Name"
 
 #: composer/e-msg-composer-address-dialog.glade.h:11
+#: mail/mail-config.glade.h:8
 msgid "Address"
 msgstr "Adresse"
 
@@ -2245,15 +3035,15 @@ msgstr "Bcc: >>"
 
 #: composer/e-msg-composer-address-dialog.glade.h:17
 msgid "label9"
-msgstr ""
+msgstr "label9"
 
 #: composer/e-msg-composer-address-dialog.glade.h:18
 msgid "label7"
-msgstr ""
+msgstr "label7"
 
 #: composer/e-msg-composer-address-dialog.glade.h:19
 msgid "label8"
-msgstr ""
+msgstr "label8"
 
 #: composer/e-msg-composer-attachment-bar.c:76
 msgid "1 byte"
@@ -2299,11 +3089,10 @@ msgstr "Anhang hinzufügen..."
 msgid "Attach a file to the message"
 msgstr "Eine Datei zu der Nachricht hinzufügen"
 
-#.
+#. 
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
-#.
 #: composer/e-msg-composer-attachment.glade.h:7
 msgid "Attachment properties"
 msgstr "Anlagen-Eigenschaften"
@@ -2316,31 +3105,39 @@ msgstr "MIME-Typ:"
 msgid "File name:"
 msgstr "Dateiname:"
 
-#: composer/e-msg-composer-hdrs.c:174
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
+msgid "From:"
+msgstr "Von:"
+
+#: composer/e-msg-composer-hdrs.c:243
 msgid "Click here for the address book"
 msgstr "Für das Adressbuch hier klicken"
 
-#: composer/e-msg-composer-hdrs.c:216
+#: composer/e-msg-composer-hdrs.c:296
+msgid "Enter the identitiy you wish to send this message from"
+msgstr "Gebe die Empfänger dieser Nachricht ein"
+
+#: composer/e-msg-composer-hdrs.c:300
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:217
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the recipients of the message"
 msgstr "Gebe die Empfänger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:221
+#: composer/e-msg-composer-hdrs.c:305
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:222
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Gebe die Adressen ein, die eine Kopie der Nachricht erhalten"
 
-#: composer/e-msg-composer-hdrs.c:227
+#: composer/e-msg-composer-hdrs.c:311
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:228
+#: composer/e-msg-composer-hdrs.c:312
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2348,53 +3145,71 @@ msgstr ""
 "Gebe die Adressen ein, die eine Kopie erhalten, dienicht in der "
 "Empfängerliste auftaucht."
 
-#: composer/e-msg-composer-hdrs.c:234
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:235
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Enter the subject of the mail"
 msgstr "Gebe den Betreff der Nachricht an"
 
-#: composer/e-msg-composer.c:463
+#: composer/e-msg-composer.c:451
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: composer/e-msg-composer.c:474
+#: composer/e-msg-composer.c:462
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:494
+#: composer/e-msg-composer.c:482
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:513
-msgid "Discard this message?"
-msgstr "Diese Nachricht wegwerfen?"
+#: composer/e-msg-composer.c:504
+msgid "Saving changes to message..."
+msgstr "Speichere Änderungen an der Nachricht..."
+
+#: composer/e-msg-composer.c:506
+msgid "About to save changes to message..."
+msgstr "Dabei die Änderungen an der Nachricht zu speichern"
+
+#: composer/e-msg-composer.c:590 shell/e-shell-view-menu.c:165
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:596
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Diese Nachricht wurde noch nicht versandt.\n"
+"\n"
+"Wollen Sie die Änderungen speichern?"
 
-#: composer/e-msg-composer.c:561
+#: composer/e-msg-composer.c:618
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:730
 msgid "That file does not exist."
 msgstr "Diese Datei existiert nicht."
 
-#: composer/e-msg-composer.c:686
+#: composer/e-msg-composer.c:740
 msgid "That is not a regular file."
 msgstr "Diese Datei ist keine normale Datei."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:750
 msgid "That file exists but is not readable."
 msgstr "Diese Datei existiert, ist aber nicht lesbar."
 
-#: composer/e-msg-composer.c:707
+#: composer/e-msg-composer.c:760
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Diese Datei scheint lesbar zu sein, aber open(2) schlug fehl."
 
-#: composer/e-msg-composer.c:729
+#: composer/e-msg-composer.c:782
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2402,195 +3217,291 @@ msgstr ""
 "Diese Datei ist sehr groß (mehr als 100 kB).\n"
 "Sind Sie sicher, dass Sie sie einfügen wollen?"
 
-#: composer/e-msg-composer.c:748
+#: composer/e-msg-composer.c:803
 msgid "An error occurred while reading the file."
 msgstr "Ein Fehler trat beim Lesen der Datei auf."
 
-#: composer/e-msg-composer.c:888
+#: composer/e-msg-composer.c:899 shell/e-shell-view-menu.c:434
+msgid "_File"
+msgstr "_Datei"
+
+#: composer/e-msg-composer.c:905
+msgid "_Open..."
+msgstr "Ö_ffnen..."
+
+#: composer/e-msg-composer.c:906
+msgid "Load a previously saved message"
+msgstr "Lade eine zuvor gespeicherte Nachricht"
+
+#: composer/e-msg-composer.c:914
+msgid "_Save..."
+msgstr "_Speichern"
+
+#: composer/e-msg-composer.c:915
+msgid "Save message"
+msgstr "Nachricht speichern"
+
+#: composer/e-msg-composer.c:923
+msgid "_Save as..."
+msgstr "Speichern _unter..."
+
+#: composer/e-msg-composer.c:924
+msgid "Save message with a different name"
+msgstr "Nachricht unter einem anderen Namen speichern"
+
+#: composer/e-msg-composer.c:932
 msgid "Save in _folder..."
 msgstr "Speichern in _Ordner..."
 
-#: composer/e-msg-composer.c:888
+#: composer/e-msg-composer.c:933
 msgid "Save the message in a specified folder"
 msgstr "Speichere die Nachricht in einem bestimmten Ordner"
 
-#: composer/e-msg-composer.c:891
-msgid "_Insert Text File"
-msgstr "Textdatei einfügen"
+#: composer/e-msg-composer.c:942
+msgid "_Insert text file... (FIXME)"
+msgstr "Textdatei einfügen... (FIXME)"
 
-#: composer/e-msg-composer.c:891
+#: composer/e-msg-composer.c:943
 msgid "Insert a file as text into the message"
 msgstr "Diese Datei als Text in die Nachricht einfügen"
 
-#: composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
-msgid "Send"
-msgstr "Senden"
+#: composer/e-msg-composer.c:952
+msgid "_Send"
+msgstr "_Senden"
 
-#: composer/e-msg-composer.c:894
+#: composer/e-msg-composer.c:953
 msgid "Send the message"
 msgstr "Sendet die Nschricht"
 
-#: composer/e-msg-composer.c:906
-msgid "View _attachments"
-msgstr "Anhänge ansehen"
+#: composer/e-msg-composer.c:963
+msgid "_Close..."
+msgstr "S_chließen"
 
-#: composer/e-msg-composer.c:907
-msgid "View/hide attachments"
-msgstr "Anhänge anzeigen/verbergen"
+#: composer/e-msg-composer.c:964
+msgid "Quit the message composer"
+msgstr "Schließt den Nachrichten-Editor"
 
-#: composer/e-msg-composer.c:942
-msgid "Send this message"
-msgstr "Diese Nachricht senden"
+#: composer/e-msg-composer.c:977 shell/e-shell-view-menu.c:478
+msgid "_Edit"
+msgstr "_Bearbeiten"
+
+#: composer/e-msg-composer.c:988
+msgid "_Format"
+msgstr "_Format"
 
-#: composer/e-msg-composer.c:945
-msgid "Cut selected region into the clipboard"
-msgstr "Gewählten Bereich in die Zwischenablage ausschneiden"
+#: composer/e-msg-composer.c:994
+msgid "HTML"
+msgstr "HTML"
 
-#: composer/e-msg-composer.c:946
-msgid "Copy selected region into the clipboard"
-msgstr "Gewählten Bereich in die Zwischenablage kopieren"
+#: composer/e-msg-composer.c:995
+msgid "Send the mail in HTML format"
+msgstr "Sende die Nachricht im HTML-Format"
 
-#: composer/e-msg-composer.c:947
-msgid "Paste selected region into the clipboard"
-msgstr "Gewählten Bereich aus der Zwischenablage einfügen"
+#: composer/e-msg-composer.c:1008 shell/e-shell-view-menu.c:383
+#: shell/e-shell-view-menu.c:489 shell/e-storage-set-view.c:242
+msgid "_View"
+msgstr "_Ansicht"
 
-#: composer/e-msg-composer.c:948
-msgid "Undo"
-msgstr "Rückgängig"
+#: composer/e-msg-composer.c:1014
+msgid "Show _attachments"
+msgstr "_Anhänge anzeigen"
 
-#: composer/e-msg-composer.c:948
-msgid "Undo last operation"
-msgstr "Letzte Aktion zurücknehmen"
+#: composer/e-msg-composer.c:1015
+msgid "Show/hide attachments"
+msgstr "Anhänge anzeigen/verbergen"
+
+#: composer/e-msg-composer.c:1048
+msgid "Send"
+msgstr "Senden"
+
+#: composer/e-msg-composer.c:1049
+msgid "Send this message"
+msgstr "Diese Nachricht senden"
 
-#: composer/e-msg-composer.c:951
+#: composer/e-msg-composer.c:1058
 msgid "Attach"
 msgstr "Anhängen"
 
-#: composer/e-msg-composer.c:951
+#: composer/e-msg-composer.c:1059
 msgid "Attach a file"
 msgstr "eine Datei anhängen"
 
-#: composer/e-msg-composer.c:1127
+#: composer/e-msg-composer.c:1246
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: filter/filter-editor.c:198
-msgid "Edit Filter"
-msgstr "Filter bearbeiten"
-
-#: filter/filter-editor.c:198
-msgid "Create filter"
-msgstr "Filter erzeugen"
-
-#: filter/filter-editor.c:209
-msgid "Back"
-msgstr "Zurück"
-
-#: filter/filter-editor.c:211
-msgid "Finish"
-msgstr "Abschließen"
-
-#: filter/filter-editor.c:212
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: filter/filter-editor.c:216
-msgid "Apply"
-msgstr "Anwenden"
+#: filter/filter-folder.c:183 filter/vfolder-rule.c:269
+msgid "Select Folder"
+msgstr "Wähle Ordner"
 
-#: filter/filter-editor.c:233
-msgid ""
-"<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
-"continue forwards to customise it.</p>"
-msgstr ""
-"<h2>Filterregel erstellen</h2><p>Wählen Sie eine der oben erwähnten "
-"Basisregeln, dann gehen Sie weiter vor, um Sie zu konfigurieren.</p>"
+#: filter/filter-folder.c:245
+msgid "<click here to select a folder>"
+msgstr "<klicken Sie hier um einen Ordner zu wähen>"
 
-#: mail/component-factory.c:197
+#: mail/component-factory.c:187
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kann die Evolution-Mail-Komponente nicht initialisieren"
 
-#: mail/folder-browser-factory.c:29
+#: mail/folder-browser-factory.c:33
 msgid "Get mail"
 msgstr "Mails abrufen"
 
-#: mail/folder-browser-factory.c:29
+#: mail/folder-browser-factory.c:33
 msgid "Check for new mail"
 msgstr "Nach neuen Mails suchen"
 
-#: mail/folder-browser-factory.c:30
+#: mail/folder-browser-factory.c:34
 msgid "Compose"
 msgstr "Erstellen"
 
-#: mail/folder-browser-factory.c:30
+#: mail/folder-browser-factory.c:34
 msgid "Compose a new message"
 msgstr "Eine neue Nachricht erstellen"
 
-#: mail/folder-browser-factory.c:34
+#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
+#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
+#: mail/folder-browser-factory.c:38 mail/mail-view.c:135
 msgid "Reply"
 msgstr "Antworten"
 
-#: mail/folder-browser-factory.c:34
+#: mail/folder-browser-factory.c:38 mail/mail-view.c:135
 msgid "Reply to the sender of this message"
 msgstr "An den Sender der Nachricht antworten"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:39 mail/mail-view.c:138
 msgid "Reply to All"
 msgstr "Allen antworten"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:39 mail/mail-view.c:138
 msgid "Reply to all recipients of this message"
 msgstr "allen Empfängern der Nachricht antworten"
 
-#: mail/folder-browser-factory.c:37
+#: mail/folder-browser-factory.c:41 mail/mail-view.c:141
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser-factory.c:37
+#: mail/folder-browser-factory.c:41 mail/mail-view.c:141
 msgid "Forward this message"
 msgstr "Die Nachricht weiterleiten"
 
-#: mail/folder-browser-factory.c:41
-msgid "Refile"
-msgstr "Neu einordnen"
+#: mail/folder-browser-factory.c:45
+msgid "Move"
+msgstr "Verschieben"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:45
 msgid "Move message to a new folder"
 msgstr "Die Nachricht in einen neuen Ordner verschieben"
 
-#: mail/folder-browser-factory.c:43
+#: mail/folder-browser-factory.c:46
+msgid "Copy message to a new folder"
+msgstr "Die Nachricht in einen neuen Ordner kopieren"
+
+#: mail/folder-browser-factory.c:48 mail/mail-view.c:145
 msgid "Print the selected message"
 msgstr "Die gewählte Nachricht drucken"
 
-#: mail/folder-browser-factory.c:45
+#: mail/folder-browser-factory.c:50 mail/mail-view.c:147
 msgid "Delete this message"
 msgstr "Die Nachricht löschen"
 
-#: mail/folder-browser-factory.c:65
+#: mail/folder-browser-factory.c:72
 msgid "_Threaded Message List"
 msgstr "Nachrichtenliste mit Threads"
 
-#: mail/folder-browser-factory.c:77
+#: mail/folder-browser-factory.c:82
+msgid "_Print message"
+msgstr "Nachricht _drucken"
+
+#: mail/folder-browser-factory.c:90
+msgid "E_dit Message"
+msgstr "Nachricht bearbeiten"
+
+#: mail/folder-browser-factory.c:97
+msgid "_View Message"
+msgstr "Nachricht anzeigen"
+
+#: mail/folder-browser-factory.c:106
+msgid "_Mark all messages seen"
+msgstr "Alle Nachrichten als gelesen markieren"
+
+#: mail/folder-browser-factory.c:110
 msgid "_Expunge"
 msgstr "Säubern"
 
-#: mail/folder-browser-factory.c:83
-msgid "_Filter Druid ..."
-msgstr "Filterdruide..."
+#: mail/folder-browser-factory.c:116
+msgid "Mail _Filters ..."
+msgstr "Mail-Filter...."
 
-#: mail/folder-browser-factory.c:89
-msgid "_Virtual Folder Druid ..."
-msgstr "Druide für virtuelle Ordner..."
+#: mail/folder-browser-factory.c:122
+msgid "_vFolder Editor ..."
+msgstr "vFolder-Editor..."
 
-#: mail/folder-browser-factory.c:95
+#: mail/folder-browser-factory.c:128
 msgid "_Mail Configuration ..."
 msgstr "Mailkonfiguration..."
 
-#: mail/folder-browser-factory.c:101
+#: mail/folder-browser-factory.c:134
 msgid "Forget _Passwords"
 msgstr "Passwörter vergessen"
 
-#: mail/mail-config.c:262
+#: mail/folder-browser-factory.c:141
+msgid "_Configure Folder"
+msgstr "Ordner einrichten"
+
+#: mail/folder-browser.c:352
+msgid "Save"
+msgstr "Speichern"
+
+#: mail/mail-callbacks.c:134
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Diese Nachricht hat keine Betreffzeile.\n"
+"Wirklich senden?"
+
+#: mail/mail-callbacks.c:166
+msgid ""
+"You need to configure an identity\n"
+"before you can send mail."
+msgstr ""
+"Sie müssen eine Indentität einrichten,\n"
+"bevor Sie E-Mails senden können."
+
+#: mail/mail-callbacks.c:182
+msgid ""
+"You need to configure a mail transport\n"
+"before you can send mail."
+msgstr ""
+"Sie müssen einen Mail-Transport einrichten,\n"
+"bevor Sie E-Mails senden können."
+
+#: mail/mail-callbacks.c:389
+msgid "Move message(s) to"
+msgstr "Nachricht(en) verschieben nach"
+
+#: mail/mail-callbacks.c:391
+msgid "Copy message(s) to"
+msgstr "Nachricht(en) kopieren nach"
+
+#: mail/mail-callbacks.c:448
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Sie können nur Nachrichten im Ordner\n"
+"'Entwürfe' bearbeiten."
+
+#: mail/mail-callbacks.c:536
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Fehler beim Laden der Filter-Informationen:\n"
+"%s"
+
+#: mail/mail-config-gui.c:430
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -2600,51 +3511,55 @@ msgstr ""
 "ausgehenden Mail ein. Sie können auf Wunsch auch den Namen Ihrer "
 "Organisation erwähnen, und den einer Datei, in der Ihre Signatur steht."
 
-#: mail/mail-config.c:277
+#: mail/mail-config-gui.c:443
 msgid "Full name:"
 msgstr "Voller Name:"
 
-#: mail/mail-config.c:305
+#: mail/mail-config-gui.c:467
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: mail/mail-config.c:328
+#: mail/mail-config-gui.c:482
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.c:340
+#: mail/mail-config-gui.c:493
 msgid "Signature file:"
 msgstr "Signaturdatei:"
 
-#: mail/mail-config.c:345
+#: mail/mail-config-gui.c:498 mail/mail-config.glade.h:10
 msgid "Signature File"
 msgstr "Signaturdatei"
 
-#: mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
+#: mail/mail-config-gui.c:897
 msgid "Server:"
 msgstr "Server:"
 
-#: mail/mail-config.c:725
+#: mail/mail-config-gui.c:903
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: mail/mail-config.c:732
+#: mail/mail-config-gui.c:909
 msgid "Path:"
 msgstr "Pfad:"
 
-#: mail/mail-config.c:739 mail/mail-config.c:819
+#: mail/mail-config-gui.c:917
 msgid "Authentication:"
 msgstr "Authentikation:"
 
-#: mail/mail-config.c:751 mail/mail-config.c:831
+#: mail/mail-config-gui.c:929
 msgid "Detect supported types..."
 msgstr "Unterstützte Typen feststellen..."
 
-#: mail/mail-config.c:777 mail/mail-config.c:853
-msgid "Test these values before continuing"
-msgstr "Vor dem Fortsetzen diese Werte testen"
+#: mail/mail-config-gui.c:952
+msgid "Don't delete messages from server"
+msgstr "Nachrichten nicht vom Server löschen"
+
+#: mail/mail-config-gui.c:964
+msgid "Test Settings"
+msgstr "Einstellungen testen"
 
-#: mail/mail-config.c:960
+#: mail/mail-config-gui.c:1094 mail/mail-config-gui.c:1142
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -2658,134 +3573,441 @@ msgstr ""
 "Wenn der Server Authentikation erfordert, können Sie auf \"Unterstützte "
 "Typen feststellen...\" klicken, bevor Sie andere Informationen eingeben."
 
-#: mail/mail-config.c:978
-msgid "Select the method you would like to use to deliver your mail."
+#: mail/mail-config-gui.c:1118
+msgid ""
+"Select the kind of news server you have, and enter the relevant information "
+"about it.\n"
+"\n"
+"If the server requires authentication, you can click the \"Detect supported "
+"types...\" button after entering the other information."
 msgstr ""
-"Wählen Sie die Methode, die Sie zum Ausliefern Ihrer Mail verwenden wollen."
-
-#: mail/mail-config.c:1163 mail/mail-config.c:1242
-msgid "Mail Configuration"
-msgstr "Mailkonfiguration"
-
-#. Identity page
-#: mail/mail-config.c:1180
-msgid "Identity"
-msgstr "Identität"
-
-#. Source page
-#: mail/mail-config.c:1199
-msgid "Mail Source"
-msgstr "Mailquelle"
-
-#. Transport page
-#: mail/mail-config.c:1220
-msgid "Mail Transport"
-msgstr "Mailtransport"
+"Wählen Sie, welche Art von Newsserver den Sie haben, und geben Sie die "
+"relevante Information dazu ein.\n"
+"\n"
+"Wenn der Server Authentifikation erfordert, können Sie auf \"Unterstützte "
+"Typen feststellen...\" klicken, nachdem Sie die anderen Informationen "
+"eingegeben haben."
 
-#: mail/mail-config.c:1343
+#: mail/mail-config-gui.c:1192
 msgid "Edit Identity"
 msgstr "Identität bearbeiten"
 
-#: mail/mail-config.c:1345
+#: mail/mail-config-gui.c:1194
 msgid "Add Identity"
 msgstr "Identität hinzufügen"
 
-#: mail/mail-config.c:1488
+#: mail/mail-config-gui.c:1288
 msgid "Edit Source"
 msgstr "Quelle bearbeiten"
 
-#: mail/mail-config.c:1490
+#: mail/mail-config-gui.c:1290
 msgid "Add Source"
 msgstr "Quelle hinzufügen"
 
-#. "\n\n"
-#. "If the server requires authentication, you can click the "
-#. "\"Detect supported types...\" button after entering "
-#. "the other information."
-#: mail/mail-config.c:1600
-msgid "Enter the hostname of the News Server you have."
-msgstr "Geben Sie den Rechnernamen Ihres Newsservers ein."
-
-#: mail/mail-config.c:1656
+#: mail/mail-config-gui.c:1387
 msgid "Edit News Server"
 msgstr "Newsserver bearbeiten"
 
-#: mail/mail-config.c:1658
+#: mail/mail-config-gui.c:1389
 msgid "Add News Server"
 msgstr "Newsserver hinzufügen"
 
-#: mail/mail-ops.c:374
-msgid "Fetching mail"
-msgstr "Rufe Mail ab"
+#: mail/mail-config-gui.c:2217
+msgid "The connection was successful!"
+msgstr "Die Verbindung war erfolgreich!"
+
+#. 
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
+msgid "Identities"
+msgstr "Identitäten"
+
+#: mail/mail-config.glade.h:9
+msgid "Organization"
+msgstr "Organisation"
+
+#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:23
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: mail/mail-config.glade.h:15
+msgid "Sources"
+msgstr "Quellen"
+
+#: mail/mail-config.glade.h:19
+msgid "Mail Sources"
+msgstr "Mailquellen"
+
+#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
+msgid "Mail Transport"
+msgstr "Mailtransport"
+
+#: mail/mail-config.glade.h:21
+msgid "News Servers"
+msgstr "Newsserver"
+
+#: mail/mail-config.glade.h:25
+msgid "News Sources"
+msgstr "Newsquellen"
+
+#: mail/mail-config.glade.h:26
+msgid "Send messages in HTML format"
+msgstr "Sende Nachrichten im HTML-Format"
+
+#. 
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
+#: mail/mail-config-druid.glade.h:16
+msgid "Mail Configuration"
+msgstr "Mailkonfiguration"
+
+#: mail/mail-config-druid.glade.h:9
+msgid ""
+"Welcome to the Evolution Mail configuration wizard!\n"
+"By filling in some information about your email\n"
+"settings, you can start sending and receiving email\n"
+"right away. Click Next to continue."
+msgstr ""
+"Willkommen zum Evolution E-Mail Konfigurations Wizzard!\n"
+"Nachdem Sie die Informationen über ihre E-Mail Einstellungen\n"
+"ausgefüllt haben, können Sie sofort Anfagen und E-Mails\n"
+"senden und empfangen. Klicken sie zum Fortfahren auf weiter."
+
+#: mail/mail-config-druid.glade.h:13
+msgid "Identity"
+msgstr "Identität"
+
+#: mail/mail-config-druid.glade.h:14
+msgid "Mail Source"
+msgstr "Mailquelle"
 
-#: mail/mail-ops.c:386
+#: mail/mail-config-druid.glade.h:17
 msgid ""
-"This message has no subject.\n"
-"Really send?"
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
 msgstr ""
-"Diese Nachricht hat keine Betreffzeile.\n"
-"Wirklich senden?"
+"Ihre E-Mail Konfiguration ist jetzt komplett.\n"
+"Klicken Sie auf 'Fertig' um die Einstellungen zu speichern"
+
+#: mail/mail-crypto.c:338 mail/mail-crypto.c:418
+msgid "Please enter your PGP/GPG passphrase."
+msgstr "Bitte geben Sie ihr PGP/GPG Passwort ein."
+
+#: mail/mail-crypto.c:342 mail/mail-crypto.c:422
+msgid "No password provided."
+msgstr "Kein Passwort verfügbar."
+
+#: mail/mail-crypto.c:348 mail/mail-crypto.c:428
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Konnte keine Verbindung zu GPG/PGP erstellen: %s"
+
+#: mail/mail-local.c:256
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr "Wandelt Ordner '%s' zum Format %s um"
+
+#: mail/mail-local.c:260
+#, c-format
+msgid "Change folder \"%s\" to \"%s\" format"
+msgstr "Ordner '%s' zum Format %s umwandeln"
+
+#: mail/mail-ops.c:74
+#, c-format
+msgid "Fetching email from %s"
+msgstr "Rufe E-Mails von %s ab"
+
+#: mail/mail-ops.c:76
+#, c-format
+msgid "Fetch email from %s"
+msgstr "E-Mails von %s abrufen"
+
+#: mail/mail-ops.c:87
+msgid "You have no remote mail source configured to fetch mail from."
+msgstr ""
+"Sie haben keine ferne E-Mail-Quelle angegeben, von der Sie E-Mails abrufen "
+"können."
+
+#: mail/mail-ops.c:97
+msgid "Bad folder passed to fetch_mail"
+msgstr "Falscher Ordner an fetch_mail übergeben"
+
+#: mail/mail-ops.c:165
+msgid "There is no new mail."
+msgstr "Es gibt keine neuen E-Mails."
+
+#: mail/mail-ops.c:234
+#, c-format
+msgid "Sending \"%s\""
+msgstr "Sende '%s'"
+
+#: mail/mail-ops.c:239
+msgid "Sending a message without a subject"
+msgstr "Sende die E-Mail ohne einen Betreff"
+
+#: mail/mail-ops.c:242
+#, c-format
+msgid "Send \"%s\""
+msgstr "Sendet '%s'"
+
+#: mail/mail-ops.c:245
+msgid "Send a message without a subject"
+msgstr "Sendet eine E-Mail ohne ein Betreff"
+
+#: mail/mail-ops.c:410
+#, c-format
+msgid "Expunging \"%s\""
+msgstr "Säubere '%s'"
+
+#: mail/mail-ops.c:412
+#, c-format
+msgid "Expunge \"%s\""
+msgstr "Säubert '%s'"
+
+#: mail/mail-ops.c:484
+#, c-format
+msgid "Moving messages from \"%s\" into \"%s\""
+msgstr "Verschiebe Nachrichten von '%s' nach '%s'"
+
+#: mail/mail-ops.c:486
+#, c-format
+msgid "Copying messages from \"%s\" into \"%s\""
+msgstr "Kopiere Nachrichten von '%s' nach '%s'"
+
+#: mail/mail-ops.c:489
+#, c-format
+msgid "Move messages from \"%s\" into \"%s\""
+msgstr "Verschiebt Nachrichten von '%s' nach '%s'"
+
+#: mail/mail-ops.c:491
+#, c-format
+msgid "Copy messages from \"%s\" into \"%s\""
+msgstr "Kopiert Nachrichten von '%s' nach '%s'"
+
+#: mail/mail-ops.c:637
+#, c-format
+msgid "Marking messages in folder \"%s\""
+msgstr "Markiere Nachrichten im Ordner '%s'"
+
+#: mail/mail-ops.c:640
+#, c-format
+msgid "Mark messages in folder \"%s\""
+msgstr "Markiert Nachrichten im Ordner '%s'"
+
+#: mail/mail-ops.c:769
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Durchsuche Ordner in '%s'"
+
+#: mail/mail-ops.c:772
+#, c-format
+msgid "Scan folders in \"%s\""
+msgstr "Durchsucht Ordner in '%s'"
+
+#: mail/mail-ops.c:859
+msgid "(No description)"
+msgstr "(keine Beschreibung)"
+
+#: mail/mail-ops.c:922
+#, c-format
+msgid "Attaching messages from folder \"%s\""
+msgstr "Nachrichten von Ordner '%s' anhängen"
+
+#: mail/mail-ops.c:925
+#, c-format
+msgid "Attach messages from \"%s\""
+msgstr "Nachrichten von '%s' anhängen"
+
+#: mail/mail-ops.c:1051
+#, c-format
+msgid "Forwarding messages \"%s\""
+msgstr "Nachricht '%s' weiterleiten"
+
+#: mail/mail-ops.c:1056
+msgid "Forwarding a message without a subject"
+msgstr "Nachricht ohne Betreff weiterleiten"
+
+#: mail/mail-ops.c:1059
+#, c-format
+msgid "Forward message \"%s\""
+msgstr "Leitet Nachricht '%s' weiter"
+
+#: mail/mail-ops.c:1064
+msgid "Forward a message without a subject"
+msgstr "Leitet eine Nachricht ohne Betreff weiter"
+
+#: mail/mail-ops.c:1129
+msgid ""
+"Failed to generate mime part from message while generating forwarded "
+"message."
+msgstr ""
+"Gescheitert den Mime-Teil von der Nachricht beim Erstellen der "
+"weitergeleiteten Nachricht zu erzeugen."
+
+#: mail/mail-ops.c:1218
+#, c-format
+msgid "Loading \"%s\""
+msgstr "Lade '%s'"
+
+#: mail/mail-ops.c:1220
+#, c-format
+msgid "Load \"%s\""
+msgstr "Lädt '%s'"
+
+#: mail/mail-ops.c:1339
+#, c-format
+msgid "Creating \"%s\""
+msgstr "Erstelle '%s'"
+
+#: mail/mail-ops.c:1341
+#, c-format
+msgid "Create \"%s\""
+msgstr "Erstellt '%s'"
+
+#: mail/mail-ops.c:1412
+msgid "Exception while reporting result to shell component listener."
+msgstr ""
+"Abbruch beim Berichten der Ergebnisse an die Shell-Komponenten Überwachung."
+
+#: mail/mail-ops.c:1465
+#, c-format
+msgid "Synchronizing \"%s\""
+msgstr "Synchronisiere '%s'"
+
+#: mail/mail-ops.c:1467
+#, c-format
+msgid "Synchronize \"%s\""
+msgstr "Synchronisiert '%s'"
+
+#: mail/mail-ops.c:1543
+#, c-format
+msgid "Displaying message UID \"%s\""
+msgstr "Zeige Nachricht UID '%s'"
+
+#: mail/mail-ops.c:1546
+msgid "Clearing message display"
+msgstr "Lösche Mendlungsanzeige"
+
+#: mail/mail-ops.c:1549
+#, c-format
+msgid "Display message UID \"%s\""
+msgstr "Zeigt Nachricht UID '%s'"
+
+#: mail/mail-ops.c:1552
+msgid "Clear message display"
+msgstr "Löscht Meldungsanzeige"
+
+#: mail/mail-ops.c:1671
+#, c-format
+msgid "Opening messages from folder \"%s\""
+msgstr "Öffne Nachrichten von '%s'"
+
+#: mail/mail-ops.c:1674
+#, c-format
+msgid "Open messages from \"%s\""
+msgstr "Öffnet Nachrichten von '%s'"
+
+#: mail/mail-ops.c:1786
+msgid "Loading Draftbox"
+msgstr "Lade Entwürfe"
+
+#: mail/mail-ops.c:1788
+msgid "Load Draftbox"
+msgstr "Lädt Entwürfe"
+
+#: mail/mail-ops.c:1856
+#, c-format
+msgid "Viewing messages from folder \"%s\""
+msgstr "Zeige Nachrichten aus dem Ordner '%s'"
+
+#: mail/mail-ops.c:1859
+#, c-format
+msgid "View messages from \"%s\""
+msgstr "Zeige Nachrichten von '%s'"
 
-#: mail/mail-ops.c:743
-msgid "Refile message(s) to"
-msgstr "Machricht(en) neu einordnen in"
+#: mail/mail-threads.c:274
+#, c-format
+msgid ""
+"Error while preparing to %s:\n"
+"%s"
+msgstr ""
+"Fehler bei der Vorbereitung zu %s:\n"
+"%s"
 
-#: mail/mail-threads.c:483
-msgid "Currently pending operations:"
-msgstr "Momentan anliegende Vorgänge:"
+#: mail/mail-threads.c:622
+#, c-format
+msgid ""
+"Error while `%s':\n"
+"%s"
+msgstr ""
+"Fehler bei '%s':\n"
+"%s"
 
-#: mail/mail-threads.c:621
+#: mail/mail-threads.c:675
 msgid "Incomplete message written on pipe!"
 msgstr "Unvollständige Nachricht auf Pipe geschrieben!"
 
-#: mail/mail-threads.c:623
+#: mail/mail-threads.c:679
 msgid "Error reading commands from dispatching thread."
 msgstr "Fehler beim Lesen von Befehlen aus dem Dispatcher-Thread."
 
-#: mail/mail-threads.c:712
+#: mail/mail-threads.c:744
 msgid "Corrupted message from dispatching thread?"
 msgstr "Beschädigte Nachricht von Dispatcher-Thread?"
 
-#: mail/mail-threads.c:814
+#: mail/mail-threads.c:856
 msgid "Could not create dialog box."
 msgstr "Konnte Dialogfenster nicht erstellen."
 
-#: mail/mail-threads.c:849
+#: mail/mail-threads.c:867
 msgid "User cancelled query."
 msgstr "Benutzer hat Abfrage abgebrochen."
 
-#: mail/main.c:62
-msgid "Mail Component: I could not initialize Bonobo"
-msgstr "Mail-Komponente: Ich kann Bonobo nicht initialisieren"
-
-#: mail/message-list.c:460
+#: mail/message-list.c:489
 msgid "Online Status"
 msgstr "Online-Zustand"
 
-#: mail/message-list.c:488
+#: mail/message-list.c:525
 msgid "From"
 msgstr "Von"
 
-#: mail/message-list.c:495
+#: mail/message-list.c:532
 msgid "Subject"
 msgstr "Betreff"
 
-#: mail/message-list.c:502
+#: mail/message-list.c:539
 msgid "Date"
 msgstr "Datum"
 
-#: mail/message-list.c:509
+#: mail/message-list.c:546
 msgid "Received"
 msgstr "Erhalten"
 
-#: mail/message-list.c:516
+#: mail/message-list.c:553
 msgid "To"
 msgstr "An"
 
-#: mail/message-list.c:523
+#: mail/message-list.c:560
 msgid "Size"
 msgstr "Größe"
 
+#: notes/component-factory.c:27
+msgid "Create a new note"
+msgstr "Erstelle eine neue Notiz"
+
+#: notes/component-factory.c:148
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Kann Evolution's Notiz-Komponente nicht initialisieren."
+
+#: notes/main.c:30
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Notiz-Komponente: Bonobo kann nicht initialisieren werden"
+
 #: shell/e-setup.c:47
 msgid "Evolution installation"
 msgstr "Installation von Evolution"
@@ -2826,17 +4048,28 @@ msgstr ""
 msgid "Evolution files successfully installed."
 msgstr "Evolutions Dateien erfolgreich installiert."
 
-#: shell/e-setup.c:108
+#: shell/e-setup.c:109
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
-"Please remove it in order to allow installation\n"
+"Please move it in order to allow installation\n"
 "of the Evolution user files."
 msgstr ""
 "Die Datei `%s' ist kein Verzeichnis.\n"
 "Bitte entfernen Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
+#: shell/e-setup.c:121
+#, c-format
+msgid ""
+"The directory `%s' exists but is not the\n"
+"Evolution directory.  Please move it in order\n"
+"to allow installation of the Evolution user files."
+msgstr ""
+"Die Datei `%s' ist kein Verzeichnis.\n"
+"Bitte entfernen Sie es, damit Evolution seine\n"
+"Benutzerdateien installieren kann."
+
 #: shell/e-shell-folder-creation-dialog.c:81
 #, c-format
 msgid ""
@@ -2854,7 +4087,7 @@ msgstr "Der angegebene Ordnername ist nicht gültig"
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Neuen Ordner anlegen"
 
-#: shell/e-shell-folder-selection-dialog.c:95
+#: shell/e-shell-folder-selection-dialog.c:96
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -2862,7 +4095,7 @@ 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:236
+#: shell/e-shell-folder-selection-dialog.c:272
 msgid "New..."
 msgstr "Neu..."
 
@@ -2872,25 +4105,20 @@ msgstr "(Namenlos)"
 
 #. you might have to call gnome_dialog_run() on the
 #. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:110
+#: shell/e-shell-view-menu.c:113
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Der Fehlermelder kann nicht gefunden werden"
 
 #. same as above
-#: shell/e-shell-view-menu.c:116
+#: shell/e-shell-view-menu.c:119
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
-#: shell/e-shell-view-menu.c:159
-msgid "Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view-menu.c:161
+#: shell/e-shell-view-menu.c:167
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:163
+#: shell/e-shell-view-menu.c:169
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -2900,136 +4128,132 @@ msgstr ""
 "und Kontakt-Management Anwendung\n"
 "innerhalt der GNOME-Desktops."
 
-#: shell/e-shell-view-menu.c:317
+#: shell/e-shell-view-menu.c:319
 msgid "Go to folder..."
 msgstr "Gehe zu Ordner..."
 
-#: shell/e-shell-view-menu.c:381
-msgid "View"
-msgstr "Ansicht"
+#: shell/e-shell-view-menu.c:377
+msgid "_New"
+msgstr "Neu"
 
-#: shell/e-shell-view-menu.c:385
+#: shell/e-shell-view-menu.c:389
 msgid "_Folder"
 msgstr "Ordner"
 
-#: shell/e-shell-view-menu.c:389
-msgid "Evolution _Bar Shortcut"
+#: shell/e-shell-view-menu.c:395
+msgid "Evolution bar _shortcut"
 msgstr "Evolution-Leisten Verknüpfung"
 
-#: shell/e-shell-view-menu.c:395
+#: shell/e-shell-view-menu.c:404
 msgid "_Mail message (FIXME)"
 msgstr "Nachricht senden (FIXME)"
 
-#: shell/e-shell-view-menu.c:396 shell/e-shell-view-menu.c:399
-msgid "Composes a new mail message"
-msgstr "Eine neue Nachricht erstellen"
-
-#: shell/e-shell-view-menu.c:398
+#: shell/e-shell-view-menu.c:410
 msgid "_Appointment (FIXME)"
 msgstr "Termine (FIXME)"
 
-#: shell/e-shell-view-menu.c:401
+#: shell/e-shell-view-menu.c:416
 msgid "_Contact (FIXME)"
 msgstr "Kontakt (FIXME)"
 
-#: shell/e-shell-view-menu.c:404
+#: shell/e-shell-view-menu.c:422
 msgid "_Task (FIXME)"
 msgstr "Aufgabe (FIXME)"
 
-#: shell/e-shell-view-menu.c:407
-msgid "Task _Request (FIXME)"
-msgstr "Aufgaben-Anfrage (FIXME)"
-
-#: shell/e-shell-view-menu.c:410
-msgid "_Journal Entry (FIXME)"
-msgstr "Journal-Eintrag (FIXME)"
-
-#: shell/e-shell-view-menu.c:418
-msgid "_New"
-msgstr "Neu"
-
-#: shell/e-shell-view-menu.c:422
+#: shell/e-shell-view-menu.c:444
 msgid "_Go to folder..."
 msgstr "Gehe zu Ordner..."
 
-#: shell/e-shell-view-menu.c:422
+#: shell/e-shell-view-menu.c:445
 msgid "Display a different folder"
 msgstr "Einen anderen Ordner anzeigen"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:452
 msgid "_Create new folder..."
 msgstr "Neuen Ordner anlegen..."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:453 shell/e-shell-view-menu.c:465
 msgid "Create a new folder"
 msgstr "Einen neuen Ordner anlegen"
 
-#: shell/e-shell-view-menu.c:439
+#: shell/e-shell-view-menu.c:464
+msgid "E_xit..."
+msgstr "_Beenden"
+
+#: shell/e-shell-view-menu.c:495
 msgid "Show _shortcut bar"
 msgstr "Verknüpfungsleiste anzeigen"
 
-#: shell/e-shell-view-menu.c:440
+#: shell/e-shell-view-menu.c:496
 msgid "Show the shortcut bar"
 msgstr "Die Verknüpfungsleiste anzeigen"
 
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:501
 msgid "Show _folder bar"
 msgstr "Ordner-Leiste anzeigen"
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:502
 msgid "Show the folder bar"
 msgstr "Die Ordner-Leiste anzeigen"
 
-#: shell/e-shell-view-menu.c:460
-msgid "Help _Index"
+#: shell/e-shell-view-menu.c:524
+msgid "_Actions"
+msgstr "Aktionen"
+
+#: shell/e-shell-view-menu.c:535
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: shell/e-shell-view-menu.c:541
+msgid "Help _index"
 msgstr "Hilfe-Index"
 
-#: shell/e-shell-view-menu.c:463
-msgid "Getting _Started"
+#: shell/e-shell-view-menu.c:548
+msgid "Getting _started"
 msgstr "Erste Schritte"
 
-#: shell/e-shell-view-menu.c:466
-msgid "Using the _Mailer"
+#: shell/e-shell-view-menu.c:555
+msgid "Using the _mailer"
 msgstr "Den Mailer benutzen"
 
-#: shell/e-shell-view-menu.c:469
-msgid "Using the _Calendar"
+#: shell/e-shell-view-menu.c:562
+msgid "Using the _calendar"
 msgstr "Den Kalender benutzen"
 
-#: shell/e-shell-view-menu.c:472
-msgid "Using the Cont_act Manager"
+#: shell/e-shell-view-menu.c:569
+msgid "Using the c_ontact manager"
 msgstr "Die Kontaktverwaltung benutzen"
 
-#: shell/e-shell-view-menu.c:477
+#: shell/e-shell-view-menu.c:579
 msgid "_Submit bug report"
 msgstr "Fehlerbericht einschicken"
 
-#: shell/e-shell-view-menu.c:478
-msgid "Submit bug-report via bug-buddy"
+#: shell/e-shell-view-menu.c:580
+msgid "Submit bug report using Bug Buddy"
 msgstr "Einen Fehler über dem Fehlermelder melden"
 
-#: shell/e-shell-view-menu.c:494
-msgid "_Actions"
-msgstr "Aktionen"
+#: shell/e-shell-view-menu.c:589
+msgid "_About Evolution..."
+msgstr "Über Evolution..."
 
-#: shell/e-shell-view.c:114
+#: shell/e-shell-view-menu.c:590
+msgid "Show information about Evolution"
+msgstr "Zeige Informationen über Evolution"
+
+#: shell/e-shell-view.c:122
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:339
+#: shell/e-shell-view.c:350
 msgid "Folders"
 msgstr "Ordner"
 
-#: shell/e-shell-view.c:731
-msgid "None"
-msgstr "Keine"
-
-#: shell/e-shell-view.c:735
+#: shell/e-shell-view.c:879
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:299
+#: shell/e-shell.c:293
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kann lokalen Speicher nicht einstellen -- %s"
@@ -3118,7 +4342,11 @@ msgstr "Der angegebene Typ wird für diese Speicherweise nicht unterstützt"
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: shell/main.c:100
+#: shell/e-storage-set-view.c:242
+msgid "View the selected folder"
+msgstr "Gewählten Ordner ansehen"
+
+#: shell/main.c:66
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -3160,7 +4388,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
 "werden, und wir hoffen auf Ihre Mitarbeit!\n"
 
-#: shell/main.c:127
+#: shell/main.c:93
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -3168,23 +4396,40 @@ msgstr ""
 "Danke.\n"
 "das Evolution-Team\n"
 
-#: shell/main.c:158
+#: shell/main.c:121
 msgid "Cannot initialize the Evolution shell."
-msgstr "Kann die Evolution-Shell nicht initialisieren"
+msgstr "Kann die Evolution-Shell nicht initialisieren."
 
-#: shell/main.c:195
-msgid "Cannot initialize the configuration system."
-msgstr "Kann das Konfigurationssystem nicht initialisieren."
-
-#: shell/main.c:201
+#: shell/main.c:156
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kann das Bonobo-System nicht initialisieren."
 
-#.
+#: tests/ui-tests/message-browser.c:360
+msgid "The component now claims that it doesn't support PersistStream!"
+msgstr ""
+"Die Komponente behauptet jetzt, dass es PersistStream nicht unterstützt!"
+
+#: tests/ui-tests/message-browser.c:378
+msgid ""
+"An exception occured while trying to load data into the component with "
+"PersistStream"
+msgstr ""
+"Ein Abbruch traf auf, als versucht wurde, die Daten mit PersistStream in die "
+"Komponente zu laden"
+
+#: tests/ui-tests/message-browser.c:471
+#, c-format
+msgid "The %s component doesn't support PersistStream!\n"
+msgstr "Die %s Komponente unterstützt PersistStream nicht!\n"
+
+#: tests/ui-tests/message-browser.c:710
+msgid "Open Mime Message"
+msgstr "Mime-Nachricht öffnen"
+
+#. 
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
-#.
 #: widgets/e-table/e-table-config.glade.h:7
 msgid "Fields"
 msgstr "Felder"
@@ -3201,12 +4446,12 @@ msgstr "Sortieren"
 msgid "Filter"
 msgstr "Filter"
 
-#.
+#. 
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
-#.
 #: widgets/e-table/e-table-field-chooser.glade.h:7
+#: widgets/e-table/e-table-header-item.c:1164
 msgid "Field Chooser"
 msgstr "Feldwähler"
 
@@ -3218,14 +4463,13 @@ msgstr ""
 "Um Ihrer Tabelle eine Spalte hinzuzufügen, ziehen\n"
 "Sie sie dorthin, wo Sie sie haben wollen."
 
-#.
+#. 
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
-#.
 #: widgets/e-table/e-table-group.glade.h:7
 msgid "window1"
-msgstr ""
+msgstr "window1"
 
 #: widgets/e-table/e-table-group.glade.h:8
 msgid "Available fields"
@@ -3233,7 +4477,7 @@ msgstr "Verfügbare Felder"
 
 #: widgets/e-table/e-table-group.glade.h:9
 msgid "label1"
-msgstr ""
+msgstr "label1"
 
 #: widgets/e-table/e-table-group.glade.h:10
 msgid "Show in this order"
@@ -3241,7 +4485,7 @@ msgstr "In dieser Reihenfolge anzeigen"
 
 #: widgets/e-table/e-table-group.glade.h:11
 msgid "label2"
-msgstr ""
+msgstr "label2"
 
 #: widgets/e-table/e-table-group.glade.h:12
 msgid "Add >>"
@@ -3251,6 +4495,46 @@ msgstr "Hinzufügen >>"
 msgid "<< Remove"
 msgstr "<< Entfernen"
 
+#: widgets/e-table/e-table-header-item.c:1156
+msgid "Sort Ascending"
+msgstr "Sortiere aufsteigend"
+
+#: widgets/e-table/e-table-header-item.c:1157
+msgid "Sort Descending"
+msgstr "Sortiere Absteigend"
+
+#: widgets/e-table/e-table-header-item.c:1158
+msgid "Unsort"
+msgstr "Sortierung aufheben"
+
+#: widgets/e-table/e-table-header-item.c:1160
+msgid "Group By This Field"
+msgstr "Gruppiere nach diesem Feld"
+
+#: widgets/e-table/e-table-header-item.c:1161
+msgid "Group By Box"
+msgstr "Gruppiere nach Fächern"
+
+#: widgets/e-table/e-table-header-item.c:1163
+msgid "Remove This Column"
+msgstr "Entferne diese Spalte"
+
+#: widgets/e-table/e-table-header-item.c:1166
+msgid "Alignment"
+msgstr "Ausrichtung"
+
+#: widgets/e-table/e-table-header-item.c:1167
+msgid "Best Fit"
+msgstr "Einpassen"
+
+#: widgets/e-table/e-table-header-item.c:1168
+msgid "Format Columns..."
+msgstr "Spalten formatieren"
+
+#: widgets/e-table/e-table-header-item.c:1170
+msgid "Customize Current View..."
+msgstr "Aktuelle Ansicht anpassen..."
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr ""
@@ -3327,6 +4611,12 @@ msgstr "Ende der Besprechung:"
 msgid "All Attendees"
 msgstr "Alle Anwesenden"
 
+#. 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:281
+msgid "MTWTFSS"
+msgstr "MDMDFSS"
+
 #: widgets/misc/e-clipped-label.c:106
 msgid "..."
 msgstr "..."
@@ -3335,3 +4625,4 @@ msgstr "..."
 #, c-format
 msgid "Group %i"
 msgstr "Gruppe %i"
+