diff --git a/SoObjects/Appointments/German.lproj/Localizable.strings b/SoObjects/Appointments/German.lproj/Localizable.strings
index 8f146e4..007ae0b 100644
--- a/SoObjects/Appointments/German.lproj/Localizable.strings
+++ b/SoObjects/Appointments/German.lproj/Localizable.strings
@@ -8,47 +8,47 @@ vtodo_class1 = "(Private Aufgabe)";
 vtodo_class2 = "(Vertrauliche Aufgabe)";
 
 /* Receipts */
-"Title:" = "Title:";
+"Title:" = "Titel:";
 "Start:" = "Start:";
-"End:" = "End:";
+"End:" = "Ende:";
 
-"Receipt: users invited to a meeting" = "Receipt: users invited to a meeting";
-"You have invited the following attendees(s):" = "You have invited the following attendees(s):";
-"... to attend the following event:" = "... to attend the following event:";
+"Receipt: users invited to a meeting" = "Empfangsbestätigung: Benutzer zu einem Termin eingeladen";
+"You have invited the following attendees(s):" = "Sie haben folgende Teilnehmer eingeladen:";
+"... to attend the following event:" = "... um an folgendem Termin teilzunehmen:";
 
-"Receipt: invitation updated" = "Receipt: invitation updated";
-"The following attendees(s):" = "The following attendees(s):";
-"... have been notified of the changes to the following event:" = "... have been notified of the changes to the following event:";
+"Receipt: invitation updated" = "Empfangsbestätigung: Einladung aktualisiert";
+"The following attendees(s):" = "Die folgenden Teilnehmer:";
+"... have been notified of the changes to the following event:" = "... wurden über die Änderung des folgenden Termins informiert:";
 
-"Receipt: attendees removed from an event" = "Receipt: attendees removed from an event";
-"You have removed the following attendees(s):" = "You have removed the following attendees(s):";
-"... from the following event:" = "... from the following event:";
+"Receipt: attendees removed from an event" = "Empfangsbestätigung: Teilnehmer eines Termins entfernt";
+"You have removed the following attendees(s):" = "Sie haben folgende Teilnehmer entfernt:";
+"... from the following event:" = "... von folgendem Termin:";
 
 /* IMIP messages */
 "startDate_label" = "Start:";
-"endDate_label" = "End:";
-"due_label" = "Due Date:";
-"location_label" = "Location:";
-"summary_label" = "Summary:";
-"comment_label" = "Comment:";
+"endDate_label" = "Ende:";
+"due_label" = "Fällig:";
+"location_label" = "Ort:";
+"summary_label" = "Zusammenfassung:";
+"comment_label" = "Kommentar:";
 
 /* Invitation */
-"Event Invitation: \"%{Summary}\"" = "Event Invitation: \"%{Summary}\"";
-"(sent by %{SentBy}) " = "(sent by %{SentBy}) ";
-"%{Organizer} %{SentByText}has invited you to %{Summary}." = "%{Organizer} %{SentByText}has invited you to %{Summary}.";
+"Event Invitation: \"%{Summary}\"" = "Termin Einladung: \"%{Summary}\"";
+"(sent by %{SentBy}) " = "(gesendet von %{SentBy}) ";
+"%{Organizer} %{SentByText}has invited you to %{Summary}." = "%{Organizer} %{SentByText}hat Sie eingeladen zu %{Summary}.";
 
 /* Deletion */
-"Event Cancelled: \"%{Summary}\"" = "Event Cancelled: \"%{Summary}\"";
+"Event Cancelled: \"%{Summary}\"" = "Termin abgesagt: \"%{Summary}\"";
 "%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.";
+= "%{Organizer} %{SentByText}hat diesen Termin abgesagt: %{Summary}.";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
-= "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed";
+= "Der Termin \"%{Summary}\" für den %{OldStartDate} um %{OldStartTime} hat sich geändert";
 "The following parameters have changed in the \"%{Summary}\" meeting:"
-= "The following parameters have changed in the \"%{Summary}\" meeting:";
+= "Folgende Parameter haben sich im Termin \"%{Summary}\" geändert:";
 "Please accept or decline those changes."
-= "Please accept or decline those changes.";
+= "Bitte akzeptieren oder lehnen Sie diese Änderungen ab.";
 
 /* Reply */
 "Reply to invitation: \"%{Summary}\"" = "Antwort Termineinladung: %{Summary}";
@@ -57,6 +57,6 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
 "%{Attendee} %{SentByText}has declined your event invitation."
 = "%{Attendee} %{SentByText}hat Ihre Termineinladung abgelehnt.";
 "%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}."
-= "%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}.";
+= "%{Attendee} %{SentByText}hat die Einladung delegiert an %{Delegate}.";
 "%{Attendee} %{SentByText}has not yet decided upon your event invitation."
 = "%{Attendee} %{SentByText}hat noch nicht über Ihre Termineinladung entschieden.";
