summaryrefslogtreecommitdiff
path: root/roundcubemail
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-07-20 07:31:54 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-07-20 07:31:54 +0000
commit8f854762316ddcbca47a6482dc2d7ec017eeeb45 (patch)
treeef4971ece77d51f7dda91cc4322fa4976c9f3f7e /roundcubemail
parentf2b98570859fa83487123ceaf89fa050c5621f2b (diff)
Just name mail 'Mail', it's that simple; Upddate changelog
git-svn-id: https://svn.roundcube.net/trunk@4939 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
-rw-r--r--roundcubemail/CHANGELOG1
-rw-r--r--roundcubemail/program/localization/en_GB/labels.inc2
-rw-r--r--roundcubemail/program/localization/en_US/labels.inc2
3 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 342e7eb6b..0f46c36ef 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fixed new_user_identity plugin to work with updated rcube_ldap class (#1487994)
- Plugin API: added folder_delete and folder_rename hooks
- Added possibility to undo last contact delete operation
- Fix sorting of contact groups after group create (#1487747)
diff --git a/roundcubemail/program/localization/en_GB/labels.inc b/roundcubemail/program/localization/en_GB/labels.inc
index 9e376784d..ebe86c7a0 100644
--- a/roundcubemail/program/localization/en_GB/labels.inc
+++ b/roundcubemail/program/localization/en_GB/labels.inc
@@ -24,7 +24,7 @@ $labels['password'] = 'Password';
$labels['server'] = 'Server';
$labels['login'] = 'Login';
$labels['logout'] = 'Logout';
-$labels['mail'] = 'Email';
+$labels['mail'] = 'Mail';
$labels['settings'] = 'Personal Settings';
$labels['addressbook'] = 'Address Book';
$labels['inbox'] = 'Inbox';
diff --git a/roundcubemail/program/localization/en_US/labels.inc b/roundcubemail/program/localization/en_US/labels.inc
index f87870ffc..b6de28bcd 100644
--- a/roundcubemail/program/localization/en_US/labels.inc
+++ b/roundcubemail/program/localization/en_US/labels.inc
@@ -28,7 +28,7 @@ $labels['login'] = 'Login';
// taskbar
$labels['logout'] = 'Logout';
-$labels['mail'] = 'Email';
+$labels['mail'] = 'Mail';
$labels['settings'] = 'Settings';
$labels['addressbook'] = 'Address Book';