From ebbe6374fc9c308daf729d2ad1b2f8007ed771ce Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 17 Feb 2014 05:34:43 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 interface/web/mailuser/lib/lang/en_mail_user_cc.lng |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/interface/web/mailuser/lib/lang/en_mail_user_cc.lng b/interface/web/mailuser/lib/lang/en_mail_user_cc.lng
index 0073c71..3437d50 100644
--- a/interface/web/mailuser/lib/lang/en_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/en_mail_user_cc.lng
@@ -4,4 +4,6 @@
 $wb["email_txt"] = 'Email';
 $wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
 $wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
+$wb["name_optional_txt"] = '(Optional)';
+$wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
\ No newline at end of file

--
Gitblit v1.9.1