diff --git a/UI/Common/German.lproj/Localizable.strings b/UI/Common/German.lproj/Localizable.strings
index 64404b0..83de902 100644
--- a/UI/Common/German.lproj/Localizable.strings
+++ b/UI/Common/German.lproj/Localizable.strings
@@ -47,19 +47,19 @@
      	= "Sie haben diesen Ordner bereits abonniert!";
 "The user rights cannot be edited for this object!"
         = "Die Benutzerrechte können für dieses Objekt nicht verändert werden!";
-"A folder by that name already exists." = "A folder by that name already exists.";
+"A folder by that name already exists." = "Ein Ordner mit diesem Namen existiert bereits.";
 "You cannot create a list in a shared address book." 
-        = "You cannot create a list in a shared address book.";
+        = "Es ist nicht möglich, eine Liste in einem gemeinsamen Adressbuch zu erstellen.";
 
 "You are not allowed to access this module or this system. Please contact your system administrator."
-= "You are not allowed to access this module or this system. Please contact your system administrator.";
+= "Sie sind nicht berechtigt auf dieses Modul oder System zuzugreifen. Bitte kontaktieren Sie ihren Systemadministrator.";
 "You don't have the required privileges to perform the operation."
 = "Sie haben nicht die benötigte Berechtigung für diesen Befehl.";
 
-"noEmailForDelegation" = "You must specify the address to which you want to delegate your invitation.";
-"delegate is organizer" = "The delegate is the organizer. Please specify a different delegate.";
-"delegate is a participant" = "The delegate is already a participant.";
-"delegate is a group" = "The specified address corresponds to a group. You can only delegate to a unique person.";
+"noEmailForDelegation" = "Zum Delegieren der Einladung muss eine Adresse angegeben werden.";
+"delegate is organizer" = "Der Vertreter ist der Organisator. Bitte einen anderen Vertreter angeben.";
+"delegate is a participant" = "Der Vertreter ist bereits ein Teilnehmer.";
+"delegate is a group" = "Die angegebene Adresse gehört einer Gruppe. Es kann nur zu einer einzelnen Person delegiert werden.";
 
 /* alarms */
 "Reminder:" = "Alarm:";
diff --git a/UI/Contacts/German.lproj/Localizable.strings b/UI/Contacts/German.lproj/Localizable.strings
index b51e855..c196da2 100644
--- a/UI/Contacts/German.lproj/Localizable.strings
+++ b/UI/Contacts/German.lproj/Localizable.strings
@@ -95,7 +95,7 @@
 
 "Title:" = "Titel:";
 "Service:" = "Service:";
-"Company:" = "Company:";
+"Company:" = "Firma:";
 "Department:" = "Abteilung:";
 "Organization:" = "Organisation:";
 "Address:" = "Adresse:";
@@ -170,21 +170,22 @@
 "Unknown Destination Folder" = "Das gewählte Ziel-Adressbuch existiert nicht mehr.";
 
 /* Lists */
-"List details" = "List details";
-"List name:" = "List name:";
-"List nickname:" = "List nickname:";
-"List description:" = "List description:";
-"Members" = "Members";
-"Contacts" = "Contacts";
-"Add" = "Add";
-"Lists can't be moved or copied." = "Lists can't be moved or copied.";
+"List details" = "Details";
+"List name:" = "Listenname:";
+"List nickname:" = "Listen-Spitzname:";
+"List description:" = "Beschreibung:";
+"Members" = "Mitglieder";
+"Contacts" = "Kontakte";
+"Add" = "Hinzufügen";
+"Lists can't be moved or copied." = "Listen können nicht verschoben oder kopiert werden.";
 "Export" = "Export";
-"Import Cards" = "Import Cards";
-"Select a vCard or LDIF file." = "Select a vCard or LDIF file.";
-"Upload" = "Upload";
-"Done" = "Done";
-"An error occured while importing contacts." = "An error occured while importing contacts.";
-"No card was imported." = "No card was imported.";
-"A total of %{0} cards were imported in the addressbook." = "A total of %{0} cards were imported in the addressbook.";
-
-"Reload" = "Reload";
+"Import Cards" = "Karten importieren";
+"Select LDIF or vCard file..." = "LDIF oder vCard Datei wählen...";
+"Upload" = "Hochladen";
+"Done" = "Abgeschlossen"
+"An error occured while importing contacts." = "Fehler während des Importierens von Kontakten.";
+"No card was imported." = "Es wurden keine Kontakte importiert.";
+"A total of %{0} cards were imported in the addressbook." = "%{0} Kontakte wurden in das Adressbuch importiert.";
+
+"Reload" = "Neu laden";
+
diff --git a/UI/MailPartViewers/German.lproj/Localizable.strings b/UI/MailPartViewers/German.lproj/Localizable.strings
index bb63920..0857124 100644
--- a/UI/MailPartViewers/German.lproj/Localizable.strings
+++ b/UI/MailPartViewers/German.lproj/Localizable.strings
@@ -10,13 +10,13 @@ you_are_an_attendee = "Sie sind ein Teilnehmer";
 add_info_text = "iMIP 'ADD' Anfragen werden von SOGo noch nicht unterstützt.";
 publish_info_text = "Der Sender informiert Sie über den angefügten Termin.";
 cancel_info_text = "Ihre Einladung zu dem Termin wurde abgesagt.";
