Localization updates

2 files changed, 160 insertions, 87 deletions

diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index ebe86c7a0..e8480b21f 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -11,6 +11,7 @@
 |                                                                       |
 +-----------------------------------------------------------------------+
 | Author: Weiran Zhang (weiran@weiran.co.uk)                            |
+|         Phil Weir                                                     |
 +-----------------------------------------------------------------------+
 
 @version $Id$
@@ -98,20 +99,18 @@ $labels['checkmail'] = 'Check for new messages';
 $labels['writenewmessage'] = 'Create a new message';
 $labels['replytomessage'] = 'Reply to sender';
 $labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
-$labels['replyall']  = 'Reply all';
+$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 "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';
 $labels['markmessages'] = 'Mark messages';
@@ -172,12 +171,15 @@ $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';
@@ -201,19 +203,65 @@ $labels['mdnrequest'] = 'The sender of this message has asked to be notified whe
 $labels['receiptread'] = 'Return Receipt (read)';
 $labels['yourmessage'] = 'This is a Return Receipt for your message';
 $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.';
-$labels['name'] = 'Display name';
-$labels['firstname'] = 'First name';
-$labels['surname'] = 'Last name';
+$labels['name'] = 'Display Name';
+$labels['firstname'] = 'First Name';
+$labels['surname'] = 'Last Name';
+$labels['middlename'] = 'Middle Name';
+$labels['nameprefix'] = 'Title';
+$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'] = 'Post 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['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';
 $labels['composeto'] = 'Compose mail to';
@@ -223,6 +271,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 set';
 $labels['firstpage'] = 'Show first set';
 $labels['nextpage'] = 'Show next set';
@@ -233,6 +283,7 @@ $labels['personaladrbook'] = 'Personal Addresses';
 $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';
@@ -318,10 +369,12 @@ $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['spellcheckbeforesend'] = 'Check spelling before sending a message';
 $labels['folder'] = 'Folder';
 $labels['folders'] = 'Folders';
 $labels['foldername'] = 'Folder name';
-$labels['subscribed']  = 'Subscribed';
+$labels['subscribed'] = 'Subscribed';
 $labels['messagecount'] = 'Messages';
 $labels['create'] = 'Create';
 $labels['createfolder'] = 'Create new folder';
@@ -334,9 +387,14 @@ $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';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index be673d238..6a53d4f41 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -11,6 +11,7 @@
 |                                                                       |
 +-----------------------------------------------------------------------+
 | Author: Weiran Zhang (weiran@weiran.co.uk)                            |
+|         Phil Weir                                                     |
 +-----------------------------------------------------------------------+
 
 @version $Id$
@@ -18,124 +19,138 @@
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Login failed';
-$messages['cookiesdisabled'] = 'Your browser does not accept cookies';
-$messages['sessionerror'] = 'Your session is invalid or has expired';
-$messages['imaperror'] = 'Connection to IMAP server failed';
+$messages['loginfailed'] = 'Login failed.';
+$messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
+$messages['sessionerror'] = 'Your session is invalid or has expired.';
+$messages['imaperror'] = 'Connection to IMAP server failed.';
 $messages['servererror'] = 'Server Error!';
 $messages['servererrormsg'] = 'Server Error: $msg';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied';
+$messages['dberror'] = 'Database Error!';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['nomessagesfound'] = 'No messages found in this mailbox';
+$messages['nomessagesfound'] = 'No messages found in this mailbox.';
 $messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
-$messages['mailboxempty'] = 'Mailbox is empty';
+$messages['mailboxempty'] = 'Mailbox is empty.';
 $messages['loading'] = 'Loading...';
 $messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Loading data...';
 $messages['checkingmail'] = 'Checking for new messages...';
 $messages['sendingmessage'] = 'Sending message...';
-$messages['messagesent'] = 'Message sent successfully';
+$messages['messagesent'] = 'Message sent successfully.';
 $messages['savingmessage'] = 'Saving message...';
-$messages['messagesaved'] = 'Message saved to Drafts';
-$messages['successfullysaved'] = 'Successfully saved';
-$messages['addedsuccessfully'] = 'Contact successfully added to address book';
-$messages['contactexists'] = 'A contact with this e-mail address already exists';
+$messages['messagesaved'] = 'Message saved to Drafts.';
+$messages['successfullysaved'] = 'Successfully saved.';
+$messages['addedsuccessfully'] = 'Contact successfully added to address book.';
+$messages['contactexists'] = 'A contact with this e-mail address already exists.';
+$messages['contactnameexists'] = 'A contact with the same name 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['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(s)';
-$messages['errorcopying'] = 'Could not copy the message(s)';
-$messages['errordeleting'] = 'Could not delete the message(s)';
-$messages['errormarking'] = 'Could not mark the message(s)';
+$messages['nocontactsfound'] = 'No contacts found.';
+$messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['sendingfailed'] = 'Failed to send message.';
+$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(s).';
+$messages['errorcopying'] = 'Could not copy the message(s).';
+$messages['errordeleting'] = 'Could not delete the message(s).';
+$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm'] = 'Do you really want to delete the selected contact(s)?';
+$messages['deletegroupconfirm'] = 'Do you really want to delete the selected group?';
 $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['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'Deleting folder...';
 $messages['foldermoving'] = 'Moving folder...';
 $messages['foldersubscribing'] = 'Subscribing to folder...';
 $messages['folderunsubscribing'] = 'Unsubscribing from 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['nosenderwarning'] = 'Please enter sender e-mail address';
-$messages['norecipientwarning'] = 'Please enter at least one recipient';
+$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['nosenderwarning'] = 'Please enter sender e-mail address.';
+$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 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['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['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
-$messages['searchsuccessful'] = '$nr messages found';
-$messages['searchnomatch'] = 'Search found no matches';
+$messages['searchsuccessful'] = '$nr messages found.';
+$messages['searchnomatch'] = 'Search found no matches.';
 $messages['searching'] = 'Searching...';
 $messages['checking'] = 'Checking...';
-$messages['nospellerrors'] = 'No spelling errors found';
-$messages['folderdeleted'] = 'Successfully deleted folder';
-$messages['foldersubscribed'] = 'Successfully subscribed to folder';
-$messages['folderunsubscribed'] = 'Successfully unsubscribed from folder';
-$messages['folderpurged'] = 'Successfully emptied folder';
-$messages['folderexpunged'] = 'Successfully compacted folder';
-$messages['deletedsuccessfully'] = 'Successfully deleted';
+$messages['nospellerrors'] = 'No spelling errors found.';
+$messages['folderdeleted'] = 'Successfully deleted folder.';
+$messages['foldersubscribed'] = 'Successfully subscribed to folder.';
+$messages['folderunsubscribed'] = 'Successfully unsubscribed from folder.';
+$messages['folderpurged'] = 'Successfully emptied folder.';
+$messages['folderexpunged'] = 'Successfully compacted folder.';
+$messages['deletedsuccessfully'] = 'Successfully deleted.';
 $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 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['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 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['deletingmessage'] = 'Deleting message(s)...';
 $messages['markingmessage'] = 'Marking message(s)...';
-$messages['receiptsent'] = 'Successfully sent a read receipt';
-$messages['errorsendingreceipt'] = 'Could not send the receipt';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$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['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['contactaddedtogroup'] = 'Successfully added the contacts to this group';
-$messages['contactremovedfromgroup'] = 'Successfully remove contacts from this group';
+$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['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
 $messages['importwait'] = 'Importing, please wait...';
 $messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts, $skipped existing entries skipped</b>:<p><em>$names</em></p>';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity';
+$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?';
 $messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg)';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg)';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list';
-$messages['smtpdsnerror'] = 'SMTP Error: Server does not support Delivery Status Notifications';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtpdsnerror'] = 'SMTP Error: Server does not support Delivery Status Notifications.';
 $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['contactdelerror'] = 'Could not delete contact(s)';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
 $messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully';
-$messages['grouprenamed'] = 'Group renamed successfully';
-$messages['groupcreated'] = 'Group created successfully';
-$messages['messagedeleted'] = 'Message(s) deleted successfully';
-$messages['messagemoved'] = 'Message(s) moved successfully';
-$messages['messagecopied'] = 'Message(s) copied successfully';
-$messages['messagemarked'] = 'Message(s) marked successfully';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion';
-$messages['namecannotbeempty'] = 'Name cannot be empty';
-$messages['nametoolong'] = 'Name is too long';
-$messages['folderupdated'] = 'Folder updated successfully';
-$messages['foldercreated'] = 'Folder created successfully';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) successfully restored.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Successfully updated folder.';
+$messages['foldercreated'] = 'Successfully created folder.';
+$messages['invalidimageformat'] = 'Not a valid image format.';
+$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
+$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
 
 ?>
\ No newline at end of file