From 59478e06c25303a790a0840ab2ac30662c4ef781 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Tue, 5 Aug 2014 16:46:22 +0200 Subject: c'est la merde.. --- program/localization/en_GB/labels.inc | 5 ----- program/localization/en_GB/messages.inc | 13 ++++--------- 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'program/localization/en_GB') diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc index f903b0cf5..275208a98 100644 --- a/program/localization/en_GB/labels.inc +++ b/program/localization/en_GB/labels.inc @@ -37,7 +37,6 @@ $labels['drafts'] = 'Drafts'; $labels['sent'] = 'Sent'; $labels['trash'] = 'Deleted Items'; $labels['junk'] = 'Junk'; -$labels['show_real_foldernames'] = 'Show real names for special folders'; // message listing $labels['subject'] = 'Subject'; @@ -194,7 +193,6 @@ $labels['listmode'] = 'List view mode'; $labels['folderactions'] = 'Folder actions...'; $labels['compact'] = 'Compact'; $labels['empty'] = 'Empty'; -$labels['importmessages'] = 'Import messages'; $labels['quota'] = 'Disk usage'; $labels['unknown'] = 'unknown'; @@ -205,7 +203,6 @@ $labels['resetsearch'] = 'Reset search'; $labels['searchmod'] = 'Search modifiers'; $labels['msgtext'] = 'Entire message'; $labels['body'] = 'Body'; -$labels['type'] = 'Type'; $labels['openinextwin'] = 'Open in new window'; $labels['emlsave'] = 'Download (.eml)'; @@ -357,7 +354,6 @@ $labels['lastpage'] = 'Show last set'; $labels['group'] = 'Group'; $labels['groups'] = 'Groups'; -$labels['listgroup'] = 'List group members'; $labels['personaladrbook'] = 'Personal Addresses'; $labels['searchsave'] = 'Save search'; @@ -476,7 +472,6 @@ $labels['spellcheckignorenums'] = 'Ignore words with numbers'; $labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalised'; $labels['addtodict'] = 'Add to dictionary'; $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links'; -$labels['standardwindows'] = 'Handle popups as standard windows'; $labels['forwardmode'] = 'Messages forwarding'; $labels['inline'] = 'inline'; $labels['asattachment'] = 'as attachment'; diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc index bba70b148..e5c873c94 100644 --- a/program/localization/en_GB/messages.inc +++ b/program/localization/en_GB/messages.inc @@ -17,7 +17,7 @@ */ $messages = array(); -$messages['errortitle'] = 'An error occured.'; +$messages['errortitle'] = 'An error occurred.'; $messages['loginfailed'] = 'Login failed.'; $messages['cookiesdisabled'] = 'Your browser does not accept cookies.'; $messages['sessionerror'] = 'Your session is invalid or has expired.'; @@ -101,16 +101,13 @@ $messages['converting'] = 'Removing formatting...'; $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 contacts.'; -$messages['movesuccess'] = 'Successfully moved $nr contacts.'; -$messages['copyerror'] = 'Could not copy any contacts.'; -$messages['moveerror'] = 'Could not move any contacts.'; +$messages['copysuccess'] = 'Successfully copied $nr addresses.'; +$messages['copyerror'] = 'Could not copy any addresses.'; $messages['sourceisreadonly'] = 'This address book is read-only.'; $messages['errorsavingcontact'] = 'Could not save the contact address.'; $messages['movingmessage'] = 'Moving message(s)...'; $messages['copyingmessage'] = 'Copying message(s)...'; $messages['copyingcontact'] = 'Copying contact(s)...'; -$messages['movingcontact'] = 'Moving contact(s)...'; $messages['deletingmessage'] = 'Deleting message(s)...'; $messages['markingmessage'] = 'Marking message(s)...'; $messages['addingmember'] = 'Adding contact(s) to the group...'; @@ -129,8 +126,6 @@ $messages['importwait'] = 'Importing, please wait...'; $messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.'; $messages['importconfirm'] = 'Successfully imported $inserted contacts'; $messages['importconfirmskipped'] = 'Skipped $skipped existing entries'; -$messages['importmessagesuccess'] = 'Successfully imported $nr messages'; -$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file'; $messages['opnotpermitted'] = 'Operation not permitted!'; $messages['nofromaddress'] = 'Missing e-mail address in selected identity.'; $messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?'; @@ -144,7 +139,7 @@ $messages['smtperror'] = 'SMTP Error: $msg'; $messages['emailformaterror'] = 'Incorrect e-mail address: $email'; $messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.'; $messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.'; -$messages['internalerror'] = 'An internal error occured. Please try again.'; +$messages['internalerror'] = 'An internal error occurred. Please try again.'; $messages['contactdelerror'] = 'Could not delete contact(s).'; $messages['contactdeleted'] = 'Contact(s) deleted successfully.'; $messages['contactrestoreerror'] = 'Could not restore deleted contact(s).'; -- cgit v1.2.3