update de_DE, en_GB, thanks!

4 files changed, 192 insertions, 229 deletions

diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index d74c296dd..127e696a0 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -10,7 +10,7 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Stephan Diehl <info@opensolutions.net>                        |
+ | Author: Marcel Schlesinger <info@marcel-schlesinger.de>               |
  +-----------------------------------------------------------------------+
 
  @version $Id$
@@ -28,19 +28,19 @@ $labels['mail'] = 'E-Mail';
 $labels['settings'] = 'Einstellungen';
 $labels['addressbook'] = 'Adressbuch';
 $labels['inbox'] = 'Posteingang';
-$labels['drafts'] = 'Entwürfe';
+$labels['drafts'] = 'Entw&uuml;rfe';
 $labels['sent'] = 'Gesendet';
-$labels['trash'] = 'Gelöscht';
+$labels['trash'] = 'Gel&ouml;scht';
 $labels['junk'] = 'Spam';
 $labels['subject'] = 'Betreff';
 $labels['from'] = 'Absender';
-$labels['to'] = 'Empfänger';
+$labels['to'] = 'Empf&auml;nger';
 $labels['cc'] = 'Kopie';
 $labels['bcc'] = 'Blindkopie';
 $labels['replyto'] = 'Antwort an';
 $labels['date'] = 'Datum';
-$labels['size'] = 'Größe';
-$labels['priority'] = 'Priorität';
+$labels['size'] = 'Gr&ouml;&szlig;e';
+$labels['priority'] = 'Priorit&auml;t';
 $labels['organization'] = 'Organisation';
 $labels['reply-to'] = 'Antwort an';
 $labels['mailboxlist'] = 'Ordner';
@@ -49,11 +49,11 @@ $labels['messagenrof'] = 'Nachricht $nr von $count';
 $labels['moveto'] = 'Verschieben nach...';
 $labels['download'] = 'Download';
 $labels['filename'] = 'Dateiname';
-$labels['filesize'] = 'Dateigröße';
+$labels['filesize'] = 'Dateigr&ouml;&szlig;e';
 $labels['preferhtml'] = 'HTML anzeigen';
 $labels['htmlmessage'] = 'HTML-Nachricht';
 $labels['prettydate'] = 'Kurze Datumsanzeige';
-$labels['addtoaddressbook'] = 'Ins Adressbuch übernehmen';
+$labels['addtoaddressbook'] = 'Ins Adressbuch &uuml;bernehmen';
 $labels['sun'] = 'So';
 $labels['mon'] = 'Mo';
 $labels['tue'] = 'Di';
@@ -69,28 +69,28 @@ $labels['thursday'] = 'Donnerstag';
 $labels['friday'] = 'Freitag';
 $labels['saturday'] = 'Samstag';
 $labels['today'] = 'Heute';
-$labels['checkmail'] = 'Auf neue Nachrichten überprüfen';
+$labels['checkmail'] = 'Auf neue Nachrichten &uuml;berpr&uuml;fen';
 $labels['writenewmessage'] = 'Neue Nachricht schreiben';
 $labels['replytomessage'] = 'Antwort verfassen';
-$labels['replytoallmessage'] = 'Antwort an Absender und alle Empfänger';
+$labels['replytoallmessage'] = 'Antwort an Absender und alle Empf&auml;nger';
 $labels['forwardmessage'] = 'Nachricht weiterleiten';
-$labels['deletemessage'] = 'Nachricht löschen';
+$labels['deletemessage'] = 'Nachricht l&ouml;schen';
 $labels['movemessagetotrash'] = 'Nachricht in den Papierkorb verschieben';
 $labels['printmessage'] = 'Diese Nachricht drucken';
 $labels['previousmessage'] = 'Vorherige Nachricht anzeigen';
 $labels['previousmessages'] = 'Vorherige Nachrichten anzeigen';
 $labels['firstmessage'] = 'Die erste Nachricht anzeigen';
 $labels['firstmessages'] = 'Die ersten Nachrichten anzeigen';
