update de_DE, en_GB, thanks!

2 files changed, 120 insertions, 157 deletions

diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index acc858067..24622d00e 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -18,59 +18,42 @@
 */
 
 $labels = array();
-
-// login page
-$labels['welcome']   = 'Welcome to $product';
-$labels['username']  = 'Username';
-$labels['password']  = 'Password';
-$labels['server']    = 'Server';
-$labels['login']     = 'Login';
-
-// taskbar
-$labels['logout']   = 'Logout';
-$labels['mail']     = 'E-Mail';
+$labels['welcome'] = 'Welcome to $product';
+$labels['username'] = 'Username';
+$labels['password'] = 'Password';
+$labels['server'] = 'Server';
+$labels['login'] = 'Login';
+$labels['logout'] = 'Logout';
+$labels['mail'] = 'E-Mail';
 $labels['settings'] = 'Personal Settings';
 $labels['addressbook'] = 'Address Book';
-
-// mailbox names
-$labels['inbox']  = 'Inbox';
+$labels['inbox'] = 'Inbox';
 $labels['drafts'] = 'Drafts';
-$labels['sent']   = 'Sent';
-$labels['trash']  = 'Deleted Items';
-$labels['junk']   = 'Junk';
-
-// message listing
+$labels['sent'] = 'Sent';
+$labels['trash'] = 'Deleted Items';
+$labels['junk'] = 'Junk';
 $labels['subject'] = 'Subject';
-$labels['from']    = 'Sender';
-$labels['to']      = 'Recipient';
-$labels['cc']      = 'Copy';
-$labels['bcc']     = 'Bcc';
+$labels['from'] = 'Sender';
+$labels['to'] = 'Recipient';
+$labels['cc'] = 'Copy';
+$labels['bcc'] = 'Bcc';
 $labels['replyto'] = 'Reply-To';
-$labels['date']    = 'Date';
-$labels['size']    = 'Size';
+$labels['date'] = 'Date';
+$labels['size'] = 'Size';
 $labels['priority'] = 'Priority';
 $labels['organization'] = 'Organisation';