-request_info_no_attendee = "schlägt den Teilnehmern ein Treffen vor. Sie sind kein vorgeseher Teilnehmer und erhalten diese Nachricht lediglich als Ankündigung";
+request_info_no_attendee = "schlägt den Teilnehmern einen Termin vor. Sie sind kein vorgesehener Teilnehmer und erhalten diese Nachricht lediglich als Ankündigung";
 Appointment = "Termin";
 
 Organizer = "Organisator";
 Time = "Zeit";
 Attendees = "Teilnehmer";
-request_info = "lädt sie ein, an einem Treffen teilzunehmen.";
+request_info = "lädt sie ein, an einem Termin teilzunehmen.";
 "Add to calendar" = "Zum Kalender hinzufügen";
 "Delete from calendar" = "Aus Kalender entfernen";
 "Update status" = "Status aktualisieren";
@@ -28,7 +28,7 @@ Tentative = "Vorläufig";
 "Update status in calendar" = "Kalender Status aktualisieren";
 
 reply_info_no_attendee = "Sie haben eine Antwort auf einen Termin von einem Nicht-Teilnehmer erhalten.";
-reply_info = "Dies ist eine Anwort auf eine Einladung von Ihnen";
+reply_info = "Dies ist eine Anwort auf eine Einladung von Ihnen.";
 
 "to" = "für";
 
@@ -36,10 +36,11 @@ reply_info = "Dies ist eine Anwort auf eine Einladung von Ihnen";
 
 "Size" = "Größe";
 
-"Digital signature is not valid" = "Digital signature is not valid";
-"Message is signed" = "Message is signed";
+"Digital signature is not valid" = "Digitale Signatur ist nicht gültig";
+"Message is signed" = "Nachricht ist signiert";
 "Subject" = "Subject";
-"From" = "From";
-"Date" = "Date";
-"To" = "To";
-"Issuer" = "Issuer";
+"From" = "Von";
+"Date" = "Datum";
+"To" = "An";
+"Issuer" = "Aussteller";
+
diff --git a/UI/MailerUI/German.lproj/Localizable.strings b/UI/MailerUI/German.lproj/Localizable.strings
index 7406ab7..3ea2339 100644
--- a/UI/MailerUI/German.lproj/Localizable.strings
+++ b/UI/MailerUI/German.lproj/Localizable.strings
@@ -19,7 +19,7 @@
 "Attach" = "Anhang";
 "Save" = "Speichern";
 "Priority" = "Priorität";
-"Size" = "Size";
+"Size" = "Größe";
 
 /* Tooltips */
 
@@ -76,7 +76,7 @@
 "Remove this folder" = "Diesen Ordner löschen";
 "Erase mails from this folder" = "E-Mails in diesem Ordner löschen";
 "Expunge this folder" = "Diesen Ordner komprimieren";
-"Archive This Folder" = "Archive This Folder";
+"Archive This Folder" = "Diesen Ordner archivieren";
 "Modify the acl of this folder" = "Benutzerrechte dieses Ordners verändern";
 
 "Saved Messages.zip" = "Saved Messages.zip";
@@ -95,10 +95,10 @@
 "Add address"   = "Adresse hinzufügen";
 
 "Attachments:" = "Anhänge:";
-"Open" = "Open";
-"Select All" = "Select All";
-"Attach Web Page..." = "Attach Web Page...";
-"Attach File(s)..." = "Attach File(s)...";
+"Open" = "Öffnen";
+"Select All" = "Alles auswählen";
+"Attach Web Page..." = "Webseite anhängen...";
+"Attach File(s)..." = "Datei(en) als Anhang anfügen";
 
 "to"            = "An";
 "cc"            = "CC";
@@ -107,7 +107,7 @@
 "Addressbook"   = "Adressbuch";
 
 "Edit Draft..." = "Entwurf bearbeiten...";
-"Load Images" = "Load Images";
+"Load Images" = "Bilder laden";
 
 "highest" = "Sehr hoch";
 "high" = "Hoch";
@@ -133,7 +133,7 @@
 "Entire Message" = "Nachrichtentext";
 
 "Date"          = "Datum";
-"View"          = "View";
+"View"          = "Ansicht";
 "All"           = "Alle";
 "Unread"        = "Ungelesene";
 "messages"      = "Nachricht(en)";
@@ -171,7 +171,7 @@
 
 /* Image Popup menu */
 "Save Image" = "Bild speichern";
-"Save Attachment" = "Save Attachment";
+"Save Attachment" = "Anhang speichern";
 
 /* Mailbox popup menus */
 "Open in New Mail Window" = "In neuem Fenster öffnen";
