From fbe54043cf598b19a753dc2b21a7ed558d23fd15 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Aug 2011 13:40:07 -0400
Subject: [PATCH] Fix folders drop-down list: descend into root folder (e.g. INBOX) even if part of the exception list

---
 program/localization/en_GB/labels.inc |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 7a36f00..ebe86c7 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -6,7 +6,7 @@
 | language/en_GB/labels.inc                                             |
 |                                                                       |
 | Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
+| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
@@ -24,7 +24,7 @@
 $labels['server'] = 'Server';
 $labels['login'] = 'Login';
 $labels['logout'] = 'Logout';
-$labels['mail'] = 'E-Mail';
+$labels['mail'] = 'Mail';
 $labels['settings'] = 'Personal Settings';
 $labels['addressbook'] = 'Address Book';
 $labels['inbox'] = 'Inbox';
@@ -154,7 +154,6 @@
 $labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Compact';
 $labels['empty'] = 'Empty';
-$labels['purge'] = 'Purge';
 $labels['quota'] = 'Disk usage';
 $labels['unknown'] = 'unknown';
 $labels['unlimited'] = 'unlimited';
@@ -163,7 +162,7 @@
 $labels['searchmod'] = 'Search modifiers';
 $labels['msgtext'] = 'Entire message';
 $labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Save (.eml)';
+$labels['emlsave'] = 'Download (.eml)';
 $labels['compose'] = 'Compose a message';
 $labels['editasnew'] = 'Edit as new';
 $labels['savemessage'] = 'Save this draft';
@@ -205,7 +204,7 @@
 $labels['name'] = 'Display name';
 $labels['firstname'] = 'First name';
 $labels['surname'] = 'Last name';
-$labels['email'] = 'E-Mail';
+$labels['email'] = 'Email';
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';
 $labels['contacts'] = 'Contacts';
@@ -214,6 +213,7 @@
 $labels['cancel'] = 'Cancel';
 $labels['save'] = 'Save';
 $labels['delete'] = 'Delete';
+$labels['rename'] = 'Rename';
 $labels['newcontact'] = 'Create new contact card';
 $labels['deletecontact'] = 'Delete selected contacts';
 $labels['composeto'] = 'Compose mail to';
@@ -275,7 +275,7 @@
 $labels['readwhendeleted'] = 'Mark the message as read on delete';
 $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
 $labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'When moving messages to Trash fails delete them';
+$labels['deletealways'] = 'If moving messages to "Deleted Items" fails, permanently delete them';
 $labels['showremoteimages'] = 'Display remote inline images';
 $labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'always';
@@ -321,11 +321,19 @@
 $labels['folder'] = 'Folder';
 $labels['folders'] = 'Folders';
 $labels['foldername'] = 'Folder name';
+$labels['subscribed']  = 'Subscribed';
 $labels['messagecount'] = 'Messages';
 $labels['create'] = 'Create';
 $labels['createfolder'] = 'Create new folder';
 $labels['managefolders'] = 'Manage folders';
 $labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
 $labels['sortby'] = 'Sort by';
 $labels['sortasc'] = 'Sort ascending';
 $labels['sortdesc'] = 'Sort descending';

--
Gitblit v1.9.1