Synchronized translations with Transifex

120 files changed, 954 insertions, 599 deletions

diff --git a/plugins/managesieve/localization/az_AZ.inc b/plugins/managesieve/localization/az_AZ.inc
index 35ca87110..b1bfae5e9 100644
--- a/plugins/managesieve/localization/az_AZ.inc
+++ b/plugins/managesieve/localization/az_AZ.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Göndərən';
 $labels['recipient'] = 'Qəbul edən';
 $labels['vacationaddresses'] = 'Əlavə ünvanlarım üçün siyahı (vergüllər ilə ayrılmış):';
 $labels['vacationdays'] = 'Məktub neçə müddətdən bir göndərilsin (gündə):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Məktubun mətni (səbəb yoxdur):';
 $labels['vacationsubject'] = 'Məktubun mövzusu:';
 $labels['rulestop'] = 'Yerinə yetirməyi dayandır';
diff --git a/plugins/managesieve/localization/be_BE.inc b/plugins/managesieve/localization/be_BE.inc
index 47719e85e..64f81599e 100644
--- a/plugins/managesieve/localization/be_BE.inc
+++ b/plugins/managesieve/localization/be_BE.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Ад каго';
 $labels['recipient'] = 'Каму';
 $labels['vacationaddresses'] = 'Дадатковы спіс атрымальнікаў (праз коску):';
 $labels['vacationdays'] = 'Як часта дасылаць паведамленні (ў днях):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/bg_BG.inc b/plugins/managesieve/localization/bg_BG.inc
index f718e3d39..a8f75df04 100644
--- a/plugins/managesieve/localization/bg_BG.inc
+++ b/plugins/managesieve/localization/bg_BG.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Подател';
 $labels['recipient'] = 'Получател';
 $labels['vacationaddresses'] = 'Допълнителни e-mail адреси (разделени със запетая):';
 $labels['vacationdays'] = 'Колко често пращате съобщения (в дни):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Текст на съобщението (причина за ваканцията)';
 $labels['vacationsubject'] = 'Тема на съобщението';
 $labels['rulestop'] = 'Правила за спиране';
diff --git a/plugins/managesieve/localization/bs_BA.inc b/plugins/managesieve/localization/bs_BA.inc
index e12886f58..6d1ec8d2c 100644
--- a/plugins/managesieve/localization/bs_BA.inc
+++ b/plugins/managesieve/localization/bs_BA.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Pošiljaoc';
 $labels['recipient'] = 'Primaoc';
 $labels['vacationaddresses'] = 'Moje dodatne email adrese (odvojite zarezima):';
 $labels['vacationdays'] = 'Frekvencija slanja poruka (u danima):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Tijelo poruke (razlog za odmor):';
 $labels['vacationsubject'] = 'Naslov poruke:';
 $labels['rulestop'] = 'Prestani procjenjivati pravila';
diff --git a/plugins/managesieve/localization/ca_ES.inc b/plugins/managesieve/localization/ca_ES.inc
index 2320dfe14..df1cdec89 100644
--- a/plugins/managesieve/localization/ca_ES.inc
+++ b/plugins/managesieve/localization/ca_ES.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remitent';
 $labels['recipient'] = 'Destinatari/a';
 $labels['vacationaddresses'] = 'Altres adreces electròniques meves (separades per coma)';
 $labels['vacationdays'] = 'Cada quan enviar un missatge (en dies):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Cos del missatge (raó de les vacances):';
 $labels['vacationsubject'] = 'Assumpte del missatge:';
 $labels['rulestop'] = 'Deixa d\'avaluar regles';
@@ -95,25 +98,25 @@ $labels['flagdeleted'] = 'Suprimit';
 $labels['flaganswered'] = 'Respost';
 $labels['flagflagged'] = 'Marcat';
 $labels['flagdraft'] = 'Esborrany';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
+$labels['setvariable'] = 'Ajusta la variable';
+$labels['setvarname'] = 'Nom de la variable:';
+$labels['setvarvalue'] = 'Valor de la variable:';
+$labels['setvarmodifiers'] = 'Modificadors:';
+$labels['varlower'] = 'minúscules';
+$labels['varupper'] = 'majúscules';
+$labels['varlowerfirst'] = 'el primer caràcter és minúscul';
+$labels['varupperfirst'] = 'el primer caràcter és majúscul';
+$labels['varquotewildcard'] = 'engloba els caràcters especials amb cometes';
+$labels['varlength'] = 'llargada';
+$labels['notify'] = 'Envia notificació';
+$labels['notifyaddress'] = 'Per a adreça de correu electrònic:';
+$labels['notifybody'] = 'Cos de la notificació';
+$labels['notifysubject'] = 'Tema de la notificació:';
+$labels['notifyfrom'] = 'Remitent de la notificació:';
+$labels['notifyimportance'] = 'Importànica:';
+$labels['notifyimportancelow'] = 'baixa';
 $labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
+$labels['notifyimportancehigh'] = 'alta';
 $labels['filtercreate'] = 'Crea filtre';
 $labels['usedata'] = 'Fes servir les següents dades al filtre:';
 $labels['nextstep'] = 'Següent pas';
diff --git a/plugins/managesieve/localization/cs_CZ.inc b/plugins/managesieve/localization/cs_CZ.inc
index 0d7dfb2fb..26baeff2b 100644
--- a/plugins/managesieve/localization/cs_CZ.inc
+++ b/plugins/managesieve/localization/cs_CZ.inc
@@ -55,8 +55,11 @@ $labels['add'] = 'Přidej';
 $labels['del'] = 'Smaž';
 $labels['sender'] = 'Odesílatel';
 $labels['recipient'] = 'Příjemce';
-$labels['vacationaddresses'] = 'Seznam příjemců, kterým nebude zpráva odeslána (oddělené čárkou):';
+$labels['vacationaddresses'] = 'Moje další e-mailové adresy (aliasy) spojené s tímto účtem (oddělené čárkou):';
 $labels['vacationdays'] = 'Počet dnů mezi automatickými odpověďmi:';
+$labels['vacationinterval'] = 'Prodleva mezi automatickými odpověďmi:';
+$labels['days'] = 'dnů';
+$labels['seconds'] = 'sekund';
 $labels['vacationreason'] = 'Zpráva (Důvod nepřítomnosti):';
 $labels['vacationsubject'] = 'Předmět zprávy:';
 $labels['rulestop'] = 'Zastavit pravidla';
diff --git a/plugins/managesieve/localization/cy_GB.inc b/plugins/managesieve/localization/cy_GB.inc
index 81f2ca216..800d14b65 100644
--- a/plugins/managesieve/localization/cy_GB.inc
+++ b/plugins/managesieve/localization/cy_GB.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Anfonwr';
 $labels['recipient'] = 'Derbynnwr';
 $labels['vacationaddresses'] = 'Fy chyfeiriadau ebost ychwanegol (gwahanir gyda coma):';
 $labels['vacationdays'] = 'Pa mor aml i ddanfon negeseuon (mewn dyddiau):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corff neges (rheswm ar wyliau):';
 $labels['vacationsubject'] = 'Pwnc neges:';
 $labels['rulestop'] = 'Stopio gwerthuso rheolau';
diff --git a/plugins/managesieve/localization/da_DK.inc b/plugins/managesieve/localization/da_DK.inc
index 02aaa1b0e..6bc43cf58 100644
--- a/plugins/managesieve/localization/da_DK.inc
+++ b/plugins/managesieve/localization/da_DK.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Afsender';
 $labels['recipient'] = 'Modtager';
 $labels['vacationaddresses'] = 'Mine alternative e-mailadresser (kommasepareret):';
 $labels['vacationdays'] = 'Hvor tit skal besked sendes (i dage):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Besked (ved ferie):';
 $labels['vacationsubject'] = 'Besked emne:';
 $labels['rulestop'] = 'Stop behandling af regler';
@@ -95,22 +98,22 @@ $labels['flagdeleted'] = 'Slettede';
 $labels['flaganswered'] = 'Besvaret';
 $labels['flagflagged'] = 'Markeret';
 $labels['flagdraft'] = 'Kladde';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
+$labels['setvariable'] = 'Skriv variablen';
+$labels['setvarname'] = 'Variabel navn:';
+$labels['setvarvalue'] = 'Variabel værdi:';
+$labels['setvarmodifiers'] = 'Modifikator';
+$labels['varlower'] = 'små bogstaver';
+$labels['varupper'] = 'store bogstaver';
+$labels['varlowerfirst'] = 'første bogstav lille';
+$labels['varupperfirst'] = 'Første bogstav stort';
+$labels['varquotewildcard'] = 'Sæt specialle tegn i citationstegn ';
 $labels['varlength'] = 'længde';
-$labels['notify'] = 'Send notification';
+$labels['notify'] = 'Send meddelelse';
 $labels['notifyaddress'] = 'Til e-mail adresse:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
+$labels['notifybody'] = 'meddelelses indhold:';
+$labels['notifysubject'] = 'Meddelelses emne:';
+$labels['notifyfrom'] = 'Meddelelses afsender:';
+$labels['notifyimportance'] = 'Vigtighed:';
 $labels['notifyimportancelow'] = 'lav';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'høj';
diff --git a/plugins/managesieve/localization/de_CH.inc b/plugins/managesieve/localization/de_CH.inc
index 207475896..b30625fe9 100644
--- a/plugins/managesieve/localization/de_CH.inc
+++ b/plugins/managesieve/localization/de_CH.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Absender';
 $labels['recipient'] = 'Empfänger';
 $labels['vacationaddresses'] = 'Zusätzliche Liste von Empfängern (Komma getrennt):';
 $labels['vacationdays'] = 'Antwort wird erneut gesendet nach (in Tagen):';
+$labels['vacationinterval'] = 'Wie oft senden:';
+$labels['days'] = 'Tage';
+$labels['seconds'] = 'Sekunden';
 $labels['vacationreason'] = 'Inhalt der Nachricht (Abwesenheitsgrund):';
 $labels['vacationsubject'] = 'Betreff';
 $labels['rulestop'] = 'Regelauswertung anhalten';
diff --git a/plugins/managesieve/localization/de_DE.inc b/plugins/managesieve/localization/de_DE.inc
index 6bd9046b2..1b741efc6 100644
--- a/plugins/managesieve/localization/de_DE.inc
+++ b/plugins/managesieve/localization/de_DE.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Absender';
 $labels['recipient'] = 'Empfänger';
 $labels['vacationaddresses'] = 'Zusätzliche Liste von E-Mail Empfängern (Komma getrennt):';
 $labels['vacationdays'] = 'Wie oft sollen Nachrichten gesendet werden (in Tagen):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Nachrichteninhalt (Abwesenheitsgrund):';
 $labels['vacationsubject'] = 'Nachrichtenbetreff';
 $labels['rulestop'] = 'Regelauswertung anhalten';
diff --git a/plugins/managesieve/localization/el_GR.inc b/plugins/managesieve/localization/el_GR.inc
index 8504f7747..714b7240f 100644
--- a/plugins/managesieve/localization/el_GR.inc
+++ b/plugins/managesieve/localization/el_GR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Αποστολέας';
 $labels['recipient'] = 'Παραλήπτης';
 $labels['vacationaddresses'] = 'Πρόσθετη λίστα email παραληπτών (διαχωρισμένη με κόμματα):';
 $labels['vacationdays'] = 'Συχνότητα αποστολής μηνυμάτων (σε ημέρες):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Σώμα μηνύματος (λόγος απουσίας):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Παύση επαλήθευσης κανόνων';
diff --git a/plugins/managesieve/localization/en_GB.inc b/plugins/managesieve/localization/en_GB.inc
index 394b6c014..4dd4f7d8b 100644
--- a/plugins/managesieve/localization/en_GB.inc
+++ b/plugins/managesieve/localization/en_GB.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Sender';
 $labels['recipient'] = 'Recipient';
 $labels['vacationaddresses'] = 'Additional list of recipient e-mails (comma separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/eo.inc b/plugins/managesieve/localization/eo.inc
index b30b08ab7..3ce49ddb2 100644
--- a/plugins/managesieve/localization/eo.inc
+++ b/plugins/managesieve/localization/eo.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Sendanto';
 $labels['recipient'] = 'Ricevanto';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/es_AR.inc b/plugins/managesieve/localization/es_AR.inc
index 20dee2f74..c9c6e70f8 100644
--- a/plugins/managesieve/localization/es_AR.inc
+++ b/plugins/managesieve/localization/es_AR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista de direcciones de correo de destinatarios adicionales (separados por comas):';
 $labels['vacationdays'] = 'Cada cuanto enviar mensajes (en días):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Cuerpo del mensaje (razón de vacaciones):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Parar de evaluar reglas';
diff --git a/plugins/managesieve/localization/es_ES.inc b/plugins/managesieve/localization/es_ES.inc
index 430079288..9673a9959 100644
--- a/plugins/managesieve/localization/es_ES.inc
+++ b/plugins/managesieve/localization/es_ES.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista de direcciones de correo de destinatarios adicionales (separados por comas):';
 $labels['vacationdays'] = 'Cada cuánto enviar mensajes (en días):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Cuerpo del mensaje (razón de vacaciones):';
 $labels['vacationsubject'] = 'Asunto del Mensaje:';
 $labels['rulestop'] = 'Parar de evaluar reglas';
diff --git a/plugins/managesieve/localization/et_EE.inc b/plugins/managesieve/localization/et_EE.inc
index 7e70a9d57..334a65cee 100644
--- a/plugins/managesieve/localization/et_EE.inc
+++ b/plugins/managesieve/localization/et_EE.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Saatja';
 $labels['recipient'] = 'Saaja';
 $labels['vacationaddresses'] = 'Lisanimekiri saaja e-posti aadressidest (komadega eraldatud):';
 $labels['vacationdays'] = 'Kui tihti kirju saata (päevades):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Kirja sisu (puhkuse põhjus):';
 $labels['vacationsubject'] = 'Kirja teema:';
 $labels['rulestop'] = 'Peata reeglite otsimine';
diff --git a/plugins/managesieve/localization/fa_IR.inc b/plugins/managesieve/localization/fa_IR.inc
index 7185d8059..91dfcb605 100644
--- a/plugins/managesieve/localization/fa_IR.inc
+++ b/plugins/managesieve/localization/fa_IR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'فرستنده';
 $labels['recipient'] = 'گیرنده';
 $labels['vacationaddresses'] = 'آدرس‌های ایمیل دیگر من (جدا شده با ویرگول):';
 $labels['vacationdays'] = 'پیغام ها در چه مواقعی فرستاده شدند (در روزهای):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'بدنه پیغام (علت مسافرت):';
 $labels['vacationsubject'] = 'موضوع پیغام:';
 $labels['rulestop'] = 'توقف قوانین ارزیابی';
diff --git a/plugins/managesieve/localization/fi_FI.inc b/plugins/managesieve/localization/fi_FI.inc
index 18cd0c68f..71856c95f 100644
--- a/plugins/managesieve/localization/fi_FI.inc
+++ b/plugins/managesieve/localization/fi_FI.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Lähettäjä';
 $labels['recipient'] = 'Vastaanottaja';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Viestin aihe:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/fr_FR.inc b/plugins/managesieve/localization/fr_FR.inc