@@ -244,7 +244,7 @@
 "Please select a message." = "Sie müssen eine Nachricht auswählen.";
 "Please select a message to print." = "Sie müssen eine Nachricht zum Drucken auswählen.";
 "Please select only one message to print." = "Bitte wählen Sie nur eine Nachricht zum Drucken aus.";
-"The message you have selected doesn't exist anymore." = "The message you have selected doesn't exist anymore.";
+"The message you have selected doesn't exist anymore." = "Die gewählte Nachricht existiert nicht mehr.";
 
 
 "The folder with name \"%{0}\" could not be created."
diff --git a/UI/MainUI/German.lproj/Localizable.strings b/UI/MainUI/German.lproj/Localizable.strings
index 4f58439..3d96dd3 100644
--- a/UI/MainUI/German.lproj/Localizable.strings
+++ b/UI/MainUI/German.lproj/Localizable.strings
@@ -39,32 +39,32 @@ This software are distributed under the <a href=\"http://gnu.org/licenses/gpl.ht
 Parts of this software are distributed under the GNU LGPL version 2.<br/><br/>
 This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law.";
 
-"Your account was locked due to too many failed attempts." = "Your account was locked due to too many failed attempts.";
-"Your account was locked due to an expired password." = "Your account was locked due to an expired password.";
-"Login failed due to unhandled error case: " = "Login failed due to unhandled error case: ";
-"Change your Password" = "Change your Password";
-"Your password has expired, please enter a new one below:" = "Your password has expired, please enter a new one below:";
-"Password must not be empty." = "Password must not be empty.";
-"The passwords do not match. Please try again." = "The passwords do not match. Please try again.";
-"Password Grace Period" = "Password Grace Period";
-"You have %{0} logins remaining before your account is locked. Please change your password in the preference dialog." = "You have %{0} logins remaining before your account is locked. Please change your password in the preference dialog.";
-"Password about to expire" = "Password about to expire";
-"Your password is going to expire in %{0} %{1}." = "Your password is going to expire in %{0} %{1}.";
-"days" = "days";
-"hours" = "hours";
-"minutes" = "minutes";
-"seconds" = "seconds";
-"Password change failed" = "Password change failed";
-"Password change failed - Permission denied" = "Password change failed - Permission denied";
-"Password change failed - Insufficient password quality" = "Password change failed - Insufficient password quality";
-"Password change failed - Password is too short" = "Password change failed - Password is too short";
-"Password change failed - Password is too young" = "Password change failed - Password is too young";
-"Password change failed - Password is in history" = "Password change failed - Password is in history";
-"Unhandled policy error: %{0}" = "Unhandled policy error: %{0}";
-"Unhandled error response" = "Unhandled error response";
-"Password change is not supported." = "Password change is not supported.";
-"Unhandled HTTP error code: %{0}" = "Unhandled HTTP error code: %{0}";
-"New password:" = "New password:";
-"Confirmation:" = "Confirmation:";
-"Cancel" = "Cancel";
-"Please wait..." = "Please wait...";
\ No newline at end of file
+"Your account was locked due to too many failed attempts." = "Ihr Account wurde wegen zu vieler fehlgeschlagener Versuche gesperrt.";
+"Your account was locked due to an expired password." = "Ihr Account wurde wegen eines abgelaufenen Passworts gesperrt.";
+"Login failed due to unhandled error case: " = "Login aufgrund eines unbehandelten Fehlers fehlgeschlagen: ";
+"Change your Password" = "Password ändern";
+"Your password has expired, please enter a new one below:" = "Ihr Passwort ist abgelaufen, bitte geben Sie ein neues an:";
+"Password must not be empty." = "Passwort darf nicht leer sein.";
+"The passwords do not match. Please try again." = "Die Passwörter stimmen nicht überein. Bitte nochmal eingeben.";
+"Password Grace Period" = "Passwort Schonfrist";
+"You have %{0} logins remaining before your account is locked. Please change your password in the preference dialog." = "Sie haben %{0} Logins übrig, bevor Ihr Account gesperrt wird. Bitte ändern Sie das Passwort im Einstellungsdialog.";
+"Password about to expire" = "Passwort läuft bald ab";
+"Your password is going to expire in %{0} %{1}." = "Ihr Passwort läuft ab in %{0} %{1}.";
+"days" = "Tagen";
+"hours" = "Stunden";
+"minutes" = "Minuten";
+"seconds" = "Sekunden";
+"Password change failed" = "Passwortänderung fehlgeschlagen";
+"Password change failed - Permission denied" = "Passwortänderung fehlgeschlagen - Zugriff verweigert";
+"Password change failed - Insufficient password quality" = "Passwortänderung fehlgeschlagen - Passwortqualität nicht ausreichend";
+"Password change failed - Password is too short" = "Passwortänderung fehlgeschlagen - Passwort ist zu kurz";
+"Password change failed - Password is too young" = "Passwortänderung fehlgeschlagen - Passwort ist zu jung";
+"Password change failed - Password is in history" = "Passwortänderung fehlgeschlagen - Passwort bereits früher verwendet";
+"Unhandled policy error: %{0}" = "Unbehandelter Richtlinienfehler: %{0}";
+"Unhandled error response" = "Unbehandelter Fehlerantwort";
+"Password change is not supported." = "Passwortänderung wird nicht unterstützt.";
+"Unhandled HTTP error code: %{0}" = "Unbehandelter HTTP Fehlercode: %{0}";
+"New password:" = "Neues Passwort:";
+"Confirmation:" = "Bestätigung:";
+"Cancel" = "Abbrechen";
+"Please wait..." = "Bitte warten...";
diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings
index 0fa0cc5..cb5b7ab 100644
--- a/UI/PreferencesUI/German.lproj/Localizable.strings
+++ b/UI/PreferencesUI/German.lproj/Localizable.strings
@@ -11,28 +11,28 @@
 "Forward" = "Forward";
 "Identities" = "Identität";
 "Password" = "Passwort";
