From b9fe7a899ad368f25e6248f75218f2472c15a1de Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 20 Jul 2011 03:31:54 -0400
Subject: [PATCH] Just name mail 'Mail', it's that simple; Upddate changelog

---
 CHANGELOG                             |    1 +
 program/localization/en_US/labels.inc |    2 +-
 program/localization/en_GB/labels.inc |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 342e7eb..0f46c36 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 9e37678..ebe86c7 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -24,7 +24,7 @@
 $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 f87870f..b6de28b 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -28,7 +28,7 @@
 
 // taskbar
 $labels['logout']   = 'Logout';
-$labels['mail']     = 'Email';
+$labels['mail']     = 'Mail';
 $labels['settings'] = 'Settings';
 $labels['addressbook'] = 'Address Book';
 

--
Gitblit v1.9.1