-$labels['nextmessage'] = 'Nächste Nachricht anzeigen';
+$labels['nextmessage'] = 'N&auml;chste Nachricht anzeigen';
 $labels['nextmessages'] = 'Weitere Nachrichten anzeigen';
 $labels['lastmessage'] = 'Die letzte Nachricht anzeigen';
 $labels['lastmessages'] = 'Die letzten Nachrichten anzeigen';
-$labels['backtolist'] = 'Zurück zur Liste';
+$labels['backtolist'] = 'Zur&uuml;ck zur Liste';
 $labels['viewsource'] = 'Quelltext anzeigen';
 $labels['markmessages'] = 'Nachrichten markieren';
 $labels['markread'] = 'Als gelesen';
 $labels['markunread'] = 'Als ungelesen';
-$labels['select'] = 'Auswählen';
+$labels['select'] = 'Ausw&auml;hlen';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
 $labels['unread'] = 'Ungelesene';
@@ -101,71 +101,71 @@ $labels['quota'] = 'Speicherplatz';
 $labels['unknown'] = 'unbekannt';
 $labels['unlimited'] = 'unbegrenzt';
 $labels['quicksearch'] = 'Schnellsuche';
-$labels['resetsearch'] = 'Suche zurücksetzen';
+$labels['resetsearch'] = 'Suche zur&uuml;cksetzen';
 $labels['compose'] = 'Neue Nachricht verfassen';
 $labels['savemessage'] = 'Nachricht speichern';
 $labels['sendmessage'] = 'Nachricht jetzt senden';
-$labels['addattachment'] = 'Datei anfügen';
+$labels['addattachment'] = 'Datei anf&uuml;gen';
 $labels['charset'] = 'Zeichensatz';
 $labels['editortype'] = 'Editor Typ';
-$labels['returnreceipt'] = 'Empfangsbestätigung';
-$labels['checkspelling'] = 'Rechtschreibung prüfen';
+$labels['returnreceipt'] = 'Empfangsbest&auml;tigung';
+$labels['checkspelling'] = 'Rechtschreibung pr&uuml;fen';
 $labels['resumeediting'] = 'Bearbeitung fortzetzen';
-$labels['revertto'] = 'Zurück zu';
-$labels['attachments'] = 'Anhänge';
+$labels['revertto'] = 'Zur&uuml;ck zu';
+$labels['attachments'] = 'Anh&auml;nge';
 $labels['upload'] = 'Hochladen';
-$labels['close'] = 'Schließen';
+$labels['close'] = 'Schlie&szlig;en';
 $labels['low'] = 'Niedrig';
 $labels['lowest'] = 'Niedrigste';
 $labels['normal'] = 'Normal';
 $labels['high'] = 'Hoch';
-$labels['highest'] = 'Höchste';
+$labels['highest'] = 'H&ouml;chste';
 $labels['nosubject'] = '(kein Betreff)';
 $labels['showimages'] = 'Bilder anzeigen';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Nur-Text';
-$labels['addcc'] = 'Cc hinzufügen';
-$labels['addbcc'] = 'Bcc hinzufügen';
-$labels['addreplyto'] = 'Antwortadresse hinzufügen';
-$labels['mdnrequest'] = 'Der Sender dieser Nachricht möchte gerne eine Lesebestätigung. Wollen Sie dieses bestätigen?';
-$labels['receiptread'] = 'Empfangsbestätigung (gelesen)';
-$labels['yourmessage'] = 'Dieses ist eine Empfangsbestätigung für Ihre Nachricht';
-$labels['receiptnote'] = 'Hinweis: Der Empfänger hat den Empfang der Nachricht bestätigt. Dieses ist keine Garantie, dass die Nachricht gelesen und verstanden wurde.';
-$labels['name'] = 'Anzeigename';
+$labels['addcc'] = 'Cc hinzuf&uuml;gen';
+$labels['addbcc'] = 'Bcc hinzuf&uuml;gen';
+$labels['addreplyto'] = 'Antwortadresse hinzuf&uuml;gen';
+$labels['mdnrequest'] = 'Der Sender dieser Nachricht m&ouml;chte gerne eine Lesebest&auml;tigung. Wollen Sie dieses best&auml;tigen?';
+$labels['receiptread'] = 'Empfangsbest&auml;tigung (gelesen)';
+$labels['yourmessage'] = 'Dies ist eine Empfangsbest&auml;tigung f&uuml;r Ihre Nachricht';
+$labels['receiptnote'] = 'Hinweis: Der Empf&auml;nger hat den Empfang der Nachricht best&auml;tigt. Dies ist keine Garantie, dass die Nachricht gelesen und verstanden wurde.';
+$labels['name'] = 'Angezeigter Name';
 $labels['firstname'] = 'Vorname';
 $labels['surname'] = 'Nachname';
 $labels['email'] = 'E-Mail';
