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 | 52 ++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 36 insertions(+), 16 deletions(-) diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc index 9b67d6c..ebe86c7 100644 --- a/program/localization/en_GB/labels.inc +++ b/program/localization/en_GB/labels.inc @@ -5,8 +5,8 @@ +-----------------------------------------------------------------------+ | language/en_GB/labels.inc | | | -| Language file of the RoundCube Webmail client | -| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland | +| Language file of the Roundcube Webmail client | +| 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'; @@ -38,11 +38,12 @@ $labels['cc'] = 'Copy'; $labels['bcc'] = 'Bcc'; $labels['replyto'] = 'Reply-To'; +$labels['followupto'] = 'Followup-To'; $labels['date'] = 'Date'; $labels['size'] = 'Size'; $labels['priority'] = 'Priority'; $labels['organization'] = 'Organisation'; -$labels['reply-to'] = 'Reply-To'; +$labels['readstatus'] = 'Read status'; $labels['mailboxlist'] = 'Folders'; $labels['messagesfromto'] = 'Messages $from to $to of $count'; $labels['threadsfromto'] = 'Threads $from to $to of $count'; @@ -96,7 +97,9 @@ $labels['checkmail'] = 'Check for new messages'; $labels['writenewmessage'] = 'Create a new message'; $labels['replytomessage'] = 'Reply to sender'; -$labels['replytoallmessage'] = 'Reply to sender and all recipients'; +$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients'; +$labels['replyall'] = 'Reply all'; +$labels['replylist'] = 'Reply list'; $labels['forwardmessage'] = 'Forward the message'; $labels['deletemessage'] = 'Delete message'; $labels['movemessagetotrash'] = 'Move message to "Deleted Items"'; @@ -148,9 +151,9 @@ $labels['listsorting'] = 'Sorting column'; $labels['listorder'] = 'Sorting order'; $labels['listmode'] = 'List view mode'; +$labels['folderactions'] = 'Folder actions...'; $labels['compact'] = 'Compact'; $labels['empty'] = 'Empty'; -$labels['purge'] = 'Purge'; $labels['quota'] = 'Disk usage'; $labels['unknown'] = 'unknown'; $labels['unlimited'] = 'unlimited'; @@ -159,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'; @@ -168,12 +171,15 @@ $labels['charset'] = 'Charset'; $labels['editortype'] = 'Editor type'; $labels['returnreceipt'] = 'Return receipt'; +$labels['dsn'] = 'Delivery status notification'; +$labels['editidents'] = 'Edit identities'; $labels['checkspelling'] = 'Check spelling'; $labels['resumeediting'] = 'Resume editing'; $labels['revertto'] = 'Revert to'; $labels['attachments'] = 'Attachments'; $labels['upload'] = 'Upload'; $labels['close'] = 'Close'; +$labels['messageoptions'] = 'Message options...'; $labels['low'] = 'Low'; $labels['lowest'] = 'Lowest'; $labels['normal'] = 'Normal'; @@ -190,6 +196,7 @@ $labels['addcc'] = 'Add Cc'; $labels['addbcc'] = 'Add Bcc'; $labels['addreplyto'] = 'Add Reply-To'; +$labels['addfollowupto'] = 'Add Followup-To'; $labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?'; $labels['receiptread'] = 'Return Receipt (read)'; $labels['yourmessage'] = 'This is a Return Receipt for your message'; @@ -197,13 +204,16 @@ $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'; +$labels['contactproperties'] = 'Contact properties'; $labels['edit'] = 'Edit'; $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'; @@ -247,6 +257,7 @@ $labels['signature'] = 'Signature'; $labels['dstactive'] = 'Summer time'; $labels['htmleditor'] = 'Compose HTML messages'; +$labels['htmlonreply'] = 'on reply to HTML message only'; $labels['htmlsignature'] = 'HTML signature'; $labels['previewpane'] = 'Show preview pane'; $labels['skin'] = 'Interface skin'; @@ -255,14 +266,16 @@ $labels['uisettings'] = 'User Interface'; $labels['serversettings'] = 'Server Settings'; $labels['mailboxview'] = 'Mailbox View'; -$labels['mdnrequests'] = 'Sender notifications'; -$labels['askuser'] = 'ask the user'; +$labels['mdnrequests'] = 'On request for return receipt'; +$labels['askuser'] = 'ask each time'; $labels['autosend'] = 'send automatically'; +$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask'; +$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore'; $labels['ignore'] = 'ignore'; $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'; @@ -302,18 +315,25 @@ $labels['insertsignature'] = 'Insert signature'; $labels['previewpanemarkread'] = 'Mark previewed messages as read'; $labels['afternseconds'] = 'after $n seconds'; +$labels['reqmdn'] = 'Always request a return receipt'; +$labels['reqdsn'] = 'Always request a delivery status notification'; +$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to'; $labels['folder'] = 'Folder'; $labels['folders'] = 'Folders'; $labels['foldername'] = 'Folder name'; -$labels['subscribed'] = 'Subscribed'; +$labels['subscribed'] = 'Subscribed'; $labels['messagecount'] = 'Messages'; $labels['create'] = 'Create'; $labels['createfolder'] = 'Create new folder'; -$labels['rename'] = 'Rename'; -$labels['renamefolder'] = 'Rename folder'; -$labels['deletefolder'] = 'Delete 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'; @@ -340,4 +360,4 @@ $labels['korean'] = 'Korean'; $labels['chinese'] = 'Chinese'; -?> +?> \ No newline at end of file -- Gitblit v1.9.1