-"Categories" = "Categories";
+"Categories" = "Kategorien";
 "Name" = "Name";
-"Color" = "Color";
-"Add" = "Add";
-"Delete" = "Delete";
+"Color" = "Farbe";
+"Add" = "Hinzufügen";
+"Delete" = "Löschen";
 
 /* vacation (auto-reply) */
-"Enable vacation auto reply" = "Enable vacation auto reply";
+"Enable vacation auto reply" = "Automatische Abwesenheitsantwort aktivieren";
 "Auto reply message :" = "Folgende Antwort wird automatisch einmal an jeden Absender gesendet:";
-"Email addresses (separated by commas) :" = "Email addresses (separated by commas) :";
-"Add default email addresses" = "Add default email addresses";
-"Days between responses :" = "Days between responses :";
-"Do not send responses to mailing lists" = "Do not send responses to mailing lists";
+"Email addresses (separated by commas) :" = "E-Mailadressen (getrennt per Komma) :";
+"Add default email addresses" = "Standardadresse hinzufügen";
+"Days between responses :" = "Tage zwischen Antworten :";
+"Do not send responses to mailing lists" = "Keine Antworten an Mailinglisten senden";
 "Please specify your message and your email addresses for which you want to enable auto reply."
-= "Please specify your message and your email addresses for which you want to enable auto reply.";
+= "Bitte ihren Nachrichtentext und ihre E-Mailadressen angeben, für die Automatische Antwort aktiviert werden soll .";
 
 /* forward messages */
-"Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
-"Keep a copy" = "Keep a copy";
+"Forward incoming messages" = "Ankommende Nachrichten weiterleiten";
+"Forward to address :" = "Weiterleiten an :";
+"Keep a copy" = "Kopie behalten";
 "Please specify an address to which you want to forward your messages."
-= "Please specify an address to which you want to forward your messages.";
+= "Bitte Adresse angeben, an die Nachrichten weitergeleitet werden sollen.";
 
 /* d & t */
 "Current Time Zone :" = "Aktuelle Zeitzone:";
@@ -79,7 +79,7 @@
 "Week begins on :" = "Erster Wochentag:";
 "Day start time :" = "Tagesanfang:";
 "Day end time :" = "Tagesende:";
-"Day start time must be prior to day end time." = "Day start time must be prior to day end time.";
+"Day start time must be prior to day end time." = "Der Tagesanfang muss vor dem Tagesende liegen.";
 "First week of year :" = "Erste Woche des Jahres:";
 "Enable reminders for Calendar items" = "Terminerinnerung aktivieren";
 "Play a sound when a reminder comes due"
@@ -127,11 +127,11 @@
 "And place my signature" = "Und setze meine Signatur";
 "signatureplacement_above" = "Signatur oberhalb";
 "signatureplacement_below" = "Signatur unterhalb";
-"Compose messages in" = "Compose messages in";
+"Compose messages in" = "Nachrichten verfassen in";
 "composemessagestype_html" = "HTML";
-"composemessagestype_text" = "Plain text";
+"composemessagestype_text" = "Reintext";
 
-"composeMessageChanged" = "Changing your messages composition type requires to save your preferences immediately. Continue?";
+"composeMessageChanged" = "Das Ändern des Typs erfordert das sofortige Speichern der Einstellungen. Fortfahren?";
 
 /* Additional Parameters */
 "Additional Parameters" = "Zusätzliche Einstellungen";
@@ -146,11 +146,11 @@
 "category_labels" = "Jubiläum,Geburtstag,Geschäft,Anrufe,Klienten,Konkurrenz,Kunde,Favoriten,Nachgehen,Geschenke,Ferien,Ideen,Meeting,Fragen,Verschiedenes,Persönlich,Projekte,Feiertag,Status,Lieferanten,Reise,Urlaub";
 
 /* Default module */
