From 88d47d2ce65e549ffccda213f4e53609cc75d882 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 23 Jan 2014 05:31:58 -0500
Subject: [PATCH] Resolved differences in sql incremental files between master and stable

---
 interface/web/mail/lib/lang/en_mail_alias.lng |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/interface/web/mail/lib/lang/en_mail_alias.lng b/interface/web/mail/lib/lang/en_mail_alias.lng
index 4023eb6..bcdafb3 100644
--- a/interface/web/mail/lib/lang/en_mail_alias.lng
+++ b/interface/web/mail/lib/lang/en_mail_alias.lng
@@ -2,10 +2,13 @@
 $wb["email_txt"] = 'Email';
 $wb["destination_txt"] = 'Destination';
 $wb["active_txt"] = 'Active';
-$wb["btn_save_txt"] = 'Save';
-$wb["btn_cancel_txt"] = 'Cancel';
 $wb["email_error_isemail"] = 'Email address is invalid.';
 $wb["email_error_unique"] = 'Duplicate Emailaddress.';
 $wb["no_domain_perm"] = "You have no permission for this domain.";
 $wb["destination_error_isemail"] = 'Destination Emailaddress is invalid.';
-?>
\ No newline at end of file
+$wb["limit_mailalias_txt"] = 'The max. number of email aliases for your account is reached.';
+$wb["duplicate_mailbox_txt"] = 'There is already a mailbox with this email address.';
+$wb['domain_txt'] = 'Domain';
+$wb["duplicate_email_alias_txt"] = 'This email alias does already exist.';
+$wb["source_txt"] = 'Alias';
+?>

--
Gitblit v1.9.1