diff --git a/fittrackee_client/src/locales/de/about.json b/fittrackee_client/src/locales/de/about.json
index 5103c517..d5c76a42 100644
--- a/fittrackee_client/src/locales/de/about.json
+++ b/fittrackee_client/src/locales/de/about.json
@@ -1,6 +1,6 @@
 {
-  "CONTACT_ADMIN": "Contact the administrator",
-  "FITTRACKEE_DESCRIPTION": "<strong>FitTrackee</strong> is a self-hosted outdoor activity tracker.",
-  "FITTRACKEE_LICENSE": "under {0} license ",
-  "SOURCE_CODE": "Source code"
-}
\ No newline at end of file
+  "CONTACT_ADMIN": "Kontaktiere den Administrator",
+  "FITTRACKEE_DESCRIPTION": "<strong>FitTrackee</strong> ist ein selbst-gehosteter Outdoor-Aktivitäts-Tracker.",
+  "FITTRACKEE_LICENSE": "unter {0} Lizenz",
+  "SOURCE_CODE": "Quellkode"
+}
diff --git a/fittrackee_client/src/locales/de/administration.json b/fittrackee_client/src/locales/de/administration.json
index f768d123..b2decee6 100644
--- a/fittrackee_client/src/locales/de/administration.json
+++ b/fittrackee_client/src/locales/de/administration.json
@@ -1,58 +1,58 @@
 {
-  "ACTION": "Action",
-  "ACTIVATE_USER_ACCOUNT": "Activate account",
-  "ACTIVE": "Active",
-  "ADMIN_RIGHTS_DELETE_USER_ACCOUNT": "Add/remove admin rights, delete user account.",
+  "ACTION": "Aktion",
+  "ACTIVATE_USER_ACCOUNT": "Aktiviere Konto",
+  "ACTIVE": "Aktiv",
+  "ADMIN_RIGHTS_DELETE_USER_ACCOUNT": "Hinzufügen/Entfernen von Administratorrechten, Lösche Nutzerkonto.",
   "ADMIN": "Admin",
   "ADMINISTRATION": "Administration",
-  "APPLICATION": "Application",
+  "APPLICATION": "Anwendung",
   "APP_CONFIG": {
-    "ADMIN_CONTACT": "Administrator email for contact",
-    "MAX_USERS_LABEL": "Max. number of active users",
-    "MAX_USERS_HELP": "If 0, no limitation on registration.",
-    "MAX_FILES_IN_ZIP_LABEL": "Max. files of zip archive",
-    "NO_CONTACT_EMAIL": "no contact email",
-    "SINGLE_UPLOAD_MAX_SIZE_LABEL": "Max. size of uploaded files (in Mb)",
-    "TITLE": "Application configuration",
-    "ZIP_UPLOAD_MAX_SIZE_LABEL": "Max. size of zip archive (in Mb)"
+    "ADMIN_CONTACT": "Kontakt-E-Mail des Administrators",
+    "MAX_USERS_LABEL": "Max. Anzahl aktiver Nutzer",
+    "MAX_USERS_HELP": "Wenn 0, gibt es keine Registrierungslimitierung..",
+    "MAX_FILES_IN_ZIP_LABEL": "Max. Dateianzahl im zip Archiv",
+    "NO_CONTACT_EMAIL": "keine Kontakt-E-Mail",
+    "SINGLE_UPLOAD_MAX_SIZE_LABEL": "Max. Größe der hochgeladenen Dateien (in Mb)",
+    "TITLE": "Anwendungskonfiguration",
+    "ZIP_UPLOAD_MAX_SIZE_LABEL": "Max. Größe des zip Archives (in Mb)"
   },
-  "BACK_TO_ADMIN": "Back to admin",
-  "CONFIRM_USER_ACCOUNT_DELETION": "Are you sure you want to delete {0} account? All data will be deleted, this cannot be undone.",
-  "CONFIRM_USER_PASSWORD_RESET": "Are you sure you want to reset {0} password?",
-  "CURRENT_EMAIL": "Current email",
-  "DELETE_USER": "Delete user",
-  "EMAIL_SENDING_DISABLED": "Email sending is disabled.",
-  "ENABLE_DISABLE_SPORTS": "Enable/disable sports.",
-  "NEW_EMAIL": "New email",
-  "PASSWORD_RESET_SUCCESSFUL": "The password has been reset.",
-  "REGISTRATION_DISABLED": "Registration is currently disabled.",
-  "REGISTRATION_ENABLED": "Registration is currently enabled.",
-  "RESET_USER_PASSWORD": "Reset password",
+  "BACK_TO_ADMIN": "Zurück zu Admin",
+  "CONFIRM_USER_ACCOUNT_DELETION": "Möchtest du wirklich das {0} Konto löschen? Alle Daten werden gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden.",
+  "CONFIRM_USER_PASSWORD_RESET": "Möchtest du wirklich das {0} Passwort zurücksetzen?",
+  "CURRENT_EMAIL": "Aktuelle E-Mail",
+  "DELETE_USER": "Lösche Nutzer",
+  "EMAIL_SENDING_DISABLED": "E-Mail-Versand ist deaktiviert.",
+  "ENABLE_DISABLE_SPORTS": "Aktivieren/Deaktivieren von Sportarten.",
+  "NEW_EMAIL": "Neue E-Mail",
+  "PASSWORD_RESET_SUCCESSFUL": "Das wasswort wurde zurückgesetzt.",
+  "REGISTRATION_DISABLED": "Registrierung ist derzeit deaktiviert.",
+  "REGISTRATION_ENABLED": "Registrierung ist derzeit aktiviert.",
+  "RESET_USER_PASSWORD": "Passwort zurücksetzen",
   "SPORTS": {
     "TABLE": {
-      "ACTIVE": "Active",
-      "HAS_WORKOUTS": "workouts exist",
-      "IMAGE": "Image",
-      "LABEL": "Label"
+      "ACTIVE": "Aktiv",
+      "HAS_WORKOUTS": "Trainings existieren",
+      "IMAGE": "Bild",
+      "LABEL": "Titel"
     },
-    "TITLE": "Sports administration"
+    "TITLE": "Sportarten Administration"
   },
-  "UPDATE_APPLICATION_DESCRIPTION": "Update application configuration (maximum number of registered users, maximum files size).",
-  "UPDATE_USER_EMAIL": "Update email",
-  "USER": "user | users",
-  "USER_EMAIL_UPDATE_SUCCESSFUL": "The email address has been updated.",
+  "UPDATE_APPLICATION_DESCRIPTION": "Aktualisiere Anwemdungskonfiguration (maximale Anzahl an registrierten Nutzern, maximale Dateigröße).",
+  "UPDATE_USER_EMAIL": "Aktualisiere E-Mail",
+  "USER": "Nutzer",
+  "USER_EMAIL_UPDATE_SUCCESSFUL": "Die E-Mail Adresse wurde aktualisiert.",
   "USERS": {
     "TABLE": {
-      "ADD_ADMIN_RIGHTS": "Add admin rights",
-      "REMOVE_ADMIN_RIGHTS": "Remove admin rights"
+      "ADD_ADMIN_RIGHTS": "Administratorrechte hinzufügen",
+      "REMOVE_ADMIN_RIGHTS": "Administratorrechte entfernen"
     },
     "SELECTS": {
       "ORDER_BY": {
-        "ADMIN": "admin status",
-        "CREATED_AT": "registration date",
-        "IS_ACTIVE": "account status",
-        "USERNAME": "username",
-        "WORKOUTS_COUNT": "workout count"
+        "ADMIN": "Adminstatus",
+        "CREATED_AT": "Registrierungsdatum",
+        "IS_ACTIVE": "Accountstatus",
+        "USERNAME": "Nutzername",
+        "WORKOUTS_COUNT": "Trainingsanzahl"
       }
     }
   }
diff --git a/fittrackee_client/src/locales/de/api.json b/fittrackee_client/src/locales/de/api.json
index 8a0ff3b4..54854a97 100644
--- a/fittrackee_client/src/locales/de/api.json
+++ b/fittrackee_client/src/locales/de/api.json
@@ -1,34 +1,34 @@
 {
   "ERROR": {
-    "UNKNOWN": "Error. Please try again or contact the administrator.",
-    "email: valid email must be provided": "Email: valid email must be provided.",
-    "error on getting configuration": "Error on getting configuration.",
-    "error when updating configuration": "Error when updating configuration",
-    "error, please try again or contact the administrator": "Error, please try again or contact the administrator.",
-    "error, registration is disabled": "Error, registration is disabled.",
-    "file extension not allowed": "File extension not allowed.",
-    "file size is greater than the allowed size": "File size is greater than the allowed size.",
-    "invalid credentials": "Invalid credentials.",
-    "invalid payload": "Provided data are invalid.",
-    "invalid token, please log in again": "Invalid token, please log in again.",
-    "invalid token, please request a new token": "Invalid token, please log in again.",
-    "Network Error": "Network Error.",
-    "new email must be different than curent email": "The new email must be different than curent email",
-    "no file part": "No file provided.",
-    "no selected file": "No selected file.",
-    "password: password and password confirmation do not match": "Password: password and password confirmation don't match.",
-    "provide a valid auth token": "Provide a valid auth token.",
-    "sorry, that username is already taken": "Sorry, that username is already taken.",
-    "sport does not exist": "Sport does not exist.",
-    "signature expired, please log in again": "Signature expired. Please log in again.",
-    "successfully registered": "Successfully registered.",
-    "user does not exist": "User does not exist.",
-    "valid email must be provided for admin contact": "A valid email must be provided for administrator contact",
-    "you can not delete your account, no other user has admin rights": "You can not delete your account, no other user has admin rights.",
-    "you do not have permissions": "You do not have permissions."
+    "UNKNOWN": "Fehler. Bitte versuche es erneut oder kontaktiere den Administrator.",
+    "email: valid email must be provided": "E-Mail: Eine gültige E-Mail muss angegeben werden.",
+    "error on getting configuration": "Fehler beim Abrufen der Konfiguration.",
+    "error when updating configuration": "Fehler beim Aktualisieren der Konfiguration.",
+    "error, please try again or contact the administrator": "Fehler. Bitte versuche es erneut oder kontaktiere den Administrator.",
+    "error, registration is disabled": "Fehler. Die Registrierung ist deaktiviert.",
+    "file extension not allowed": "Dateierweiterung ist nicht erlaubt.",
+    "file size is greater than the allowed size": "Die Datei ist größer als erlaubt.",
+    "invalid credentials": "Ungültige Anmeldedaten.",
+    "invalid payload": "Die bereitgestellten Daten sind ungültig.",
+    "invalid token, please log in again": "Ungültiges Token, bitte erneut anmelden.",
+    "invalid token, please request a new token": "Ungültiges Token, bitte erneut anmelden.",
+    "Network Error": "Netzwerkfehler.",
+    "new email must be different than curent email": "Die neue E-Mail muss sich von der aktuellen E-Mail unterscheiden.",
+    "no file part": "Keine Datei angegeben.",
+    "no selected file": "Keine Datei ausgewählt.",
+    "password: password and password confirmation do not match": "Passwort: Passwort und Passwortbestätigung stimmen nicht überein.",
+    "provide a valid auth token": "Gebe ein gültiges Authentifizierungstoken an.",
+    "sorry, that username is already taken": "Es tut mir leid, der Benutzername ist schon vergeben.",
+    "sport does not exist": "Sportart existiert nicht.",
+    "signature expired, please log in again": "Die Signatur ist abgelaufen. Bitte melde dich erneut an.",
+    "successfully registered": "Registrierung erfolgreich.",
+    "user does not exist": "Der Nutzer existiert nicht.",
+    "valid email must be provided for admin contact": "Um den Administrator zu kontaktieren, muss eine gültige E-Mail-Adresse angegeben werden.",
+    "you can not delete your account, no other user has admin rights": "Du kannst dein Konto nicht löschen, da kein anderer Nutzer hat Administratorrechte besitzt.",
+    "you do not have permissions": "Du hast keine Berechtigung."
   },
   "PAGINATION": {
-    "PREVIOUS": "previous",
-    "NEXT": "next"
+    "PREVIOUS": "Vorhergehende",
+    "NEXT": "Nächste"
   }
-}
\ No newline at end of file
+}
diff --git a/fittrackee_client/src/locales/de/buttons.json b/fittrackee_client/src/locales/de/buttons.json
index 6b97d2ee..9be5564e 100644
--- a/fittrackee_client/src/locales/de/buttons.json
+++ b/fittrackee_client/src/locales/de/buttons.json
@@ -1,17 +1,17 @@
 {
-  "ACCOUNT-CONFIRMATION-RESEND": "Resend confirmation email",
-  "BACK": "Back",
-  "CANCEL": "Cancel",
-  "CLEAR_FILTER": "Clear filters",
-  "DELETE_MY_ACCOUNT": "Delete my account",
-  "DISABLE": "Disable",
-  "EDIT": "Edit",
-  "ENABLE": "Enable",
+  "ACCOUNT-CONFIRMATION-RESEND": "Bestätigungs-E-Mail erneut senden",
+  "BACK": "Zurück",
+  "CANCEL": "Abbrechen",
+  "CLEAR_FILTER": "Filter löschen",
+  "DELETE_MY_ACCOUNT": "Lösche meinen Account",
+  "DISABLE": "Deaktivieren",
+  "EDIT": "Editieren",
+  "ENABLE": "Aktivieren",
   "FILTER": "Filter",
-  "LOGIN": "Log in",
-  "NO": "No",
-  "REGISTER": "Register",
-  "RESET": "Reset",
-  "SUBMIT": "Submit",
-  "YES": "Yes"
-}
\ No newline at end of file
+  "LOGIN": "Einloggen",
+  "NO": "Nein",
+  "REGISTER": "Registrieren",
+  "RESET": "Zurücksetzen",
+  "SUBMIT": "Speichern",
+  "YES": "Ja"
+}
diff --git a/fittrackee_client/src/locales/de/common.json b/fittrackee_client/src/locales/de/common.json
index 077ccf24..bd7cea60 100644
--- a/fittrackee_client/src/locales/de/common.json
+++ b/fittrackee_client/src/locales/de/common.json
@@ -1,23 +1,23 @@
 {
-  "ABOUT": "about",
-  "CONFIRMATION": "Confirmation",
-  "CONTACT": "contact",
-  "DAY": "day | days",
-  "DOCUMENTATION": "documentation",
-  "HOME": "Home",
-  "HERE": "here",
+  "ABOUT": "Über",
+  "CONFIRMATION": "Bestätigung",
+  "CONTACT": "Kontakt",
+  "DAY": "Tag | Tage",
+  "DOCUMENTATION": "Dokumentation",
+  "HOME": "Startseite",
+  "HERE": "hier",
   "SELECTS": {
     "ORDER_BY": {
-      "LABEL": "order by"
+      "LABEL": "sortiert nach"
     },
     "ORDER": {
-      "LABEL": "sort",
-      "ASC": "ascending",
-      "DESC": "descending"
+      "LABEL": "sortieren",
+      "ASC": "aufsteigend",
+      "DESC": "absteigend"
     },
     "PER_PAGE": {
-      "LABEL": "par page"
+      "LABEL": "pro Seite"
     }
   },
-  "TOTAL": "Total"
+  "TOTAL": "Insgesamt"
 }