-$labels['addcontact'] = 'Kontakt hinzufügen';
+$labels['addcontact'] = 'Kontakt hinzuf&uuml;gen';
 $labels['editcontact'] = 'Kontakt bearbeiten';
 $labels['edit'] = 'Bearbeiten';
 $labels['cancel'] = 'Abbrechen';
 $labels['save'] = 'Speichern';
-$labels['delete'] = 'Löschen';
+$labels['delete'] = 'L&ouml;schen';
 $labels['newcontact'] = 'Neuen Kontakt erstellen';
-$labels['deletecontact'] = 'Gewählte Kontakte löschen';
+$labels['deletecontact'] = 'Gew&auml;hlte Kontakte l&ouml;schen';
 $labels['composeto'] = 'Nachricht verfassen';
 $labels['contactsfromto'] = 'Kontakte $from bis $to von $count';
 $labels['print'] = 'Drucken';
 $labels['export'] = 'Exportieren';
-$labels['previouspage'] = 'Seite zurück';
+$labels['previouspage'] = 'Seite zur&uuml;ck';
 $labels['firstpage'] = 'Erste Seite';
-$labels['nextpage'] = 'Nächste Seite';
+$labels['nextpage'] = 'N&auml;chste Seite';
 $labels['lastpage'] = 'Letzte Seite';
 $labels['groups'] = 'Gruppen';
-$labels['personaladrbook'] = 'Persönliches Adressbuch';
-$labels['settingsfor'] = 'Einstellungen für';
+$labels['personaladrbook'] = 'Pers&ouml;nliches Adressbuch';
+$labels['settingsfor'] = 'Einstellungen f&uuml;r';
 $labels['preferences'] = 'Einstellungen';
 $labels['userpreferences'] = 'Benutzereinstellungen';
 $labels['editpreferences'] = 'Benutzereinstellungen bearbeiten';
-$labels['identities'] = 'Absender';
-$labels['manageidentities'] = 'Absender für dieses Konto verwalten';
+$labels['identities'] = 'Identit&auml;ten';
+$labels['manageidentities'] = 'Absender f&uuml;r dieses Konto verwalten';
 $labels['newidentity'] = 'Neuer Absender';
 $labels['newitem'] = 'Neuer Eintrag';
 $labels['edititem'] = 'Eintrag bearbeiten';
 $labels['setdefault'] = 'Als Standard';
 $labels['language'] = 'Sprache';
 $labels['timezone'] = 'Zeitzone';
-$labels['pagesize'] = 'Einträge pro Seite';
+$labels['pagesize'] = 'Eintr&auml;ge pro Seite';
 $labels['signature'] = 'Signatur';
 $labels['dstactive'] = 'Sommerzeit';
 $labels['htmleditor'] = 'HTML-Nachrichten erstellen';
@@ -183,10 +183,10 @@ $labels['create'] = 'Erstellen';
 $labels['createfolder'] = 'Neuen Ordner erstellen';
 $labels['rename'] = 'Umbenennen';
 $labels['renamefolder'] = 'Ordner umbenennen';
-$labels['deletefolder'] = 'Ordner löschen';
+$labels['deletefolder'] = 'Ordner l&ouml;schen';
 $labels['managefolders'] = 'Ordner verwalten';
 $labels['sortby'] = 'Sortieren nach';
 $labels['sortasc'] = 'Aufsteigend sortieren';
 $labels['sortdesc'] = 'Absteigend sortieren';
 