index 912c03f48..9be9f1054 100644
--- a/plugins/managesieve/localization/fr_FR.inc
+++ b/plugins/managesieve/localization/fr_FR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Expéditeur';
 $labels['recipient'] = 'Destinataire';
 $labels['vacationaddresses'] = 'Liste des destinataires (séparés par une virgule) :';
 $labels['vacationdays'] = 'Ne pas renvoyer un message avant (jours) :';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corps du message (raison de l\'absence) :';
 $labels['vacationsubject'] = 'Sujet du message:';
 $labels['rulestop'] = 'Arrêter d\'évaluer les prochaines règles';
diff --git a/plugins/managesieve/localization/gl_ES.inc b/plugins/managesieve/localization/gl_ES.inc
index 4a4ec3dc5..3f492ad46 100644
--- a/plugins/managesieve/localization/gl_ES.inc
+++ b/plugins/managesieve/localization/gl_ES.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista de enderezos de correo de destinatarios adicionais (separados por comas):';
 $labels['vacationdays'] = 'Cada canto enviar mensaxes (en días):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corpo da mensaxe (razón de vacacións):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Parar de avaliar regras';
diff --git a/plugins/managesieve/localization/he_IL.inc b/plugins/managesieve/localization/he_IL.inc
index 547913199..0b2f67ede 100644
--- a/plugins/managesieve/localization/he_IL.inc
+++ b/plugins/managesieve/localization/he_IL.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'השולח';
 $labels['recipient'] = 'הנמען';
 $labels['vacationaddresses'] = 'כתובות דוא"ל נוספות שלי (מופרדות ע"י פסיקים)';
 $labels['vacationdays'] = 'באיזו תדירות ( בימים ) לשלוח הודעות:';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'גוף ההודעה (סיבת החופשה):';
 $labels['vacationsubject'] = 'נושא ההודעה:';
 $labels['rulestop'] = 'עצירה של בחינת הכללים';
diff --git a/plugins/managesieve/localization/hr_HR.inc b/plugins/managesieve/localization/hr_HR.inc
index c38ed3ee2..64b9bef62 100644
--- a/plugins/managesieve/localization/hr_HR.inc
+++ b/plugins/managesieve/localization/hr_HR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Pošiljatelj';
 $labels['recipient'] = 'Primatelj';
 $labels['vacationaddresses'] = 'Dodatna lista primatelja (odvojenih zarezom):';
 $labels['vacationdays'] = 'Koliko često slati poruku (u danima):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Tijelo poruke (razlog odmora):';
 $labels['vacationsubject'] = 'Naslov poruke:';
 $labels['rulestop'] = 'Prekini izvođenje filtera';
diff --git a/plugins/managesieve/localization/hu_HU.inc b/plugins/managesieve/localization/hu_HU.inc
index de4f687d8..c7c648ded 100644
--- a/plugins/managesieve/localization/hu_HU.inc
+++ b/plugins/managesieve/localization/hu_HU.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Feladó';
 $labels['recipient'] = 'Címzett';
 $labels['vacationaddresses'] = 'További címzettek (vesszővel elválasztva):';
 $labels['vacationdays'] = 'Válaszüzenet küldése ennyi naponként:';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Levél szövege (automatikus válasz):';
 $labels['vacationsubject'] = 'Üzenet tárgya:';
 $labels['rulestop'] = 'Műveletek végrehajtásának befejezése';
diff --git a/plugins/managesieve/localization/hy_AM.inc b/plugins/managesieve/localization/hy_AM.inc
index a0c1c7cca..908175f1d 100644
--- a/plugins/managesieve/localization/hy_AM.inc
+++ b/plugins/managesieve/localization/hy_AM.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Ուղարկող';
 $labels['recipient'] = 'Ստացող';
 $labels['vacationaddresses'] = 'Իմ հավելյալ էլփոստի հասցեներ (բաժանված ստորակետներով).';
 $labels['vacationdays'] = 'Ինչ հաճախությամբ ուղարկել հաղորդագրությունները (օրեր)`';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Հաղորդագրության բովանդակություն (արձակուրդի պատճառ)`';
 $labels['vacationsubject'] = 'Հաղորդագրության վերնագիր`';
 $labels['rulestop'] = 'Դադարել պայմանների ստուգումը';
diff --git a/plugins/managesieve/localization/ia.inc b/plugins/managesieve/localization/ia.inc
index f4ea903be..45f6e5263 100644
--- a/plugins/managesieve/localization/ia.inc
+++ b/plugins/managesieve/localization/ia.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Sender';
 $labels['recipient'] = 'Recipient';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/id_ID.inc b/plugins/managesieve/localization/id_ID.inc
index 0e9245d6f..a30c2a0b0 100644
--- a/plugins/managesieve/localization/id_ID.inc
+++ b/plugins/managesieve/localization/id_ID.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Pengirim';
 $labels['recipient'] = 'Penerima';
 $labels['vacationaddresses'] = 'Alamat email tambahan saya (dipisahkan koma):';
 $labels['vacationdays'] = 'Seberapa sering mengirim pesan (dalam hari):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Isi pesan (alasan liburan):';
 $labels['vacationsubject'] = 'Judul pesan:';
 $labels['rulestop'] = 'Berhenti mengevaluasi aturan';
diff --git a/plugins/managesieve/localization/it_IT.inc b/plugins/managesieve/localization/it_IT.inc
index bcbf4d186..6fb2c424f 100644
--- a/plugins/managesieve/localization/it_IT.inc
+++ b/plugins/managesieve/localization/it_IT.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Mittente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista di indirizzi e-mail di destinatari addizionali (separati da virgola):';
 $labels['vacationdays'] = 'Ogni quanti giorni ribadire il messaggio allo stesso mittente';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corpo del messaggio (dettagli relativi all\'assenza):';
 $labels['vacationsubject'] = 'Oggetto del messaggio';
 $labels['rulestop'] = 'Non valutare le regole successive';
diff --git a/plugins/managesieve/localization/ja_JP.inc b/plugins/managesieve/localization/ja_JP.inc
index 715827bd4..0cd4f44b9 100644
--- a/plugins/managesieve/localization/ja_JP.inc
+++ b/plugins/managesieve/localization/ja_JP.inc
@@ -57,6 +57,9 @@ $labels['sender'] = '送信者';
 $labels['recipient'] = '宛先';
 $labels['vacationaddresses'] = '電子メールの宛先の(コンマ区切った)追加のリスト:';
 $labels['vacationdays'] = 'メッセージを(1日に)送信する頻度:';
+$labels['vacationinterval'] = 'メッセージを送信する頻度:';
+$labels['days'] = '日';
+$labels['seconds'] = '秒';
 $labels['vacationreason'] = 'メッセージ本体(休暇の理由):';
 $labels['vacationsubject'] = 'メッセージの件名:';
 $labels['rulestop'] = 'ルールの評価を停止';
diff --git a/plugins/managesieve/localization/ko_KR.inc b/plugins/managesieve/localization/ko_KR.inc
index 8445c297d..5ab4fc220 100644
--- a/plugins/managesieve/localization/ko_KR.inc
+++ b/plugins/managesieve/localization/ko_KR.inc
@@ -19,156 +19,159 @@
 
 $labels['filters'] = '필터';
 $labels['managefilters'] = '수신 메일 필터 관리';
-$labels['filtername'] = '필터 이름';
+$labels['filtername'] = '필터명';
 $labels['newfilter'] = '새 필터';
 $labels['filteradd'] = '필터 추가';
 $labels['filterdel'] = '필터 삭제';
 $labels['moveup'] = '위로 이동';
 $labels['movedown'] = '아래로 이동';
-$labels['filterallof'] = '다음에 오는 규칙들 전부와 일치';
-$labels['filteranyof'] = '다음에 오는 규칙들 중 어떠한 것 이라도 일치';
+$labels['filterallof'] = '다음의 모든 규칙과 일치함';
+$labels['filteranyof'] = '다음 규칙 중 하나라도 일치함';
 $labels['filterany'] = '모든 메시지';
-$labels['filtercontains'] = '포함합니다';
-$labels['filternotcontains'] = '포함하지 않습니다';
-$labels['filteris'] = '와 같습니다';
-$labels['filterisnot'] = '와 같지 않습니다';
-$labels['filterexists'] = '존재합니다';
-$labels['filternotexists'] = '존재하지 않습니다';
-$labels['filtermatches'] = '표현식과 일치합니다';
-$labels['filternotmatches'] = '표현식과 일치하지 않습니다';
-$labels['filterregex'] = '정규표현식과 일치합니다';
-$labels['filternotregex'] = '정규 표현식과 일치하지 않습니다';
-$labels['filterunder'] = 'under';
-$labels['filterover'] = 'over';
-$labels['addrule'] = '규칙 더하기';
+$labels['filtercontains'] = '다음을 포함함';
+$labels['filternotcontains'] = '다음을 포함하지 않음';
+$labels['filteris'] = '다음과 같음';
+$labels['filterisnot'] = '다음과 같지 않음';
+$labels['filterexists'] = '다음이 존재함';
+$labels['filternotexists'] = '다음이 존재하지 않음';
+$labels['filtermatches'] = '다음 표현식과 일치함';
+$labels['filternotmatches'] = '다음 표현식과 일치하지 않음';
+$labels['filterregex'] = '다음 정규 표현식과 일치함';
+$labels['filternotregex'] = '다음 정규 표현식과 일치하지 않음';
+$labels['filterunder'] = '다음보다 아래임';
+$labels['filterover'] = '다음보다 위임';
+$labels['addrule'] = '규칙 추가';
 $labels['delrule'] = '규칙 삭제';
-$labels['messagemoveto'] = '메시지 이동';
-$labels['messageredirect'] = '메시지를 Redirect';
-$labels['messagecopyto'] = '메시지를 복사';
-$labels['messagesendcopy'] = '메시지의 복사본 보내기';
-$labels['messagereply'] = '메시지에 회신하기';
-$labels['messagedelete'] = '메시지 삭제';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagesrules'] = 'For incoming mail:';
-$labels['messagesactions'] = '...execute the following actions:';
+$labels['messagemoveto'] = '메시지를 다음 위치로 이동함';
+$labels['messageredirect'] = '메시지를 다음 주소로 전송함';
+$labels['messagecopyto'] = '메시지를 다음 위치로 복사함';
+$labels['messagesendcopy'] = '메시지의 사본을 다음 위치로 보냄';
+$labels['messagereply'] = '다음 메시지로 회신';
+$labels['messagedelete'] = '메시지를 삭제';
+$labels['messagediscard'] = '다음 메시지와 함께 폐기';
+$labels['messagesrules'] = '해당 받은 메일:';
+$labels['messagesactions'] = '...다음 동작을 실행:';
 $labels['add'] = '추가';
 $labels['del'] = '삭제';
-$labels['sender'] = '보낸 사람';
-$labels['recipient'] = '수신자';
-$labels['vacationaddresses'] = '나의 추가 e-mail 주소(들) (콤마로 구분 됨):';
-$labels['vacationdays'] = 'How often send messages (in days):';
+$labels['sender'] = '발신인';
+$labels['recipient'] = '수신인';
+$labels['vacationaddresses'] = '나의 추가 이메일 주소 (쉼표로 구분됨):';
+$labels['vacationdays'] = '메시지 발신 주기 (일):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = '메시지 본문 (휴가 사유):';
 $labels['vacationsubject'] = '메시지 제목:';
-$labels['rulestop'] = '규칙의 실행을 멈춤';
-$labels['enable'] = '사용/사용안함';
-$labels['filterset'] = '필터 묶음';
-$labels['filtersets'] = '필터 묶음';
-$labels['filtersetadd'] = '필터 묶음 추가';
-$labels['filtersetdel'] = '현재 필터 묶음을 삭제';
+$labels['rulestop'] = '규칙 평가를 중단';
+$labels['enable'] = '활성화/비활성화';
+$labels['filterset'] = '필터 세트';
+$labels['filtersets'] = '필터 세트';
+$labels['filtersetadd'] = '필터 세트 추가';
+$labels['filtersetdel'] = '현재 필터 세트를 삭제';
 $labels['filtersetact'] = '현재 필터 세트를 활성화';
 $labels['filtersetdeact'] = '현재 필터 세트를 비활성화';
 $labels['filterdef'] = '필터 정의';
-$labels['filtersetname'] = '필터 세트 이름';
-$labels['newfilterset'] = '새로운 필터 세트';
+$labels['filtersetname'] = '필터 세트명';
+$labels['newfilterset'] = '새 필터 세트';
 $labels['active'] = '활성';
 $labels['none'] = '없음';
-$labels['fromset'] = '묶음으로 부터';
-$labels['fromfile'] = '파일로 부터';
-$labels['filterdisabled'] = '필터 사용하지 않음';
-$labels['countisgreaterthan'] = '갯수가 큼';
-$labels['countisgreaterthanequal'] = '갯수가 크거나 같음';
-$labels['countislessthan'] = '갯수가 작음';
-$labels['countislessthanequal'] = '갯수가 작거나 같음';
-$labels['countequals'] = '갯수가 같음';
-$labels['countnotequals'] = '갯수가 같지 않음';
-$labels['valueisgreaterthan'] = '값이 큼';
-$labels['valueisgreaterthanequal'] = '값이 크거나 같음';
-$labels['valueislessthan'] = '값이 작음';
-$labels['valueislessthanequal'] = '값이 작거나 같음';
-$labels['valueequals'] = '값이 같음';
-$labels['valuenotequals'] = '값이 같지 않음';
-$labels['setflags'] = '메시지에 플래그를 설정';
-$labels['addflags'] = '메시지에 플래그를 추가';
-$labels['removeflags'] = '메시지에서 플래그를 제거';
+$labels['fromset'] = '세트로부터';
+$labels['fromfile'] = '파일로부터';
+$labels['filterdisabled'] = '필터가 비활성화됨';
+$labels['countisgreaterthan'] = '개수가 다음보다 큼';
+$labels['countisgreaterthanequal'] = '개수가 다음보다 크거나 같음';
+$labels['countislessthan'] = '개수가 다음보다 작음';
+$labels['countislessthanequal'] = '개수가 작거나 같음';
+$labels['countequals'] = '개수가 다음과 같음';
+$labels['countnotequals'] = '개수가 다음과 같지 않음';
+$labels['valueisgreaterthan'] = '값이 다음보다 큼';
+$labels['valueisgreaterthanequal'] = '값이 다음보다 크거나 같음';
+$labels['valueislessthan'] = '값이 다음보다 작음';
+$labels['valueislessthanequal'] = '값이 다음보다 작거나 같음';
+$labels['valueequals'] = '값이 다음과 같음';
+$labels['valuenotequals'] = '값이 다음과 같지 않음';
+$labels['setflags'] = '메시지에 깃발을 설정';
+$labels['addflags'] = '메시지에 깃발을 추가';
+$labels['removeflags'] = '메시지에서 깃발을 제거';
 $labels['flagread'] = '읽음';
 $labels['flagdeleted'] = '삭제됨';
 $labels['flaganswered'] = '응답함';
-$labels['flagflagged'] = '표시함';
+$labels['flagflagged'] = '깃발을 추가함';
 $labels['flagdraft'] = '임시 보관함';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
+$labels['setvariable'] = '변수 설정';
+$labels['setvarname'] = '변수명:';
+$labels['setvarvalue'] = '변수 값:';
+$labels['setvarmodifiers'] = '수식자:';
+$labels['varlower'] = '소문자';
+$labels['varupper'] = '대문자';
+$labels['varlowerfirst'] = '첫 문자를 소문자로';
+$labels['varupperfirst'] = '첫 문자를 대문자로';
+$labels['varquotewildcard'] = '특수 기호를 인용';
+$labels['varlength'] = '길이';
+$labels['notify'] = '알림 메시지 보내기';
+$labels['notifyaddress'] = '대상 이메일 주소:';
+$labels['notifybody'] = '알림 메시지 본문:';
+$labels['notifysubject'] = '알림 메시지 제목:';
+$labels['notifyfrom'] = '알림 메시지 발신인:';
+$labels['notifyimportance'] = '중요도:';
+$labels['notifyimportancelow'] = '낮음';
+$labels['notifyimportancenormal'] = '보통';
+$labels['notifyimportancehigh'] = '높음';
 $labels['filtercreate'] = '필터 생성';
-$labels['usedata'] = '필터에서 다음에 오는 데이터를 사용';
+$labels['usedata'] = '필터에서 다음 데이터를 사용:';
 $labels['nextstep'] = '다음 단계';
 $labels['...'] = '...';
-$labels['advancedopts'] = '상세 설정';
+$labels['advancedopts'] = '고급 설정';
 $labels['body'] = '본문';
 $labels['address'] = '주소';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
+$labels['envelope'] = '봉투';
+$labels['modifier'] = '수식자:';
 $labels['text'] = '텍스트';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
+$labels['undecoded'] = '암호화되지 않음 (원상태)';
+$labels['contenttype'] = '내용 유형';
+$labels['modtype'] = '유형:';
+$labels['allparts'] = '모두';
 $labels['domain'] = '도메인';
-$labels['localpart'] = 'local part';
+$labels['localpart'] = '로컬 부분';
 $labels['user'] = '사용자';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = '기본값';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['detail'] = '세부사항';
+$labels['comparator'] = '비교기:';
+$labels['default'] = '기본';
+$labels['octet'] = '엄격 (8진수)';
+$labels['asciicasemap'] = '대/소문자 구분 (ascii-casemap)';
+$labels['asciinumeric'] = '숫자 (ascii-numeric)';
 
 $messages = array();
-$messages['filterunknownerror'] = '알수 없는 서버 에러.';
-$messages['filterconnerror'] = '서버에 연결할 수 없습니다.';
-$messages['filterdeleteerror'] = '필터를 삭제할 수 없습니다. 서버 에러 발생 함.';
-$messages['filterdeleted'] = '필터를 성공적으로 삭제 함.';
-$messages['filtersaved'] = '필터를 성공적으로 저장 함.';
-$messages['filtersaveerror'] = '필터를 저장할 수 없음. 서버 에러 발생 함.';
-$messages['filterdeleteconfirm'] = '정말로 선택한 필터의 삭제를 원하십니까?';
-$messages['ruledeleteconfirm'] = '선택한 규칙을 삭제하고자 하는 것이 확실합니까?';
-$messages['actiondeleteconfirm'] = '선택한 동작을 삭제하고자 하는 것이 확실합니까?';
-$messages['forbiddenchars'] = '필드에 금지된 문자가 있음.';
-$messages['cannotbeempty'] = '필드는 비어있을 수 없음.';
-$messages['ruleexist'] = '지정한 이름의 필터가 이미 존재 함.';
-$messages['setactivateerror'] = '선택한 필터 묶음을 활성화 할 수 없음. 서버 에러 발생 함.';
-$messages['setdeactivateerror'] = '선택한 필터 묶음을 비활성화 할 수 없음. 서버 에러 발생 함.';
-$messages['setdeleteerror'] = '선택한 필터 묶음을 삭제할 수 없음. 서버 에러 발생 함.';
-$messages['setactivated'] = '필터 묶음을 성공적으로 활성화 하였음.';
-$messages['setdeactivated'] = '필터 묶음을 성공적으로 비활성화 하였음.';
-$messages['setdeleted'] = '필터 묶음을 성공적으로 삭제 함.';
-$messages['setdeleteconfirm'] = '선택한 필터 묶음을 지우고자 하는 것이 확실합니까?';
-$messages['setcreateerror'] = '필터 묶음을 생성할 수 없음. 서버 에러 발생 함.';
-$messages['setcreated'] = '필터 묶음을 성공적으로 생성 함.';
-$messages['activateerror'] = '선택한 필터(들)을 동작하게 할 수 없음. 서버 에러 발생 함.';
-$messages['deactivateerror'] = '선택한 필터(들)을 동작하지 않게 할 수 없음. 서버 에러 발생 함.';
-$messages['deactivated'] = '필터(들)을 동작하게 하는데 성공하였음.';
-$messages['activated'] = '필터(들)을 동작하지 않게 하는데 성공하였음.';
-$messages['moved'] = '필터를 이동하는 데 성공하였음.';
-$messages['moveerror'] = '선택한 필터를 이동할 수 없음. 서버 에러 발생 함.';
+$messages['filterunknownerror'] = '알수 없는 서버 오류.';
+$messages['filterconnerror'] = '서버에 연결할 수 없음.';
+$messages['filterdeleteerror'] = '필터를 삭제할 수 없음. 서버 오류가 발생함.';
+$messages['filterdeleted'] = '필터가 성공적으로 삭제됨.';
+$messages['filtersaved'] = '필터가 성공적으로 저장됨.';
+$messages['filtersaveerror'] = '필터를 저장할 수 없음. 서버 오류가 발생함.';
+$messages['filterdeleteconfirm'] = '정말로 선택한 필터를 삭제하시겠습니까?';
+$messages['ruledeleteconfirm'] = '정말로 선택한 규칙을 삭제하시겠습니까?';
+$messages['actiondeleteconfirm'] = '정말로 선택한 동작을 삭제하시겠습니까?';
+$messages['forbiddenchars'] = '필드에 금지된 문자가 존재함.';
+$messages['cannotbeempty'] = '필드는 비워둘 수 없음.';
+$messages['ruleexist'] = '지정한 이름의 필터가 이미 존재함.';
+$messages['setactivateerror'] = '선택한 필터 세트를 활성화 할 수 없음. 서버 오류가 발생함.';
+$messages['setdeactivateerror'] = '선택한 필터 세트를 비활성화 할 수 없음. 서버 오류가 발생함.';
+$messages['setdeleteerror'] = '선택한 필터 세트를 삭제할 수 없음. 서버 오류가 발생함.';
+$messages['setactivated'] = '필터 세트가 성공적으로 활성화됨.';
+$messages['setdeactivated'] = '필터 세트가 성공적으로 비활성화됨.';
+$messages['setdeleted'] = '필터 세트가 성공적으로 삭제됨.';
+$messages['setdeleteconfirm'] = '정말로 선택한 필터 세트를 삭제하시겠습니까?';
+$messages['setcreateerror'] = '필터 세트를 생성할 수 없음. 서버 오류가 발생함.';
+$messages['setcreated'] = '필터 세트가 성공적으로 생성됨.';
+$messages['activateerror'] = '선택한 필터를 활성화할 수 없음. 서버 오류가 발생함.';
+$messages['deactivateerror'] = '선택한 필터를 비활성화할 수 없음. 서버 오류가 발생함.';
+$messages['deactivated'] = '필터가 성공적으로 비활성화됨.';
+$messages['activated'] = '필터가 성공적으로 활성화됨.';
+$messages['moved'] = '필터가 성공적으로 이동함.';
+$messages['moveerror'] = '선택한 필터를 이동할 수 없음. 서버 오류가 발생함.';
 $messages['nametoolong'] = '이름이 너무 김.';
 $messages['namereserved'] = '예약된 이름.';
-$messages['setexist'] = '묶음이 이미 존재 함.';
-$messages['nodata'] = '적어도 하나의 위치가 선택되어야 함!';
+$messages['setexist'] = '세트가 이미 존재함.';
+$messages['nodata'] = '최소 하나의 위치가 선택되어야 합니다!';
 
 ?>
diff --git a/plugins/managesieve/localization/lt_LT.inc b/plugins/managesieve/localization/lt_LT.inc
index d0a19cc62..fecd3d6bc 100644
--- a/plugins/managesieve/localization/lt_LT.inc
+++ b/plugins/managesieve/localization/lt_LT.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Siuntėjas';
 $labels['recipient'] = 'Gavėjas';
 $labels['vacationaddresses'] = 'Papildomas gavėjų adresų sąrašas (skirti kableliais):';
 $labels['vacationdays'] = 'Kaip dažnai išsiųsti laiškus (dienomis):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Laiško tekstas';
 $labels['vacationsubject'] = 'Laiško tema:';
 $labels['rulestop'] = 'Nutraukti taisyklių vykdymą';
diff --git a/plugins/managesieve/localization/lv_LV.inc b/plugins/managesieve/localization/lv_LV.inc
index dc0d6fd75..f1f85c2e0 100644
--- a/plugins/managesieve/localization/lv_LV.inc
+++ b/plugins/managesieve/localization/lv_LV.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Sūtītājs';
 $labels['recipient'] = 'Saņēmējs';
 $labels['vacationaddresses'] = 'Ievadiet vienu vai vairākus e-pastu(s), atdalot tos komatu:';
 $labels['vacationdays'] = 'Cik dienu laikā vienam un tam pašam sūtītājam neatbildēt atkārtoti (piem., 7):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Atvaļinājuma paziņojuma teksts:';
 $labels['vacationsubject'] = 'Vēstules tēma:';
 $labels['rulestop'] = 'Apturēt nosacījumu pārbaudi';
diff --git a/plugins/managesieve/localization/ml_IN.inc b/plugins/managesieve/localization/ml_IN.inc
index 88c57da9d..67cd6829f 100644
--- a/plugins/managesieve/localization/ml_IN.inc
+++ b/plugins/managesieve/localization/ml_IN.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'അയചയാള്‍';
 $labels['recipient'] = 'സ്വീകര്‍ത്താവ്';
 $labels['vacationaddresses'] = 'സ്വീകര്‍ത്താവിന്റെ ഇമെയില്‍ വിലാസങ്ങളുടെ അധികമുള്ള പട്ടിക (കോമയിട്ട് തിരിച്ച)';
 $labels['vacationdays'] = 'എത്ര ഭിവസം കൂടുമ്പോള്‍ സന്ദേശം അയക്കണം:';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'സന്ദേശത്തിന്റെ ഉള്ളടക്കം (അവധിയുടെ കാരണം):';
 $labels['vacationsubject'] = 'സന്ദേശത്തിന്റെ വിഷയം:';
 $labels['rulestop'] = 'നിയമങ്ങള്‍ വിലയിരുത്തുന്നത് നിര്‍ത്തുക';
diff --git a/plugins/managesieve/localization/mr_IN.inc b/plugins/managesieve/localization/mr_IN.inc
index 20a99991b..3339737e0 100644
--- a/plugins/managesieve/localization/mr_IN.inc
+++ b/plugins/managesieve/localization/mr_IN.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'प्रेषक';
 $labels['recipient'] = 'Recipient';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/nl_NL.inc b/plugins/managesieve/localization/nl_NL.inc
index e90eb2819..1fd6eee4e 100644
--- a/plugins/managesieve/localization/nl_NL.inc
+++ b/plugins/managesieve/localization/nl_NL.inc
@@ -18,7 +18,7 @@
 
 
 $labels['filters'] = 'Filters';
-$labels['managefilters'] = 'Beheer inkomende mail filters';
+$labels['managefilters'] = 'Beheer filters voor inkomende e-mail';
 $labels['filtername'] = 'Filternaam';
 $labels['newfilter'] = 'Nieuw filter';
 $labels['filteradd'] = 'Filter toevoegen';
@@ -43,7 +43,7 @@ $labels['filterover'] = 'over';
 $labels['addrule'] = 'Regel toevoegen';
 $labels['delrule'] = 'Regel verwijderen';
 $labels['messagemoveto'] = 'Verplaats bericht naar';
-$labels['messageredirect'] = 'Redirect bericht naar';
+$labels['messageredirect'] = 'Bericht doorsturen naar';
 $labels['messagecopyto'] = 'Kopieer bericht naar';
 $labels['messagesendcopy'] = 'Verstuur een kopie naar';
 $labels['messagereply'] = 'Beantwoord met bericht';
@@ -57,6 +57,9 @@ $labels['sender'] = 'Afzender';
 $labels['recipient'] = 'Ontvanger';
 $labels['vacationaddresses'] = 'Aanvullende lijst van geadresseerden (gescheiden met komma\'s):';
 $labels['vacationdays'] = 'Hoe vaak moet een bericht verstuurd worden (in dagen):';
+$labels['vacationinterval'] = 'Hoe vaak moet een bericht verstuurd worden:';
+$labels['days'] = 'dagen';
+$labels['seconds'] = 'seconden';
 $labels['vacationreason'] = 'Bericht (vakantiereden):';
 $labels['vacationsubject'] = 'Onderwerp:';
 $labels['rulestop'] = 'Stop met regels uitvoeren';
diff --git a/plugins/managesieve/localization/pl_PL.inc b/plugins/managesieve/localization/pl_PL.inc
index e3a530e62..f2ec96eb9 100644
--- a/plugins/managesieve/localization/pl_PL.inc
+++ b/plugins/managesieve/localization/pl_PL.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Nadawca';
 $labels['recipient'] = 'Odbiorca';
 $labels['vacationaddresses'] = 'Lista dodatkowych adresów odbiorców (oddzielonych przecinkami):';
 $labels['vacationdays'] = 'Częstotliwość wysyłania wiadomości (w dniach):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Treść (przyczyna nieobecności):';
 $labels['vacationsubject'] = 'Temat wiadomości:';
 $labels['rulestop'] = 'Przerwij przetwarzanie reguł';
diff --git a/plugins/managesieve/localization/pt_BR.inc b/plugins/managesieve/localization/pt_BR.inc
index a18ef1546..fb4699fd2 100644
--- a/plugins/managesieve/localization/pt_BR.inc
+++ b/plugins/managesieve/localization/pt_BR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remetente';
 $labels['recipient'] = 'Destinatário';
 $labels['vacationaddresses'] = 'Lista adicional de e-mails destinatários (separado por vírgula):';
 $labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corpo da mensagem (motivo de férias):';
 $labels['vacationsubject'] = 'Título da mensagem:';
 $labels['rulestop'] = 'Parar de avaliar regras';
diff --git a/plugins/managesieve/localization/pt_PT.inc b/plugins/managesieve/localization/pt_PT.inc
index 375277ac2..bfb3f296a 100644
--- a/plugins/managesieve/localization/pt_PT.inc
+++ b/plugins/managesieve/localization/pt_PT.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remetente';
 $labels['recipient'] = 'Destinatário';
 $labels['vacationaddresses'] = 'Lista adicional de destinatários de e-mails (separados por vírgula):';
 $labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):';
+$labels['vacationinterval'] = 'Com que frequência envia mensagens:';
+$labels['days'] = 'dias';
+$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Conteúdo da mensagem (motivo da ausência):';
 $labels['vacationsubject'] = 'Assunto da mensagem:';
 $labels['rulestop'] = 'Parar de avaliar regras';
diff --git a/plugins/managesieve/localization/ro_RO.inc b/plugins/managesieve/localization/ro_RO.inc
index a619045a6..2c917cbdd 100644
--- a/plugins/managesieve/localization/ro_RO.inc
+++ b/plugins/managesieve/localization/ro_RO.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Expeditor';
 $labels['recipient'] = 'Destinatar';
 $labels['vacationaddresses'] = 'Adresele mele de e-mail adiționale (împărțite cu virgulă):';
 $labels['vacationdays'] = 'Cât de des să trimit mesajele (în zile):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corpul mesajului (motivul vacanţei):';
 $labels['vacationsubject'] = 'Subiectul mesajului:';
 $labels['rulestop'] = 'Nu mai evalua reguli';
diff --git a/plugins/managesieve/localization/ru_RU.inc b/plugins/managesieve/localization/ru_RU.inc
index 47b139949..b05074c22 100644
--- a/plugins/managesieve/localization/ru_RU.inc
+++ b/plugins/managesieve/localization/ru_RU.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Отправитель';
 $labels['recipient'] = 'Получатель';
 $labels['vacationaddresses'] = 'Список моих дополнительных адресов (разделённых запятыми):';
 $labels['vacationdays'] = 'Как часто отправлять сообщения (в днях):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Текст сообщения (причина отсутствия):';
 $labels['vacationsubject'] = 'Тема сообщения:';
 $labels['rulestop'] = 'Закончить выполнение';
diff --git a/plugins/managesieve/localization/si_LK.inc b/plugins/managesieve/localization/si_LK.inc
index 8a2856369..afc2e3851 100644
--- a/plugins/managesieve/localization/si_LK.inc
+++ b/plugins/managesieve/localization/si_LK.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'යවන්නා';
 $labels['recipient'] = 'ලබන්නා';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'පණිවිඩයේ මාතෘකාව:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/sk_SK.inc b/plugins/managesieve/localization/sk_SK.inc
index 81caec02d..f336cf2c5 100644
--- a/plugins/managesieve/localization/sk_SK.inc
+++ b/plugins/managesieve/localization/sk_SK.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Odosielateľ';
 $labels['recipient'] = 'Adresát';
 $labels['vacationaddresses'] = 'Dodatoční príjemcovia správy (oddelení čiarkami):';
 $labels['vacationdays'] = 'Počet dní medzi odoslaním správy:';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Dôvod neprítomnosti:';
 $labels['vacationsubject'] = 'Predmet správy:';
 $labels['rulestop'] = 'Koniec pravidiel';
diff --git a/plugins/managesieve/localization/sl_SI.inc b/plugins/managesieve/localization/sl_SI.inc
index eb37f5298..f1c3b983b 100644
--- a/plugins/managesieve/localization/sl_SI.inc
+++ b/plugins/managesieve/localization/sl_SI.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Pošiljatelj';
 $labels['recipient'] = 'Prejemnik';
 $labels['vacationaddresses'] = 'Dodaten seznam naslovov prejemnikov (ločenih z vejico):';
 $labels['vacationdays'] = 'Kako pogosto naj bodo sporočila poslana (v dnevih):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Vsebina sporočila (vzrok za odsotnost):';
 $labels['vacationsubject'] = 'Zadeva sporočila';
 $labels['rulestop'] = 'Prekini z izvajanjem pravil';
@@ -99,14 +102,14 @@ $labels['setvariable'] = 'Nastavi spremenljivko';
 $labels['setvarname'] = 'Ime spremenljivke:';
 $labels['setvarvalue'] = 'Vrednost spremenljivke:';
 $labels['setvarmodifiers'] = 'Modifikator:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
+$labels['varlower'] = 'majhne črke';
+$labels['varupper'] = 'velike črke';
+$labels['varlowerfirst'] = 'prvi znak velika začetnica';
 $labels['varupperfirst'] = 'prvi znak velika začetnica';
 $labels['varquotewildcard'] = 'citiraj posebne znake';
 $labels['varlength'] = 'dolžina';
 $labels['notify'] = 'Poštlji obvestilo';
-$labels['notifyaddress'] = 'To e-mail address:';
+$labels['notifyaddress'] = 'Na elektronski naslov:';
 $labels['notifybody'] = 'Telo obvestila:';
 $labels['notifysubject'] = 'Zadeva obvestila:';
 $labels['notifyfrom'] = 'Pošiljatelj obvestila:';
diff --git a/plugins/managesieve/localization/sv_SE.inc b/plugins/managesieve/localization/sv_SE.inc
index 50749e6ff..49d5b1222 100644
--- a/plugins/managesieve/localization/sv_SE.inc
+++ b/plugins/managesieve/localization/sv_SE.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Avsändare';
 $labels['recipient'] = 'Mottagare';
 $labels['vacationaddresses'] = 'Ytterligare mottagaradresser (avdelade med kommatecken)';
 $labels['vacationdays'] = 'Antal dagar mellan auto-svar:';
+$labels['vacationinterval'] = 'Tid mellan auto-svar:';
+$labels['days'] = 'Dagar';
+$labels['seconds'] = 'Sekunder';
 $labels['vacationreason'] = 'Meddelande i auto-svar:';
 $labels['vacationsubject'] = 'Meddelandeämne:';
 $labels['rulestop'] = 'Avsluta filtrering';
diff --git a/plugins/managesieve/localization/tr_TR.inc b/plugins/managesieve/localization/tr_TR.inc
index 1c12661ca..c36869d29 100644
--- a/plugins/managesieve/localization/tr_TR.inc
+++ b/plugins/managesieve/localization/tr_TR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Gönderici';
 $labels['recipient'] = 'Alıcı';
 $labels['vacationaddresses'] = 'İlave e-posta adreslerim(virgül ile ayrılmış)';
 $labels['vacationdays'] = 'Ne sıklıkla mesajlar gönderilir(gün)';
+$labels['vacationinterval'] = 'Ne kadar sıklıkla mesaj gönderirsiniz:';
+$labels['days'] = 'günler';
+$labels['seconds'] = 'saniyeler';
 $labels['vacationreason'] = 'Mesaj gövdesi(tatil sebebi):';
 $labels['vacationsubject'] = 'Mesaj konusu:';
 $labels['rulestop'] = 'Kuralları değerlendirmeyi bitir';
diff --git a/plugins/managesieve/localization/uk_UA.inc b/plugins/managesieve/localization/uk_UA.inc
index 476341834..41623df35 100644
--- a/plugins/managesieve/localization/uk_UA.inc
+++ b/plugins/managesieve/localization/uk_UA.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Відправник';
 $labels['recipient'] = 'Отримувач';
 $labels['vacationaddresses'] = 'Додатковий список адрес отримувачів (розділених комою)';
 $labels['vacationdays'] = 'Як часто повторювати (у днях):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Текст повідомлення:';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Зупинити перевірку правил';
diff --git a/plugins/managesieve/localization/zh_CN.inc b/plugins/managesieve/localization/zh_CN.inc
index b3b09ecee..79b705c54 100644
--- a/plugins/managesieve/localization/zh_CN.inc
+++ b/plugins/managesieve/localization/zh_CN.inc
@@ -35,29 +35,32 @@ $labels['filterisnot'] = '不等于';
 $labels['filterexists'] = '存在';
 $labels['filternotexists'] = '不存在';
 $labels['filtermatches'] = '匹配表达式';
-$labels['filternotmatches'] = '无匹配的表达式';
+$labels['filternotmatches'] = '不匹配表达式';
 $labels['filterregex'] = '匹配正则表达式';
-$labels['filternotregex'] = '无匹配的正则表达式';
+$labels['filternotregex'] = '不匹配正则表达式';
 $labels['filterunder'] = '小于';
 $labels['filterover'] = '大于';
-$labels['addrule'] = '添加规则';
+$labels['addrule'] = '新建规则';
 $labels['delrule'] = '删除规则';
 $labels['messagemoveto'] = '将邮件移至';
 $labels['messageredirect'] = '将邮件转发至';
 $labels['messagecopyto'] = '复制邮件至';
 $labels['messagesendcopy'] = '发送复制邮件至';
-$labels['messagereply'] = '回复以下信息';
+$labels['messagereply'] = '回复以下内容';
 $labels['messagedelete'] = '删除邮件';
-$labels['messagediscard'] = '舍弃邮件并回复以下信息';
-$labels['messagesrules'] = '对收取的邮件应用规则：';
-$labels['messagesactions'] = '...执行以下动作：';
+$labels['messagediscard'] = '舍弃邮件并回复以下内容';
+$labels['messagesrules'] = '对新收取的邮件应用规则：';
+$labels['messagesactions'] = '执行以下操作：';
 $labels['add'] = '添加';
 $labels['del'] = '删除';
 $labels['sender'] = '发件人';
 $labels['recipient'] = '收件人';
-$labels['vacationaddresses'] = '收件人地址的附加名单（以逗号分隔）';
-$labels['vacationdays'] = '发送邮件频率(天数):';
-$labels['vacationreason'] = '邮件正文(休假原因)';
+$labels['vacationaddresses'] = '收件人地址的附加名单（以半角逗号分隔）';
+$labels['vacationdays'] = '发送邮件频率(单位：天):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
+$labels['vacationreason'] = '邮件正文(假期原因)';
 $labels['vacationsubject'] = '邮件主题';
 $labels['rulestop'] = '停止评价规则';
 $labels['enable'] = '启用/禁用';
@@ -70,11 +73,11 @@ $labels['filtersetdeact'] = '停用当前的过滤器设置集';
 $labels['filterdef'] = '过滤器定义';
 $labels['filtersetname'] = '过滤器集的名称';
 $labels['newfilterset'] = '新的过滤器集';
-$labels['active'] = '活动';
+$labels['active'] = '启用';
 $labels['none'] = '无';
-$labels['fromset'] = '从设置';
+$labels['fromset'] = '从设置集';
 $labels['fromfile'] = '从文件';
-$labels['filterdisabled'] = '禁用过滤器';
+$labels['filterdisabled'] = '过滤器已禁用';
 $labels['countisgreaterthan'] = '计数大于';
 $labels['countisgreaterthanequal'] = '计数大于或等于';
 $labels['countislessthan'] = '计数小于';
@@ -90,7 +93,7 @@ $labels['valuenotequals'] = '值不等于';
 $labels['setflags'] = '设定邮件的标识';
 $labels['addflags'] = '增加邮件的标识';
 $labels['removeflags'] = '删除邮件的标识';
-$labels['flagread'] = '阅读';
+$labels['flagread'] = '读取';
 $labels['flagdeleted'] = '删除';
 $labels['flaganswered'] = '已答复';
 $labels['flagflagged'] = '已标记';
@@ -98,26 +101,26 @@ $labels['flagdraft'] = '草稿';
 $labels['setvariable'] = '设置变量';
 $labels['setvarname'] = '变量名：';
 $labels['setvarvalue'] = '值：';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
+$labels['setvarmodifiers'] = '修改：';
+$labels['varlower'] = '小写';
+$labels['varupper'] = '大写';
+$labels['varlowerfirst'] = '首字母小写';
+$labels['varupperfirst'] = '首字母大写';
+$labels['varquotewildcard'] = '引用特殊字符';
 $labels['varlength'] = '长度';
 $labels['notify'] = '发送通知';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
+$labels['notifyaddress'] = '收件地址：';
+$labels['notifybody'] = '通知正文：';
 $labels['notifysubject'] = '通知主题';
-$labels['notifyfrom'] = 'Notification sender:';
+$labels['notifyfrom'] = '通知的发送人：';
 $labels['notifyimportance'] = '优先级：';
 $labels['notifyimportancelow'] = '低';
 $labels['notifyimportancenormal'] = '中';
 $labels['notifyimportancehigh'] = '高';
-$labels['filtercreate'] = '创建过滤器';
-$labels['usedata'] = '在过滤器中使用以下数据';
+$labels['filtercreate'] = '创建过滤规则';
+$labels['usedata'] = '在过滤器中使用下列数据';
 $labels['nextstep'] = '下一步';
-$labels['...'] = '……';
+$labels['...'] = '...';
 $labels['advancedopts'] = '高级选项';
 $labels['body'] = '正文';
 $labels['address'] = '地址';
@@ -134,41 +137,41 @@ $labels['user'] = '用户';
 $labels['detail'] = '细节';
 $labels['comparator'] = '比较：';
 $labels['default'] = '默认';
-$labels['octet'] = '严格的（字节）';
-$labels['asciicasemap'] = '不区分大小写（ascii字符）';
-$labels['asciinumeric'] = '数字（ascii数字）';
+$labels['octet'] = '严格模式(字节)';
+$labels['asciicasemap'] = '不区分大小写(ascii 字符)';
+$labels['asciinumeric'] = '数字类型(ascii 数字)';
 
 $messages = array();
 $messages['filterunknownerror'] = '未知的服务器错误';
-$messages['filterconnerror'] = '无法连接到 managesieve 服务器';
-$messages['filterdeleteerror'] = '无法删除过滤器。服务器错误';
+$messages['filterconnerror'] = '无法连接至服务器';
+$messages['filterdeleteerror'] = '无法删除过滤器。服务器发生错误';
 $messages['filterdeleted'] = '过滤器已成功删除';
 $messages['filtersaved'] = '过滤器已成功保存。';
-$messages['filtersaveerror'] = '无法保存过滤器。服务器错误';
+$messages['filtersaveerror'] = '无法保存过滤器。服务器发生错误';
 $messages['filterdeleteconfirm'] = '您确定要删除所选择的过滤器吗？';
 $messages['ruledeleteconfirm'] = '您确定要删除所选择的规则吗？';
-$messages['actiondeleteconfirm'] = '您确定要删除所选择的动作吗？';
-$messages['forbiddenchars'] = '内容中包含禁用的字符';
+$messages['actiondeleteconfirm'] = '您确定要删除所选择的操作吗？';
+$messages['forbiddenchars'] = '内容包含禁用字符';
 $messages['cannotbeempty'] = '内容不能为空';
 $messages['ruleexist'] = '指定过滤器名称已存在。';
-$messages['setactivateerror'] = '无法启用指定过滤器，服务器错误。';
-$messages['setdeactivateerror'] = '无法停用指定过滤器，服务器错误。';
-$messages['setdeleteerror'] = '无法删除指定过滤器，服务器错误。';
-$messages['setactivated'] = '过滤器成功启用。';
-$messages['setdeactivated'] = '过滤器成功停用。';
-$messages['setdeleted'] = '过滤器成功删除。';
-$messages['setdeleteconfirm'] = '你确定要删除指定过滤器？';
-$messages['setcreateerror'] = '无法创建过滤器，服务器错误。';
+$messages['setactivateerror'] = '无法启用指定过滤器，服务器发生错误。';
+$messages['setdeactivateerror'] = '无法停用指定过滤器，服务器发生错误。';
+$messages['setdeleteerror'] = '无法删除指定过滤器，服务器发生错误。';
+$messages['setactivated'] = '启用过滤器集成功。';
+$messages['setdeactivated'] = '禁用过滤器集成功。';
+$messages['setdeleted'] = '删除过滤器成功。';
+$messages['setdeleteconfirm'] = '您确定要删除指定的过滤器吗？';
+$messages['setcreateerror'] = '无法创建过滤器，服务器发生错误。';
 $messages['setcreated'] = '过滤器成功创建。';
-$messages['activateerror'] = '无法启用选中的过滤器，因为服务器发生错误。';
-$messages['deactivateerror'] = '无法禁用选中的过滤器，因为服务器发生错误。';
+$messages['activateerror'] = '无法启用选中的过滤器，服务器发生错误。';
+$messages['deactivateerror'] = '无法禁用选中的过滤器，服务器发生错误。';
 $messages['deactivated'] = '启用过滤器成功。';
 $messages['activated'] = '禁用过滤器成功。';
-$messages['moved'] = '过滤器移动成功。';
-$messages['moveerror'] = '无法移动选中的过滤器，因为服务器发生错误。';
-$messages['nametoolong'] = '名称太长。';
-$messages['namereserved'] = 'Reserved name.';
+$messages['moved'] = '移动过滤器成功。';
+$messages['moveerror'] = '无法移动选中的过滤器，服务器发生错误。';
+$messages['nametoolong'] = '无法创建过滤器集，名称太长。';
+$messages['namereserved'] = '保留名称。';
 $messages['setexist'] = '设置已存在。';
-$messages['nodata'] = 'At least one position must be selected!';
+$messages['nodata'] = '至少选择一个位置！';
 
 ?>
diff --git a/plugins/managesieve/localization/zh_TW.inc b/plugins/managesieve/localization/zh_TW.inc
index cee1d1abd..3f3fc1313 100644
--- a/plugins/managesieve/localization/zh_TW.inc
+++ b/plugins/managesieve/localization/zh_TW.inc
@@ -57,12 +57,15 @@ $labels['sender'] = '寄件者';
 $labels['recipient'] = '收件者';
 $labels['vacationaddresses'] = '其他收件者（用半形逗號隔開）：';
 $labels['vacationdays'] = '多久回覆一次（單位：天）：';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = '信件內容（休假原因）：';
 $labels['vacationsubject'] = '訊息主旨:';
 $labels['rulestop'] = '停止評估規則';
 $labels['enable'] = '啟用/停用';
 $labels['filterset'] = '篩選器集合';
-$labels['filtersets'] = 'Filter sets';
+$labels['filtersets'] = '篩選器集合';
 $labels['filtersetadd'] = '加入篩選器集合';
 $labels['filtersetdel'] = '刪除目前的篩選器集合';
 $labels['filtersetact'] = '啟用目前的篩選器集合';
@@ -92,13 +95,13 @@ $labels['addflags'] = '新增標記到訊息';
 $labels['removeflags'] = '移除訊息標記';
 $labels['flagread'] = '讀取';
 $labels['flagdeleted'] = '刪除';
-$labels['flaganswered'] = 'Answered';
+$labels['flaganswered'] = '已經回覆';
 $labels['flagflagged'] = '已加標記的郵件';
 $labels['flagdraft'] = '草稿';
 $labels['setvariable'] = '設定變數';
 $labels['setvarname'] = '變數名稱:';
 $labels['setvarvalue'] = '變數值:';
-$labels['setvarmodifiers'] = 'Modifiers:';
+$labels['setvarmodifiers'] = '修改:';
 $labels['varlower'] = '低於';
 $labels['varupper'] = '高於';
 $labels['varlowerfirst'] = '第一個字低於';
@@ -121,8 +124,8 @@ $labels['...'] = '…';
 $labels['advancedopts'] = '進階選項';
 $labels['body'] = '內文';
 $labels['address'] = '郵件位址';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
+$labels['envelope'] = '信封';
+$labels['modifier'] = '修改:';
 $labels['text'] = '文字';
 $labels['undecoded'] = '未解碼(raw)';
 $labels['contenttype'] = '內容類型';
@@ -134,9 +137,9 @@ $labels['user'] = '使用者';
 $labels['detail'] = '細節';
 $labels['comparator'] = '比較:';
 $labels['default'] = '預設';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['octet'] = '嚴謹模式(八位元組)';
+$labels['asciicasemap'] = '不區分大小寫(採用ASCII-Casemap)';
+$labels['asciinumeric'] = '數字類型(ascii-numeric)';
 
 $messages = array();
 $messages['filterunknownerror'] = '未知的伺服器錯誤';
@@ -167,8 +170,8 @@ $messages['activated'] = '篩選器已停用';
 $messages['moved'] = '篩選器已移動';
 $messages['moveerror'] = '無法移動選擇的篩選器。伺服器錯誤';
 $messages['nametoolong'] = '無法建立篩選器集合。 名稱太長';
-$messages['namereserved'] = 'Reserved name.';
+$messages['namereserved'] = '保留名稱.';
 $messages['setexist'] = '設定已存在';
-$messages['nodata'] = 'At least one position must be selected!';
+$messages['nodata'] = '至少要選擇一個位置';
 
 ?>
diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index da2e80672..7dc8c15ad 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'نسخ';
 $labels['move']     = 'نقل';
 $labels['moveto']   = 'نقل إلى...';
 $labels['download'] = 'تنزيل';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'افتح في نافذة جديدة';
 $labels['emlsave'] = 'تنزيل (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'تعديل كجديد';
diff --git a/program/localization/ast/labels.inc b/program/localization/ast/labels.inc
index 075097e42..996c6043f 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copia';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'mover pa...';
 $labels['download'] = 'baxar';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Abrir en una ventana nueva';
 $labels['emlsave'] = 'Baxar (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Editar como nuevu';
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 1b7994f8d..60e861177 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopyala';
 $labels['move']     = 'Köçür';
 $labels['moveto']   = 'Burada köçür...';
 $labels['download'] = 'Endir';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Göstər';
 $labels['showanyway'] = 'İstənilən halda göstər';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Mətn';
 
 $labels['openinextwin'] = 'Yeni pəncərədə aç';
 $labels['emlsave'] = 'Saxla (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Yeni kimi redaktə et';
diff --git a/program/localization/be_BE/labels.inc b/program/localization/be_BE/labels.inc
index 5bafc78f1..db3893ced 100644
--- a/program/localization/be_BE/labels.inc
+++ b/program/localization/be_BE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copy';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index 0a5334263..fa92ec042 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Копиране';
 $labels['move']     = 'Преместване';
 $labels['moveto']   = 'Премести в...';
 $labels['download'] = 'Изтегли';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Показване';
 $labels['showanyway'] = 'Показване въпреки това';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Основен текст';
 
 $labels['openinextwin'] = 'Отвори в нов прозорец';
 $labels['emlsave'] = 'Изтегли като .eml';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Промени като ново';
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index f1ad34bc0..0f20bba37 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'অনুলিপির ঠিকানা';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'সরিয়ে ফেলুন..';
 $labels['download'] = 'ডাউনলোড';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'নতুন উইন্ডো তে দেখুন';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index 4cc9e6f89..95756e393 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Eilañ';
 $labels['move']     = 'Dilec\'hiañ';
 $labels['moveto']   = 'Dilec\'hiañ da...';
 $labels['download'] = 'Pellgargañ';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Diskouez';
 $labels['showanyway'] = 'Diskouez anezhañ memestra';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index 37b1abebb..f2a871cdd 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiraj';
 $labels['move']     = 'Premjesti';
 $labels['moveto']   = 'Premjesti u...';
 $labels['download'] = 'Preuzmi';
+$labels['open']     = 'Otvori';
 $labels['showattachment'] = 'Prikaži';
 $labels['showanyway'] = 'Ipak prikaži';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Tijelo';
 
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Preuzmi (.eml)';
+$labels['changeformattext'] = 'Prikaži kao obični tekst';
+$labels['changeformathtml'] = 'Prikaži kao HTML';
 
 // message compose
 $labels['editasnew']      = 'Uredi kao novo';
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index 3949a42a6..7a1b26168 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Greška u bazi podataka!';
 $messages['requesttimedout'] = 'Zahtjev je istekao';
 $messages['errorreadonly'] = 'Nije moguće izvršiti operaciju. Folder je samo za čitanje.';
 $messages['errornoperm'] = 'Nije moguće izvršiti operaciju. Pristup je odbijen.';
+$messages['erroroverquota'] = 'Nije moguće izvršiti operaciju. Nema slobodnog prostora.';
+$messages['erroroverquotadelete'] = 'Nema slobodnog prostora. Pritisnite SHIFT+DEL da obrišete poruku.';
 $messages['invalidrequest'] = 'Neispravan zahtjev! Podaci nisu sačuvani.';
 $messages['invalidhost'] = 'Neispravno ime servera.';
 $messages['nomessagesfound'] = 'Nema poruka u ovom sandučetu.';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 3d5df27b4..1bcb526ea 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -41,7 +41,7 @@ $labels['junk']   = 'Correu brossa';
 // message listing
 $labels['subject'] = 'Assumpte';
 $labels['from']    = 'Remitent';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Remitent';
 $labels['to']      = 'Destinatari';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -64,7 +64,8 @@ $labels['copy']     = 'Copia';
 $labels['move']     = 'Mou';
 $labels['moveto']   = 'Mou a...';
 $labels['download'] = 'Descarrega';
-$labels['showattachment'] = 'Mostrar';
+$labels['open']     = 'Obre';
+$labels['showattachment'] = 'Mostra';
 $labels['showanyway'] = 'Mostra-ho de totes maneres';
 
 $labels['filename'] = 'Nom del fitxer';
@@ -200,10 +201,12 @@ $labels['quicksearch']  = 'Cerca ràpida';
 $labels['resetsearch']  = 'Neteja cerca';
 $labels['searchmod']  = 'Cerca modificadors';
 $labels['msgtext']  = 'Missatge sencer';
-$labels['body']  = 'Body';
+$labels['body']  = 'Cos';
 
 $labels['openinextwin'] = 'Obre a una nova finestra';
 $labels['emlsave'] = 'Descarrega (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edita com a nou';
@@ -243,7 +246,7 @@ $labels['alwaysshow'] = 'Mostra sempre les imatges de $sender';
 $labels['isdraft']    = 'Aquest és un missatge esborrany.';
 $labels['andnmore']   = '$nr més...';
 $labels['togglemoreheaders'] = 'Mostra més capçaleres del missatge';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['togglefullheaders'] = 'Conmuta les capçaleres de text cru';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text net';
@@ -335,8 +338,8 @@ $labels['composeto']      = 'Redacta correu per a';
 $labels['contactsfromto'] = 'Contactes $from a $to de $count';
 $labels['print']          = 'Imprimeix';
 $labels['export']         = 'Exporta';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Exporta\'ls tots';
+$labels['exportsel']      = 'Exporta els seleccionats';
 $labels['exportvcards']   = 'Exporta contactes en format vCard';
 $labels['newcontactgroup'] = 'Crea un nou grup de contactes';
 $labels['grouprename']    = 'Reanomena el grup';
@@ -360,7 +363,7 @@ $labels['importcontacts'] = 'Importa contactes';
 $labels['importfromfile'] = 'Importa des d\'un fitxer:';
 $labels['importtarget'] = 'Afegeix contactes nous a la llibreta d\'adreces:';
 $labels['importreplace'] = 'Reemplaça la llibreta d\'adreçes sencera';
-$labels['importdesc'] = '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> or CSV (comma-separated) data format.';
+$labels['importdesc'] = 'Podeu carregar contactes des d\'una llibreta de direccions.<br/>Actualment donem suport a la importació d\'adreces des de fitxers de tipus <a href="http://ca.wikipedia.org/wiki/VCard">vCard</a> o CSV (valors separats per comes).';
 $labels['done'] = 'Fet';
 
 // settings
@@ -381,7 +384,7 @@ $labels['preferhtml'] = 'Mostra HTML';
 $labels['defaultcharset'] = 'Joc de caràcters per defecte';
 $labels['htmlmessage'] = 'Missatge HTML';
 $labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
+$labels['digitalsig'] = 'Signatura digital';
 $labels['dateformat'] = 'Format de la data';
 $labels['timeformat'] = 'Format horari';
 $labels['prettydate'] = 'Dates curtes';
@@ -396,7 +399,7 @@ $labels['showinextwin'] = 'Obrir el missatge en una nova finestra';
 $labels['composeextwin'] = 'Redactar en una nova finestra';
 $labels['htmleditor'] = 'Escriu missatges en HTML';
 $labels['htmlonreply'] = 'només en resposta a missatges en HTML';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreplyandforward'] = 'en reenviament o resposta a missatge HTML';
 $labels['htmlsignature'] = 'Signatura en HTML';
 $labels['previewpane'] = 'Mostra el panell de previsualització';
 $labels['skin'] = 'Aparença d\'interfície';
@@ -470,7 +473,7 @@ $labels['spellcheckignorenums'] = 'Ignora paraules amb números';
 $labels['spellcheckignorecaps'] = 'Ignora paraules amb lletres capitalitzades';
 $labels['addtodict'] = 'Afegeix al diccionari';
 $labels['mailtoprotohandler'] = 'Registra controlador de protocol pels enllaços mailto:';
-$labels['forwardmode'] = 'Messages forwarding';
+$labels['forwardmode'] = 'Reenviament de missatges';
 $labels['inline'] = 'en línia';
 $labels['asattachment'] = 'com adjunt';
 
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index 9f8dc1870..2240065e7 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopírovat';
 $labels['move']     = 'Přesunout';
 $labels['moveto']   = 'přesunout do...';
 $labels['download'] = 'stáhnout';
+$labels['open']     = 'Otevřít';
 $labels['showattachment'] = 'Zobrazit';
 $labels['showanyway'] = 'Přesto zobrazit';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Tělo';
 
 $labels['openinextwin'] = 'Otevřít v novém okně';
 $labels['emlsave'] = 'Stáhnout (.eml)';
+$labels['changeformattext'] = 'Zobrazit v textovém formátu';
+$labels['changeformathtml'] = 'Zobrazit v HTML formátu';
 
 // message compose
 $labels['editasnew']      = 'Upravit jako novou';
@@ -335,8 +338,8 @@ $labels['composeto']      = 'Poslat e-mail';
 $labels['contactsfromto'] = 'Kontakty $from až $to z celkem $count';
 $labels['print']          = 'Tisk';
 $labels['export']         = 'Export';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Export všech';
+$labels['exportsel']      = 'Export vybraných';
 $labels['exportvcards']   = 'Exportovat kontakty ve formátu vCard';
 $labels['newcontactgroup'] = 'Vytvořit novou skupinu kontaktů';
 $labels['grouprename']    = 'Přejmenovat skupinu';
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index c6cf2344a..9b695e140 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copio';
 $labels['move']     = 'Symud';
 $labels['moveto']   = 'Symud i...';
 $labels['download'] = 'Llwytho lawr';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Dangos';
 $labels['showanyway'] = 'Dangos beth bynnag';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Corff';
 
 $labels['openinextwin'] = 'Agor mewn ffenest newydd';
 $labels['emlsave'] = 'Llwytho lawr (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Golygu fel neges newydd';
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 93209b869..cb4e3b55c 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiér';
 $labels['move']     = 'Flyt';
 $labels['moveto']   = 'Flyt til...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Åben';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis alligevel';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Åbn i nyt vindue';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Redigér som ny';
@@ -243,7 +246,7 @@ $labels['alwaysshow'] = 'Vis altid billeder fra $sender';
 $labels['isdraft']    = 'Dette er en kladde.';
 $labels['andnmore']   = '$nr yderligere...';
 $labels['togglemoreheaders'] = 'Vis yderligere headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['togglefullheaders'] = 'Ændre rå brevhoveder';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Almindelig tekst';
@@ -335,8 +338,8 @@ $labels['composeto']      = 'Skriv besked til';
 $labels['contactsfromto'] = 'Kontakter $from til $to af $count';
 $labels['print']          = 'Udskriv';
 $labels['export']         = 'Eksportér';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Eksporter alt';
+$labels['exportsel']      = 'Eksporter udvalgte';
 $labels['exportvcards']   = 'Eksportér kontakter i vCard format';
 $labels['newcontactgroup'] = 'Opret ny kontaktgruppe';
 $labels['grouprename']    = 'Omdøb gruppe';
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 31444b6c1..98bbd8837 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopieren';
 $labels['move']     = 'Verschieben';
 $labels['moveto']   = 'Verschieben nach...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Öffnen';
 $labels['showattachment'] = 'Anzeigen';
 $labels['showanyway'] = 'Trotzdem anzeigen';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Inhalt';
 
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Herunterladen (.eml)';
+$labels['changeformattext'] = 'Als reiner Text anzeigen';
+$labels['changeformathtml'] = 'Als original HTML anzeigen';
 
 // message compose
 $labels['editasnew']      = 'Als neue Nachricht öffnen';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index 027e2ee06..f3697a825 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Datenbankfehler!';
 $messages['requesttimedout'] = 'Zeitlimit überschritten';
 $messages['errorreadonly'] = 'Die Aktion kann nicht ausgeführt werden. Der Ordner ist schreibgeschützt.';
 $messages['errornoperm'] = 'Die Aktion kann nicht ausgeführt werden. Zugriff verweigert.';
+$messages['erroroverquota'] = 'Die Aktion kann nicht ausgeführt werden. Keine freier Speicherplatz.';
+$messages['erroroverquotadelete'] = 'Kein freier Speicherplatz. Drücken Sie SHIFT+DEL um die Nachricht zu löschen.';
 $messages['invalidrequest'] = 'Ungültige Anfrage! Es wurden keine Daten gespeichert.';
 $messages['invalidhost'] = 'Ungültiger Servername';
 $messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 6ce679caa..956e32aa4 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopieren';
 $labels['move']     = 'Verschieben';
 $labels['moveto']   = 'Verschieben nach...';
 $labels['download'] = 'Herunterladen';
+$labels['open']     = 'Offen';
 $labels['showattachment'] = 'Anzeigen';
 $labels['showanyway'] = 'Trotzdem anzeigen';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Inhalt';
 
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Lokal speichern (.eml)';
+$labels['changeformattext'] = 'Als reiner Text anzeigen';
+$labels['changeformathtml'] = 'Als original HTML anzeigen';
 
 // message compose
 $labels['editasnew']      = 'Als neue Nachricht öffnen';
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index 208164779..b3166730f 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Αντιγραφή';
 $labels['move']     = 'Μετακίνηση';
 $labels['moveto']   = 'Μετακίνηση σε...';
 $labels['download'] = 'Λήψη';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Εμφάνιση';
 $labels['showanyway'] = 'Εμφάνιση';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Σώμα';
 
 $labels['openinextwin'] = 'Άνοιγμα σε νέο παράθυρο';
 $labels['emlsave'] = 'Λήψη αρχείου (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Επεξεργασία σαν νέο';
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index fb9ebe383..49b6be519 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copy';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index 57d7c2e42..823fc25cb 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopii';
 $labels['move']     = 'Movi';
 $labels['moveto']   = 'transloku al...';
 $labels['download'] = 'elŝutu';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Malfermu en nova fenestro';
 $labels['emlsave'] = 'Elŝutu (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Redaktu kiel nova';
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index d6760ac97..3e6793e51 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Abrir en ventana nueva';
 $labels['emlsave'] = 'Guardar (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Editar como nuevo';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index eca1d1e93..cbee58b6e 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a…';
 $labels['download'] = 'Descargar';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrarlo de todos modos';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Cuerpo';
 
 $labels['openinextwin'] = 'Abrir en nueva ventana';
 $labels['emlsave'] = 'Descargar (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Editar como nuevo';
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 45552200c..6c031df29 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = '¡Error de base de datos!';
 $messages['requesttimedout'] = 'Ha expirado el tiempo de respuesta';
 $messages['errorreadonly'] = 'Imposible realizar la operación. La bandeja es sólo de lectura.';
 $messages['errornoperm'] = 'Imposible realizar la operación. Permiso denegado.';
+$messages['erroroverquota'] = 'No se pudo completar la operación. No queda espacio en el disco.';
+$messages['erroroverquotadelete'] = 'No queda espacio en el disco. Use Shift+Supr para borrar un mensaje.';
 $messages['invalidrequest'] = '¡Petición no válida! No se han guardado los datos.';
 $messages['invalidhost'] = 'Nombre de servidor inválido.';
 $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla.';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index 01c372308..cb184b086 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopeeri';
 $labels['move']     = 'Liiguta';
 $labels['moveto']   = 'liiguta kausta...';
 $labels['download'] = 'laadi arvutisse';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Näita';
 $labels['showanyway'] = 'Näita ikka';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Keha';
 
 $labels['openinextwin'] = 'Ava uues aknas';
 $labels['emlsave'] = 'Salvesta (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Kasuta uue kirja põhjana';
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index 6b45038f8..eb61f4c8c 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopia';
 $labels['move']     = 'Mugitu';
 $labels['moveto']   = 'mugitu hona...';
 $labels['download'] = 'deskargatu';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Lehio berrian ireki';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index ae38105db..6a4904d7e 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'تکثیر';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'انتقال بدهید به ...';
 $labels['download'] = 'داونلود کردن';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'در پینجره ای جدید باز کنید';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/fa_IR/labels.inc b/program/localization/fa_IR/labels.inc
index 518c6742b..8bba66c26 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -20,7 +20,7 @@ $labels = array();
 
 // login page
 $labels['welcome']   = 'به $product خوش آمدید';
-$labels['username']  = 'نام‌کاربری';
+$labels['username']  = 'نام کاربری';
 $labels['password']  = 'گذرواژه';
 $labels['server']    = 'سرور';
 $labels['login']     = 'ورود';
@@ -64,6 +64,7 @@ $labels['copy']     = 'رونوشت';
 $labels['move']     = 'انتقال';
 $labels['moveto']   = 'انتقال به...';
 $labels['download'] = 'بارگیری';
+$labels['open']     = 'باز کردن';
 $labels['showattachment'] = 'نمایش';
 $labels['showanyway'] = 'نمایش آن در هر صورت';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'بدنه';
 
 $labels['openinextwin'] = 'باز کردن در پنجره‌ی جدید';
 $labels['emlsave'] = 'بارگیری (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'ویرایش به عنوان جدید';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 29e2c028b..4a78e565f 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copier';
 $labels['move']     = 'Déplacer';
 $labels['moveto']   = 'Déplacer vers...';
 $labels['download'] = 'Télécharger';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Afficher';
 $labels['showanyway'] = 'Afficher quand même';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Corps';
 
 $labels['openinextwin'] = 'Ouvrir dans une nouvelle fenêtre';
 $labels['emlsave'] = 'Télécharger (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Éditer en tant que nouveau message';
diff --git a/program/localization/fy_NL/labels.inc b/program/localization/fy_NL/labels.inc
index cd6154626..d04d7e89c 100644
--- a/program/localization/fy_NL/labels.inc
+++ b/program/localization/fy_NL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopieare';
 $labels['move']     = 'Ferplaatse';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'Delhelje';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Toane';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 795295eb2..7169a8800 100755
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Cóipeáil';
 $labels['move']     = 'Bog';
 $labels['moveto']   = 'bog go...';
 $labels['download'] = 'síos-luchtú';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 3c5b60026..13fdfa793 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Abrir nunha nova fiestra';
 $labels['emlsave'] = 'Gardar (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Editar como nova';
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 8cf6101f5..698b73493 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'העתק';
 $labels['move']     = 'העבר';
 $labels['moveto']   = 'תיוק ב...';
 $labels['download'] = 'הורדה';
+$labels['open']     = 'לפתוח';
 $labels['showattachment'] = 'הצגה';
 $labels['showanyway'] = 'להציג בכל מקרה';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'גוף ההודעה';
 
 $labels['openinextwin'] = 'פתיחה בחלון חדש';
 $labels['emlsave'] = 'הורדת הודעה בפורמט  EML';
+$labels['changeformattext'] = 'הצגה בפורמט לא מעוצב';
+$labels['changeformathtml'] = 'הצגה בפורמט HTML';
 
 // message compose
 $labels['editasnew']      = 'עריכת ההודעה כחדשה';
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index 8188b8eca..4564e1226 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'कार्बन';
 $labels['move']     = 'स्थानांतरित करें';
 $labels['moveto']   = 'खीस्काऐं...';
 $labels['download'] = 'डाऊनलोड';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index d7b1b2041..bf5364653 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiraj';
 $labels['move']     = 'Premjesti';
 $labels['moveto']   = 'Premjesti u...';
 $labels['download'] = 'Preuzmi (download)';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Uredi kao novo';
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index 644fca261..96c43d146 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Másolás';
 $labels['move']     = 'Áthelyezés';
 $labels['moveto']   = 'Áthelyezés...';
 $labels['download'] = 'letöltés';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Megjelenítés';
 $labels['showanyway'] = 'Megjelnités mindenképpen';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Törzs';
 
 $labels['openinextwin'] = 'Megnyitás új ablakban';
 $labels['emlsave'] = 'Letöltés (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Szerkesztés újként';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 490604cc5..3612dc974 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Cc';
 $labels['move']     = 'Տեղափոխել';
 $labels['moveto']   = 'Տեղափոխել...';
 $labels['download'] = 'Քաշել';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Բացել նոր պատուհանում';
 $labels['emlsave'] = 'Ներբեռնել (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Խմբագրել որպես նոր';
diff --git a/program/localization/ia/labels.inc b/program/localization/ia/labels.inc
index fcf5634ff..89273c147 100644
--- a/program/localization/ia/labels.inc
+++ b/program/localization/ia/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a';
 $labels['download'] = 'Discargar';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Monstrar';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Aperir in nove fenestra';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Modificar como nove';
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 13c34bef6..4877434ed 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Salin';
 $labels['move']     = 'Pindahkan';
 $labels['moveto']   = 'Pindahkan ke...';
 $labels['download'] = 'Unduh';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Tampilkan';
 $labels['showanyway'] = 'Tampilkan saja';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Badan';
 
 $labels['openinextwin'] = 'Buka dalam jendela baru';
 $labels['emlsave'] = 'Unduh (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Sunting sebagai pesan baru';
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index 33dc7b6d2..c8d49bf23 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Afrit';
 $labels['move']     = 'Færa';
 $labels['moveto']   = 'Færa í...';
 $labels['download'] = 'Hlaða niður';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Opna í nýjum glugga';
 $labels['emlsave'] = 'Niðurhlaða (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Breyta sem nýju';
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index 2f8442f18..97be929cf 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copia';
 $labels['move']     = 'Sposta';
 $labels['moveto']   = 'Sposta in...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Apri';
 $labels['showattachment'] = 'Visualizza';
 $labels['showanyway'] = 'Visualizza comunque';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Apri in una nuova finestra';
 $labels['emlsave'] = 'Scarica (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Modifica come nuovo';
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index 46f6fad28..685dba0b3 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'コピー';
 $labels['move']     = '移動';
 $labels['moveto']   = 'フォルダーに移動';
 $labels['download'] = 'ダウンロード';
+$labels['open']     = '開く';
 $labels['showattachment'] = '表示';
 $labels['showanyway'] = 'とにかく表示';
 
@@ -204,6 +205,8 @@ $labels['body']  = '本文';
 
 $labels['openinextwin'] = '新しいウィンドウで開く';
 $labels['emlsave'] = 'ダウンロード(.eml形式)';
+$labels['changeformattext'] = 'テキスト形式で表示';
+$labels['changeformathtml'] = 'HTML形式で表示';
 
 // message compose
 $labels['editasnew']      = '新しいメッセージとして編集';
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index 9b06db839..b3a712515 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ასლი';
 $labels['move']     = 'გადატანა';
 $labels['moveto']   = 'გადატანა...';
 $labels['download'] = 'გადმოწერა';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'გახსნა ახალ ფანჯარაში';
 $labels['emlsave'] = 'გადმოწერა (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'რედაქტირება როგორც ახლის';
diff --git a/program/localization/km_KH/labels.inc b/program/localization/km_KH/labels.inc
index 0f7d85dd8..a344e60c2 100644
--- a/program/localization/km_KH/labels.inc
+++ b/program/localization/km_KH/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ចំលង';
 $labels['move']     = 'ផ្ទេរ';
 $labels['moveto']   = 'ផ្ទេរទៅ';
 $labels['download'] = 'ទាញយក';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'បើកក្នុងវីនដូវថ្មី';
 $labels['emlsave'] = 'រក្សាទុកទិន្នន័យជាឯកសារប្រភេទ(.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'កែហើយរក្សាទុកដូចជាសំបុត្រថ្មី';
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index 1d17cdd94..667fb422a 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -21,53 +21,54 @@ $labels = array();
 // login page
 $labels['welcome']   = '$product에 오신 것을 환영합니다';
 $labels['username']  = '사용자명';
-$labels['password']  = '비밀번호';
+$labels['password']  = '암호';
 $labels['server']    = '서버';
 $labels['login']     = '로그인';
 
 // taskbar
 $labels['logout']   = '로그아웃';
-$labels['mail']     = '이메일';
-$labels['settings'] = '개인 설정';
+$labels['mail']     = '메일';
+$labels['settings'] = '설정';
 $labels['addressbook'] = '주소록';
 
 // mailbox names
-$labels['inbox']  = '받은편지함';
-$labels['drafts'] = '임시저장';
-$labels['sent']   = '보낸편지함';
+$labels['inbox']  = '받은 편지함';
+$labels['drafts'] = '임시 보관함';
+$labels['sent']   = '보낸 편지함';
 $labels['trash']  = '휴지통';
-$labels['junk']   = '정크메일';
+$labels['junk']   = '스팸 편지함';
 
 // message listing
 $labels['subject'] = '제목';
 $labels['from']    = '보내는 사람';
-$labels['sender']  = '보낸 사람';
+$labels['sender']  = '발신인';
 $labels['to']      = '받는 사람';
 $labels['cc']      = '참조';
 $labels['bcc']     = '숨은 참조';
 $labels['replyto'] = '회신 주소';
-$labels['followupto'] = '추가 답장';
+$labels['followupto'] = '전달';
 $labels['date']    = '날짜';
 $labels['size']    = '크기';
 $labels['priority'] = '우선순위';
 $labels['organization'] = '기관';
-$labels['readstatus'] = '보기 상태';
+$labels['readstatus'] = '읽음 상태';
 $labels['listoptions'] = '목록 옵션...';
 
 $labels['mailboxlist'] = '폴더';
-$labels['messagesfromto'] = '$count 개 중 $from 에서 $to 번 메시지';
-$labels['threadsfromto'] = '$from 에서 $to 까지 $count 개의 쓰레드';
-$labels['messagenrof'] = '$count 개 중 $nr 번 메시지';
-$labels['fromtoshort'] = '$from 에서 $to 까지 $count 개';
+$labels['messagesfromto'] = '총 $count개 중 $from 번째부터 $to 번째까지의 메시지';
+$labels['threadsfromto'] = '총 $count개 중 $from 번째부터 $to 번째까지의 스레드';
+$labels['messagenrof'] = '총 $count개 중  $nr 번째 메시지';
+$labels['fromtoshort'] = '총 $count개 중 $from 번째 - $to 번째';
 
-$labels['copy']     = '참조';
+$labels['copy']     = '복사';
 $labels['move']     = '이동';
-$labels['moveto']   = '이동...';
+$labels['moveto']   = '이동할 위치...';
 $labels['download'] = '다운로드';
-$labels['showattachment'] = '표시';
-$labels['showanyway'] = '항상 표시';
+$labels['open']     = '열기';
+$labels['showattachment'] = '보기';
+$labels['showanyway'] = '그래도 항상 보기';
 
-$labels['filename'] = '파일 이름';
+$labels['filename'] = '파일명';
 $labels['filesize'] = '파일 크기';
 
 $labels['addtoaddressbook'] = '주소록에 추가';
@@ -122,114 +123,116 @@ $labels['today'] = '오늘';
 
 // toolbar buttons
 $labels['refresh']          = '새로 고침';
-$labels['checkmail']        = '새 메일 확인';
-$labels['compose']          = '메일 쓰기';
-$labels['writenewmessage']  = '새 메일 작성';
+$labels['checkmail']        = '새 메시지 확인';
+$labels['compose']          = '메시지 작성';
+$labels['writenewmessage']  = '새 메시지 생성';
 $labels['reply']            = '회신';
-$labels['replytomessage']   = '회신 작성';
-$labels['replytoallmessage'] = '보낸이와 모든 수신자에게 회신';
+$labels['replytomessage']   = '발신인에게 회신';
+$labels['replytoallmessage'] = '보낸 사람과 모든 수신인에게 회신';
 $labels['replyall']         = '전체 회신';
 $labels['replylist']        = '회신 목록';
 $labels['forward']          = '전달';
-$labels['forwardinline']    = '전달';
-$labels['forwardattachment'] = '메일을 첨부파일로 전달';
-$labels['forwardmessage']   = '메일 전달';
-$labels['deletemessage']    = '메일 삭제';
-$labels['movemessagetotrash'] = '메일 휴지통으로 이동';
-$labels['printmessage']     = '메일 인쇄';
-$labels['previousmessage']  = '이전 메일 보기';
-$labels['firstmessage']     = '처음 메일 보기';
-$labels['nextmessage']      = '다음 메일 보기';
-$labels['lastmessage']      = '마지막 메일 보기';
-$labels['backtolist']       = '메일 목록으로';
+$labels['forwardinline']    = '본문 내용으로 전달';
+$labels['forwardattachment'] = '첨부파일로 전달';
+$labels['forwardmessage']   = '메시지 전달';
+$labels['deletemessage']    = '메시지 삭제';
+$labels['movemessagetotrash'] = '메시지를 휴지통으로 이동';
+$labels['printmessage']     = '이 메시지 인쇄';
+$labels['previousmessage']  = '이전 메시지 보기';
+$labels['firstmessage']     = '처음 메시지 표시';
+$labels['nextmessage']      = '다음 메시지 표시';
+$labels['lastmessage']      = '마지막 메시지 표시';
+$labels['backtolist']       = '메일 목록으로 돌아가기';
 $labels['viewsource']       = '소스 보기';
 $labels['mark']             = '표시';
-$labels['markmessages']     = '메시지 표시';
-$labels['markread']         = '읽은 것으로 표시';
-$labels['markunread']       = '읽지 않은 것으로 표시';
-$labels['markflagged']      = '깃발 달기';
-$labels['markunflagged']    = '깃발 내리기';
-$labels['moreactions']      = '이외의 동작...';
+$labels['markmessages']     = '메시지 표시하기';
+$labels['markread']         = '읽음으로 표시';
+$labels['markunread']       = '읽지 않음으로 표시';
+$labels['markflagged']      = '깃발로 표시됨으로 표시';
+$labels['markunflagged']    = '깃발로 표시되지 않음으로 표시';
+$labels['moreactions']      = '추가 동작...';
 $labels['more']             = '더보기';
 $labels['back']             = '뒤로';
-$labels['options']          = '선택 사항';
+$labels['options']          = '옵션';
 
 $labels['select'] = '선택';
 $labels['all'] = '모두';
 $labels['none'] = '없음';
 $labels['currpage'] = '현재 페이지';
 $labels['unread'] = '읽지 않음';
-$labels['flagged'] = '깃발';
+$labels['flagged'] = '깃발로 표시됨';
 $labels['unanswered'] = '답장하지 않음';
 $labels['deleted'] = '삭제됨';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = '삭제되지 않음';
 $labels['invert'] = '반전';
 $labels['filter'] = '필터';
-$labels['list'] = '리스트';
-$labels['threads'] = '쓰레드';
+$labels['list'] = '목록';
+$labels['threads'] = '스레드';
 $labels['expand-all'] = '모두 확장';
-$labels['expand-unread'] = 'Expand Unread';
+$labels['expand-unread'] = '읽지 않은 메시지 확장';
 $labels['collapse-all'] = '모두 접기';
-$labels['threaded'] = '그룹화됨';
-
-$labels['autoexpand_threads'] = '모든 메시지 확장';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = '표시';
-$labels['attachment'] = '첨부';
+$labels['threaded'] = '스레드화됨';
+
+$labels['autoexpand_threads'] = '메시지 스레드 확장';
+$labels['do_expand'] = '모든 스레드';
+$labels['expand_only_unread'] = '읽지 않은 메시지에만 적용';
+$labels['fromto'] = '보내는 사람/받는 사람';
+$labels['flag'] = '깃발로 표시';
+$labels['attachment'] = '첨부파일';
 $labels['nonesort'] = '없음';
-$labels['sentdate'] = '보낸 날짜';
-$labels['arrival'] = '수신 날짜';
+$labels['sentdate'] = '발신일';
+$labels['arrival'] = '도착일';
 $labels['asc'] = '오름차순';
 $labels['desc'] = '내림차순';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = '정렬';
+$labels['listcolumns'] = '열 목록 보기';
+$labels['listsorting'] = '열 정렬';
 $labels['listorder'] = '정렬 순서';
-$labels['listmode'] = 'List view mode';
+$labels['listmode'] = '화면 모드 목록 보기';
 
 $labels['folderactions'] = '폴더 명령';
 $labels['compact'] = '간단하게';
-$labels['empty'] = '비우기';
+$labels['empty'] = '비어 있음';
 
-$labels['quota'] = '디스크 사용';
-$labels['unknown']  = '알수 없음';
+$labels['quota'] = '디스크 사용량';
+$labels['unknown']  = '알 수 없음';
 $labels['unlimited']  = '제한 없음';
 
-$labels['quicksearch']  = '빨리 찾기';
-$labels['resetsearch']  = '찾기 리셋';
-$labels['searchmod']  = 'Search modifiers';
+$labels['quicksearch']  = '빠른 검색';
+$labels['resetsearch']  = '검색 재설정';
+$labels['searchmod']  = '수정자 검색';
 $labels['msgtext']  = '전체 메시지';
-$labels['body']  = 'Body';
+$labels['body']  = '본문';
 
 $labels['openinextwin'] = '새 창에서 열기';
-$labels['emlsave'] = '다운로드 (.eml)';
+$labels['emlsave'] = '다운로드(.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
-$labels['sendmessage']    = '메일 지금 보냄';
-$labels['savemessage']    = '드래프트 저장';
+$labels['editasnew']      = '새 메시지로 편집';
+$labels['send']           = '보내기';
+$labels['sendmessage']    = '메일 보내기';
+$labels['savemessage']    = '임시 보관함에 저장';
 $labels['addattachment']  = '파일 첨부';
-$labels['charset']        = '문자셋';
-$labels['editortype']     = '편집기 형태';
-$labels['returnreceipt']  = '수신 확인 요청하기';
-$labels['dsn']            = '전송상태 메일 받기';
-$labels['mailreplyintro'] = '$date에, $sender가 작성:';
+$labels['charset']        = '인코딩';
+$labels['editortype']     = '편집기 유형';
+$labels['returnreceipt']  = '수신 확인';
+$labels['dsn']            = '전송 상태 알림';
+$labels['mailreplyintro'] = '$date에 $sender이(가) 작성한 내용:';
 $labels['originalmessage'] = '원본 메세지';
 
-$labels['editidents']    = 'Edit identities';
+$labels['editidents']    = '신원 편집';
 $labels['spellcheck']    = '맞춤법';
-$labels['checkspelling'] = '스펠링 체크';
-$labels['resumeediting'] = '편집 계속';
-$labels['revertto']      = '돌아감';
+$labels['checkspelling'] = '맞춤법 검사하기';
+$labels['resumeediting'] = '편집 계속하기';
+$labels['revertto']      = '돌아가기';
 
 $labels['attach'] = '첨부';
-$labels['attachments'] = '첨부 파일';
+$labels['attachments'] = '첨부파일';
 $labels['upload'] = '업로드';
-$labels['uploadprogress'] = '$percent ($total 에서 $current)';
+$labels['uploadprogress'] = '$percent ($total개 중 $current개)';
 $labels['close']  = '닫기';
-$labels['messageoptions']  = '메시지 옵션(들)...';
+$labels['messageoptions']  = '메시지 옵션...';
 
 $labels['low']     = '낮음';
 $labels['lowest']  = '가장 낮음';
@@ -238,86 +241,86 @@ $labels['high']    = '높음';
 $labels['highest'] = '가장 높음';
 
 $labels['nosubject']  = '(제목 없음)';
-$labels['showimages'] = '이미지 표시';
-$labels['alwaysshow'] = '$sender 에서 온 이미지 항상 보기';
-$labels['isdraft']    = '이 메시지는 임시 보관 메시지 입니다.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['showimages'] = '이미지 보기';
+$labels['alwaysshow'] = '$sender에서 수신된 이미지 항상 보기';
+$labels['isdraft']    = '이것은 작성 중인 메시지입니다.';
+$labels['andnmore']   = '$nr 더 보기...';
+$labels['togglemoreheaders'] = '메시지 헤더 더 보기';
+$labels['togglefullheaders'] = '원 메시지 헤더 표시/숨기기';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '일반 텍스트';
-$labels['savesentmessagein'] = '보낸 메시지를 다음에 저장';
+$labels['savesentmessagein'] = '보낸 메시지를 다음 위치에 저장';
 $labels['dontsave'] = '저장하지 않음';
-$labels['maxuploadsize'] = '최대 파일 크기는 $size 입니다';
+$labels['maxuploadsize'] = '최대 허용 파일 크기는 $size 입니다';
 
-$labels['addcc'] = '참조 넣기';
-$labels['addbcc'] = '숨은참조 넣기';
-$labels['addreplyto'] = '회신주소 넣기';
-$labels['addfollowupto'] = 'Add Followup-To';
+$labels['addcc'] = '참조 추가';
+$labels['addbcc'] = '숨은 참조 추가';
+$labels['addreplyto'] = '회신 주소 추가';
+$labels['addfollowupto'] = '전달 추가';
 
 // mdn
-$labels['mdnrequest'] = '이 메시지를 보낸 분이 읽음 확인 요청을 했습니다. 확인할까요?';
-$labels['receiptread'] = '읽음 확인 보내기';
-$labels['yourmessage'] = '당신의 메시지를 읽었습니다.';
-$labels['receiptnote'] = '주의: 이 확인은 이 메시지가 수신자의 컴퓨터에 표시된 것만을 의미합니다. 수신자가 반드시 이 메일을 읽거나 이해했다는 것은 아닙니다.';
+$labels['mdnrequest'] = '이 메시지를 보낸 사람이 사용자가 이 메시지를 읽었을 때 읽음 확인을 요청했습니다. 보낸 사람에게 알리시겠습니까?';
+$labels['receiptread'] = '수신 확인 (읽음)';
+$labels['yourmessage'] = '이것은 사용자의 메시지에 대한 수신 확인입니다.';
+$labels['receiptnote'] = '참고: 이 수신 확인은 이 메시지가 받는 사람의 컴퓨터에 표시되었다는 것만을 의미합니다. 받는 사람이 메시지 내용을 읽거나 이해했다는 보장은 없습니다.';
 
 // address boook
-$labels['name']         = '표시 이름';
+$labels['name']         = '표시명';
 $labels['firstname']    = '이름';
 $labels['surname']      = '성';
 $labels['middlename']   = '가운데 이름';
 $labels['nameprefix']   = '접두사';
 $labels['namesuffix']   = '접미사';
-$labels['nickname']     = '별명';
+$labels['nickname']     = '별칭';
 $labels['jobtitle']     = '직위';
 $labels['department']   = '부서';
 $labels['gender']       = '성별';
-$labels['maidenname']   = '결혼 전 이름';
+$labels['maidenname']   = '결혼 전 성';
 $labels['email']        = '이메일';
 $labels['phone']        = '전화';
 $labels['address']      = '주소';
-$labels['street']       = '세부주소';
+$labels['street']       = '나머지 주소';
 $labels['locality']     = '시/구/군';
 $labels['zipcode']      = '우편번호';
-$labels['region']       = '도';
+$labels['region']       = '시/도';
 $labels['country']      = '국가';
 $labels['birthday']     = '생년월일';
 $labels['anniversary']  = '기념일';
 $labels['website']      = '웹사이트';
-$labels['instantmessenger'] = '메신져';
-$labels['notes'] = '노트';
+$labels['instantmessenger'] = '인스턴트 메신저';
+$labels['notes'] = '메모';
 $labels['male']   = '남성';
 $labels['female'] = '여성';
-$labels['manager'] = '관리자';
-$labels['assistant'] = '도우미';
+$labels['manager'] = '상사';
+$labels['assistant'] = '비서';
 $labels['spouse'] = '배우자';
-$labels['allfields'] = '친구 전체';
+$labels['allfields'] = '모든 항목';
 $labels['search'] = '검색';
-$labels['advsearch'] = '상세 검색';
-$labels['advanced'] = '고급 설정';
-$labels['other'] = '그 외';
+$labels['advsearch'] = '고급 검색';
+$labels['advanced'] = '고급';
+$labels['other'] = '기타';
 
-$labels['typehome']   = '홈';
+$labels['typehome']   = '자택';
 $labels['typework']   = '직장';
-$labels['typeother']  = '그 외';
-$labels['typemobile']  = '휴대폰';
-$labels['typemain']  = '주';
-$labels['typehomefax']  = '팩스(집)';
-$labels['typeworkfax']  = '팩스(직장)';
+$labels['typeother']  = '기타';
+$labels['typemobile']  = '휴대전화';
+$labels['typemain']  = '대표';
+$labels['typehomefax']  = '자택 팩스';
+$labels['typeworkfax']  = '직장 팩스';
 $labels['typecar']  = '자동차';
 $labels['typepager']  = '호출기';
 $labels['typevideo']  = '동영상';
-$labels['typeassistant']  = '도우미';
-$labels['typehomepage']  = '홈 페이지';
+$labels['typeassistant']  = '비서';
+$labels['typehomepage']  = '홈페이지';
 $labels['typeblog'] = '블로그';
 $labels['typeprofile'] = '자기소개';
 
-$labels['addfield'] = '항목 추가..';
+$labels['addfield'] = '필드 추가..';
 $labels['addcontact'] = '새 연락처 추가';
 $labels['editcontact'] = '연락처 편집';
 $labels['contacts'] = '연락처';
-$labels['contactproperties'] = 'Contact properties';
+$labels['contactproperties'] = '연락처 속성';
 $labels['personalinfo'] = '개인 정보';
 
 $labels['edit']   = '편집';
@@ -327,207 +330,207 @@ $labels['delete'] = '삭제';
 $labels['rename'] = '이름 변경';
 $labels['addphoto'] = '추가';
 $labels['replacephoto'] = '바꾸기';
-$labels['uploadphoto'] = '사진 올리기';
+$labels['uploadphoto'] = '사진 업로드';
 
-$labels['newcontact']     = '새 연락처 카드 만들기';
+$labels['newcontact']     = '새 연락처 카드 생성';
 $labels['deletecontact']  = '선택한 연락처 삭제';
-$labels['composeto']      = '새 메일 작성';
-$labels['contactsfromto'] = '$from 에서 $to 로의 연락처 $count 개';
+$labels['composeto']      = '메일 작성 대상';
+$labels['contactsfromto'] = '총 $count개의 연락처 중 $from 번째부터 $to 번째 까지';
 $labels['print']          = '인쇄';
 $labels['export']         = '내보내기';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = '연락처를 vCard 포맷으로 내보내기';
-$labels['newcontactgroup'] = '새로운 연락처 그룹 생성';
-$labels['grouprename']    = '그룹 이름 바꾸기';
+$labels['exportall']      = '모두 내보내기';
+$labels['exportsel']      = '선택한 항목 내보내기';
+$labels['exportvcards']   = '연락처를 vCard 형식으로 내보내기';
+$labels['newcontactgroup'] = '새 연락처 그룹 생성';
+$labels['grouprename']    = '그룹명 변경';
 $labels['groupdelete']    = '그룹 삭제';
 $labels['groupremoveselected'] = '그룹에서 선택한 연락처 제거';
 
-$labels['previouspage']   = '이전 세트 보기';
-$labels['firstpage']      = '처음 세트 보기';
-$labels['nextpage']       = '다음 세트 보기';
-$labels['lastpage']       = '마지막 세트 보기';
+$labels['previouspage']   = '이전 페이지 보기';
+$labels['firstpage']      = '처음 페이지 보기';
+$labels['nextpage']       = '다음 페이지 보기';
+$labels['lastpage']       = '마지막 페이지 보기';
 
 $labels['group'] = '그룹';
 $labels['groups'] = '그룹';
 $labels['personaladrbook'] = '개인 주소';
 
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
+$labels['searchsave'] = '검색 저장';
+$labels['searchdelete'] = '검색 삭제';
 
 $labels['import'] = '가져오기';
 $labels['importcontacts'] = '연락처 가져오기';
-$labels['importfromfile'] = '파일에서 가져오기';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = '전체 주소록을 바꿈';
-$labels['importdesc'] = '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> or CSV (comma-separated) data format.';
+$labels['importfromfile'] = '파일에서 가져오기:';
+$labels['importtarget'] = '새 연락처를 주소록에 추가:';
+$labels['importreplace'] = '전체 주소록을 바꾸기';
+$labels['importdesc'] = '기존 주소록에서 연락처를 가져올 수 있습니다.<br/> 현재 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 데이터 형식에서 주소 가져오기를 지원합니다.\'';
 $labels['done'] = '완료';
 
 // settings
 $labels['settingsfor'] = '설정';
-$labels['about'] = '이것은...';
-$labels['preferences'] = '환경 설정';
-$labels['userpreferences'] = '사용자 환경';
-$labels['editpreferences'] = '사용자 환경 편집';
+$labels['about'] = '정보...';
+$labels['preferences'] = '환경설정';
+$labels['userpreferences'] = '사용자 환경설정';
+$labels['editpreferences'] = '사용자 환경설정 편집';
 
 $labels['identities'] = '신원';
 $labels['manageidentities'] = '이 계정의 신원 관리';
 $labels['newidentity'] = '새 신원';
 
-$labels['newitem'] = '새 아이템';
-$labels['edititem'] = '아이템 편집';
+$labels['newitem'] = '새 항목';
+$labels['edititem'] = '항목 편집';
 
-$labels['preferhtml'] = 'HTML 보이기';
-$labels['defaultcharset'] = '기본 문자 세트';
+$labels['preferhtml'] = 'HTML 표시';
+$labels['defaultcharset'] = '기본 인코딩';
 $labels['htmlmessage'] = 'HTML 메시지';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
+$labels['messagepart'] = '부분';
+$labels['digitalsig'] = '디지털 서명';
 $labels['dateformat'] = '날짜 형식';
 $labels['timeformat'] = '시간 형식';
-$labels['prettydate'] = '날짜 형식';
-$labels['setdefault']  = '기본으로 설정';
+$labels['prettydate'] = '간결한 날짜';
+$labels['setdefault']  = '기본 설정';
 $labels['autodetect']  = '자동';
 $labels['language']  = '언어';
 $labels['timezone']  = '시간대';
-$labels['pagesize']  = '페이지당 줄 수';
+$labels['pagesize']  = '페이지당 행 수';
 $labels['signature'] = '서명';
-$labels['dstactive']  = '서머타임';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
-$labels['htmleditor'] = 'HTML 메일 쓰기';
-$labels['htmlonreply'] = 'HTML 메시지에 회신할 때에 만';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['dstactive']  = '일광 절약 시간';
+$labels['showinextwin'] = '메시지를 새 창에서 열기';
+$labels['composeextwin'] = '새 창에서 작성하기';
+$labels['htmleditor'] = 'HTML 메시지 작성';
+$labels['htmlonreply'] = 'HTML 메시지 회신 시';
+$labels['htmlonreplyandforward'] = '전달 또는 HTML 메시지 회신 시';
 $labels['htmlsignature'] = 'HTML 서명';
-$labels['previewpane'] = '미리 보기 창 보기';
+$labels['previewpane'] = '미리보기 창 보기';
 $labels['skin'] = '인터페이스 스킨';
 $labels['logoutclear'] = '로그아웃할 때 휴지통 비우기';
-$labels['logoutcompact'] = '로그아웃할 때 받은편지함 압축하기';
+$labels['logoutcompact'] = '로그아웃할 때 받은 편지함 압축하기';
 $labels['uisettings'] = '사용자 인터페이스';
 $labels['serversettings'] = '서버 설정';
-$labels['mailboxview'] = '메일 상자 보기';
-$labels['mdnrequests'] = '수신 확인';
-$labels['askuser'] = '사용자에게 묻기';
-$labels['autosend'] = '자동으로 보내기';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = '무시';
-$labels['readwhendeleted'] = '삭제할 때 메시지를 읽은 것으로 표시';
-$labels['flagfordeletion'] = '지우는 대신 지울 메시지에 깃발 달기';
-$labels['skipdeleted'] = '지운 메시지 보이지 않기';
-$labels['deletealways'] = '휴지통으로 메시지 이동을 실패하면, 삭제';
-$labels['deletejunk'] = '정크 메일함에 있는 메시지들을 바로 삭제';
-$labels['showremoteimages'] = '원격 이미지 보이기';
-$labels['fromknownsenders'] = '아는 발신인에게서만';
+$labels['mailboxview'] = '메일함 화면';
+$labels['mdnrequests'] = '수신 확인 요청 시';
+$labels['askuser'] = '사용자에게 물어봄';
+$labels['autosend'] = '수신 확인 보내기';
+$labels['autosendknown'] = '내 연락처에 수신 확인 요청을 보냄, 아닐 경우 물어봄';
+$labels['autosendknownignore'] = '내 연락처에 수신 확인 요청을 보냄, 아닐 경우 무시함';
+$labels['ignore'] = '무시함';
+$labels['readwhendeleted'] = '삭제 시 메시지를 읽음으로 표시';
+$labels['flagfordeletion'] = '삭제 대신 삭제 대상 메시지를 깃발로 표시';
+$labels['skipdeleted'] = '삭제된 메시지 보지 않기';
+$labels['deletealways'] = '메시지를 휴지통으로 이동하는 작업에 실패할 경우 삭제';
+$labels['deletejunk'] = '스팸 메일함에 있는 메시지를 바로 삭제';
+$labels['showremoteimages'] = '본문 내용의 원격 이미지 표시';
+$labels['fromknownsenders'] = '알려진 발신인으로부터 받은 메시지만';
 $labels['always'] = '항상';
-$labels['showinlineimages'] = '메시지 아래에 첨부 이미지 보이기';
-$labels['autosavedraft']  = '드래프트 자동 저장';
-$labels['everynminutes']  = '$n 분마다';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['showinlineimages'] = '메시지 하단에 첨부 이미지 표시';
+$labels['autosavedraft']  = '작성 중인 메시지를 자동으로 저장';
+$labels['everynminutes']  = '매 $n분 마다';
+$labels['refreshinterval']  = '새로 고침 (새 메시지 확인, 기타 등등)';
 $labels['never']  = '하지 않음';
 $labels['immediately']  = '즉시';
-$labels['messagesdisplaying'] = '메시지 표시 중';
-$labels['messagescomposition'] = '메시지 작성 중';
-$labels['mimeparamfolding'] = '첨부 파일 이름';
+$labels['messagesdisplaying'] = '메시지 보기';
+$labels['messagescomposition'] = '메시지 작성';
+$labels['mimeparamfolding'] = '첨부파일명';
 $labels['2231folding'] = 'Full RFC 2231 (선더버드)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS 아웃룻)';
-$labels['2047folding'] = 'Full RFC 2047 (다른 프로그램들)';
-$labels['force7bit'] = '8-bit 문자들을 위해서 MIME 인코딩을 사용';
-$labels['advancedoptions'] = '상세 설정';
-$labels['focusonnewmessage'] = '새 메시지가 있으면 브라우저 윈도우로 포커스 이동';
-$labels['checkallfolders'] = '새 메시지를 위해 모든 폴더 체크';
-$labels['displaynext'] = '메시지 삭제/이동한 후에는 다음 메시지를 표시';
-$labels['defaultfont'] = 'HTML 메시지의 기본 폰트';
-$labels['mainoptions'] = '주 옵션';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS 아웃룩)';
+$labels['2047folding'] = 'Full RFC 2047 (기타)';
+$labels['force7bit'] = '8-bit 문자에 MIME 인코딩 사용';
+$labels['advancedoptions'] = '고급 옵션';
+$labels['focusonnewmessage'] = '새 메시지가 있을 경우 브라우저 창으로 포커스 이동';
+$labels['checkallfolders'] = '모든 폴더에서 새 메시지 확인';
+$labels['displaynext'] = '메시지 삭제/이동 후 다음 메시지 표시';
+$labels['defaultfont'] = 'HTML 메시지의 기본 글꼴';
+$labels['mainoptions'] = '주요 옵션';
 $labels['browseroptions'] = '브라우저 옵션';
 $labels['section'] = '섹션';
