diff options
| -rw-r--r-- | program/localization/en_GB/labels.inc | 54 | ||||
| -rw-r--r-- | program/localization/en_GB/messages.inc | 28 | ||||
| -rw-r--r-- | program/localization/en_US/labels.inc | 4 | ||||
| -rw-r--r-- | program/localization/en_US/messages.inc | 2 |
4 files changed, 70 insertions, 18 deletions
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc index 71e73c830..88ba61362 100644 --- a/program/localization/en_GB/labels.inc +++ b/program/localization/en_GB/labels.inc @@ -37,7 +37,6 @@ $labels['inbox'] = 'Inbox'; $labels['drafts'] = 'Drafts'; $labels['sent'] = 'Sent'; $labels['trash'] = 'Deleted Items'; -$labels['drafts'] = 'Drafts'; $labels['junk'] = 'Junk'; // message listing @@ -65,7 +64,7 @@ $labels['download'] = 'download'; $labels['filename'] = 'File name'; $labels['filesize'] = 'File size'; -$labels['preferhtml'] = 'Prefer HTML'; +$labels['preferhtml'] = 'Display HTML'; $labels['htmlmessage'] = 'HTML Message'; $labels['prettydate'] = 'Pretty dates'; @@ -97,10 +96,17 @@ $labels['writenewmessage'] = 'Create a new message'; $labels['replytomessage'] = 'Reply to the message'; $labels['replytoallmessage'] = 'Reply to sender and all recipients'; $labels['forwardmessage'] = 'Forward the message'; -$labels['deletemessage'] = 'Move message to trash'; +$labels['deletemessage'] = 'Delete message'; +$labels['movemessagetotrash'] = 'Move message to "Deleted Items"'; $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['backtolist'] = 'Back to message list'; $labels['viewsource'] = 'Show source'; @@ -114,14 +120,25 @@ $labels['empty'] = 'Empty'; $labels['purge'] = 'Purge'; $labels['quota'] = 'Disk usage'; +$labels['unknown'] = 'unknown'; +$labels['unlimited'] = 'unlimited'; + +$labels['quicksearch'] = 'Quick search'; +$labels['resetsearch'] = 'Reset search'; // message compose -$labels['compose'] = 'Compose a message'; -$labels['savemessage'] = 'Save this draft'; -$labels['sendmessage'] = 'Send the message now'; +$labels['compose'] = 'Compose a message'; +$labels['savemessage'] = 'Save this draft'; +$labels['sendmessage'] = 'Send the message now'; $labels['addattachment'] = 'Attach a file'; -$labels['charset'] = 'Charset'; +$labels['charset'] = 'Charset'; +$labels['editortype'] = 'Editor type'; +$labels['returnreceipt'] = 'Return receipt'; + +$labels['checkspelling'] = 'Check spelling'; +$labels['resumeediting'] = 'Resume editing'; +$labels['revertto'] = 'Revert to'; $labels['attachments'] = 'Attachments'; $labels['upload'] = 'Upload'; @@ -136,6 +153,9 @@ $labels['highest'] = 'Highest'; $labels['nosubject'] = '(no subject)'; $labels['showimages'] = 'Display images'; +$labels['htmltoggle'] = 'HTML'; +$labels['plaintoggle'] = 'Plain text'; + // address boook $labels['name'] = 'Display name'; @@ -158,6 +178,14 @@ $labels['contactsfromto'] = 'Contacts $from to $to of $count'; $labels['print'] = 'Print'; $labels['export'] = 'Export'; +$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'; + // settings $labels['settingsfor'] = 'Settings for'; @@ -178,6 +206,14 @@ $labels['language'] = 'Language'; $labels['timezone'] = 'Time zone'; $labels['pagesize'] = 'Rows per page'; $labels['signature'] = 'Signature'; +$labels['dstactive'] = 'Daylight savings'; +$labels['htmleditor'] = 'Compose HTML messages'; +$labels['htmlsignature'] = 'HTML signature'; +$labels['previewpane'] = 'Show preview pane'; + +$labels['autosavedraft'] = 'Automatically save draft'; +$labels['everynminutes'] = 'every $n minutes'; +$labels['never'] = 'never'; $labels['folder'] = 'Folder'; $labels['folders'] = 'Folders'; @@ -185,6 +221,8 @@ $labels['foldername'] = 'Folder name'; $labels['subscribed'] = 'Subscribed'; $labels['create'] = 'Create'; $labels['createfolder'] = 'Create new folder'; +$labels['rename'] = 'Rename'; +$labels['renamefolder'] = 'Rename folder'; $labels['deletefolder'] = 'Delete folder'; $labels['managefolders'] = 'Manage folders'; @@ -192,4 +230,4 @@ $labels['sortby'] = 'Sort by'; $labels['sortasc'] = 'Sort ascending'; $labels['sortdesc'] = 'Sort descending'; -?>
\ No newline at end of file +?> diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc index 5e3cfe8f5..f06422a4d 100644 --- a/program/localization/en_GB/messages.inc +++ b/program/localization/en_GB/messages.inc @@ -20,7 +20,7 @@ $messages = array(); $messages['loginfailed'] = 'Login failed'; $messages['cookiesdisabled'] = 'Your browser does not accept cookies'; -$messages['sessionerror'] = 'Your session is invalid or expired'; +$messages['sessionerror'] = 'Your session is invalid or has expired'; $messages['imaperror'] = 'Connection to IMAP server failed'; $messages['nomessagesfound'] = 'No messages found in this mailbox'; $messages['loggedout'] = 'You have successfully terminated the session. Good bye!'; @@ -28,38 +28,52 @@ $messages['mailboxempty'] = 'Mailbox is empty'; $messages['loading'] = 'Loading...'; $messages['loadingdata'] = 'Loading data...'; $messages['checkingmail'] = 'Checking for new messages...'; +$messages['sendingmessage'] = 'Sending message...'; $messages['messagesent'] = 'Message sent successfully'; $messages['savingmessage'] = 'Saving message...'; $messages['messagesaved'] = 'Message saved to Drafts'; $messages['successfullysaved'] = 'Successfully saved'; -$messages['addedsuccessfully'] = 'Contact added successfully to address book'; +$messages['addedsuccessfully'] = 'Contact successfully added to address book'; $messages['contactexists'] = 'A contact with this e-mail address already exists'; $messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.'; $messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!'; $messages['nocontactsfound'] = 'No contacts found'; +$messages['contactnotfound'] = 'The requested contact was not found'; + $messages['sendingfailed'] = 'Failed to send message'; $messages['errorsaving'] = 'An error occured 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['formincomplete'] = 'The form was not completely filled out'; $messages['noemailwarning'] = 'Please enter a valid email address'; $messages['nonamewarning'] = 'Please enter a name'; $messages['nopagesizewarning'] = 'Please enter a page size'; $messages['norecipientwarning'] = 'Please enter at least one recipient'; $messages['nosubjectwarning'] = 'The "Subject" field is empty. Would you like to enter one now?'; -$messages['nobodywarning'] = 'Send this message without text?'; -$messages['notsentwarning'] = 'Message has not been sent. Do you want to discard your message?'; -$messages['noldapserver'] = 'Please select an ldap server to search'; +$messages['nobodywarning'] = 'Send this message without any text?'; +$messages['notsentwarning'] = 'Your message has not been sent. Do you want to discard it?'; +$messages['noldapserver'] = 'Please select an LDAP server to search'; $messages['nocontactsreturned'] = 'No contacts were found'; $messages['nosearchname'] = 'Please enter a contact name or email address'; $messages['searchsuccessful'] = '$nr messages found'; -$messages['searchnomatch'] = 'Search returned no matches'; +$messages['searchnomatch'] = 'Search found no matches'; $messages['searching'] = 'Searching...'; $messages['checking'] = 'Checking...'; $messages['nospellerrors'] = 'No spelling errors found'; $messages['folderdeleted'] = 'Folder successfully deleted'; -$messages['movingmessage'] = 'Moving message...'; +$messages['deletedsuccessfully'] = "Successfully deleted"; +$messages['converting'] = 'Removing formatting from message...'; +$messages['messageopenerror'] = 'Could not load message from server'; +$messages['fileuploaderror'] = 'File upload failed'; +$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size'; +$messages['copysuccess'] = 'Successfully copied $nr addresses'; +$messages['copyerror'] = 'Could not copy any addresses'; +$messages['sourceisreadonly'] = 'This address source is read-only'; +$messages['errorsavingcontact'] = 'Could not save the contact address'; +$messages['movingmessage'] = 'Moving message...'; ?> diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index adf8f29da..c4b71416c 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -129,8 +129,8 @@ $labels['resetsearch'] = 'Reset search'; // message compose $labels['compose'] = 'Compose a message'; +$labels['savemessage'] = 'Save this draft'; $labels['sendmessage'] = 'Send the message now'; -$labels['savemessage'] = 'Save this draft'; $labels['addattachment'] = 'Attach a file'; $labels['charset'] = 'Charset'; $labels['editortype'] = 'Editor type'; @@ -230,4 +230,4 @@ $labels['sortby'] = 'Sort by'; $labels['sortasc'] = 'Sort ascending'; $labels['sortdesc'] = 'Sort descending'; -?>
\ No newline at end of file +?> diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index 293809e80..d10eaf1a2 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -3,7 +3,7 @@ /* +-----------------------------------------------------------------------+ - | language/en/messages.inc | + | language/en_US/messages.inc | | | | Language file of the RoundCube Webmail client | | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland | |