2 commits - lib/locale

[Jeroen van Meeuwen]

 lib/locale/en_US.php |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 0c8180530747333cd9ee26fd0bf08e02d7987ba9
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Mar 14 19:19:28 2012 +0000

    Add additional labels

diff --git a/lib/locale/en_US.php b/lib/locale/en_US.php
index eca3ea8..21fd2fc 100644
--- a/lib/locale/en_US.php
+++ b/lib/locale/en_US.php
@@ -48,6 +48,8 @@ $LANG['user.cn'] = 'Common name';
 $LANG['user.givenname'] = 'Given name';
 $LANG['user.displayname'] = 'Display name';
 $LANG['user.mail'] = 'Primary Email Address';
+$LANG['user.mailhost'] = 'Email Server';
+$LANG['user.kolabhomeserver'] = 'Email Server';
 $LANG['user.initials'] = 'Middle name';
 $LANG['user.title'] = 'Title';
 $LANG['user.country'] = 'Country';


commit ed865c4d53545f9f783274a9fea42a35072cf364
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Mar 14 19:17:56 2012 +0000

    Update labels user.email and user.alias

diff --git a/lib/locale/en_US.php b/lib/locale/en_US.php
index c8201e7..eca3ea8 100644
--- a/lib/locale/en_US.php
+++ b/lib/locale/en_US.php
@@ -47,7 +47,7 @@ $LANG['user.sn'] = 'Surname';
 $LANG['user.cn'] = 'Common name';
 $LANG['user.givenname'] = 'Given name';
 $LANG['user.displayname'] = 'Display name';
-$LANG['user.mail'] = 'Email';
+$LANG['user.mail'] = 'Primary Email Address';
 $LANG['user.initials'] = 'Middle name';
 $LANG['user.title'] = 'Title';
 $LANG['user.country'] = 'Country';
@@ -66,7 +66,7 @@ $LANG['user.quota.desc'] = 'Leave blank for unlimited';
 $LANG['user.fbinterval'] = 'Free-Busy interval';
 $LANG['user.fbinterval.desc'] = 'Leave blank for default (60 days)';
 $LANG['user.user_type_id'] = 'Account type';
-$LANG['user.alias'] = 'Email aliases';
+$LANG['user.alias'] = 'Secondary Email Address(es)';
 $LANG['user.invitation-policy'] = 'Invitation policy';
 $LANG['user.delegate'] = 'Email delegates';
 $LANG['user.delegate.desc'] = 'Others allowed to send emails with a "From" address of this account';