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 | 54 +++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 15 deletions(-) diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index c04531c..6aefd6c 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'] = 'E-Mail'; +$labels['mail'] = 'Mail'; $labels['settings'] = 'Settings'; $labels['addressbook'] = 'Address Book'; @@ -41,8 +41,8 @@ // 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'; @@ -140,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'; @@ -163,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'; @@ -202,6 +202,8 @@ $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'; @@ -210,6 +212,7 @@ $labels['attachments'] = 'Attachments'; $labels['upload'] = 'Upload'; +$labels['uploadprogress'] = '$percent ($current from $total)'; $labels['close'] = 'Close'; $labels['messageoptions'] = 'Message options...'; @@ -222,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'; @@ -241,25 +245,25 @@ $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['middlename'] = 'Middle name'; +$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['jobtitle'] = 'Job Title'; $labels['organization'] = 'Company'; $labels['department'] = 'Department'; $labels['gender'] = 'Gender'; -$labels['maidenname'] = 'Maiden name'; -$labels['email'] = 'E-Mail'; +$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'] = 'Region'; +$labels['zipcode'] = 'ZIP Code'; +$labels['region'] = 'State/Province'; $labels['country'] = 'Country'; $labels['birthday'] = 'Birthday'; $labels['anniversary'] = 'Anniversary'; @@ -272,6 +276,9 @@ $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'; @@ -284,6 +291,9 @@ $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'; @@ -308,7 +318,8 @@ $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 page'; $labels['firstpage'] = 'Show first page'; @@ -319,9 +330,13 @@ $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'; @@ -343,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'; @@ -414,7 +431,13 @@ $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'; @@ -440,6 +463,7 @@ $labels['sortby'] = 'Sort by'; $labels['sortasc'] = 'Sort ascending'; $labels['sortdesc'] = 'Sort descending'; +$labels['undo'] = 'Undo'; // units $labels['B'] = 'B'; -- Gitblit v1.9.1