6 files changed, 91 insertions, 74 deletions

diff --git a/i18n/de/addressbook.ts b/i18n/de/addressbook.ts
index bb81649..fc715fe 100644
--- a/i18n/de/addressbook.ts
+++ b/i18n/de/addressbook.ts
@@ -1,418 +1,418 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Vollständiger Name</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation type="unfinished"></translation>
+        <translation>unbestimmt</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Anrede</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Führen als...</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-Mailadresse</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Felder anordnen</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation>Wählen Sie die Reihenfolde der Felder:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Runter</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kontakte</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Schreibe E-Mail an</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Eintrage senden...</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Eigene Daten</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Felder anordnen</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Nicht genügend Speicherplatz</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Ansicht</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann die Daten nicht editieren, synchronisiere gerade</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Persönliche Daten editieren</translation>
     </message>
     <message>
         <source>Edit Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse Editieren</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Adressbuch - Persönliche Einstellungen</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Speicherplatz</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Anrede</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Arbeit</translation>
     </message>
     <message>
         <source>Mb</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Führen als...</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-Mailadresse</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation></translation>
+        <translation>unbestimmt</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Schrift</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Fax</source>
         <translation>Fax</translation>
     </message>
     <message>
         <source>Phone</source>
         <translation>Telefon</translation>
     </message>
     <message>
         <source>IM</source>
         <translation></translation>
     </message>
     <message>
         <source>Mobile</source>
         <translation>Handy</translation>
     </message>
     <message>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-Mailadresse</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>2. E-Mailadresse</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>2. Vorname</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Führen als...</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppen</translation>
     </message>
     <message>
         <source>Street</source>
         <translation>Strasse</translation>
     </message>
     <message>
         <source>Street 2</source>
-        <translation>2. Strasse</translation>
+        <translation>2. Straße</translation>
     </message>
     <message>
         <source>P.O. Box</source>
         <translation>Postfach</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Stadt</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Bundesland</translation>
     </message>
     <message>
         <source>Zip</source>
         <translation>Postleitzahl</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Vollständiger Name</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notizen...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Geschäft</translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Postleitzahl</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Vereinigte Staaten</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Vereingtes Königreich</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japan</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Frankreich</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Deutschland</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norwegen</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Männlich</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Weiblich</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Notiz eingeben</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Namen editieren</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakte</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/de/clock.ts b/i18n/de/clock.ts
index eee6707..6426063 100644
--- a/i18n/de/clock.ts
+++ b/i18n/de/clock.ts
@@ -1,73 +1,81 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm On</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Alarm Off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Alarm Is On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm Is Off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/datebook.ts b/i18n/de/datebook.ts
index 1a40e28..b8b78f2 100644
--- a/i18n/de/datebook.ts
+++ b/i18n/de/datebook.ts
@@ -1,199 +1,199 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Ansicht</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>7 Tage</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation>Alarm- und Startzeit...</translation>
     </message>
     <message>
         <source>Default View</source>
         <translation>Voreinstellung</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kann Daten zur Zeit nicht editieren, synchronisiere gerade</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Ereignis editieren</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>Minuten)</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>OL</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Kein Speicherplatz</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Kalender war nicht in der Lage,
 Ihre Änderungen zu speichern.
 Bitte machen Sie etwas Speicherplatz
 frei.
 Trozdem beenden?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Fehler!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>D</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished">Beginn</translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished">Ende</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
@@ -279,421 +279,423 @@ Trozdem beenden?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00 Jan-00 Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation>D</translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation>D</translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation>S</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation>S</translation>
     </message>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Wiederholung...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Täglich...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Wöchentlich...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Monatlich...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Jählich...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Keine Wiederholung...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Neues Ereignis</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Treffen</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Mittagessen</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reise</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>zu Hause</translation>
     </message>
     <message>
         <source>Start - End</source>
-        <translation type="unfinished"></translation>
+        <translation>Start - Ende</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="unfinished"></translation>
+        <translation>Startzeit</translation>
     </message>
     <message>
         <source>All day</source>
-        <translation type="unfinished"></translation>
+        <translation>Ganztägig</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zeitzone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Still</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Laut</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Wiederholung</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Keine Wiederholung...</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Ende</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
-        <translation type="unfinished"></translation>
+        <translation>Jeden</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
-        <translation type="unfinished">Tag</translation>
+        <translation>Tag</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Jahr(e)</translation>
     </message>
     <message>
         <source>days</source>
-        <translation type="unfinished"></translation>
+        <translation>Tage</translation>
     </message>
     <message>
         <source>day</source>
-        <translation type="unfinished"></translation>
+        <translation>Tag</translation>
     </message>
     <message>
         <source>weeks</source>
-        <translation type="unfinished"></translation>
+        <translation>Wochen</translation>
     </message>
     <message>
         <source>week</source>
-        <translation type="unfinished"></translation>
+        <translation>Woche</translation>
     </message>
     <message>
         <source>month</source>
-        <translation type="unfinished"></translation>
+        <translation>Monat</translation>
     </message>
     <message>
         <source>year</source>