-$labels['maintenance'] = '유지 관리';
+$labels['maintenance'] = '유지관리';
 $labels['newmessage'] = '새 메시지';
 $labels['signatureoptions'] = '서명 옵션';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = '자동으로 서명 추가';
-$labels['newmessageonly'] = '새로운 메시지만';
-$labels['replyandforwardonly'] = '회신이나 전달 메시지 만';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
+$labels['whenreplying'] = '회신 시';
+$labels['replyempty'] = '원문 메시지를 인용하지 않음';
+$labels['replytopposting'] = '새 메시지를 인용문 상단에서 시작';
+$labels['replybottomposting'] = '새 메시지를 인용문 하단에서 시작';
+$labels['replyremovesignature'] = '회신 시 메시지에서 원문 서명을 제거';
+$labels['autoaddsignature'] = '서명 자동으로 추가';
+$labels['newmessageonly'] = '새로운 메시지에만';
+$labels['replyandforwardonly'] = '회신 및 전달 시에만';
+$labels['replysignaturepos'] = '회신 또는 전달 시 서명 추가';
+$labels['belowquote'] = '인용문 하단';
+$labels['abovequote'] = '인용문 상단';
 $labels['insertsignature'] = '서명 삽입';
-$labels['previewpanemarkread']  = '미리 읽힘 메시지를 읽음으로 표시';
-$labels['afternseconds']  = '$n 초 이후';
-$labels['reqmdn'] = '항상 수신확인 요청 하기';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = '메시지를 보내기 전에 맞춤법 확인';
-$labels['spellcheckoptions'] = '맞춤법 확인 옵션';
-$labels['spellcheckignoresyms'] = '심볼이 포함된 단어 무시하기';
-$labels['spellcheckignorenums'] = '숫자가 포함된 단어 무시하기';
-$labels['spellcheckignorecaps'] = '대문자가 포함된 단어 무시하기';
+$labels['previewpanemarkread']  = '미리 본 메시지를 읽음으로 표시';
+$labels['afternseconds']  = '$n초 후';
+$labels['reqmdn'] = '수신 확인을 항상 요청';
+$labels['reqdsn'] = '전송 상태 알림을 항상 요청';
+$labels['replysamefolder'] = ' 회신 메시지를 회신 대상 메시지의 폴더로 이동';
+$labels['defaultabook'] = '기본 주소록';
+$labels['autocompletesingle'] = '자동완성에서 대체 이메일 주소를 건너뜀';
+$labels['listnamedisplay'] = '연락처 정렬 방식';
+$labels['spellcheckbeforesend'] = '메시지를 보내기 전에 맞춤법 검사';
+$labels['spellcheckoptions'] = '맞춤법 검사 옵션';
+$labels['spellcheckignoresyms'] = '기호가 포함된 단어 무시';
+$labels['spellcheckignorenums'] = '숫자가 포함된 단어 무시';
+$labels['spellcheckignorecaps'] = '모두 대문자로 표기된 단어 무시';
 $labels['addtodict'] = '사전에 추가';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