-"Calendar" = "Calendar";
-"Contacts" = "Address Book";
+"Calendar" = "Kalender";
+"Contacts" = "Adressbuch";
 "Mail" = "Mail";
-"Last" = "Last used";
-"Default module :" = "Default module :";
+"Last" = "Zuletzt benutztes";
+"Default module :" = "Vorgegebenes Modul:"; 
 
 "Language :" = "Sprache :";
 "choose" = "Auswählen";
@@ -168,52 +168,52 @@
 "Welsh" = "Cymraeg";
 
 /* Filters - UIxPreferences */
-"Filters" = "Filters";
-"Active" = "Active";
-"Move Up" = "Move Up";
-"Move Down" = "Move Down";
+"Filters" = "Filter";
+"Active" = "Aktiv";
+"Move Up" = "Nach oben";
+"Move Down" = "Nach unten";
 
 /* Filters - UIxFilterEditor */
-"Filter name:" = "Filter name:";
-"For incoming messages that" = "For incoming messages that";
-"match all of the following rules:" = "match all of the following rules:";
-"match any of the following rules:" = "match any of the following rules:";
-"match all messages" = "match all messages";
-"Perform these actions:" = "Perform these actions:";
-
-"Subject" = "Subject";
-"From" = "From";
-"To" = "To";
+"Filter name:" = "Filtername:";
+"For incoming messages that" = "Für eingehende Nachrichten die";
+"match all of the following rules:" = "mit allen der folgenden Regeln übereinstimmen:";
+"match any of the following rules:" = "mit einer der folgenden Regeln übereinstimmen:";
+"match all messages" = "mit allen Nachrichten übereinstimmen";
+"Perform these actions:" = "Führe folgende Aktionen aus:";
+
+"Subject" = "Betreff";
+"From" = "Von";
+"To" = "An";
 "Cc" = "Cc";
-"To or Cc" = "To or Cc";
-"Size (Kb)" = "Size (Kb)";
+"To or Cc" = "An oder Cc";
+"Size (Kb)" = "Größe (Kb)";
 "Header" = "Header";
-"Flag the message with:" = "Flag the message with:";
-"Discard the message" = "Discard the message";
-"File the message in:" = "File the message in:";
-"Keep the message" = "Keep the message";
-"Forward the message to:" = "Forward the message to:";
-"Send a reject message:" = "Send a reject message:";
-"Send a vacation message" = "Send a vacation message";
-"Stop processing filter rules" = "Stop processing filter rules";
-
-"is under" = "is under";
-"is over" = "is over";
-"is" = "is";
-"is not" = "is not";
-"contains" = "contains";
-"does not contain" = "does not contain";
-"matches" = "matches";
-"does not match" = "does not match";
+"Flag the message with:" = "Markiere die Nachricht als:";
+"Discard the message" = "Verwerfe die Nachricht";
+"File the message in:" = "Verschiebe die Nachricht in:";
+"Keep the message" = "Behalte die Nachricht";
+"Forward the message to:" = "Weiterleiten der Nachricht an:";
+"Send a reject message:" = "Sende eine Ablehnungsnachricht:";
+"Send a vacation message" = "Sende eine Abwesenheitsnachricht";
+"Stop processing filter rules" = "Beende die Filterverarbeitung";
+
+"is under" = "ist kleiner";
+"is over" = "ist größer";
+"is" = "ist";
+"is not" = "ist nicht";
+"contains" = "enthält";
+"does not contain" = "enthält nicht";
+"matches" = "ist gleich";
+"does not match" = "ist nicht gleich";
 "matches regex" = "matches regex";
 "does not match regex" = "does not match regex";
 
-"Seen" = "Seen";
-"Deleted" = "Deleted";
-"Answered" = "Answered";
-"Flagged" = "Flagged";
+"Seen" = "Gelesen";
+"Deleted" = "Gelöscht";
+"Answered" = "Beantwortet";
+"Flagged" = "Markiert";
 "Junk" = "Junk";
-"Not Junk" = "Not Junk";
+"Not Junk" = "Kein Junk";
 "Label 1" = "Label 1";
 "Label 2" = "Label 2";
 "Label 3" = "Label 3";
diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings
index 13a76eb..44a9821 100644
--- a/UI/Scheduler/German.lproj/Localizable.strings
+++ b/UI/Scheduler/German.lproj/Localizable.strings
@@ -10,7 +10,7 @@
 "Switch to day view" = "Zur Tagesansicht wechseln";
 "Switch to week view" = "Zur Wochenansicht wechseln";
 "Switch to month view" = "Zur wehrwöchigen Ansicht wechseln";
-"Reload all calendars" = "Reload all calendars";
+"Reload all calendars" = "Alle Kalender neu laden";
 
 /* Tabs */
 "Date" = "Datum";
@@ -25,7 +25,7 @@
 "Thursday" = "Donnerstag";
 "Friday" = "Freitag";
 "Saturday" = "Samstag";
