From ecfaed571b2c38f4bcc2b6a0fa39fba15a5126ce Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Fri, 11 Nov 2011 10:04:45 -0500 Subject: [PATCH] - Apply fixes fom trunk up to r5414 --- program/localization/en_US/labels.inc | 163 ++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 126 insertions(+), 37 deletions(-) diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 2a52c04..6aefd6c 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -5,8 +5,8 @@ +-----------------------------------------------------------------------+ | language/en_US/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 | | | +-----------------------------------------------------------------------+ @@ -28,7 +28,7 @@ // taskbar $labels['logout'] = 'Logout'; -$labels['mail'] = 'E-Mail'; +$labels['mail'] = 'Mail'; $labels['settings'] = 'Settings'; $labels['addressbook'] = 'Address Book'; @@ -41,18 +41,17 @@ // message listing $labels['subject'] = 'Subject'; -$labels['from'] = 'Sender'; -$labels['to'] = 'Recipient'; +$labels['from'] = 'From'; +$labels['to'] = 'To'; $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'] = 'Organization'; - -// aliases -$labels['reply-to'] = $labels['replyto']; +$labels['readstatus'] = 'Read status'; $labels['mailboxlist'] = 'Folders'; $labels['messagesfromto'] = 'Messages $from to $to of $count'; @@ -121,19 +120,19 @@ $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['forwardinline'] = 'Forward inline'; +$labels['forwardattachment'] = 'Forward as attachment'; $labels['forwardmessage'] = 'Forward the message'; $labels['deletemessage'] = 'Delete message'; $labels['movemessagetotrash'] = 'Move message to trash'; $labels['printmessage'] = 'Print this message'; -$labels['previousmessage'] = 'Show the previous message'; -$labels['previousmessages'] = 'Show previous set of messages'; -$labels['firstmessage'] = 'Show the first message'; -$labels['firstmessages'] = 'Show first set of messages'; -$labels['nextmessage'] = 'Show the next message'; -$labels['nextmessages'] = 'Show next set of messages'; -$labels['lastmessage'] = 'Show the last message'; -$labels['lastmessages'] = 'Show last set of messages'; +$labels['previousmessage'] = 'Show previous message'; +$labels['firstmessage'] = 'Show first message'; +$labels['nextmessage'] = 'Show next message'; +$labels['lastmessage'] = 'Show last message'; $labels['backtolist'] = 'Back to message list'; $labels['viewsource'] = 'Show source'; $labels['markmessages'] = 'Mark messages'; @@ -141,7 +140,7 @@ $labels['markunread'] = 'As unread'; $labels['markflagged'] = 'As flagged'; $labels['markunflagged'] = 'As unflagged'; -$labels['messageactions'] = 'More actions...'; +$labels['moreactions'] = 'More actions...'; $labels['select'] = 'Select'; $labels['all'] = 'All'; @@ -164,7 +163,7 @@ $labels['autoexpand_threads'] = 'Expand message threads'; $labels['do_expand'] = 'all threads'; $labels['expand_only_unread'] = 'only with unread messages'; -$labels['fromto'] = 'Sender/Recipient'; +$labels['fromto'] = 'From/To'; $labels['flag'] = 'Flag'; $labels['attachment'] = 'Attachment'; $labels['nonesort'] = 'None'; @@ -177,9 +176,9 @@ $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'; @@ -202,14 +201,20 @@ $labels['charset'] = 'Charset'; $labels['editortype'] = 'Editor type'; $labels['returnreceipt'] = 'Return receipt'; +$labels['dsn'] = 'Delivery status notification'; +$labels['mailreplyintro'] = 'On $date, $sender wrote:'; +$labels['originalmessage'] = 'Original Message'; +$labels['editidents'] = 'Edit identities'; $labels['checkspelling'] = 'Check spelling'; $labels['resumeediting'] = 'Resume editing'; $labels['revertto'] = 'Revert to'; $labels['attachments'] = 'Attachments'; $labels['upload'] = 'Upload'; +$labels['uploadprogress'] = '$percent ($current from $total)'; $labels['close'] = 'Close'; +$labels['messageoptions'] = 'Message options...'; $labels['low'] = 'Low'; $labels['lowest'] = 'Lowest'; @@ -220,6 +225,7 @@ $labels['nosubject'] = '(no subject)'; $labels['showimages'] = 'Display images'; $labels['alwaysshow'] = 'Always show images from $sender'; +$labels['isdraft'] = 'This is a draft message.'; $labels['htmltoggle'] = 'HTML'; $labels['plaintoggle'] = 'Plain text'; @@ -230,6 +236,7 @@ $labels['addcc'] = 'Add Cc'; $labels['addbcc'] = 'Add Bcc'; $labels['addreplyto'] = 'Add Reply-To'; +$labels['addfollowupto'] = 'Add Followup-To'; // mdn $labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?'; @@ -238,18 +245,70 @@ $labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.'; // address boook -$labels['name'] = 'Display name'; -$labels['firstname'] = 'First name'; -$labels['surname'] = 'Last name'; -$labels['email'] = 'E-Mail'; +$labels['name'] = 'Display Name'; +$labels['firstname'] = 'First Name'; +$labels['surname'] = 'Last Name'; +$labels['middlename'] = 'Middle Name'; +$labels['nameprefix'] = 'Prefix'; +$labels['namesuffix'] = 'Suffix'; +$labels['nickname'] = 'Nickname'; +$labels['jobtitle'] = 'Job Title'; +$labels['organization'] = 'Company'; +$labels['department'] = 'Department'; +$labels['gender'] = 'Gender'; +$labels['maidenname'] = 'Maiden Name'; +$labels['email'] = 'Email'; +$labels['phone'] = 'Phone'; +$labels['address'] = 'Address'; +$labels['street'] = 'Street'; +$labels['locality'] = 'City'; +$labels['zipcode'] = 'ZIP Code'; +$labels['region'] = 'State/Province'; +$labels['country'] = 'Country'; +$labels['birthday'] = 'Birthday'; +$labels['anniversary'] = 'Anniversary'; +$labels['website'] = 'Website'; +$labels['instantmessenger'] = 'IM'; +$labels['notes'] = 'Notes'; +$labels['male'] = 'male'; +$labels['female'] = 'female'; +$labels['manager'] = 'Manager'; +$labels['assistant'] = 'Assistant'; +$labels['spouse'] = 'Spouse'; +$labels['allfields'] = 'All fields'; +$labels['search'] = 'Search'; +$labels['advsearch'] = 'Advanced Search'; +$labels['other'] = 'Other'; +$labels['typehome'] = 'Home'; +$labels['typework'] = 'Work'; +$labels['typeother'] = 'Other'; +$labels['typemobile'] = 'Mobile'; +$labels['typemain'] = 'Main'; +$labels['typehomefax'] = 'Home Fax'; +$labels['typeworkfax'] = 'Work Fax'; +$labels['typecar'] = 'Car'; +$labels['typepager'] = 'Pager'; +$labels['typevideo'] = 'Video'; +$labels['typeassistant'] = 'Assistant'; +$labels['typehomepage'] = 'Home Page'; +$labels['typeblog'] = 'Blog'; +$labels['typeprofile'] = 'Profile'; + +$labels['addfield'] = 'Add field...'; $labels['addcontact'] = 'Add new contact'; $labels['editcontact'] = 'Edit contact'; +$labels['contacts'] = 'Contacts'; +$labels['contactproperties'] = 'Contact properties'; +$labels['personalinfo'] = 'Personal information'; $labels['edit'] = 'Edit'; $labels['cancel'] = 'Cancel'; $labels['save'] = 'Save'; $labels['delete'] = 'Delete'; +$labels['rename'] = 'Rename'; +$labels['addphoto'] = 'Add'; +$labels['replacephoto'] = 'Replace'; $labels['newcontact'] = 'Create new contact card'; $labels['deletecontact'] = 'Delete selected contacts'; @@ -259,20 +318,25 @@ $labels['export'] = 'Export'; $labels['exportvcards'] = 'Export contacts in vCard format'; $labels['newcontactgroup'] = 'Create new contact group'; -$labels['groupactions'] = 'Actions for contact groups...'; +$labels['grouprename'] = 'Rename group'; +$labels['groupdelete'] = 'Delete group'; -$labels['previouspage'] = 'Show previous set'; -$labels['firstpage'] = 'Show first set'; -$labels['nextpage'] = 'Show next set'; -$labels['lastpage'] = 'Show last set'; +$labels['previouspage'] = 'Show previous page'; +$labels['firstpage'] = 'Show first page'; +$labels['nextpage'] = 'Show next page'; +$labels['lastpage'] = 'Show last page'; $labels['group'] = 'Group'; $labels['groups'] = 'Groups'; $labels['personaladrbook'] = 'Personal Addresses'; +$labels['searchsave'] = 'Save search'; +$labels['searchdelete'] = 'Delete search'; + $labels['import'] = 'Import'; $labels['importcontacts'] = 'Import contacts'; $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['done'] = 'Done'; @@ -294,6 +358,8 @@ $labels['preferhtml'] = 'Display HTML'; $labels['defaultcharset'] = 'Default Character Set'; $labels['htmlmessage'] = 'HTML Message'; +$labels['dateformat'] = 'Date format'; +$labels['timeformat'] = 'Time format'; $labels['prettydate'] = 'Pretty dates'; $labels['setdefault'] = 'Set default'; $labels['autodetect'] = 'Auto'; @@ -303,6 +369,7 @@ $labels['signature'] = 'Signature'; $labels['dstactive'] = 'Daylight saving 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'; @@ -311,14 +378,16 @@ $labels['uisettings'] = 'User Interface'; $labels['serversettings'] = 'Server Settings'; $labels['mailboxview'] = 'Mailbox View'; -$labels['mdnrequests'] = 'Sender notifications'; -$labels['askuser'] = 'ask the user'; -$labels['autosend'] = 'send automatically'; +$labels['mdnrequests'] = 'On request for return receipt'; +$labels['askuser'] = 'ask me'; +$labels['autosend'] = 'send receipt'; +$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me'; +$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 Trash fails, delete them'; $labels['showremoteimages'] = 'Display remote inline images'; $labels['fromknownsenders'] = 'from known senders'; $labels['always'] = 'always'; @@ -358,6 +427,17 @@ $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['autocompletesingle'] = 'Skip alternative email addresses in autocompletion'; +$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['folder'] = 'Folder'; $labels['folders'] = 'Folders'; @@ -366,15 +446,24 @@ $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['foldertype'] = 'Folder Type'; +$labels['personalfolder'] = 'Private Folder'; +$labels['otherfolder'] = 'Other User\'s Folder'; +$labels['sharedfolder'] = 'Public Folder'; $labels['sortby'] = 'Sort by'; $labels['sortasc'] = 'Sort ascending'; $labels['sortdesc'] = 'Sort descending'; +$labels['undo'] = 'Undo'; // units $labels['B'] = 'B'; @@ -401,5 +490,5 @@ $labels['japanese'] = 'Japanese'; $labels['korean'] = 'Korean'; $labels['chinese'] = 'Chinese'; - + ?> -- Gitblit v1.9.1