-?>
+?>
\ No newline at end of file
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index 2070d3953..3f9ad134a 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -10,7 +10,7 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Stephan Diehl <info@opensolutions.net>                        |
+ | Author: Marcel Schlesinger <info@marcel-schlesinger.de>               |
  +-----------------------------------------------------------------------+
 
  @version $Id$
@@ -18,65 +18,65 @@
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Anmelden fehlgeschlagen';
+$messages['loginfailed'] = 'Anmeldung fehlgeschlagen';
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
-$messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen';
+$messages['sessionerror'] = 'Ihre Session ist ung&uuml;ltig oder abgelaufen';
 $messages['imaperror'] = 'Keine Verbindung zum IMAP-Server';
 $messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner';
 $messages['loggedout'] = 'Sie haben Ihre Session erfolgreich beendet. Auf Wiedersehen!';
 $messages['mailboxempty'] = 'Ordner ist leer';
 $messages['loading'] = 'Lade...';
 $messages['loadingdata'] = 'Daten werden geladen...';
-$messages['checkingmail'] = 'Überprüfung auf neue Nachrichten...';
+$messages['checkingmail'] = '&Uuml;berpr&uuml;fung auf neue Nachrichten...';
 $messages['sendingmessage'] = 'Nachricht wird gesendet...';
 $messages['messagesent'] = 'Nachricht erfolgreich gesendet';
 $messages['savingmessage'] = 'Nachricht wird gespeichert...';
 $messages['messagesaved'] = 'Nachricht als Entwurf gespeichert';
 $messages['successfullysaved'] = 'Erfolgreich gespeichert';
-$messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugefügt';
+$messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugef&uuml;gt';
 $messages['contactexists'] = 'Es existiert bereits ein Eintrag mit dieser E-Mail-Adresse';
-$messages['blockedimages'] = 'Um Ihre Privatsphäre zur schützen, wurden externe Bilder blockiert.';
-$messages['encryptedmessage'] = 'Dies ist eine verschlüsselte Nachricht und kann leider nicht angezeigt werden. Sorry!';
+$messages['blockedimages'] = 'Um Ihre Privatsph&auml;re zur sch&uuml;tzen, wurden externe Bilder blockiert.';
+$messages['encryptedmessage'] = 'Dies ist eine verschl&uuml;sselte Nachricht und kann leider nicht angezeigt werden. Sorry!';
 $messages['nocontactsfound'] = 'Keine Kontakte gefunden';
 $messages['contactnotfound'] = 'Der angeforderte Kontakt wurde nicht gefunden';
 $messages['sendingfailed'] = 'Versenden der Nachricht fehlgeschlagen';
 $messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten';
 $messages['errormoving'] = 'Nachricht konnte nicht verschoben werden';