-"DayOfTheMonth" = "DayOfTheMonth";
+"DayOfTheMonth" = "Monatstag";
 
 "Sun" = "So";
 "Mon" = "Mo";
@@ -46,8 +46,8 @@
 "dayLabelFormat" = "%d/%m/%Y";
 "today" = "Heute";
 
-"Previous Day" = "Previous Day";
-"Next Day" = "Next Day";
+"Previous Day" = "Vorheriger Tag";
+"Next Day" = "Nächster Tag";
 
 /* Week */
 
@@ -56,8 +56,8 @@
 
 "Week %d" = "Woche %d";
 
-"Previous Week" = "Previous Week";
-"Next Week" = "Next Week";
+"Previous Week" = "Vorherige Woche";
+"Next Week" = "Nächste Woche";
 
 /* Month */
 
@@ -89,8 +89,8 @@
 "a3_November" = "Nov";
 "a3_December" = "Dez";
 
-"Previous Month" = "Previous Month";
-"Next Month" = "Next Month";
+"Previous Month" = "Vorheriger Monat";
+"Next Month" = "Nächster Monat";
 
 /* Year */
 
@@ -103,20 +103,20 @@
 
 "New Calendar..." = "Neuer Kalender...";
 "Delete Calendar" = "Kalender löschen";
-"Unsubscribe Calendar" = "Unsubscribe Calendar";
+"Unsubscribe Calendar" = "Kalender abbestellen";
 "Sharing..." = "Benutzerrechte...";
 "Export Calendar..." = "Kalender exportieren...";
-"Import Events..." = "Import Events...";
-"Import Events" = "Import Events";
-"Select an iCalendar file (.ics)." = "Select an iCalendar file (.ics).";
-"Upload" = "Upload";
+"Import Events..." = "Termine importieren...";
+"Import Events" = "Termine importieren";
+"Select iCalendar file (*.ics)..." = "iCalendar Datei (*.ics) wählen...";
+"Upload" = "Hochladen";
 "Publish Calendar..." = "Kalender publizieren...";
 "Reload Remote Calendars" = "Externe Kalender neu laden";
 "Properties" = "Einstellungen";
 "Done" = "Done";
-"An error occured while importing calendar." = "An error occured while importing calendar.";
-"No event was imported." = "No event was imported.";
-"A total of %{0} events were imported in the calendar." = "A total of %{0} events were imported in the calendar.";
+"An error occured while importing calendar." = "Fehler während des Importierens von Terminen.";
+"No event was imported." = "Es wurden keine Termine importiert.";
+"A total of %{0} events were imported in the calendar." = "%{0} Termine wurden in den Kalender importiert.";
 
 "Compose E-Mail to All Attendees" = "E-Mail an alle Teilnehmer erstellen";
 "Compose E-Mail to Undecided Attendees" = "E-Mail an unentschlossene Teilnehmer erstellen";
@@ -171,7 +171,7 @@
 "Save and Close" = "Speichern und schließen";
 "Close" = "Schließen";
 "Invite Attendees" = "Teilnehmer einladen";
-"Attach" = "Attach";
+"Attach" = "Anhang";
 "Update" = "Speichern";
 "Cancel" = "Abbrechen";
 "show_rejected_apts" = "Abgelehnte Termine anzeigen";
@@ -223,11 +223,11 @@
 "Document:" = "Dokument:";
 "Category:" = "Kategorie:";
 "Repeat:" = "Wiederholen:";
-"Reminder:" = "Alarm:";
-"General:" = "General:";
-"Reply:" = "Reply:";
+"Reminder:" = "Erinnerung:";
+"General:" = "Generell:";
+"Reply:" = "Antwort:";
 
-"Target:" = "Destination :";
+"Target:" = "Ziel:";
 
 "attributes" = "Attribute";
 "attendees" = "Teilnehmer";
@@ -348,23 +348,23 @@
 "Every" = "Jeden";
 "Days" = "Tage";
 "Week(s)" = "Woche(n)";
-"On" = "An";
+"On" = "Am";
 "Month(s)" = "Monat(e)";
-"The" = "Der";
+"The" = "Am";
 "Recur on day(s)" = "Wiederholung an Tag(en) ";
 "Year(s)" = "Jahr(e)";
-"cycle_of" = "of";
+"cycle_of" = "im";
 "No end date" = "Kein Enddatum";
 "Create" = "Erstelle";
-"appointment(s)" = "Verabredung(en)";
+"appointment(s)" = "Termin(e)";
 "Repeat until" = "Wiederhole bis";
 
-"First" = "Erste";
-"Second" = "Zweite";
-"Third" = "Dritte";
-"Fourth" = "Vierte";
-"Fift" = "Fünfte";
-"Last" = "Letzter";
+"First" = "ersten";
+"Second" = "zweiten";
+"Third" = "dritten";
+"Fourth" = "vierten";
+"Fift" = "fünften";
+"Last" = "letzten";
 
 /* Appointment categories */
 
