From 3562eb319e446621b58bdc6237bc62b45a4e3ce3 Mon Sep 17 00:00:00 2001 From: alecpl Date: Fri, 19 Sep 2008 08:17:05 +0000 Subject: #1485368: en_* update --- program/localization/en_GB/labels.inc | 28 ++++++++++++++++++++++++++++ program/localization/en_GB/messages.inc | 21 ++++++++++++++------- program/localization/en_US/labels.inc | 4 ++-- program/localization/en_US/messages.inc | 8 ++++---- 4 files changed, 48 insertions(+), 13 deletions(-) diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc index 82d06b090..13008f535 100644 --- a/program/localization/en_GB/labels.inc +++ b/program/localization/en_GB/labels.inc @@ -52,6 +52,7 @@ $labels['filename'] = 'File name'; $labels['filesize'] = 'File size'; $labels['preferhtml'] = 'Display HTML'; $labels['htmlmessage'] = 'HTML Message'; +$labels['showknownimages'] = 'Show images from known senders'; $labels['prettydate'] = 'Pretty dates'; $labels['addtoaddressbook'] = 'Add to address book'; $labels['sun'] = 'Sun'; @@ -114,6 +115,8 @@ $labels['viewsource'] = 'Show source'; $labels['markmessages'] = 'Mark messages'; $labels['markread'] = 'As read'; $labels['markunread'] = 'As unread'; +$labels['markflagged'] = 'As flagged'; +$labels['markunflagged'] = 'As unflagged'; $labels['select'] = 'Select'; $labels['all'] = 'All'; $labels['none'] = 'None'; @@ -126,6 +129,7 @@ $labels['unknown'] = 'unknown'; $labels['unlimited'] = 'unlimited'; $labels['quicksearch'] = 'Quick search'; $labels['resetsearch'] = 'Reset search'; +$labels['openinextwin'] = 'Open in new window'; $labels['compose'] = 'Compose a message'; $labels['savemessage'] = 'Save this draft'; $labels['sendmessage'] = 'Send now'; @@ -146,8 +150,12 @@ $labels['high'] = 'High'; $labels['highest'] = 'Highest'; $labels['nosubject'] = '(no subject)'; $labels['showimages'] = 'Display images'; +$labels['alwaysshow'] = 'Always show images from $sender'; $labels['htmltoggle'] = 'HTML'; $labels['plaintoggle'] = 'Plain text'; +$labels['savesentmessagein'] = 'Save sent message in'; +$labels['dontsave'] = 'don\'t save'; +$labels['maxuploadsize'] = 'Maximum allowed file size is $size'; $labels['addcc'] = 'Add Cc'; $labels['addbcc'] = 'Add Bcc'; $labels['addreplyto'] = 'Add Reply-To'; @@ -171,12 +179,19 @@ $labels['composeto'] = 'Compose mail to'; $labels['contactsfromto'] = 'Contacts $from to $to of $count'; $labels['print'] = 'Print'; $labels['export'] = 'Export'; +$labels['exportvcards'] = 'Export contacts in vCard format'; $labels['previouspage'] = 'Show previous set'; $labels['firstpage'] = 'Show first set'; $labels['nextpage'] = 'Show next set'; $labels['lastpage'] = 'Show last set'; $labels['groups'] = 'Groups'; $labels['personaladrbook'] = 'Personal Addresses'; +$labels['import'] = 'Import'; +$labels['importcontacts'] = 'Import contacts'; +$labels['importfromfile'] = 'Import from file:'; +$labels['importreplace'] = 'Replace the entire address book'; +$labels['importtext'] = 'You can upload contacts from an existing address book. We currently support importing addresses from the vCard data format.'; +$labels['done'] = 'Done'; $labels['settingsfor'] = 'Settings for'; $labels['preferences'] = 'Preferences'; $labels['userpreferences'] = 'User preferences'; @@ -187,6 +202,7 @@ $labels['newidentity'] = 'New identity'; $labels['newitem'] = 'New item'; $labels['edititem'] = 'Edit item'; $labels['setdefault'] = 'Set default'; +$labels['autodetect'] = 'Auto'; $labels['language'] = 'Language'; $labels['timezone'] = 'Time zone'; $labels['pagesize'] = 'Rows per page'; @@ -195,13 +211,24 @@ $labels['dstactive'] = 'Summer time'; $labels['htmleditor'] = 'Compose HTML messages'; $labels['htmlsignature'] = 'HTML signature'; $labels['previewpane'] = 'Show preview pane'; +$labels['skin'] = 'Interface skin'; $labels['logoutclear'] = 'Clear Trash on logout'; $labels['logoutcompact'] = 'Compact Inbox on logout'; $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['ignore'] = 'ignore'; +$labels['readwhendeleted'] = 'Mark the message as read on delete'; +$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete'; +$labels['showinlineimages'] = 'Display attached images below the message'; $labels['autosavedraft'] = 'Automatically save draft'; $labels['everynminutes'] = 'every $n minutes'; $labels['never'] = 'never'; +$labels['messagesdisplaying'] = 'Displaying messages'; +$labels['messagescomposition'] = 'Composing messages'; $labels['folder'] = 'Folder'; $labels['folders'] = 'Folders'; $labels['foldername'] = 'Folder name'; @@ -213,6 +240,7 @@ $labels['rename'] = 'Rename'; $labels['renamefolder'] = 'Rename folder'; $labels['deletefolder'] = 'Delete folder'; $labels['managefolders'] = 'Manage folders'; +$labels['specialfolders'] = 'Special folders'; $labels['sortby'] = 'Sort by'; $labels['sortasc'] = 'Sort ascending'; $labels['sortdesc'] = 'Sort descending'; diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc index 3b0da6864..1f66288cf 100644 --- a/program/localization/en_GB/messages.inc +++ b/program/localization/en_GB/messages.inc @@ -40,18 +40,18 @@ $messages['encryptedmessage'] = 'This is an encrypted message and can not be dis $messages['nocontactsfound'] = 'No contacts found'; $messages['contactnotfound'] = 'The requested contact was not found'; $messages['sendingfailed'] = 'Failed to send message'; -$messages['senttooquickly'] = 'You have to wait $sec sec. to sent the message'; -$messages['errorsavingsent'] = 'An error occured while saving sent message'; -$messages['errorsaving'] = 'An error occured while saving'; +$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message'; +$messages['errorsavingsent'] = 'An error occurred while saving sent message'; +$messages['errorsaving'] = 'An error occurred while saving'; $messages['errormoving'] = 'Could not move the message'; $messages['errordeleting'] = 'Could not delete the message'; $messages['deletecontactconfirm'] = 'Do you really want to delete the selected contact(s)?'; $messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?'; $messages['deletefolderconfirm'] = 'Do you really want to delete this folder?'; $messages['purgefolderconfirm'] = 'Do you really want to delete all messages in this folder?'; -$messages['foldercreating'] = 'Folder creating...'; -$messages['folderdeleting'] = 'Folder deleting...'; -$messages['folderrenaming'] = 'Folder renaming...'; +$messages['foldercreating'] = 'Creating folder...'; +$messages['folderdeleting'] = 'Deleting folder...'; +$messages['folderrenaming'] = 'Renaming folder...'; $messages['formincomplete'] = 'The form was not completely filled out'; $messages['noemailwarning'] = 'Please enter a valid email address'; $messages['nonamewarning'] = 'Please enter a name'; @@ -83,5 +83,12 @@ $messages['receiptsent'] = 'Successfully sent a read receipt'; $messages['errorsendingreceipt'] = 'Could not send the receipt'; $messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.'; $messages['addsubfolderhint'] = 'This folder will be created as subfolder of the currently selected one'; +$messages['forbiddencharacter'] = 'Folder name contains a forbidden character'; +$messages['selectimportfile'] = 'Please select a file to upload'; +$messages['addresswriterror'] = 'The selected address book is not writeable'; +$messages['importwait'] = 'Importing, please wait...'; +$messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.'; +$messages['importconfirm'] = 'Successfully imported $inserted contacts, $skipped existing entries skipped:$names'; +$messages['opnotpermitted'] = 'Operation not permitted!'; -?> \ No newline at end of file +?> diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 7e538c2ed..380352e79 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -282,8 +282,8 @@ $labels['showinlineimages'] = 'Display attached images below the message'; $labels['autosavedraft'] = 'Automatically save draft'; $labels['everynminutes'] = 'every $n minutes'; $labels['never'] = 'never'; -$labels['messagesdisplaying'] = 'Messages displaying'; -$labels['messagescomposition'] = 'Messages composition'; +$labels['messagesdisplaying'] = 'Displaying messages'; +$labels['messagescomposition'] = 'Composing messages'; $labels['folder'] = 'Folder'; $labels['folders'] = 'Folders'; diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index e7c64c0df..6b1bb8475 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -40,7 +40,7 @@ $messages['encryptedmessage'] = 'This is an encrypted message and can not be dis $messages['nocontactsfound'] = 'No contacts found'; $messages['contactnotfound'] = 'The requested contact was not found'; $messages['sendingfailed'] = 'Failed to send message'; -$messages['senttooquickly'] = 'You have to wait $sec sec. to sent the message'; +$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message'; $messages['errorsavingsent'] = 'An error occured while saving sent message'; $messages['errorsaving'] = 'An error occured while saving'; $messages['errormoving'] = 'Could not move the message'; @@ -49,9 +49,9 @@ $messages['deletecontactconfirm'] = 'Do you really want to delete the selected $messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?'; $messages['deletefolderconfirm'] = 'Do you really want to delete this folder?'; $messages['purgefolderconfirm'] = 'Do you really want to delete all messages in this folder?'; -$messages['foldercreating'] = 'Folder creating...'; -$messages['folderdeleting'] = 'Folder deleting...'; -$messages['folderrenaming'] = 'Folder renaming...'; +$messages['foldercreating'] = 'Creating folder...'; +$messages['folderdeleting'] = 'Deleting folder...'; +$messages['folderrenaming'] = 'Renaming folder...'; $messages['formincomplete'] = 'The form was not completely filled out'; $messages['noemailwarning'] = 'Please enter a valid email address'; $messages['nonamewarning'] = 'Please enter a name'; -- cgit v1.2.3