From 05beae43cfeb15ea89b984d36105dcdbdffd0975 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 09:16:34 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 interface/web/mailuser/lib/lang/de_mail_user_password.lng |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/interface/web/mailuser/lib/lang/de_mail_user_password.lng b/interface/web/mailuser/lib/lang/de_mail_user_password.lng
index b43010f..5e5fe5e 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_password.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["mailbox_password_txt"] = 'Mailbox-Passwort';
-$wb["password_txt"] = 'Passwort';
-$wb["password_strength_txt"] = 'Passwortkomplexit&auml;t';
-$wb["email_txt"] = 'Email';
+$wb['mailbox_password_txt'] = 'E-Mailkonto Passwort';
+$wb['password_txt'] = 'Passwort';
+$wb['password_strength_txt'] = 'Passwortkomplexität';
+$wb['email_txt'] = 'E-Mail';
 $wb['generate_password_txt'] = 'Passwort erzeugen';
 $wb['repeat_password_txt'] = 'Passwort wiederholen';
-$wb['password_mismatch_txt'] = 'Die Passw&ouml;rter stimmen nicht &uuml;berein.';
-$wb['password_match_txt'] = 'Die Passw&ouml;rter stimmen &uuml;berein.';
-?>
\ No newline at end of file
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
+?>

--
Gitblit v1.9.1