@@ -438,7 +438,7 @@ validate_endbeforestart    = "Ihr Beginn ist nach dem Ende";
 "Day View" = "Tagesansicht";
 "Week View" = "Wochenansicht";
 "Month View" = "Monatsansicht";
-"Reload" = "Reload";
+"Reload" = "Neu laden";
 
 "eventPartStatModificationError" = "Ihre Teilnahme an dem Termin kann nicht geändert werden.";
 
@@ -481,7 +481,7 @@ validate_endbeforestart    = "Ihr Beginn ist nach dem Ende";
 "Next slot" = "Nächster";
 "Previous hour" = "Vorherige Stunde";
 "Next hour" = "Nächste Stunde";
-"Only office hours" = "Only office hours";
+"Only office hours" = "Nur Arbeitszeit";
 
 /* apt list */
 "Title" = "Titel";
@@ -511,33 +511,34 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
 "Name:" = "Name:";
 "Color:" = "Farbe:";
 
-"Synchronization" = "Synchronization";
-"Synchronize" = "Synchronize";
+"Synchronization" = "Synchronisation";
+"Synchronize" = "Synchronisieren";
 "Tag:" = "Tag:";
 
-"Display" = "Display";
-"Show alarms" = "Show alarms";
-"Show tasks" = "Show tasks";
+"Display" = "Anzeige";
+"Show alarms" = "Zeige Erinnerungen";
+"Show tasks" = "Zeige Aufgaben";
 
 /* Error messages */
-"dayFieldInvalid" = "Please specify a numerical value in the Days field greater or equal to 1.";
-"weekFieldInvalid" = "Please specify a numerical value in the Week(s) field greater or equal to 1.";
-"monthFieldInvalid" = "Please specify a numerical value in the Month(s) field greater or equal to 1.";
-"monthDayFieldInvalid" = "Please specify a numerical value in the month day field greater or equal to 1.";
-"yearFieldInvalid" = "Please specify a numerical value in the Year(s) field greater or equal to 1.";
-"appointmentFieldInvalid" = "Please specify a numerical value in the Appointment(s) field  greater or equal to 1.";
-"recurrenceUnsupported" = "This type of recurrence is currently unsupported.";
-"tagNotDefined" = "You must specify a tag if you want to synchronize this calendar.";
-"tagAlreadyExists" = "The tag you specified is already associated to another calendar.";
-"tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?";
-"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?";
-"tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?";
-
-"Open Task..." = "Open Task...";
-"Mark Completed" = "Mark Completed";
-"Delete Task" = "Delete Task";
-"Delete Event" = "Delete Event";
-
-"Subscribe to a web calendar..." = "Subscribe to a web calendar...";
-"URL of the Calendar" = "URL of the Calendar";
-"Web Calendar" = "Web Calendar";
+"dayFieldInvalid" = "Im Feld Tage ist ein numerischer Wert größer oder gleich 1 erforderlich.";
+"weekFieldInvalid" = "Im Feld Woche(n) ist ein numerischer Wert größer oder gleich 1 erforderlich.";
+"monthFieldInvalid" = "Im Feld Monat(e) ist ein numerischer Wert größer oder gleich 1 erforderlich.";
+"monthDayFieldInvalid" = "Im Feld Monatstag ist ein numerischer Wert größer oder gleich 1 erforderlich.";
+"yearFieldInvalid" = "Im Feld Jahr(e) ist ein numerischer Wert größer oder gleich 1 erforderlich.";
+"appointmentFieldInvalid" = "Im Feld Termin(e) ist ein numerischer Wert größer oder gleich 1 erforderlich.";
+"recurrenceUnsupported" = "Diese Art von Wiederholung wird derzeit nicht unterstützt.";
+"tagNotDefined" = "Zum Synchronisieren des Kalenders muss ein Tag angegeben werden.";
+"tagAlreadyExists" = "Das angegebene Tag ist bereits für einen anderen Kalender vergeben.";
+"tagHasChanged" = "Wenn der Tag des Kalenders geändert wird, müssen die Daten erneut auf das Mobilgerät geladen werden.\nFortfahren?";
+"tagWasAdded" = "Wenn der Kalender synchronisiert werden soll, müssen die Daten erneut auf das Mobilgerät geladen werden.\nFortfahren?";
+"tagWasRemoved" = "Wenn der Kalender aus der Synchronisation entfernt wird, müssen die Daten erneut auf das Mobilgerät geladen werden.\nFortfahren?";
+
+"Open Task..." = "Aufgabe öffnen...";
+"Mark Completed" = "Als abgeschlossen markieren";
+"Delete Task" = "Aufgabe löschen";
+"Delete Event" = "Termin löschen";
+
+"Subscribe to a web calendar..." = "Einen Web-Kalender abonnieren...";
+"URL of the Calendar" = "URL des Kalenders";
+"Web Calendar" = "Web-Kalender";
+