-
-// aliases
-$labels['reply-to'] = $labels['replyto'];
-
+$labels['reply-to'] = 'Reply-To';
 $labels['mailboxlist'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
-
-$labels['moveto']   = 'move to...';
+$labels['moveto'] = 'move to...';
 $labels['download'] = 'download';
-
 $labels['filename'] = 'File name';
 $labels['filesize'] = 'File size';
-
 $labels['preferhtml'] = 'Display HTML';
 $labels['htmlmessage'] = 'HTML Message';
 $labels['prettydate'] = 'Pretty dates';
-
 $labels['addtoaddressbook'] = 'Add to address book';
-
-// weekdays short
 $labels['sun'] = 'Sun';
 $labels['mon'] = 'Mon';
 $labels['tue'] = 'Tue';
@@ -78,156 +61,132 @@ $labels['wed'] = 'Wed';
 $labels['thu'] = 'Thu';
 $labels['fri'] = 'Fri';
 $labels['sat'] = 'Sat';
-
-// weekdays long
-$labels['sunday']    = 'Sunday';
-$labels['monday']    = 'Monday';
-$labels['tuesday']   = 'Tuesday';
+$labels['sunday'] = 'Sunday';
+$labels['monday'] = 'Monday';
+$labels['tuesday'] = 'Tuesday';
 $labels['wednesday'] = 'Wednesday';
-$labels['thursday']  = 'Thursday';
-$labels['friday']    = 'Friday';
-$labels['saturday']  = 'Saturday';
-
+$labels['thursday'] = 'Thursday';
+$labels['friday'] = 'Friday';
+$labels['saturday'] = 'Saturday';
 $labels['today'] = 'Today';
-
-// toolbar buttons
-$labels['checkmail']        = 'Check for new messages';
-$labels['writenewmessage']  = 'Create a new message';
-$labels['replytomessage']   = 'Reply to the message';
+$labels['checkmail'] = 'Check for new messages';
+$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']    = 'Delete message';
+$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['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['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';
+$labels['markread'] = 'As read';
+$labels['markunread'] = 'As unread';
 $labels['select'] = 'Select';
 $labels['all'] = 'All';
 $labels['none'] = 'None';
 $labels['unread'] = 'Unread';
-
 $labels['compact'] = 'Compact';
 $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['addattachment']  = 'Attach a file';
-$labels['charset']        = 'Charset';
-$labels['editortype']     = 'Editor type';
-$labels['returnreceipt']  = 'Return receipt';
-
+$labels['unknown'] = 'unknown';
+$labels['unlimited'] = 'unlimited';
+$labels['quicksearch'] = 'Quick search';
+$labels['resetsearch'] = 'Reset search';
+$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['editortype'] = 'Editor type';
+$labels['returnreceipt'] = 'Return receipt';
 $labels['checkspelling'] = 'Check spelling';
 $labels['resumeediting'] = 'Resume editing';
-$labels['revertto']      = 'Revert to';
-
+$labels['revertto'] = 'Revert to';
 $labels['attachments'] = 'Attachments';
 $labels['upload'] = 'Upload';
-$labels['close']  = 'Close';
-
-$labels['low']     = 'Low';
-$labels['lowest']  = 'Lowest';
-$labels['normal']  = 'Normal';
-$labels['high']    = 'High';
+$labels['close'] = 'Close';
+$labels['low'] = 'Low';
+$labels['lowest'] = 'Lowest';
+$labels['normal'] = 'Normal';
+$labels['high'] = 'High';
 $labels['highest'] = 'Highest';
-
-$labels['nosubject']  = '(no subject)';
+$labels['nosubject'] = '(no subject)';
 $labels['showimages'] = 'Display images';
-
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Plain text';
-
-
-// address boook
-$labels['name']      = 'Display name';
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$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['email']     = 'E-Mail';
-
+$labels['surname'] = 'Last name';
+$labels['email'] = 'E-Mail';
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';
-
-$labels['edit']   = 'Edit';
+$labels['edit'] = 'Edit';
 $labels['cancel'] = 'Cancel';
-$labels['save']   = 'Save';
+$labels['save'] = 'Save';
 $labels['delete'] = 'Delete';
-
-$labels['newcontact']     = 'Create new contact card';
-$labels['deletecontact']  = 'Delete selected contacts';
-$labels['composeto']      = 'Compose mail to';
+$labels['newcontact'] = 'Create new contact card';
+$labels['deletecontact'] = 'Delete selected contacts';
+$labels['composeto'] = 'Compose mail to';
 $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['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';
-
-$labels['preferences']  = 'Preferences';
-$labels['userpreferences']  = 'User preferences';
-$labels['editpreferences']  = 'Edit user preferences';
-
-$labels['identities']  = 'Identities';
-$labels['manageidentities']  = 'Manage identities for this account';
-$labels['newidentity']  = 'New identity';
-
-$labels['newitem']  = 'New item';
-$labels['edititem']  = 'Edit item';
-
-$labels['setdefault']  = 'Set default';
-$labels['language']  = 'Language';
-$labels['timezone']  = 'Time zone';
-$labels['pagesize']  = 'Rows per page';
+$labels['settingsfor'] = 'Settings for';
+$labels['preferences'] = 'Preferences';
+$labels['userpreferences'] = 'User preferences';
+$labels['editpreferences'] = 'Edit user preferences';
+$labels['identities'] = 'Identities';
+$labels['manageidentities'] = 'Manage identities for this account';
+$labels['newidentity'] = 'New identity';
+$labels['newitem'] = 'New item';
+$labels['edititem'] = 'Edit item';
+$labels['setdefault'] = 'Set default';
+$labels['language'] = 'Language';
+$labels['timezone'] = 'Time zone';
+$labels['pagesize'] = 'Rows per page';
 $labels['signature'] = 'Signature';
-$labels['dstactive']  = 'Daylight savings';
+$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';
-$labels['foldername']  = 'Folder name';
-$labels['subscribed']  = 'Subscribed';
-$labels['create']  = 'Create';
-$labels['createfolder']  = 'Create new folder';
+$labels['autosavedraft'] = 'Automatically save draft';
+$labels['everynminutes'] = 'every $n minutes';
+$labels['never'] = 'never';
+$labels['folder'] = 'Folder';
+$labels['folders'] = 'Folders';
+$labels['foldername'] = 'Folder name';
+$labels['subscribed'] = 'Subscribed';
+$labels['messagecount'] = 'Messages';
+$labels['create'] = 'Create';
+$labels['createfolder'] = 'Create new folder';
 $labels['rename'] = 'Rename';
 $labels['renamefolder'] = 'Rename folder';
-$labels['deletefolder']  = 'Delete folder';
-$labels['managefolders']  = 'Manage folders';
-
+$labels['deletefolder'] = 'Delete folder';
+$labels['managefolders'] = 'Manage folders';
 $labels['sortby'] = 'Sort by';
-$labels['sortasc']  = 'Sort ascending';
+$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 20c0c14a3..c763d0126 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -18,7 +18,7 @@
 */
 
 $messages = array();
-$messages['loginfailed']  = 'Login 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';
@@ -43,16 +43,16 @@ $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['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['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['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['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';
@@ -64,7 +64,7 @@ $messages['searching'] = 'Searching...';
 $messages['checking'] = 'Checking...';
 $messages['nospellerrors'] = 'No spelling errors found';
 $messages['folderdeleted'] = 'Folder successfully deleted';
-$messages['deletedsuccessfully'] = "Successfully deleted";
+$messages['deletedsuccessfully'] = 'Successfully deleted';
 $messages['converting'] = 'Removing formatting from message...';
 $messages['messageopenerror'] = 'Could not load message from server';
 $messages['fileuploaderror'] = 'File upload failed';
@@ -74,5 +74,9 @@ $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...';
+$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';
+
 ?>
\ No newline at end of file