-        <translation type="unfinished"></translation>
+        <translation>Jahr</translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation>und</translation>
     </message>
     <message>
         <source>,
 and </source>
-        <translation type="unfinished"></translation>
+        <translation>,
+und</translation>
     </message>
     <message>
         <source>, and </source>
-        <translation type="unfinished"></translation>
+        <translation>,
+und</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
-        <translation type="unfinished"></translation>
+        <translation>Zu wiederholendes Ereignis</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Day</source>
-        <translation type="unfinished">Tag</translation>
+        <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
-        <translation type="unfinished">Woche</translation>
+        <translation>Woche</translation>
     </message>
     <message>
         <source>Month</source>
-        <translation type="unfinished">Monat</translation>
+        <translation>Monat</translation>
     </message>
     <message>
         <source>Year</source>
-        <translation type="unfinished"></translation>
+        <translation>Jahr</translation>
     </message>
     <message>
         <source>Every:</source>
-        <translation type="unfinished"></translation>
+        <translation>Jeden</translation>
     </message>
     <message>
         <source>Frequency</source>
-        <translation type="unfinished"></translation>
+        <translation>Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
-        <translation type="unfinished"></translation>
+        <translation>Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
-        <translation type="unfinished"></translation>
+        <translation>Mo</translation>
     </message>
     <message>
         <source>Tue</source>
-        <translation type="unfinished"></translation>
+        <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
-        <translation type="unfinished"></translation>
+        <translation>Mi</translation>
     </message>
     <message>
         <source>Thu</source>
-        <translation type="unfinished"></translation>
+        <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
-        <translation type="unfinished"></translation>
+        <translation>Fr</translation>
     </message>
     <message>
         <source>Sat</source>
-        <translation type="unfinished"></translation>
+        <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
-        <translation type="unfinished"></translation>
+        <translation>So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libbatteryapplet.ts b/i18n/de/libbatteryapplet.ts
index 0f0c5ce..8ec69f5 100644
--- a/i18n/de/libbatteryapplet.ts
+++ b/i18n/de/libbatteryapplet.ts
@@ -1,61 +1,61 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Battery Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Batteriestatus</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Schließen</translation>
     </message>
     <message>
         <source>Charging</source>
-        <translation type="unfinished"></translation>
+        <translation>Batterie wird aufgeladen</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery status: </source>
-        <translation type="unfinished"></translation>
+        <translation>Batteriestatus:</translation>
     </message>
     <message>
         <source>Good</source>
-        <translation type="unfinished"></translation>
+        <translation>Gut</translation>
     </message>
     <message>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Niedrig</translation>
     </message>
     <message>
         <source>Very Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Sehr niedrig</translation>
     </message>
     <message>
         <source>Critical</source>
-        <translation type="unfinished"></translation>
+        <translation>Kritisch</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannt</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Externe Stromzufurh wurde entfernt</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbleibende Batterielaufzeit</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/light-and-power.ts b/i18n/de/light-and-power.ts
index 4ffa3f6..0b3f6ef 100644
--- a/i18n/de/light-and-power.ts
+++ b/i18n/de/light-and-power.ts
@@ -1,49 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light Settings</source>
         <translation>Helligkeitseinstellungen</translation>
     </message>
     <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation>Energie sparen</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Licht aus nach</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Licht dimmen nach</translation>
     </message>
     <message>
         <source>Suspend after</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ausschalten nach:</translation>
     </message>
     <message>
         <source>Bright</source>
         <translation>Hell</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation>&lt;blockquote&gt;Je heller der Bildschrim eingestellt ist, desto mehr Strom wird verbraucht.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Aus</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/today.ts b/i18n/de/today.ts
index 4a09bf4..a6fa001 100644
--- a/i18n/de/today.ts
+++ b/i18n/de/today.ts
@@ -1,103 +1,110 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
         <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
         <translation>&lt;b&gt;Bitte füllen Sie die Visitenkarte aus&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; neue Nachricht(en), &lt;b&gt;%2&lt;/b&gt; ausgehende</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Es gibt &lt;b&gt;1&lt;/b&gt; aktive Aufgabe:&lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Es gibt &lt;b&gt;%1&lt;/b&gt;aktive Aufgaben:&lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Keine aktiven Aufgaben</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Heute keine Termine mehr</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Heute keine Termine</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>Opiemail ist nicht installiert</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
-        <translation type="unfinished"></translation>
+        <translation>Heute - Einstellungen</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
-        <translation type="unfinished"></translation>
+        <translation>Soll der Ort
+angezeigt
+werden?</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
-        <translation type="unfinished"></translation>
+        <translation>Sollen die Notizen
+angezeigt werden?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur spätere Verabredungen
+anzeigen</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
-        <translation type="unfinished"></translation>
+        <translation>Kalender</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wieviele Aufgaben
+sollen angezeigt
+werden?</translation>
     </message>
     <message>
         <source>Tasks</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufgaben</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeilenumbruch nach
+wievielen Buchstaben?</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume ? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschiedenes</translation>
     </message>
 </context>
 </TS>