From 099d2b9fd4af3c7e7f1568af3c01c0b2e52cd9c3 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Tue, 26 Mar 2013 14:38:07 -0400 Subject: [PATCH] Remove sig_above configuration option, use reply_mode only (#1489001) --- program/localization/en_US/labels.inc | 95 +++++++++++++++++++++++++++++++---------------- 1 files changed, 63 insertions(+), 32 deletions(-) diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index f192209..1a753ec 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -1,20 +1,19 @@ <?php /* - +-----------------------------------------------------------------------+ - | language/en_US/labels.inc | + | localization/<lang>/labels.inc | | | - | Language file of the Roundcube Webmail client | - | Copyright (C) 2005-2010, The Roundcube Dev Team | - | Licensed under the GNU GPL | + | Localization file of the Roundcube Webmail client | + | Copyright (C) 2005-2012, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | | | +-----------------------------------------------------------------------+ - | Author: Thomas Bruederli <roundcube@gmail.com> | - +-----------------------------------------------------------------------+ - @version $Id$ - + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/ */ $labels = array(); @@ -42,6 +41,7 @@ // message listing $labels['subject'] = 'Subject'; $labels['from'] = 'From'; +$labels['sender'] = 'Sender'; $labels['to'] = 'To'; $labels['cc'] = 'Cc'; $labels['bcc'] = 'Bcc'; @@ -52,16 +52,20 @@ $labels['priority'] = 'Priority'; $labels['organization'] = 'Organization'; $labels['readstatus'] = 'Read status'; +$labels['listoptions'] = 'List options...'; $labels['mailboxlist'] = 'Folders'; $labels['messagesfromto'] = 'Messages $from to $to of $count'; $labels['threadsfromto'] = 'Threads $from to $to of $count'; $labels['messagenrof'] = 'Message $nr of $count'; +$labels['fromtoshort'] = '$from – $to of $count'; $labels['copy'] = 'Copy'; $labels['move'] = 'Move'; $labels['moveto'] = 'Move to...'; $labels['download'] = 'Download'; +$labels['showattachment'] = 'Show'; +$labels['showanyway'] = 'Show it anyway'; $labels['filename'] = 'File name'; $labels['filesize'] = 'File size'; @@ -117,12 +121,16 @@ $labels['today'] = 'Today'; // toolbar buttons +$labels['refresh'] = 'Refresh'; $labels['checkmail'] = 'Check for new messages'; +$labels['compose'] = 'Compose'; $labels['writenewmessage'] = 'Create a new message'; +$labels['reply'] = 'Reply'; $labels['replytomessage'] = 'Reply to sender'; $labels['replytoallmessage'] = 'Reply to list or to sender and all recipients'; $labels['replyall'] = 'Reply all'; $labels['replylist'] = 'Reply list'; +$labels['forward'] = 'Forward'; $labels['forwardinline'] = 'Forward inline'; $labels['forwardattachment'] = 'Forward as attachment'; $labels['forwardmessage'] = 'Forward the message'; @@ -135,12 +143,16 @@ $labels['lastmessage'] = 'Show last message'; $labels['backtolist'] = 'Back to message list'; $labels['viewsource'] = 'Show source'; +$labels['mark'] = 'Mark'; $labels['markmessages'] = 'Mark messages'; $labels['markread'] = 'As read'; $labels['markunread'] = 'As unread'; $labels['markflagged'] = 'As flagged'; $labels['markunflagged'] = 'As unflagged'; $labels['moreactions'] = 'More actions...'; +$labels['more'] = 'More'; +$labels['back'] = 'Back'; +$labels['options'] = 'Options'; $labels['select'] = 'Select'; $labels['all'] = 'All'; @@ -150,6 +162,7 @@ $labels['flagged'] = 'Flagged'; $labels['unanswered'] = 'Unanswered'; $labels['deleted'] = 'Deleted'; +$labels['undeleted'] = 'Not deleted'; $labels['invert'] = 'Invert'; $labels['filter'] = 'Filter'; $labels['list'] = 'List'; @@ -187,15 +200,16 @@ $labels['resetsearch'] = 'Reset search'; $labels['searchmod'] = 'Search modifiers'; $labels['msgtext'] = 'Entire message'; +$labels['body'] = 'Body'; $labels['openinextwin'] = 'Open in new window'; $labels['emlsave'] = 'Download (.eml)'; // message compose -$labels['compose'] = 'Compose a message'; $labels['editasnew'] = 'Edit as new'; -$labels['savemessage'] = 'Save this draft'; -$labels['sendmessage'] = 'Send now'; +$labels['send'] = 'Send'; +$labels['sendmessage'] = 'Send message'; +$labels['savemessage'] = 'Save as draft'; $labels['addattachment'] = 'Attach a file'; $labels['charset'] = 'Charset'; $labels['editortype'] = 'Editor type'; @@ -205,10 +219,12 @@ $labels['originalmessage'] = 'Original Message'; $labels['editidents'] = 'Edit identities'; +$labels['spellcheck'] = 'Spell'; $labels['checkspelling'] = 'Check spelling'; $labels['resumeediting'] = 'Resume editing'; $labels['revertto'] = 'Revert to'; +$labels['attach'] = 'Attach'; $labels['attachments'] = 'Attachments'; $labels['upload'] = 'Upload'; $labels['uploadprogress'] = '$percent ($current from $total)'; @@ -225,6 +241,9 @@ $labels['showimages'] = 'Display images'; $labels['alwaysshow'] = 'Always show images from $sender'; $labels['isdraft'] = 'This is a draft message.'; +$labels['andnmore'] = '$nr more...'; +$labels['togglemoreheaders'] = 'Show more message headers'; +$labels['togglefullheaders'] = 'Toggle raw message headers'; $labels['htmltoggle'] = 'HTML'; $labels['plaintoggle'] = 'Plain text'; @@ -252,7 +271,6 @@ $labels['namesuffix'] = 'Suffix'; $labels['nickname'] = 'Nickname'; $labels['jobtitle'] = 'Job Title'; -$labels['organization'] = 'Company'; $labels['department'] = 'Department'; $labels['gender'] = 'Gender'; $labels['maidenname'] = 'Maiden Name'; @@ -277,6 +295,7 @@ $labels['allfields'] = 'All fields'; $labels['search'] = 'Search'; $labels['advsearch'] = 'Advanced Search'; +$labels['advanced'] = 'Advanced'; $labels['other'] = 'Other'; $labels['typehome'] = 'Home'; @@ -308,6 +327,7 @@ $labels['rename'] = 'Rename'; $labels['addphoto'] = 'Add'; $labels['replacephoto'] = 'Replace'; +$labels['uploadphoto'] = 'Upload photo'; $labels['newcontact'] = 'Create new contact card'; $labels['deletecontact'] = 'Delete selected contacts'; @@ -319,6 +339,7 @@ $labels['newcontactgroup'] = 'Create new contact group'; $labels['grouprename'] = 'Rename group'; $labels['groupdelete'] = 'Delete group'; +$labels['groupremoveselected'] = 'Remove selected contacts from group'; $labels['previouspage'] = 'Show previous page'; $labels['firstpage'] = 'Show first page'; @@ -337,26 +358,28 @@ $labels['importfromfile'] = 'Import from file:'; $labels['importtarget'] = 'Add new contacts to address book:'; $labels['importreplace'] = 'Replace the entire address book'; -$labels['importtext'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> data format.'; +$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.'; $labels['done'] = 'Done'; // settings -$labels['settingsfor'] = 'Settings for'; +$labels['settingsfor'] = 'Settings for'; $labels['about'] = 'About'; -$labels['preferences'] = 'Preferences'; -$labels['userpreferences'] = 'User preferences'; -$labels['editpreferences'] = 'Edit user preferences'; +$labels['preferences'] = 'Preferences'; +$labels['userpreferences'] = 'User preferences'; +$labels['editpreferences'] = 'Edit user preferences'; -$labels['identities'] = 'Identities'; -$labels['manageidentities'] = 'Manage identities for this account'; -$labels['newidentity'] = 'New identity'; +$labels['identities'] = 'Identities'; +$labels['manageidentities'] = 'Manage identities for this account'; +$labels['newidentity'] = 'New identity'; -$labels['newitem'] = 'New item'; -$labels['edititem'] = 'Edit item'; +$labels['newitem'] = 'New item'; +$labels['edititem'] = 'Edit item'; $labels['preferhtml'] = 'Display HTML'; $labels['defaultcharset'] = 'Default Character Set'; $labels['htmlmessage'] = 'HTML Message'; +$labels['messagepart'] = 'Part'; +$labels['digitalsig'] = 'Digital Signature'; $labels['dateformat'] = 'Date format'; $labels['timeformat'] = 'Time format'; $labels['prettydate'] = 'Pretty dates'; @@ -367,8 +390,11 @@ $labels['pagesize'] = 'Rows per page'; $labels['signature'] = 'Signature'; $labels['dstactive'] = 'Daylight saving time'; +$labels['showinextwin'] = 'Open message in a new window'; +$labels['composeextwin'] = 'Compose in a new window'; $labels['htmleditor'] = 'Compose HTML messages'; -$labels['htmlonreply'] = 'on reply to HTML message only'; +$labels['htmlonreply'] = 'on reply to HTML message'; +$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message'; $labels['htmlsignature'] = 'HTML signature'; $labels['previewpane'] = 'Show preview pane'; $labels['skin'] = 'Interface skin'; @@ -387,13 +413,14 @@ $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete'; $labels['skipdeleted'] = 'Do not show deleted messages'; $labels['deletealways'] = 'If moving messages to Trash fails, delete them'; +$labels['deletejunk'] = 'Directly delete messages in Junk'; $labels['showremoteimages'] = 'Display remote inline images'; $labels['fromknownsenders'] = 'from known senders'; $labels['always'] = 'always'; $labels['showinlineimages'] = 'Display attached images below the message'; $labels['autosavedraft'] = 'Automatically save draft'; $labels['everynminutes'] = 'every $n minute(s)'; -$labels['keepalive'] = 'Check for new messages on'; +$labels['refreshinterval'] = 'Refresh (check for new messages, etc.)'; $labels['never'] = 'never'; $labels['immediately'] = 'immediately'; $labels['messagesdisplaying'] = 'Displaying Messages'; @@ -409,35 +436,38 @@ $labels['displaynext'] = 'After message delete/move display the next message'; $labels['defaultfont'] = 'Default font of HTML message'; $labels['mainoptions'] = 'Main Options'; +$labels['browseroptions'] = 'Browser Options'; $labels['section'] = 'Section'; $labels['maintenance'] = 'Maintenance'; $labels['newmessage'] = 'New Message'; -$labels['listoptions'] = 'List Options'; $labels['signatureoptions'] = 'Signature Options'; $labels['whenreplying'] = 'When replying'; -$labels['replytopposting'] = 'start new message above original'; -$labels['replybottomposting'] = 'start new message below original'; +$labels['replyempty'] = 'do not quote the original message'; +$labels['replytopposting'] = 'start new message above the quote'; +$labels['replybottomposting'] = 'start new message below the quote'; $labels['replyremovesignature'] = 'When replying remove original signature from message'; $labels['autoaddsignature'] = 'Automatically add signature'; $labels['newmessageonly'] = 'new message only'; $labels['replyandforwardonly'] = 'replies and forwards only'; -$labels['replysignaturepos'] = 'When replying or forwarding place signature'; -$labels['belowquote'] = 'below the quote'; -$labels['abovequote'] = 'above the quote'; $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['defaultaddressbook'] = 'Add new contacts to the selected addressbook'; +$labels['defaultabook'] = 'Default address book'; $labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion'; +$labels['listnamedisplay'] = 'List contacts as'; $labels['spellcheckbeforesend'] = 'Check spelling before sending a message'; $labels['spellcheckoptions'] = 'Spellcheck Options'; $labels['spellcheckignoresyms'] = 'Ignore words with symbols'; $labels['spellcheckignorenums'] = 'Ignore words with numbers'; $labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized'; $labels['addtodict'] = 'Add to dictionary'; +$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links'; +$labels['forwardmode'] = 'Messages forwarding'; +$labels['inline'] = 'inline'; +$labels['asattachment'] = 'as attachment'; $labels['folder'] = 'Folder'; $labels['folders'] = 'Folders'; @@ -465,6 +495,7 @@ $labels['sortdesc'] = 'Sort descending'; $labels['undo'] = 'Undo'; +$labels['installedplugins'] = 'Installed plugins'; $labels['plugin'] = 'Plugin'; $labels['version'] = 'Version'; $labels['source'] = 'Source'; -- Gitblit v1.9.1