From a4e127a6af97041b2c067f888f8c73a8aec682f1 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 04 Jan 2016 05:29:53 -0500
Subject: [PATCH] Merge branch 'mergebranch' into 'master'

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

diff --git a/interface/web/mailuser/lib/lang/de_mail_user_cc.lng b/interface/web/mailuser/lib/lang/de_mail_user_cc.lng
index 5cc55df..e43d39c 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_cc.lng
@@ -1,7 +1,9 @@
 <?php
-$wb["mailbox_cc_txt"] = 'Kopie an E-Mail-Adresse senden';
-$wb["cc_txt"] = 'Kopie senden an';
-$wb["email_txt"] = 'E-Mail';
-$wb["cc_error_isemail"] = 'E-Mail-Adresse ungültig im -Kopie senden an- Feld';
-$wb["email_is_cc_error"] = 'E-Mail-Adresse and "Kopie senden an"-Adresse dürfen nicht identisch sein.';
-?>
\ No newline at end of file
+$wb['mailbox_cc_txt'] = 'Kopie an E-Mail Adresse senden';
+$wb['cc_txt'] = 'Kopie senden an';
+$wb['email_txt'] = 'E-Mail';
+$wb['cc_error_isemail'] = 'E-Mail Adresse ungültig im -Kopie senden an- Feld';
+$wb['email_is_cc_error'] = 'E-Mail Adresse und ';
+$wb['name_optional_txt'] = '(optional)';
+$wb['cc_note_txt'] = '(Mehrere E-Mail-Adressen mit Kommas trennen)';
+?>

--
Gitblit v1.9.1