+$labels['mailtoprotohandler'] = 'mailto: 링크의 프로토콜 처리자 등록';
+$labels['forwardmode'] = '메시지 전달';
+$labels['inline'] = '본문 내용으로';
+$labels['asattachment'] = '첨부파일로';
 
 $labels['folder']  = '폴더';
 $labels['folders']  = '폴더';
-$labels['foldername']  = '폴더 이름';
-$labels['subscribed']  = '가입됨';
+$labels['foldername']  = '폴더명';
+$labels['subscribed']  = '구독함';
 $labels['messagecount'] = '메시지';
-$labels['create']  = '만들기';
-$labels['createfolder']  = '새 폴더 만들기';
+$labels['create']  = '생성';
+$labels['createfolder']  = '새 폴더 생성';
 $labels['managefolders']  = '폴더 관리';
 $labels['specialfolders'] = '특수 폴더';
-$labels['properties'] = '등록 정보';
-$labels['folderproperties'] = '폴더 등록 정보';
+$labels['properties'] = '속성';
+$labels['folderproperties'] = '폴더 속성';
 $labels['parentfolder'] = '상위 폴더';
-$labels['location'] = 'Location';
+$labels['location'] = '위치';
 $labels['info'] = '정보';
-$labels['getfoldersize'] = '폴더의 사이즈를 알아보려면 클릭';
-$labels['changesubscription'] = '구독을 변경하려면 클릭';
-$labels['foldertype'] = '폴더 타입';
+$labels['getfoldersize'] = '폴더 크기를 확인하려면 클릭하세요';
+$labels['changesubscription'] = '구독을 변경하려면 클릭하세요';
+$labels['foldertype'] = '폴더 유형';
 $labels['personalfolder']  = '개인 폴더';
 $labels['otherfolder']  = '다른 사용자의 폴더';
