summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-07-20 07:31:54 +0000
committerthomascube <thomas@roundcube.net>2011-07-20 07:31:54 +0000
commitb9fe7a899ad368f25e6248f75218f2472c15a1de (patch)
treee87003cbc2fc1435b6db5a1d89d128b80aebacb9
parent71cc6bf630f2a0bc12091515418f6d23e18d2720 (diff)
Just name mail 'Mail', it's that simple; Upddate changelog
-rw-r--r--CHANGELOG1
-rw-r--r--program/localization/en_GB/labels.inc2
-rw-r--r--program/localization/en_US/labels.inc2
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 342e7eb6b..0f46c36ef 100644
--- a/CHANGELOG
+++ b/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/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 9e376784d..ebe86c7a0 100644
--- a/program/localization/en_GB/labels.inc
+++ b/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/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index f87870ffc..b6de28bcd 100644
--- a/program/localization/en_US/labels.inc
+++ b/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';