-$messages['errordeleting'] = 'Nachricht konnte nicht gelöscht werden';
-$messages['deletecontactconfirm'] = 'Wollen Sie die ausgewählten Kontakte wirklich löschen?';
-$messages['deletemessagesconfirm'] = 'Wollen Sie die ausgewählten Nachrichten wirklich löschen?';
-$messages['deletefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich löschen?';
+$messages['errordeleting'] = 'Nachricht konnte nicht gel&ouml;scht werden';
+$messages['deletecontactconfirm'] = 'Wollen Sie die ausgew&auml;hlten Kontakte wirklich l&ouml;schen?';
+$messages['deletemessagesconfirm'] = 'Wollen Sie die ausgew&auml;hlten Nachrichten wirklich l&ouml;schen?';
+$messages['deletefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich l&ouml;schen?';
 $messages['purgefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich leeren?';
-$messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt';
-$messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein';
+$messages['formincomplete'] = 'Das Formular wurde nicht vollst&auml;ndig ausgef&uuml;llt';
+$messages['noemailwarning'] = 'Bitte geben Sie eine g&uuml;ltige E-Mail-Adresse ein';
 $messages['nonamewarning'] = 'Bitte geben Sie einen Namen ein';
-$messages['nopagesizewarning'] = 'Bitte geben Sie die Einträge pro Seite an';
-$messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an';
-$messages['nosubjectwarning'] = 'Die Betreffzeile ist leer. Möchten Sie jetzt einen Betreff eingeben?';
+$messages['nopagesizewarning'] = 'Bitte geben Sie die Eintr&auml;ge pro Seite an';
+$messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empf&auml;nger an';
+$messages['nosubjectwarning'] = 'Die Betreffzeile ist leer. M&ouml;chten Sie jetzt einen Betreff eingeben?';
 $messages['nobodywarning'] = 'Diese Nachricht ohne Inhalt senden?';
 $messages['notsentwarning'] = 'Ihre Nachricht wurde nicht gesendet. Wollen Sie die Nachricht verwerfen?';
-$messages['noldapserver'] = 'Bitte wählen Sie einen LDAP-Server aus';
+$messages['noldapserver'] = 'Bitte w&auml;hlen Sie einen LDAP-Server aus';
 $messages['nocontactsreturned'] = 'Es wurden keine Kontakte gefunden';
 $messages['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein';
 $messages['searchsuccessful'] = '$nr Nachrichten gefunden';
-$messages['searchnomatch'] = 'Keine Treffer';
+$messages['searchnomatch'] = 'Die Suche lieferte keine Treffer';
 $messages['searching'] = 'Suche...';
-$messages['checking'] = 'Prüfe...';
+$messages['checking'] = 'Pr&uuml;fe...';
 $messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden';
-$messages['folderdeleted'] = 'Ordner erfolgreich gelöscht';
-$messages['deletedsuccessfully'] = 'Erfolgreich gelöscht';
-$messages['converting'] = 'Entferne Formatierung der Nachricht...';
+$messages['folderdeleted'] = 'Ordner erfolgreich gel&ouml;scht';
+$messages['deletedsuccessfully'] = 'Erfolgreich gel&ouml;scht';
+$messages['converting'] = 'Entferne Formatierungen der Nachricht...';
 $messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden';
 $messages['fileuploaderror'] = 'Hochladen der Datei fehlgeschlagen';
-$messages['filesizeerror'] = 'Die hochzuladende Datei überschreitet die Maximalgröße von $size';
+$messages['filesizeerror'] = 'Die hochzuladende Datei &uuml;berschreitet die Maximalgr&ouml;&szlig;e von $size';
 $messages['copysuccess'] = '$nr Adressen erfolgreich kopiert';
 $messages['copyerror'] = 'Die Adressen konnten nicht kopiert werden';
-$messages['sourceisreadonly'] = 'Das Adressverzeichnis kann nicht verändert werden';
-$messages['errorsavingcontact'] = 'Die Änderungen konnten nicht gespeichert werden';
+$messages['sourceisreadonly'] = 'Das Adressverzeichnis kann nicht ver&auml;ndert werden';
+$messages['errorsavingcontact'] = 'Die &Auml;nderungen konnten nicht gespeichert werden';
 $messages['movingmessage'] = 'Die E-Mail wird verschoben...';
-$messages['receiptsent'] = 'Bestätigung erfolgreich gesendet';
-$messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden';
-$messages['nodeletelastidentity'] = 'Sie können diesen Absender nicht löschen';
-$messages['addsubfolderhint'] = 'Wird als Unterdornder des aktuell selektieren Ordners erstellt';
+$messages['receiptsent'] = 'Lesebest&auml;tigung erfolgreich gesendet';
+$messages['errorsendingreceipt'] = 'Best&auml;tigung konnte nicht gesendet werden';
+$messages['nodeletelastidentity'] = 'Diese Identit&auml;t kann nicht gel&ouml;scht werden, da dies die letzte ist.';
+$messages['addsubfolderhint'] = 'Wird als Unterordner des aktuell selektieren Ordners erstellt';
 
-?>
+?>
\ No newline at end of file
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