2 files changed, 45 insertions, 3 deletions

diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index f203b1e39..5e94f977d 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -50,9 +50,6 @@ $labels['moveto'] = 'Verschieben nach...';
 $labels['download'] = 'Download';
 $labels['filename'] = 'Dateiname';
 $labels['filesize'] = 'Dateigröße';
-$labels['preferhtml'] = 'HTML anzeigen';
-$labels['htmlmessage'] = 'HTML-Nachricht';
-$labels['prettydate'] = 'Kurze Datumsanzeige';
 $labels['addtoaddressbook'] = 'Ins Adressbuch übernehmen';
 $labels['sun'] = 'So';
 $labels['mon'] = 'Mo';
@@ -233,6 +230,7 @@ $labels['ignore'] = 'ignorieren';
 $labels['readwhendeleted'] = 'Beim Löschen als gelesen markieren';
 $labels['flagfordeletion'] = 'Als gelöscht markieren anstatt in den Papierkorb verschieben';
 $labels['skipdeleted'] = 'Zeige keine gelöschten Nachrichten an';
+$labels['deletealways'] = 'Wenn verschieben in den Papierkorb fehlschlägt, Nachricht löschen';
 $labels['showremoteimages'] = 'Eingebettete Bilder vom Internet laden';
 $labels['fromknownsenders'] = 'bei bekannten Absendern';
 $labels['always'] = 'immer';
@@ -288,5 +286,27 @@ $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['preferhtml'] = 'HTML anzeigen';
+$labels['defaultcharset'] = 'Standard Zeichensatz';
+$labels['htmlmessage'] = 'HTML-Nachricht';
+$labels['prettydate'] = 'Kurze Datumsanzeige';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Englisch';
+$labels['westerneuropean'] = 'West Europäisch';
+$labels['easterneuropean'] = 'Ost Europäisch';
+$labels['southeasterneuropean'] = 'Süd-Ost Europäisch';
+$labels['baltic'] = 'Baltisch';
+$labels['cyrillic'] = 'Kyrillisch';
+$labels['arabic'] = 'Arabisch';
+$labels['greek'] = 'Griechisch';
+$labels['hebrew'] = 'Hebräisch';
+$labels['turkish'] = 'Türkisch';
+$labels['nordic'] = 'Nordisch';
+$labels['thai'] = 'Thailändisch';
+$labels['celtic'] = 'Keltisch';
+$labels['vietnamese'] = 'Vietnamesisch';
+$labels['japanese'] = 'Japanisch';
+$labels['korean'] = 'Koreanisch';
+$labels['chinese'] = 'Chinesisch';
 
 ?>
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 6dc3af22c..02f7b75f6 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -51,6 +51,7 @@ $labels['download'] = 'Download';
 $labels['filename'] = 'File name';
 $labels['filesize'] = 'File size';
 $labels['preferhtml'] = 'Display HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML Message';
 $labels['prettydate'] = 'Pretty dates';
 $labels['addtoaddressbook'] = 'Add to address book';
@@ -139,6 +140,7 @@ $labels['msgtext']  = 'Entire message';
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Save (.eml)';
 $labels['compose'] = 'Compose a message';
+$labels['editasnew'] = 'Edit as new';
 $labels['savemessage'] = 'Save this draft';
 $labels['sendmessage'] = 'Send now';
 $labels['addattachment'] = 'Attach a file';
@@ -232,6 +234,7 @@ $labels['ignore'] = 'ignore';
 $labels['readwhendeleted'] = 'Mark the message as read on delete';
 $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
 $labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'When moving messages to Trash fails delete them';
 $labels['showremoteimages'] = 'Display remote inline images';
 $labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'always';
@@ -246,6 +249,7 @@ $labels['mimeparamfolding'] = 'Attachment names';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Advanced options';
 $labels['focusonnewmessage'] = 'Focus browser window on new message';
 $labels['checkallfolders'] = 'Check all folders for new messages';
@@ -287,5 +291,23 @@ $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'English';
+$labels['westerneuropean'] = 'Western European';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
+$labels['baltic'] = 'Baltic';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabic';
+$labels['greek'] = 'Greek';
+$labels['hebrew'] = 'Hebrew';
+$labels['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
 ?>