\ No newline at end of file
diff --git a/fittrackee_client/src/locales/de/dashboard.json b/fittrackee_client/src/locales/de/dashboard.json
index 598014dc..2168d6ee 100644
--- a/fittrackee_client/src/locales/de/dashboard.json
+++ b/fittrackee_client/src/locales/de/dashboard.json
@@ -1,4 +1,4 @@
 {
   "DASHBOARD": "Dashboard",
-  "THIS_MONTH": "This month"
+  "THIS_MONTH": "Dieser Monat"
 }
diff --git a/fittrackee_client/src/locales/de/error.json b/fittrackee_client/src/locales/de/error.json
index 9f687794..12d4d56f 100644
--- a/fittrackee_client/src/locales/de/error.json
+++ b/fittrackee_client/src/locales/de/error.json
@@ -1,9 +1,9 @@
 {
-  "UNKNOWN": "Error. Please try again or contact the administrator.",
-  "APP_ERROR": "The application seems to have encountered some issues.<br />Please try again later or contact the administrator.",
+  "UNKNOWN": "Fehler. Bitte versuche es erneut oder kontaktiere den Administrator.",
+  "APP_ERROR": "Bei der Anwendung scheinen einige Probleme aufgetreten zu sein.<br />Bitte versuche es später noch einmal oder kontaktiere den Administrator.",
   "NOT_FOUND": {
-    "PAGE": "Page not found",
-    "WORKOUT": "Workout not found"
+    "PAGE": "Seite nicht gefunden",
+    "WORKOUT": "Training nicht gefunden"
   },
-  "SOMETHING_WRONG": "Something went wrong"
-}
\ No newline at end of file
+  "SOMETHING_WRONG": "Etwas lief schief"
+}
diff --git a/fittrackee_client/src/locales/de/sports.json b/fittrackee_client/src/locales/de/sports.json
index d4b44ab4..b67a4303 100644
--- a/fittrackee_client/src/locales/de/sports.json
+++ b/fittrackee_client/src/locales/de/sports.json
@@ -1,33 +1,33 @@
 {
   "Cycling (Sport)": {
-    "LABEL": "Cycling (Sport)"
+    "LABEL": "Radfahren (Sport)"
   },
   "Cycling (Transport)": {
-    "LABEL": "Cycling (Transport)"
+    "LABEL": "Radfahren (Pendeln)"
   },
   "Hiking": {
-    "LABEL": "Hiking"
+    "LABEL": "Wandern"
   },
   "Mountain Biking": {
-    "LABEL": "Mountain Biking"
+    "LABEL": "Mountainbiken"
   },
   "Mountain Biking (Electric)": {
-    "LABEL": "Mountain Biking (Electric)"
+    "LABEL": "Mountainbiken (elektrisch)"
   },
   "Rowing": {
-    "LABEL": "Rowing"
+    "LABEL": "Rudern"
   },
   "Running": {
-    "LABEL": "Running"
+    "LABEL": "Laufen"
   },
   "Skiing (Alpine)": {
-    "LABEL": "Skiing (Alpine)"
+    "LABEL": "Skifahren (Alpin)"
   },
   "Skiing (Cross Country)": {
-    "LABEL": "Skiing (Cross Country)"
+    "LABEL": "Skifahren (Langlauf)"
   },
   "Snowshoes": {
-    "LABEL": "Snowshoes"
+    "LABEL": "Schneeschuhe"
   },
   "Trail": {
     "LABEL": "Trail"
diff --git a/fittrackee_client/src/locales/de/statistics.json b/fittrackee_client/src/locales/de/statistics.json
index ecd2cbfe..2de290e0 100644
--- a/fittrackee_client/src/locales/de/statistics.json
+++ b/fittrackee_client/src/locales/de/statistics.json
@@ -1,8 +1,8 @@
 {
-  "STATISTICS": "Statistics",
+  "STATISTICS": "Statistik",
   "TIME_FRAMES": {
-    "week": "week",
-    "month": "month",
-    "year": "year"
+    "week": "Woche",
+    "month": "Monat",
+    "year": "Jahr"
   }
 }
diff --git a/fittrackee_client/src/locales/de/user.json b/fittrackee_client/src/locales/de/user.json
index 23f9fb55..9a6234d8 100644
--- a/fittrackee_client/src/locales/de/user.json
+++ b/fittrackee_client/src/locales/de/user.json
@@ -1,108 +1,108 @@
 {
-  "ACCOUNT_CONFIRMATION_NOT_RECEIVED": "Didn't received instructions?",
-  "ACCOUNT_CONFIRMATION_SENT": "Check your email. A new confirmation email has been sent to the address provided.",
+  "ACCOUNT_CONFIRMATION_NOT_RECEIVED": "Hast du keine Anweisungen erhalten?",
+  "ACCOUNT_CONFIRMATION_SENT": "Prüfe deine E-Mail. Eine neue Bestätigungsemail wurde an die angegebene Adresse geschickt.",
   "ADMIN": "Admin",
-  "ALREADY_HAVE_ACCOUNT": "Already have an account?",
-  "CONFIRM_ACCOUNT_DELETION": "Are you sure you want to delete your account? All data will be deleted, this cannot be undone",
-  "CURRENT_PASSWORD": "Current password",
-  "EMAIL": "Email",
-  "EMAIL_INFO": "Enter a valid email address.",
-  "ENTER_PASSWORD": "Enter a password",
-  "FILTER_ON_USERNAME": "Filter on username",
-  "HIDE_PASSWORD": "hide password",
-  "INVALID_TOKEN": "Invalid token, please request a new password reset.",
-  "LANGUAGE": "Language",
-  "LOG_IN": "log in",
-  "LOGIN": "Login",
-  "LOGOUT": "Logout",
-  "NEW_PASSWORD": "New password",
-  "NO_USERS_FOUND": "No users found.",
-  "PASSWORD": "Password",
-  "PASSWORD_INFO": "At least 8 characters required.",
-  "PASSWORD_FORGOTTEN": "Forgot password?",
-  "PASSWORD_RESET": "Password reset",
-  "PASSWORD_SENT_EMAIL_TEXT": "Check your email. If your address is in our database, you'll received an email with a link to reset your password.",
+  "ALREADY_HAVE_ACCOUNT": "Hast du bereits ein Konto?",
+  "CONFIRM_ACCOUNT_DELETION": "Möchtest du dein Konto wirklich löschen? Alle Daten werden gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden.",
+  "CURRENT_PASSWORD": "Aktuelles Passwort",
+  "EMAIL": "E-Mail",
+  "EMAIL_INFO": "Gebe eine gültige E-Mail-Adresse an.",
+  "ENTER_PASSWORD": "Gebe ein Passwort ein",
+  "FILTER_ON_USERNAME": "Nach Benutzernamen filtern",
+  "HIDE_PASSWORD": "Passwort verbergen",
+  "INVALID_TOKEN": "Ungültiges Token, bitte fordere ein neues Passworts an.",
+  "LANGUAGE": "Sprache",
+  "LOG_IN": "Anmelden",
+  "LOGIN": "Anmeldung",
+  "LOGOUT": "Abmelden",
+  "NEW_PASSWORD": "Neues Passwort",
+  "NO_USERS_FOUND": "Keine Nutzer gefunden.",
+  "PASSWORD": "Passwort",
+  "PASSWORD_INFO": "Mindestens 8 Zeichen sind erforderlich.",
+  "PASSWORD_FORGOTTEN": "Passwort vergessen?",
+  "PASSWORD_RESET": "Passwort zurücksetzen",
+  "PASSWORD_SENT_EMAIL_TEXT": "Prüfe deine E-Mail. Wenn deine Adresse in der Datenbank enthalten ist, wirst du eine E-Mail mit einem Link erhalten um dein Passwort zurückzusetzen.",
   "PASSWORD_STRENGTH": {
-    "WEAK": "weak",
-    "AVERAGE": "average",
-    "GOOD": "good",
-    "STRONG": "strong",
-    "LABEL": "password strength",
+    "WEAK": "schwach",
+    "AVERAGE": "mittel",
+    "GOOD": "gut",
+    "STRONG": "start",
+    "LABEL": "Passwortstärke",
     "SUGGESTIONS": {
-      "l33t": "Avoid predictable letter substitutions like {'@'} for a.",
-      "reverseWords": "Avoid reversed spellings of common words.",
-      "allUppercase": "Capitalize some, but not all letters.",
-      "capitalization": "Capitalize more than the first letter.",
-      "dates": "Avoid dates and years that are associated with you.",
-      "recentYears": "Avoid recent years.",
-      "associatedYears": "Avoid years that are associated with you.",
-      "sequences": "Avoid common character sequences.",
-      "repeated": "Avoid repeated words and characters.",
-      "longerKeyboardPattern": "Use longer keyboard patterns and change typing direction multiple times.",
-      "anotherWord": "Add more words that are less common.",
-      "useWords": "Use multiple words, but avoid common phrases.",
-      "noNeed": "You can create strong passwords without using symbols, numbers, or uppercase letters.",
-      "pwned": "If you use this password elsewhere, you should change it."
+      "l33t": "Vermeide vorhersehbare Buchstabenersetzungen wie {'@'} für a.",
+      "reverseWords": "Vermeide umgekehrte Schreibweisen gebräuchlicher Wörter.",
+      "allUppercase": "Schreibe einige, aber nicht alle Buchstaben groß.",
+      "capitalization": "Schreibe mehr als nur den ersten Buchstaben groß.",
+      "dates": "Vermeide Daten und Jahreszahlen, die mit Dir in Verbindung gebracht werden.",
+      "recentYears": "Vermeide Angabe von letzten Jahreszahlen.",
+      "associatedYears": "Vermeide Jahreszahlen, die mit Dir in Verbindung gebracht werden.",
+      "sequences": "Vermeide gebräuchliche Zeichenfolgen.",
+      "repeated": "Vermeide wiederholungen von Wörtern und Zeichen.",
+      "longerKeyboardPattern": "Verwende längere Tastaturmuster und ändere mehrmals die Schreibrichtung.",
+      "anotherWord": "Füge weitere weniger gebräuchliche Wörter hinzu.",
+      "useWords": "Verwenden Sie mehrere Wörter, aber vermeide gebräuchliche Ausdrücke.",
+      "noNeed": "Du kannst sichere Passwörter erstellen, ohne Symbole, Zahlen oder Großbuchstaben zu verwenden.",
+      "pwned": "Wenn Sie dieses Passwort auch anderweitig verwenden, sollten Sie es ändern."
     }
   },
-  "PASSWORD_UPDATED": "Your password have been updated. Click {0} to log in.",
+  "PASSWORD_UPDATED": "Dein Passwort wurde aktualisiert. Klicke {0} um dich anzumelden.",
   "PROFILE": {
-    "ACCOUNT_EDITION": "Account edition",
-    "BACK_TO_PROFILE": "Back to profile",
-    "BIO": "Bio",
-    "BIRTH_DATE": "Birth date",
-    "EDIT": "Edit profile",
-    "EDIT_PREFERENCES": "Edit preferences",
-    "EDIT_SPORTS_PREFERENCES": "Edit sports preferences",
-    "ERRORED_EMAIL_UPDATE": "Please {0} to change your email address again or contact the administrator",
-    "FIRST_NAME": "First name",
-    "FIRST_DAY_OF_WEEK": "First day of week",
-    "LANGUAGE": "Language",
-    "LAST_NAME": "Last name",
-    "LOCATION": "Location",
-    "MONDAY": "Monday",
-    "PICTURE": "Picture",
-    "PICTURE_EDITION": "Picture edition",
-    "PICTURE_UPDATE": "Update picture",
-    "PICTURE_REMOVE": "Remove picture",
-    "PREFERENCES_EDITION": "Preferences edition",
-    "PROFILE_EDITION": "Profile edition",
-    "REGISTRATION_DATE": "Registration date",
-    "SPORTS_EDITION": "Sports preferences edition",
-    "SUNDAY": "Sunday",
+    "ACCOUNT_EDITION": "Kontoausgabe",
+    "BACK_TO_PROFILE": "Zurück zum Profil",
+    "BIO": "Biographie",
+    "BIRTH_DATE": "Geburtsdatum",
+    "EDIT": "Profil bearbeiten",
+    "EDIT_PREFERENCES": "Einstellungen ändern",
+    "EDIT_SPORTS_PREFERENCES": "Einstellungen für Sportarten ändern",
+    "ERRORED_EMAIL_UPDATE": "Bitte {0} um deine E-Mail Adresse nochmals zu ändern oder kontaktiere den Administrator",
+    "FIRST_NAME": "Vorname",
+    "FIRST_DAY_OF_WEEK": "Erster Tag der Woche",
+    "LANGUAGE": "Sprache",
+    "LAST_NAME": "Nachname",
+    "LOCATION": "Ort",
+    "MONDAY": "Montag",
+    "PICTURE": "Bild",
+    "PICTURE_EDITION": "Bildausgabe",
+    "PICTURE_UPDATE": "Bild aktualisieren",
+    "PICTURE_REMOVE": "Bild entfernen",
+    "PREFERENCES_EDITION": "Einstellungsausgabe",
+    "PROFILE_EDITION": "Profil-Ausgabe",
+    "REGISTRATION_DATE": "Regirierungsdatum",
+    "SPORTS_EDITION": "Sportarten-Einstellungsausgabe",
+    "SUNDAY": "Sontag",
     "TABS": {
-      "ACCOUNT": "account",
-      "PICTURE": "picture",
-      "PREFERENCES": "preferences",
-      "PROFILE": "profile",
-      "SPORTS": "sports"
+      "ACCOUNT": "Konto",
+      "PICTURE": "Bild",
+      "PREFERENCES": "Einstellungen",
+      "PROFILE": "Profil",
+      "SPORTS": "Sportarten"
     },
     "SPORT": {
-      "ACTION": "action",
-      "COLOR": "color",
-      "DISABLED_BY_ADMIN": "disabled by admin",
-      "IS_ACTIVE": "active",
-      "LABEL": "label",
-      "STOPPED_SPEED_THRESHOLD": "stopped speed threshold"
+      "ACTION": "Aktion",
+      "COLOR": "Farbe",
+      "DISABLED_BY_ADMIN": "vom Admin deaktiviert",
+      "IS_ACTIVE": "aktiv",
+      "LABEL": "Titel",
+      "STOPPED_SPEED_THRESHOLD": "Geschwindigkeitsschwellenwert für Stopp"
     },
-    "SUCCESSFUL_EMAIL_UPDATE": "Your account has been updated successfully. Please check your email to confirm your new email address.",
-    "SUCCESSFUL_REGISTRATION": "Your account has been created successfully.",
-    "SUCCESSFUL_REGISTRATION_WITH_EMAIL": "A link to activate your account has been emailed to the address provided.",
-    "SUCCESSFUL_UPDATE": "Your account has been updated successfully.",
+    "SUCCESSFUL_EMAIL_UPDATE": "Dein Konto wurde erfolgreich aktualisiert. Bitte prüfe deine E-Mail um deine neue E-Mail Adresse zu bestätigen.",
+    "SUCCESSFUL_REGISTRATION": "Dein Konto wurde erfolgreich erstellt.",
+    "SUCCESSFUL_REGISTRATION_WITH_EMAIL": "Ein Aktivierungslink für dein Konto wurde an die angegebene E-Mail Adresse geschickt.",
+    "SUCCESSFUL_UPDATE": "Dein Konto wurde erfolgreich aktualisiert.",
     "UNITS": {
-      "LABEL": "Units for distance",
-      "IMPERIAL": "Imperial system (ft, mi)",
-      "METRIC": "Metric system (m, km)"
+      "LABEL": "Einheiten für die Distanz",
+      "IMPERIAL": "Imperiales System (ft, mi)",
+      "METRIC": "Metrisches System (m, km)"
     },
-    "TIMEZONE": "Timezone"
+    "TIMEZONE": "Zeitzone"
   },
-  "REGISTER": "Register",
-  "RESENT_ACCOUNT_CONFIRMATION": "Resend account confirmation email",
-  "REGISTER_DISABLED": "Sorry, registration is disabled.",
-  "RESET_PASSWORD": "Reset your password",
-  "SHOW_PASSWORD": "show password",
-  "THIS_USER_ACCOUNT_IS_INACTIVE": "This user account is inactive.",
-  "USER_PICTURE": "user picture",
-  "USERNAME": "Username",
-  "USERNAME_INFO": "3 to 30 characters required, only alphanumeric characters and the underscore character \"_\" allowed."
+  "REGISTER": "Registrieren",
+  "RESENT_ACCOUNT_CONFIRMATION": "Sende Email zur Kontobestätigung erneut",
+  "REGISTER_DISABLED": "Entschuldigung, die Registrierung ist deaktiviert.",
+  "RESET_PASSWORD": "Passwort zurücksetzen",
+  "SHOW_PASSWORD": "Passwort anzeigen",
+  "THIS_USER_ACCOUNT_IS_INACTIVE": "Dieser Account ist inaktiv.",
+  "USER_PICTURE": "Benutzerbild",
+  "USERNAME": "Nutzername",
+  "USERNAME_INFO": "3 bis 30 Zeichen sind erforderlich, nur alphanumerische Zeichen und der Unterstrich \"_\" sind erlaubt."
 }
diff --git a/fittrackee_client/src/locales/de/workouts.json b/fittrackee_client/src/locales/de/workouts.json
index 59be12ca..2c15ae8d 100644
--- a/fittrackee_client/src/locales/de/workouts.json
+++ b/fittrackee_client/src/locales/de/workouts.json
@@ -8,7 +8,7 @@
   "DATE": "Datum",
   "DESCENT": "Abstieg",
   "DISPLAY_FILTERS": "zeige Filter",
-  "DISTANCE": "Distanz",
+  "DISTANCE": "Entfernung",
   "DURATION": "Dauer",
   "EDIT_WORKOUT": "Training bearbeiten",
   "ELEVATION": "Höhe",
@@ -18,15 +18,15 @@
   "HIDE_FILTERS": "verberge Filter",
   "LATEST_WORKOUTS": "Letzte Trainings",
   "LOAD_MORE_WORKOUT": "Lade mehr Trainings",
-  "MAX_ALTITUDE": "max. altitude",
+  "MAX_ALTITUDE": "maximale Höhe",
   "MAX_FILES": "Maximale Dateianzahl",
   "MAX_SIZE": "Maximalgröße",
-  "MAX_SPEED": "max. speed",
-  "MIN_ALTITUDE": "min. altitude",
+  "MAX_SPEED": "Max. Geschwindigkeit",
+  "MIN_ALTITUDE": "minimale Höhe",
   "NEXT_SEGMENT": "Nächstes Segment",
   "NEXT_WORKOUT": "Nächstes Training",
   "NO_DATA_CLEANING": "Daten aus gpx, ohne Bereinigung",
-  "NO_FILE_PROVIDED": "No file provided",
+  "NO_FILE_PROVIDED": "Keine Datei angegeben",
   "NO_FOLDER": "enthält keinen Ordner",
   "NO_MAP": "Keine Karte",
   "NO_NEXT_SEGMENT": "Kein nächstes Segment",
@@ -40,13 +40,13 @@
   "PAUSES": "Pausen",
   "PREVIOUS_SEGMENT": "Vorheriges Segment",
   "PREVIOUS_WORKOUT": "Vorheriges Training",
-  "RECORD": "Eintrag | Einträge",
-  "RECORD_AS": "Ave. speed",
-  "RECORD_FD": "Weiteste Distanz",
+  "RECORD": "Aufzeichnung | Aufzeichnungen",
+  "RECORD_AS": "Durchschn. Geschwindigkeit",
+  "RECORD_FD": "Weiteste Entfernung",
   "RECORD_LD": "Längste Dauer",
-  "RECORD_MS": "Max. speed",
+  "RECORD_MS": "Max. Geschwindigkeit",
   "REMAINING_CHARS": "remaining characters",
-  "SEGMENT": "segment | segments",
+  "SEGMENT": "Segment | Segmente",
   "SPEED": "Geschwindigkeit",
   "SPORT": "Sportart | Sportarten",
   "START": "Start",