From e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 27 Jan 2014 10:33:40 -0500
Subject: [PATCH]  Merge branch 'master' into 'master'

---
 interface/web/tools/lib/lang/de_usersettings.lng |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/interface/web/tools/lib/lang/de_usersettings.lng b/interface/web/tools/lib/lang/de_usersettings.lng
index 7f7cc5b..908bbf6 100644
--- a/interface/web/tools/lib/lang/de_usersettings.lng
+++ b/interface/web/tools/lib/lang/de_usersettings.lng
@@ -1,7 +1,12 @@
 <?php
-$wb['passwort_txt'] = 'Password';
-$wb['language_txt'] = 'Language';
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['password_mismatch'] = 'The password in the second password field does not match the first password.';
+$wb['passwort_txt'] = 'Passwort';
+$wb['language_txt'] = 'Sprache';
+$wb['password_mismatch'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_strength_txt'] = 'Passwortkomplexität';
+$wb['Form to edit the user password and language.'] = 'Formular, um das Benutzerpasswort und die Sprache zu bearbeiten.';
+$wb['Settings'] = 'Einstellungen';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
+$wb['repeat_password_txt'] = 'Passwort wiederholen';
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
 ?>

--
Gitblit v1.9.1