-$labels['sharedfolder']  = '공개 폴더';
+$labels['sharedfolder']  = '공유 폴더';
 
-$labels['sortby'] = '정렬';
+$labels['sortby'] = '정렬 방식';
 $labels['sortasc']  = '오름차순으로 정렬';
 $labels['sortdesc'] = '내림차순으로 정렬';
 $labels['undo'] = '실행 취소';
 
-$labels['installedplugins'] = 'Installed plugins';
+$labels['installedplugins'] = '설치된 플러그인';
 $labels['plugin'] = '플러그인';
 $labels['version'] = '버전';
-$labels['source'] = 'Source';
-$labels['license'] = '라이센스';
-$labels['support'] = '지원 받기';
+$labels['source'] = '소스';
+$labels['license'] = '라이선스';
+$labels['support'] = '지원 요청';
 
 // units
-$labels['B'] = '바이트';
-$labels['KB'] = '킬로바이트';
-$labels['MB'] = '메가바이트';
-$labels['GB'] = '기가바이트';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
 
 // character sets
-$labels['unicode'] = '유니코드(단일 코드,다국적 지원코드)';
+$labels['unicode'] = '유니코드';
 $labels['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['westerneuropean'] = '서유럽어';
+$labels['easterneuropean'] = '동유럽어';
+$labels['southeasterneuropean'] = '남동유럽어';
+$labels['baltic'] = '발트어';
+$labels['cyrillic'] = '키릴어';
+$labels['arabic'] = '아랍어';
+$labels['greek'] = '그리스어';
+$labels['hebrew'] = '히브리어';
 $labels['turkish'] = '터키어';
-$labels['nordic'] = 'Nordic';
+$labels['nordic'] = '북유럽어';
 $labels['thai'] = '태국어';
-$labels['celtic'] = 'Celtic';
+$labels['celtic'] = '켈트어';
 $labels['vietnamese'] = '베트남어';
 $labels['japanese'] = '일본어';
 $labels['korean'] = '한국어';
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index 0193484a9..5c6786502 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiya Karbon';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'bibe...';
 $labels['download'] = 'daxe';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 2a161824f..376f9c771 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopijuoti';
 $labels['move']     = 'Perkelti';
 $labels['moveto']   = 'Perkelti į…';
 $labels['download'] = 'Parsisiųsti';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Rodyti';
 $labels['showanyway'] = 'Vistiek rodyti';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Atverti naujame lange';
 $labels['emlsave'] = 'Parsisiųsti (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Redaguoti kaip naują';
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index 5e47b1a29..a71d5e554 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopēt';
 $labels['move']     = 'Pārvietot';
 $labels['moveto']   = 'pārvietot uz...';
 $labels['download'] = 'lejupielādēt';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'atvērt jaunā logā';
 $labels['emlsave'] = 'lejupielādēt (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'rediģēt kā jaunu';
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index 247cc334d..c8190276e 100755
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Копирај';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'Премести во...';
 $labels['download'] = 'Преземи';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Отвори во нов прозорец';
 $labels['emlsave'] = 'Преземи (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Уреди како ново';
diff --git a/program/localization/ml_IN/labels.inc b/program/localization/ml_IN/labels.inc
index 5644f1599..463256c0e 100644
--- a/program/localization/ml_IN/labels.inc
+++ b/program/localization/ml_IN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'പകര്‍ത്തുക';
 $labels['move']     = 'നീക്കുക';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'ഡൗണ്‍ലോഡ്';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'പുതിയ വിന്‍ഡോയില്‍ തുറക്കുക';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'പുതിയതായി തിരുത്തുക';
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index 1a02a7e2d..804fb5651 100755
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'नक्‍कल';
 $labels['move']     = 'हलवा';
 $labels['moveto']   = 'या फोल्डरमधे ठेवा';
 $labels['download'] = 'उतरवून घ्या';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'नवीन खिडकी उघडा';
 $labels['emlsave'] = 'इएमएल स्‍वरूपात उतरवून घ्या';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'नवीन आहे असा संपादित करा';
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index ada834483..43884e986 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Salin';
 $labels['move']     = 'Alih';
 $labels['moveto']   = 'Alih ke...';
 $labels['download'] = 'Muat Turun';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Buka dalam tetingkap baru';
 $labels['emlsave'] = 'Muat-turun (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Ubah seperti baharu';
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index 4b62e942b..26be68f35 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'प्रतिलिपि गर्नुहोस्';
 $labels['move']     = 'सार्नुहोस';
 $labels['moveto']   = 'यहाँ सार्नुहोस';
 $labels['download'] = 'डाऊनलोड';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index fd74ce4f1..82cf3a023 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopieer';
 $labels['move']     = 'Verplaats';
 $labels['moveto']   = 'Verplaats naar...';
 $labels['download'] = 'Downloaden';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Weergeven';
 $labels['showanyway'] = 'Toch weergeven';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Als nieuw bewerken';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index abe96a90f..2d34a5135 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiëren';
 $labels['move']     = 'Verplaats';
 $labels['moveto']   = 'Verplaats naar...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Openen';
 $labels['showattachment'] = 'Toon';
 $labels['showanyway'] = 'Laat toch zien';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Inhoud';
 
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
+$labels['changeformattext'] = 'Weergeven als platte tekst';
+$labels['changeformathtml'] = 'Weergeven als opgemaakte tekst (HTML)';
 
 // message compose
 $labels['editasnew']      = 'Als nieuw bewerken';
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 05a362104..4a67e1590 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -25,9 +25,11 @@ $messages['storageerror'] = 'Verbinding met IMAP-server mislukt.';
 $messages['servererror'] = 'Serverfout!';
 $messages['servererrormsg'] = 'Serverfout: $msg';
 $messages['dberror'] = 'Databasefout!';
-$messages['requesttimedout'] = 'Wachttijd verzoek overschreden';
+$messages['requesttimedout'] = 'Verzoek duurde te lang';
 $messages['errorreadonly'] = 'De bewerking kan niet uitgevoerd worden. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Niet in staat om de bewerking uit te voeren. Toestemming geweigerd.';
+$messages['erroroverquota'] = 'Niet in staat om de bewerking uit te voeren. Onvoldoende vrije opslagruimte.';
+$messages['erroroverquotadelete'] = 'Onvoldoende vrije opslagruimte. Gebruik Shift+Del om een bericht te verwijderen.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
 $messages['invalidhost'] = 'Ongeldige servernaam.';
 $messages['nomessagesfound'] = 'Geen berichten gevonden in deze mailbox.';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 47a00f645..7a4248830 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiuj';
 $labels['move']     = 'Przenieś';
 $labels['moveto']   = 'Przenieś do...';
 $labels['download'] = 'Pobierz';
+$labels['open']     = 'Otwórz';
 $labels['showattachment'] = 'Pokaż';
 $labels['showanyway'] = 'Pokaż';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Treść';
 
 $labels['openinextwin'] = 'Otwórz w nowym oknie';
 $labels['emlsave'] = 'Pobierz (.eml)';
+$labels['changeformattext'] = 'Wyświetl w formacie tekstowym';
+$labels['changeformathtml'] = 'Wyświetl w formacie HTML';
 
 // message compose
 $labels['editasnew']      = 'Edytuj jako nową';
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index 93943947a..05f6c3d32 100755
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'لمېسل';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'ته خوځوي';
 $labels['download'] = 'ښکته کول';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'په نوي کړکۍ کې پرانيزه';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 1d28088a3..55068df5b 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover para...';
 $labels['download'] = 'Baixar';
+$labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Exibir';
 $labels['showanyway'] = 'Exibir mesmo assim';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Conteúdo';
 
 $labels['openinextwin'] = 'Abrir em nova janela';
 $labels['emlsave'] = 'Baixar (formato .eml)';
+$labels['changeformattext'] = 'Exibir em formato de texto simples';
+$labels['changeformathtml'] = 'Exibir com formatação HTML';
 
 // message compose
 $labels['editasnew']      = 'Editar como novo';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 20105a348..62fa8bbb4 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'mover para...';
 $labels['download'] = 'descarregar';
+$labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrar na mesma';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Corpo';
 
 $labels['openinextwin'] = 'Abrir numa nova janela';
 $labels['emlsave'] = 'Guardar como (.eml)';
+$labels['changeformattext'] = 'Mostrar em formato de texto simples';
+$labels['changeformathtml'] = 'Mostrar em formato HTML';
 
 // message compose
 $labels['editasnew']      = 'Editar como nova';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index 00ec11f13..0dcd97919 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiază';
 $labels['move']     = 'Mută';
 $labels['moveto']   = 'Mută in...';
 $labels['download'] = 'Descarcă';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Arată';
 $labels['showanyway'] = 'Arată oricum';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Corp';
 
 $labels['openinextwin'] = 'Deschide într-o fereastră nouă';
 $labels['emlsave'] = 'Salvează în format .eml';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Editează ca nou';
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 9d854450a..6b6d0c6bd 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Копировать';
 $labels['move']     = 'Переместить';
 $labels['moveto']   = 'Переместить в...';
 $labels['download'] = 'Загрузить';
+$labels['open']     = 'Открыть';
 $labels['showattachment'] = 'Показать';
 $labels['showanyway'] = 'Все равно показать';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Тело письма';
 
 $labels['openinextwin'] = 'Открыть в новом окне';
 $labels['emlsave'] = 'Сохранить (.eml)';
+$labels['changeformattext'] = 'Показать в формате обычного текста';
+$labels['changeformathtml'] = 'Показать в HTML формате';
 
 // message compose
 $labels['editasnew']      = 'Редактировать как новое';
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index 3d1dfccdb..eddc01b57 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'පිටපත් කරන්න';
 $labels['move']     = 'ගෙනයන්න';
 $labels['moveto']   = 'ගෙන යන්න...';
 $labels['download'] = 'බාගත කරන්න';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'නව කවුළුවක විවෘත කරන්න';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 702131d7e..7b993e77a 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopírovať';
 $labels['move']     = 'Presunúť';
 $labels['moveto']   = 'presunúť do...';
 $labels['download'] = 'stiahnuť';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Otvoriť v novom okne';
 $labels['emlsave'] = 'Stiahnuť';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Upraviť ako novú';
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index a4e2d43e3..70150e4d9 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -64,8 +64,9 @@ $labels['copy']     = 'Kopiraj';
 $labels['move']     = 'Premakni';
 $labels['moveto']   = 'Premakni v...';
 $labels['download'] = 'Prenesi';
+$labels['open']     = 'Odpri';
 $labels['showattachment'] = 'Prikaži';
-$labels['showanyway'] = 'Show it anyway';
+$labels['showanyway'] = 'Prikaži';
 
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Velikost datoteke';
@@ -162,7 +163,7 @@ $labels['unread'] = 'Neprebrano';
 $labels['flagged'] = 'Označeno';
 $labels['unanswered'] = 'Neoznačeno';
 $labels['deleted'] = 'Izbrisano';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = 'Ni izbrisano';
 $labels['invert'] = 'Zamenjaj';
 $labels['filter'] = 'Prikaži';
 $labels['list'] = 'Seznam';
@@ -200,10 +201,12 @@ $labels['quicksearch']  = 'Hitri iskalnik';
 $labels['resetsearch']  = 'Prekliči iskanje';
 $labels['searchmod']  = 'Spremembe iskanja';
 $labels['msgtext']  = 'Celotno sporočilo';
-$labels['body']  = 'Body';
+$labels['body']  = 'Vsebina sporočila';
 
 $labels['openinextwin'] = 'Odpri v novem oknu';
 $labels['emlsave'] = 'Prenos datoteke (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Uredi kot novo';
@@ -241,9 +244,9 @@ $labels['nosubject']  = '(brez naslova)';
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Vedno prikaži slike od $sender';
 $labels['isdraft']    = 'To je osnutek sporočila.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['andnmore']   = '$nr več...';
+$labels['togglemoreheaders'] = 'Prikaži več glav sporočila';
+$labels['togglefullheaders'] = 'Preklopi na neobdelan zapis glave sporočila';
 
 $labels['htmltoggle'] = 'Obogateno besedilo (HTML)';
 $labels['plaintoggle'] = 'Samo besedilo';
@@ -335,8 +338,8 @@ $labels['composeto']      = 'Sestavi sporočilo za';
 $labels['contactsfromto'] = 'Vizitke $from od $to do $count';
 $labels['print']          = 'Natisni';
 $labels['export']         = 'Izvozi';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Izvozi vse';
+$labels['exportsel']      = 'Izvozi označeno';
 $labels['exportvcards']   = 'Izvozi stike v formatu vCard';
 $labels['newcontactgroup'] = 'Ustvari novo skupino stikov';
 $labels['grouprename']    = 'Preimenuj skupino';
@@ -360,7 +363,7 @@ $labels['importcontacts'] = 'Uvozi stike';
 $labels['importfromfile'] = 'Uvozi iz datoteke:';
 $labels['importtarget'] = 'Dodaj nove stike v imenik:';
 $labels['importreplace'] = 'Zamenjaj celoten imenik';
-$labels['importdesc'] = '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> or CSV (comma-separated) data format.';
+$labels['importdesc'] = 'Stike lahko naložite iz obstoječega imenika. <br/>Trenutno je podprt uvoz stikov v zapisu  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ali v CSV (z vejico ločene vrednosti) zapisu.';
 $labels['done'] = 'Dokončano';
 
 // settings
@@ -380,8 +383,8 @@ $labels['edititem'] = 'Uredi predmet';
 $labels['preferhtml'] = 'Prednostno HTML';
 $labels['defaultcharset'] = 'Privzeto kodiranje znakov';
 $labels['htmlmessage'] = 'HTML sporočilo';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
+$labels['messagepart'] = 'Del';
+$labels['digitalsig'] = 'Digitalni podpis';
 $labels['dateformat'] = 'Prikaz datuma';
 $labels['timeformat'] = 'Prikaz časa';
 $labels['prettydate'] = 'Bolj čitljivi datumi';
@@ -393,10 +396,10 @@ $labels['pagesize']  = 'Vrstic na stran';
 $labels['signature'] = 'Podpis';
 $labels['dstactive']  = 'Samodejna nastavitev zimskega/letnega časa';
 $labels['showinextwin'] = 'Odpri v novem oknu';
-$labels['composeextwin'] = 'Compose in a new window';
+$labels['composeextwin'] = 'Sestavi sporočilo v novem oknu';
 $labels['htmleditor'] = 'Sestavi sporočila z obogatenim besedilom';
 $labels['htmlonreply'] = 'le pri odgovoru na sporočila z obogatenim besedilom';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreplyandforward'] = 'le pri posredovanju ali odgovoru na sporočila z obogatenim besedilom';
 $labels['htmlsignature'] = 'Podpis z obogatenim besedilom';
 $labels['previewpane'] = 'Prikaži predogled';
 $labels['skin'] = 'Tema uporabniškega vmesnika';
@@ -422,7 +425,7 @@ $labels['always'] = 'vedno';
 $labels['showinlineimages'] = 'Prikaži priponke na dnu sporočila';
 $labels['autosavedraft']  = 'Samodejno shrani osnutke';
 $labels['everynminutes']  = '$n minut';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['refreshinterval']  = 'Osveži (preglej nova sporočila)';
 $labels['never']  = 'nikoli';
 $labels['immediately']  = 'takoj';
 $labels['messagesdisplaying'] = 'Prikazovanje sporočil';
@@ -444,7 +447,7 @@ $labels['maintenance'] = 'Vzdrževanje';
 $labels['newmessage'] = 'Novo sporočilo';
 $labels['signatureoptions'] = 'Nastavitve podpisa';
 $labels['whenreplying'] = 'Pri odgovoru';
-$labels['replyempty'] = 'do not quote the original message';
+$labels['replyempty'] = 'ne navajaj izvornega sporočila v odgovoru';
 $labels['replytopposting'] = 'začni z novim sporočilom nad izvornim sporočilom';
 $labels['replybottomposting'] = 'začni z novim sporočilom pod izvornim sporočilom';
 $labels['replyremovesignature'] = 'Pri odgovoru na sporočilo odstrani izvorni podpis iz sporočila';
@@ -460,7 +463,7 @@ $labels['afternseconds']  = 'po $n sekundah';
 $labels['reqmdn'] = 'Vedno zahtevaj povratnico';
 $labels['reqdsn'] = 'Vedno zahtevaj obvestilo o statusu dostave';
 $labels['replysamefolder'] = 'Shrani odgovore na sporočilo v mapo izvornega sporočila';
-$labels['defaultabook'] = 'Default address book';
+$labels['defaultabook'] = 'Privzeti stiki';
 $labels['autocompletesingle'] = 'Preskoči nadomestni e-naslov pri samodejnem dokončanju';
 $labels['listnamedisplay'] = 'Prikaži seznam stikov kot';
 $labels['spellcheckbeforesend'] = 'Preveri črkovanje pred pošiljanjem sporočila';
@@ -470,8 +473,8 @@ $labels['spellcheckignorenums'] = 'Ne upoštevaj besed, ki vsebujejo številke';
 $labels['spellcheckignorecaps'] = 'Ne upoštevaj besed, ki vsebujejo samo velike črke';
 $labels['addtodict'] = 'Dodaj v slovar';
 $labels['mailtoprotohandler'] = 'Registriraj upravljavca protokola za e-naslov: povezave';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
+$labels['forwardmode'] = 'Posredovanje sporočil';
+$labels['inline'] = 'medvrstično';
 $labels['asattachment'] = 'Kot priponka';
 
 $labels['folder']  = 'Mapa';
@@ -500,7 +503,7 @@ $labels['sortasc']  = 'Uredi naraščajoče';
 $labels['sortdesc'] = 'Uredi padajoče';
 $labels['undo'] = 'Prekliči';
 
-$labels['installedplugins'] = 'Installed plugins';
+$labels['installedplugins'] = 'Nameščeni vtičniki';
 $labels['plugin'] = 'Vtičnik';
 $labels['version'] = 'Različica';
 $labels['source'] = 'Vir';
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index aa102670c..52ff45cd6 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopje';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'ço te...';
 $labels['download'] = 'shkarko';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index 1461606eb..1e84735e6 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Копирај';
 $labels['move']     = 'Пребаци';
 $labels['moveto']   = 'Пребаци у...';
 $labels['download'] = 'Преузми (скидање)';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Отвори у новом прозору';
 $labels['emlsave'] = 'Довнлоад (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Модификуј као ново';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 5d10334b3..c1a91cf82 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiera';
 $labels['move']     = 'Flytta';
 $labels['moveto']   = 'Flytta till:';
 $labels['download'] = 'Ladda ner';
+$labels['open']     = 'Öppna';
 $labels['showattachment'] = 'Visa';
 $labels['showanyway'] = 'Visa det ändå';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Innehåll';
 
 $labels['openinextwin'] = 'Öppna i nytt fönster';
 $labels['emlsave'] = 'Spara (.eml)';
+$labels['changeformattext'] = 'Visa i text-format';
+$labels['changeformathtml'] = 'Visa i HTML-format';
 
 // message compose
 $labels['editasnew']      = 'Redigera som nytt';
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index d71da6799..1cbffb588 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'நகல்';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'இதற்கு அனுப்பு...';
 $labels['download'] = 'பதிவிறக்கு';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'புது சாளரத்தில் திற';
 $labels['emlsave'] = 'பதிவிறக்கு (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'புதியதாக திருத்து';
diff --git a/program/localization/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index f96bafa66..93f2304e1 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'คัดลอก';
 $labels['move']     = 'เลื่อน';
 $labels['moveto']   = 'ย้ายไป...';
 $labels['download'] = 'ดาวน์โหลด';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'แสดง';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'เนื้อหา';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index 6937f2a1e..d8e9e20cf 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopyala';
 $labels['move']     = 'Taşı';
 $labels['moveto']   = 'Şuraya taşı...';
 $labels['download'] = 'İndir';
+$labels['open']     = 'Aç';
 $labels['showattachment'] = 'Göster';
 $labels['showanyway'] = 'Yine de göster';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Gövde';
 
 $labels['openinextwin'] = 'Yeni pencerede aç';
 $labels['emlsave'] = 'İndir (.eml)';
+$labels['changeformattext'] = 'Düz yazı formatında göster';
+$labels['changeformathtml'] = 'HTML formatında göster';
 
 // message compose
 $labels['editasnew']      = 'Postayı yeni olarak düzenle';
@@ -335,8 +338,8 @@ $labels['composeto']      = 'Seçili kişiye posta gönder';
 $labels['contactsfromto'] = 'Kişiler: $from - $to , Toplam: $count';
 $labels['print']          = 'Yazdır';
 $labels['export']         = 'Dışa aktar';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Hepsini dışa aktar';
+$labels['exportsel']      = 'Seçileni dışa aktar';
 $labels['exportvcards']   = 'vCard olarak dışa aktar';
 $labels['newcontactgroup'] = 'Yeni kişi grubu oluştur';
 $labels['grouprename']    = 'Grubu yeniden adlandır';
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index f3c0919c0..3b451d556 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Veritabanı Hatası!';
 $messages['requesttimedout'] = 'İstek zaman aşımına uğradı';
 $messages['errorreadonly'] = 'İşlem gerçekleştirilemedi. Dizin salt okunabilir';
 $messages['errornoperm'] = 'İşlem gerçekleştirilemedi. İzin verilmedi.';
+$messages['erroroverquota'] = 'İşlem gerçekleştirilemedi. Boş alan yok.';
+$messages['erroroverquotadelete'] = 'Boş alan yok. SHIFT+DEL tuş kombinasyonunu kullanarak mesajı silin.';
 $messages['invalidrequest'] = 'Geçersiz İstek! Veri kaydedilmedi';
 $messages['invalidhost'] = 'Geçersiz sunucu adı.';
 $messages['nomessagesfound'] = 'Posta kutusunda ileti bulunamadı';
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index d70718fcc..35be96cab 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Копіювати';
 $labels['move']     = 'Перемістити';
 $labels['moveto']   = 'Перемістити до...';
 $labels['download'] = 'Завантажити';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Показати';
 $labels['showanyway'] = 'Все одно показати';
 
@@ -204,6 +205,8 @@ $labels['body']  = 'Тіло повідомлення';
 
 $labels['openinextwin'] = 'Відкрити в новому вікні';
 $labels['emlsave'] = 'Зберегти (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Редагувати як новий';
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index af2bd7b68..9b79283b1 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -33,15 +33,15 @@ $labels['addressbook'] = '通讯录';
 
 // mailbox names
 $labels['inbox']  = '收件箱';
-$labels['drafts'] = '草稿';
-$labels['sent']   = '已发送';
+$labels['drafts'] = '草稿箱';
+$labels['sent']   = '已发送邮件';
 $labels['trash']  = '已删除邮件';
 $labels['junk']   = '垃圾邮件';
 
 // message listing
 $labels['subject'] = '主题';
 $labels['from']    = '发件人';
-$labels['sender']  = 'Sender';
+$labels['sender']  = '发件人';
 $labels['to']      = '收件人';
 $labels['cc']      = '抄送';
 $labels['bcc']     = '密送';
@@ -50,22 +50,23 @@ $labels['followupto'] = '投递组';
 $labels['date']    = '日期';
 $labels['size']    = '大小';
 $labels['priority'] = '优先级';
-$labels['organization'] = '公司';
+$labels['organization'] = '组织';
 $labels['readstatus'] = '阅读状态';
-$labels['listoptions'] = 'List options...';
+$labels['listoptions'] = '列表选项';
 
-$labels['mailboxlist'] = '目录管理';
-$labels['messagesfromto'] = '第 $from 到 $to，共 $count 封邮件';
-$labels['threadsfromto'] = '第 $from 到 $to，共 $count 个主题';
-$labels['messagenrof'] = '第 $nr 封邮件，共 $count 封';
+$labels['mailboxlist'] = '邮件夹';
+$labels['messagesfromto'] = '第 $from 到 $to，共计 $count 封邮件';
+$labels['threadsfromto'] = '第 $from 到 $to，共计 $count 个主题';
+$labels['messagenrof'] = '第 $nr 封邮件，共计 $count 封';
 $labels['fromtoshort'] = '自 $from – $to 统计 $count';
 
 $labels['copy']     = '复制';
 $labels['move']     = '移动';
-$labels['moveto']   = '移动至';
+$labels['moveto']   = '移至...';
 $labels['download'] = '下载';
+$labels['open']     = '打开';
 $labels['showattachment'] = '显示';
-$labels['showanyway'] = 'Show it anyway';
+$labels['showanyway'] = '总是显示';
 
 $labels['filename'] = '文件名';
 $labels['filesize'] = '文件大小';
@@ -73,7 +74,7 @@ $labels['filesize'] = '文件大小';
 $labels['addtoaddressbook'] = '添加至通讯录';
 
 // weekdays short
-$labels['sun'] = '周日';
+$labels['sun'] = '星期日';
 $labels['mon'] = '星期一';
 $labels['tue'] = '星期二';
 $labels['wed'] = '星期三';
@@ -122,8 +123,8 @@ $labels['today'] = '今天';
 
 // toolbar buttons
 $labels['refresh']          = '刷新';
-$labels['checkmail']        = '收取新邮件';
-$labels['compose']          = '写邮件';
+$labels['checkmail']        = '检查新邮件';
+$labels['compose']          = '撰写新邮件';
 $labels['writenewmessage']  = '写邮件';
 $labels['reply']            = '回复';
 $labels['replytomessage']   = '回复发件人';
@@ -135,42 +136,42 @@ $labels['forwardinline']    = '直接转发';
 $labels['forwardattachment'] = '以附件转发';
 $labels['forwardmessage']   = '转发邮件';
 $labels['deletemessage']    = '删除邮件';
-$labels['movemessagetotrash'] = '移动邮件到回收站';
+$labels['movemessagetotrash'] = '移至已删除邮件';
 $labels['printmessage']     = '打印邮件';
 $labels['previousmessage']  = '显示上一封邮件';
 $labels['firstmessage']     = '显示第一封邮件';
 $labels['nextmessage']      = '下一封';
 $labels['lastmessage']      = '最后一封';
 $labels['backtolist']       = '返回邮件列表';
-$labels['viewsource']       = '显示邮件源文件';
+$labels['viewsource']       = '显示原始邮件文件';
 $labels['mark']             = '标记';
-$labels['markmessages']     = '标记邮件';
+$labels['markmessages']     = '标记选中的邮件为';
 $labels['markread']         = '已读';
 $labels['markunread']       = '未读';
 $labels['markflagged']      = '已标记';
 $labels['markunflagged']    = '未标记';
-$labels['moreactions']      = '更多动作...';
+$labels['moreactions']      = '更多操作...';
 $labels['more']             = '更多';
-$labels['back']             = '后退';
+$labels['back']             = '返回';
 $labels['options']          = '选项';
 
 $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
 $labels['currpage'] = '当前页';
-$labels['unread'] = '未读';
-$labels['flagged'] = '已标记';
-$labels['unanswered'] = '未回复';
-$labels['deleted'] = '删除';
-$labels['undeleted'] = 'Not deleted';
+$labels['unread'] = '未读邮件';
+$labels['flagged'] = '已标记邮件';
+$labels['unanswered'] = '未回复邮件';
+$labels['deleted'] = '已删除邮件';
+$labels['undeleted'] = '未删除邮件';
 $labels['invert'] = '反选';
 $labels['filter'] = '过滤';
 $labels['list'] = '列表';
 $labels['threads'] = '主题';
 $labels['expand-all'] = '展开全部';
 $labels['expand-unread'] = '展开未读';
-$labels['collapse-all'] = '收合全部';
-$labels['threaded'] = '线索';
+$labels['collapse-all'] = '收起全部';
+$labels['threaded'] = '所有邮件';
 
 $labels['autoexpand_threads'] = '展开消息主题';
 $labels['do_expand'] = '所有主题';
@@ -188,7 +189,7 @@ $labels['listsorting'] = '排序列';
 $labels['listorder'] = '排序';
 $labels['listmode'] = '列表视图样式';
 
-$labels['folderactions'] = '目录操作...';
+$labels['folderactions'] = '文件夹操作...';
 $labels['compact'] = '压缩';
 $labels['empty'] = '清空';
 
@@ -197,31 +198,33 @@ $labels['unknown']  = '未知';
 $labels['unlimited']  = '无限制';
 
 $labels['quicksearch']  = '快速查找';
-$labels['resetsearch']  = '清空查找内容';
-$labels['searchmod']  = '搜寻模式';
-$labels['msgtext']  = '整个邮件';
+$labels['resetsearch']  = '清空';
+$labels['searchmod']  = '修改搜索';
+$labels['msgtext']  = '整封邮件';
 $labels['body']  = '正文';
 
 $labels['openinextwin'] = '在新窗口中打开';
-$labels['emlsave'] = '下载（.eml）';
+$labels['emlsave'] = '下载(.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
-$labels['editasnew']      = '编辑为新邮件';
+$labels['editasnew']      = '以新邮件编辑';
 $labels['send']           = '发送';
 $labels['sendmessage']    = '立即发送';
 $labels['savemessage']    = '保存为草稿';
 $labels['addattachment']  = '添加附件';
 $labels['charset']        = '字符集';
 $labels['editortype']     = '编辑器类型';
-$labels['returnreceipt']  = '邮件回执';
-$labels['dsn']            = '投递状态提示';
-$labels['mailreplyintro'] = '于 $date, $sender 回复:';
-$labels['originalmessage'] = '原始信件';
+$labels['returnreceipt']  = '需要已读回执';
+$labels['dsn']            = '投递状态通知';
+$labels['mailreplyintro'] = '在 $date，$sender 写道：';
+$labels['originalmessage'] = '原始邮件';
 
 $labels['editidents']    = '编辑身份';
 $labels['spellcheck']    = '拼写';
 $labels['checkspelling'] = '拼写检查';
-$labels['resumeediting'] = '重新编辑';
+$labels['resumeediting'] = '继续编辑';
 $labels['revertto']      = '恢复至';
 
 $labels['attach'] = '附加';
@@ -237,19 +240,19 @@ $labels['normal']  = '普通';
 $labels['high']    = '高';
 $labels['highest'] = '最高';
 
-$labels['nosubject']  = '（无主题）';
+$labels['nosubject']  = '(无主题)';
 $labels['showimages'] = '显示图片';
 $labels['alwaysshow'] = '总是在来自 $sender 的邮件中显示图片';
-$labels['isdraft']    = '这是邮件草稿';
-$labels['andnmore']   = '$nr more...';
+$labels['isdraft']    = '这是一封草稿';
+$labels['andnmore']   = '第$nr封或更多...';
 $labels['togglemoreheaders'] = '显示更多消息头';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['togglefullheaders'] = '切换至原始消息头';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '纯文本';
-$labels['savesentmessagein'] = '将已发送邮件保存到';
+$labels['savesentmessagein'] = '保存已发送邮件至';
 $labels['dontsave'] = '不保存';
-$labels['maxuploadsize'] = '允许的最大文件大小是 $size';
+$labels['maxuploadsize'] = '上传附件最大不超过 $size';
 
 $labels['addcc'] = '添加抄送';
 $labels['addbcc'] = '添加密送';
@@ -257,10 +260,10 @@ $labels['addreplyto'] = '添加回复';
 $labels['addfollowupto'] = '添加投递组';
 
 // mdn
-$labels['mdnrequest'] = '发件人要求在您阅读这封邮件时发送通知。您是否希望通知发件人？';
-$labels['receiptread'] = '发送回执（已读）';
+$labels['mdnrequest'] = '发件人要求在您阅读这封邮件时发送已读通知。您是否希望通知发件人？';
+$labels['receiptread'] = '发送回执(已读)';
 $labels['yourmessage'] = '这是您的邮件回执';
-$labels['receiptnote'] = '注意：回执只表示邮件在收件人的电脑上被打开过，不表示收件人已经阅读或已理解邮件的内容。';
+$labels['receiptnote'] = '注意：回执只表示邮件在收件人的电脑上被打开过，不表示收件人已经阅读或了解邮件内容。';
 
 // address boook
 $labels['name']         = '显示名称';
@@ -272,9 +275,9 @@ $labels['namesuffix']   = '后缀';
 $labels['nickname']     = '昵称';
 $labels['jobtitle']     = '职位';
 $labels['department']   = '部门';
-$labels['gender']       = 'Gender';
+$labels['gender']       = '性别';
 $labels['maidenname']   = '娘家姓';
-$labels['email']        = 'Email';
+$labels['email']        = '邮件地址';
 $labels['phone']        = '电话';
 $labels['address']      = '地址';
 $labels['street']       = '街道';
@@ -285,14 +288,14 @@ $labels['country']      = '国家';
 $labels['birthday']     = '生日';
 $labels['anniversary']  = '纪念日';
 $labels['website']      = '主页';
-$labels['instantmessenger'] = 'QQ';
+$labels['instantmessenger'] = '即时通讯';
 $labels['notes'] = '备注';
 $labels['male']   = '男';
 $labels['female'] = '女';
 $labels['manager'] = '经理';
 $labels['assistant'] = '助理';
 $labels['spouse'] = '配偶';
-$labels['allfields'] = '所有项目';
+$labels['allfields'] = '所有栏目';
 $labels['search'] = '查询';
 $labels['advsearch'] = '高级查询';
 $labels['advanced'] = '高级选项';
@@ -302,7 +305,7 @@ $labels['typehome']   = '家庭';
 $labels['typework']   = '工作';
 $labels['typeother']  = '其他';
 $labels['typemobile']  = '手机';
-$labels['typemain']  = '主';
+$labels['typemain']  = '主要';
 $labels['typehomefax']  = '家庭传真';
 $labels['typeworkfax']  = '工作传真';
 $labels['typecar']  = '车牌';
@@ -311,10 +314,10 @@ $labels['typevideo']  = '视频';
 $labels['typeassistant']  = '助理';
 $labels['typehomepage']  = '主页';
 $labels['typeblog'] = '博客';
-$labels['typeprofile'] = '资历';
+$labels['typeprofile'] = '资料';
 
-$labels['addfield'] = '增加项..';
-$labels['addcontact'] = '添加联系人';
+$labels['addfield'] = '新增条目...';
+$labels['addcontact'] = '新建联系人';
 $labels['editcontact'] = '编辑联系人';
 $labels['contacts'] = '联系人';
 $labels['contactproperties'] = '联系人信息';
@@ -324,24 +327,24 @@ $labels['edit']   = '编辑';
 $labels['cancel'] = '取消';
 $labels['save']   = '保存';
 $labels['delete'] = '删除';
-$labels['rename'] = '更名';
+$labels['rename'] = '重命名';
 $labels['addphoto'] = '上传';
-$labels['replacephoto'] = '覆盖';
+$labels['replacephoto'] = '替换照片';
 $labels['uploadphoto'] = '上传照片';
 
 $labels['newcontact']     = '新建联系人';
 $labels['deletecontact']  = '删除选中的联系人';
-$labels['composeto']      = '写信给';
+$labels['composeto']      = '写信至选中的联系人';
 $labels['contactsfromto'] = '第 $from 到 $to 个联系人，共 $count 个';
 $labels['print']          = '打印';
 $labels['export']         = '导出';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = '以 vCard 格式导出联系人';
-$labels['newcontactgroup'] = '创建新的组';
-$labels['grouprename']    = '重命名组';
-$labels['groupdelete']    = '删除组';
-$labels['groupremoveselected'] = '从分组中移除选中的联系人';
+$labels['exportall']      = '导出全部';
+$labels['exportsel']      = '导出选中';
+$labels['exportvcards']   = '导出联系人为 vCard 格式';
+$labels['newcontactgroup'] = '创建新的联系人群组';
+$labels['grouprename']    = '重命名群组';
+$labels['groupdelete']    = '删除群组组';
+$labels['groupremoveselected'] = '删除选中';
 
 $labels['previouspage']   = '上一页';
 $labels['firstpage']      = '第一页';
@@ -356,19 +359,19 @@ $labels['searchsave'] = '保存搜索';
 $labels['searchdelete'] = '删除搜索';
 
 $labels['import'] = '导入';
-$labels['importcontacts'] = '导入联系人';
+$labels['importcontacts'] = '导入通讯录';
 $labels['importfromfile'] = '从文件导入';
-$labels['importtarget'] = '增加新联系人到通讯录:';
-$labels['importreplace'] = '替换整个地址簿';
-$labels['importdesc'] = '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> or CSV (comma-separated) data format.';
+$labels['importtarget'] = '添加新联系人至通讯录:';
+$labels['importreplace'] = '替换全部通讯录';
+$labels['importdesc'] = '您可以从通讯录文件上传联系人，目前已支持 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 和 CSV(逗号分隔)格式';
 $labels['done'] = '完成';
 
 // settings
 $labels['settingsfor'] = '设置';
 $labels['about'] = '关于';
-$labels['preferences'] = '偏好设置';
-$labels['userpreferences'] = '个人偏好';
-$labels['editpreferences'] = '修改个人偏好';
+$labels['preferences'] = '选项';
+$labels['userpreferences'] = '个人选项';
+$labels['editpreferences'] = '修改个人选项';
 
 $labels['identities'] = '发件身份';
 $labels['manageidentities'] = '管理此账号的身份';
@@ -380,7 +383,7 @@ $labels['edititem'] = '编辑条目';
 $labels['preferhtml'] = '以 HTML 格式显示';
 $labels['defaultcharset'] = '默认字符集';
 $labels['htmlmessage'] = 'HTML 邮件';
-$labels['messagepart'] = 'Part';
+$labels['messagepart'] = '部分';
 $labels['digitalsig'] = '数字签名';
 $labels['dateformat'] = '日期格式';
 $labels['timeformat'] = '时间格式';
@@ -392,10 +395,10 @@ $labels['timezone']  = '时区';
 $labels['pagesize']  = '每页显示的邮件数量';
 $labels['signature'] = '签名';
 $labels['dstactive']  = '夏令时';
-$labels['showinextwin'] = 'Open message in a new window';
+$labels['showinextwin'] = '在新窗口中打开';
 $labels['composeextwin'] = '在新窗口中撰写';
 $labels['htmleditor'] = '使用 HTML 编辑器';
-$labels['htmlonreply'] = '仅当回复HTML邮件';
+$labels['htmlonreply'] = '仅当回复 HTML 邮件';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = '使用 HTML 签名';
 $labels['previewpane'] = '显示预览窗口';
@@ -422,7 +425,7 @@ $labels['always'] = '总是';
 $labels['showinlineimages'] = '在邮件下方显示附件中的图片';
 $labels['autosavedraft']  = '自动保存到草稿箱';
 $labels['everynminutes']  = '每隔 $n 分钟';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['refreshinterval']  = '刷新间隔';
 $labels['never']  = '从不';
 $labels['immediately']  = '立即';
 $labels['messagesdisplaying'] = '显示参数';
@@ -431,12 +434,12 @@ $labels['mimeparamfolding'] = '附件名';
 $labels['2231folding'] = '完整的 RFC 2231（Thunderbird）';
 $labels['miscfolding'] = 'RFC 2047/2232（MS Outlook）';
 $labels['2047folding'] = '完整的 RFC 2047（其它）';
-$labels['force7bit'] = '对8位字符使用MIME编码';
+$labels['force7bit'] = '对8位字符使用 MIME 编码';
 $labels['advancedoptions'] = '高级选项';
 $labels['focusonnewmessage'] = '新邮件到达时将窗口提升为焦点窗口';
 $labels['checkallfolders'] = '检查所有邮件夹里的新邮件';
-$labels['displaynext'] = '当邮件删掉/移动后显示下一封邮件';
-$labels['defaultfont'] = '默认的HTML格式字体';
+$labels['displaynext'] = '当邮件删除/移动后显示下一封邮件';
+$labels['defaultfont'] = '默认的 HTML 格式字体';
 $labels['mainoptions'] = '主要选项';
 $labels['browseroptions'] = '浏览器选项';
 $labels['section'] = '项目';
@@ -444,7 +447,7 @@ $labels['maintenance'] = '维护';
 $labels['newmessage'] = '新邮件';
 $labels['signatureoptions'] = '签名选项';
 $labels['whenreplying'] = '当回复时';
-$labels['replyempty'] = 'do not quote the original message';
+$labels['replyempty'] = '不要引用原始邮件';
 $labels['replytopposting'] = '在原文上面开始新邮件';
 $labels['replybottomposting'] = '在原文下面开始新邮件';
 $labels['replyremovesignature'] = '当回复时从邮件移除原始签名';
@@ -462,7 +465,7 @@ $labels['reqdsn'] = '总是要求投递状态通知';
 $labels['replysamefolder'] = '保存回复邮件到邮件相同的目录';
 $labels['defaultabook'] = '默认地址薄';
 $labels['autocompletesingle'] = '跳过自动完成的电子邮件地址';
-$labels['listnamedisplay'] = 'List contacts as';
+$labels['listnamedisplay'] = '列出联系人为';
 $labels['spellcheckbeforesend'] = '发邮件前进行拼写检查';
 $labels['spellcheckoptions'] = '拼写检查选项';
 $labels['spellcheckignoresyms'] = '忽略带符号的单词';
@@ -470,9 +473,9 @@ $labels['spellcheckignorenums'] = '忽略带数字的单词';
 $labels['spellcheckignorecaps'] = '忽略所有大写字母的单词';
 $labels['addtodict'] = '添加到字典中';
 $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
+$labels['forwardmode'] = '邮件转发方式';
+$labels['inline'] = '内嵌';
+$labels['asattachment'] = '作为附件';
 
 $labels['folder']  = '目录管理';
 $labels['folders']  = '目录管理';
@@ -503,9 +506,9 @@ $labels['undo'] = '撤销';
 $labels['installedplugins'] = '已安装插件';
 $labels['plugin'] = '插件';
 $labels['version'] = '版本';
-$labels['source'] = '源';
+$labels['source'] = '源代码';
 $labels['license'] = '许可协议';
-$labels['support'] = '获取支持';
+$labels['support'] = '支持';
 
 // units
 $labels['B'] = 'B';
@@ -519,7 +522,7 @@ $labels['english'] = '英语';
 $labels['westerneuropean'] = '西欧';
 $labels['easterneuropean'] = '东欧';
 $labels['southeasterneuropean'] = '东南欧';
-$labels['baltic'] = '波罗的海';
+$labels['baltic'] = '波罗的语';
 $labels['cyrillic'] = '西里尔语';
 $labels['arabic'] = '阿拉伯语';
 $labels['greek'] = '希腊语';
@@ -527,7 +530,7 @@ $labels['hebrew'] = '希伯来语';
 $labels['turkish'] = '土耳其语';
 $labels['nordic'] = '北欧';
 $labels['thai'] = '泰语';
-$labels['celtic'] = '塞尔特';
+$labels['celtic'] = '塞尔特语';
 $labels['vietnamese'] = '越南语';
 $labels['japanese'] = '日文';
 $labels['korean'] = '韩语';
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 6f2f7ed52..488a7ab2d 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '複製';
 $labels['move']     = '移動';
 $labels['moveto']   = '移至...';
 $labels['download'] = '下載';
+$labels['open']     = 'Open';
 $labels['showattachment'] = '顯示';
 $labels['showanyway'] = '總是顯示';
 
@@ -204,6 +205,8 @@ $labels['body']  = '內文';
 
 $labels['openinextwin'] = '在新視窗開啟';
 $labels['emlsave'] = '下載（.eml）';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = '以新郵件編輯';
@@ -241,7 +244,7 @@ $labels['nosubject']  = '（沒有主旨）';
 $labels['showimages'] = '顯示圖片';
 $labels['alwaysshow'] = '永遠顯示來自 $sender 的圖片';
 $labels['isdraft']    = '這是一封草稿';
-$labels['andnmore']   = '$nr more...';
+$labels['andnmore']   = '第$nr封或是更多...';
 $labels['togglemoreheaders'] = '顯示更多的訊息表頭';
 $labels['togglefullheaders'] = '切換原始訊息表頭';
 
@@ -335,8 +338,8 @@ $labels['composeto']      = '寄信至所選擇的聯絡人';
 $labels['contactsfromto'] = '聯絡人 $from 至 $to，共有 $count 人';
 $labels['print']          = '列印';
 $labels['export']         = '匯出通訊錄';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = '匯出全部';
+$labels['exportsel']      = '匯出選擇項目';
 $labels['exportvcards']   = '匯出通訊錄為 vCard 格式';
 $labels['newcontactgroup'] = '新增聯絡人群組';
 $labels['grouprename']    = '重新命名群組';
@@ -380,7 +383,7 @@ $labels['edititem'] = '編輯項目';
 $labels['preferhtml'] = '使用 HTML 顯示';
 $labels['defaultcharset'] = '預設編碼';
 $labels['htmlmessage'] = 'HTML 郵件';
-$labels['messagepart'] = 'Part';
+$labels['messagepart'] = '部分';
 $labels['digitalsig'] = '數位簽章';
 $labels['dateformat'] = '日期格式';
 $labels['timeformat'] = '時間格式';