Improved support for UTF-8 and other charsets

2 files changed, 26 insertions, 23 deletions

diff --git a/program/localization/de/labels.inc b/program/localization/de/labels.inc
index 08fd870c0..a5a0a410a 100644
--- a/program/localization/de/labels.inc
+++ b/program/localization/de/labels.inc
@@ -9,7 +9,8 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author:      Thomas Bruederli <roundcube@gmail.com>                   |
+ | Corrections: Alexander Stiebing <ja.stiebing[NOSPAM]@web.de>          |
  +-----------------------------------------------------------------------+
 
  $Id$
@@ -18,46 +19,46 @@
 
 $labels = array();
 
-// login page
+// login page // Login-Seite
 $labels['username']  = 'Benutzername';
 $labels['password']  = 'Passwort';
 $labels['server']    = 'Server';
 $labels['login']     = 'Login';
 
-// taskbar
+// taskbar // Aktionsleiste
 $labels['logout']   = 'Logout';
 $labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Einstellungen';
 $labels['addressbook'] = 'Adressbuch';
 
-// mailbox names
+// mailbox names // E-Mail-Ordnernamen
 $labels['inbox']  = 'Posteingang';
 $labels['sent']   = 'Gesendet';
 $labels['trash']  = 'Gelöscht';
 $labels['drafts'] = 'Vorlagen';
 $labels['junk']   = 'Junk';
 
-// message listing
+// message listing // Nachrichtenliste
 $labels['subject'] = 'Betreff';
 $labels['from']    = 'Absender';
 $labels['to']      = 'Empfänger';
-$labels['cc']      = 'Kopie';
-$labels['bcc']     = 'Bcc';
+$labels['cc']      = 'Kopie (CC)';
+$labels['bcc']     = 'Blind-Kopie';
 $labels['replyto'] = 'Antwort an';
 $labels['date']    = 'Datum';
-$labels['size']    = 'Grösse';
+$labels['size']    = 'Größe';
 $labels['priority'] = 'Priorität';
 $labels['organization'] = 'Organisation';
 
-// aliases
+// aliases // [Platzhalter]
 $labels['reply-to'] = $labels['replyto'];
 
 $labels['mailboxlist'] = 'Ordner';
 $labels['messagesfromto'] = 'Nachrichten $from bis $to von $count';
 $labels['messagenrof'] = 'Nachrichten $nr von $count';
 
-$labels['moveto']   = 'verschieben nach...';
-$labels['download'] = 'download';
+$labels['moveto']   = 'Verschieben nach...';
+$labels['download'] = 'Download';
 
 $labels['filename'] = 'Dateiname';
 $labels['filesize'] = 'Dateigrösse';
@@ -68,7 +69,7 @@ $labels['prettydate'] = 'Kurze Datumsanzeige';
 
 $labels['addtoaddressbook'] = 'Ins Adressbuch übernehmen';
 
-// weekdays short
+// weekdays short // Wochentage (Abkürzungen) 
 $labels['sun'] = 'So';
 $labels['mon'] = 'Mo';
 $labels['tue'] = 'Di';
@@ -77,7 +78,7 @@ $labels['thu'] = 'Do';
 $labels['fri'] = 'Fr';
 $labels['sat'] = 'Sa';
 
-// weekdays long
+// weekdays long // Wochentage (normal)
 $labels['sunday']    = 'Sonntag';
 $labels['monday']    = 'Montag';
 $labels['tuesday']   = 'Dienstag';
@@ -88,7 +89,7 @@ $labels['saturday']  = 'Samstag';
 
 $labels['today'] = 'Heute';
 
-// toolbar buttons
+// toolbar buttons // Symbolleisten-Tipps
 $labels['writenewmessage']  = 'Neue Nachricht schreiben';
 $labels['replytomessage']   = 'Antwort verfassen';
 $labels['forwardmessage']   = 'Nachricht weiterleiten';
@@ -103,17 +104,17 @@ $labels['all']    = 'Alle';
 $labels['none']   = 'Keine';
 $labels['unread'] = 'Ungelesene';
 
-// message compose
+// message compose // Nachrichten erstellen
 $labels['compose']  = 'Neue Nachricht verfassen';
 $labels['sendmessage']  = 'Nachricht jetzt senden';
 $labels['addattachment']  = 'Datei anfügen';
 
 $labels['attachments'] = 'Anhänge';
 $labels['upload'] = 'Hochladen';
-$labels['close']  = 'Schliessen';
+$labels['close']  = 'Schließen';
 
-$labels['low']     = 'Tief';
-$labels['lowest']  = 'Tiefste';
+$labels['low']     = 'Niedrig';
+$labels['lowest']  = 'Niedrigste';
 $labels['normal']  = 'Normal';
 $labels['high']    = 'Hoch';
 $labels['highest'] = 'Höchste';
@@ -121,7 +122,7 @@ $labels['highest'] = 'Höchste';
 $labels['showimages'] = 'Bilder anzeigen';
 
 
-// address boook
+// address book // Adressbuch
 $labels['name']      = 'Anzeigename';
 $labels['firstname'] = 'Vorname';
 $labels['surname']   = 'Nachname';
@@ -139,14 +140,16 @@ $labels['newcontact']     = 'Neuen Kontakt erfassen';
 $labels['deletecontact']  = 'Gewählte Kontakte löschen';
 $labels['composeto']      = 'Nachricht verfassen';
 $labels['contactsfromto'] = 'Kontakte $from bis $to von $count';
+$labels['print']          = 'Drucken';
+$labels['export']         = 'Exportieren';
 
 
-// settings
+// settings // Einstellungen
 $labels['settingsfor']  = 'Einstellungen für';
 
 $labels['preferences']  = 'Einstellungen';
 $labels['userpreferences']  = 'Benutzereinstellungen';
-$labels['editpreferences']  = 'Ereinstellungen bearbeiten';
+$labels['editpreferences']  = 'Einstellungen bearbeiten';
 
 $labels['identities']  = 'Absender';
 $labels['manageidentities']  = 'Absender für dieses Konto verwalten';
diff --git a/program/localization/de/messages.inc b/program/localization/de/messages.inc
index 3061bf045..41470fab4 100644
--- a/program/localization/de/messages.inc
+++ b/program/localization/de/messages.inc
@@ -24,9 +24,9 @@ $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
 
 $messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen';
 
-$messages['imaperror'] = 'Keine Verbindung zum IMAP server';
+$messages['imaperror'] = 'Keine Verbindung zum IMAP Server';
 
-$messages['nomessagesfound'] = 'Keine Nachrichten in diesem Order';
+$messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner';
 
 $messages['loggedout'] = 'Sie haben Ihre Session erfolgreich beendet. Auf Wiedersehen!';