Synchronized localizations from Transifex

73 files changed, 228 insertions, 358 deletions

diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index 7dc8c15ad..cc023c31c 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'الصفحة الحالية';
 $labels['unread'] = 'غير المقروءة';
 $labels['flagged'] = 'موسوم';
 $labels['unanswered'] = 'بلا رد';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'محذوف';
 $labels['undeleted'] = 'غير محذوفة';
 $labels['invert'] = 'عكس';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'إزالة التوقيع من الرسالة
 $labels['autoaddsignature'] = 'إضافة التوقيع آلياً';
 $labels['newmessageonly'] = 'الرسالة الجديدة فقط';
 $labels['replyandforwardonly'] = 'الردود والتمريرات فقط';
-$labels['replysignaturepos'] = 'إضافة التوقيع عند الرد أو التمرير';
-$labels['belowquote'] = 'بعد الاقتباس';
-$labels['abovequote'] = 'قبل الاقتباس';
 $labels['insertsignature'] = 'إضافة التوقيع';
 $labels['previewpanemarkread']  = 'تحديد الرسائل المُعاينة كمقروءة';
 $labels['afternseconds']  = 'بعد $n ثواني';
diff --git a/program/localization/ast/labels.inc b/program/localization/ast/labels.inc
index 996c6043f..c6207c0d7 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Ensin lleer';
 $labels['flagged'] = 'Marcáu';
 $labels['unanswered'] = 'Ensin contestar';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Desaniciáu';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invertir';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 60e861177..7d25c9234 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -64,7 +64,7 @@ $labels['copy']     = 'Kopyala';
 $labels['move']     = 'Köçür';
 $labels['moveto']   = 'Burada köçür...';
 $labels['download'] = 'Endir';
-$labels['open']     = 'Open';
+$labels['open']     = 'Aç';
 $labels['showattachment'] = 'Göstər';
 $labels['showanyway'] = 'İstənilən halda göstər';
 
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Hazırki səhifəni';
 $labels['unread'] = 'Oxunmamışları';
 $labels['flagged'] = 'İşarəliləri';
 $labels['unanswered'] = 'Cavabsızları';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Silinmişləri';
 $labels['undeleted'] = 'Silinməyib';
 $labels['invert'] = 'İnvertliləri';
@@ -205,8 +206,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';
+$labels['changeformattext'] = 'Sadə mətn formatında göstər';
+$labels['changeformathtml'] = 'HTML formatında göstər';
 
 // message compose
 $labels['editasnew']      = 'Yeni kimi redaktə et';
@@ -338,8 +339,8 @@ $labels['composeto']      = 'Seçilmiş ünvanlara məktub yaz';
 $labels['contactsfromto'] = '$count ünvanının $from - $to arası';
 $labels['print']          = 'Çap et';
 $labels['export']         = 'İxrac et';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Hamısını İxrac et';
+$labels['exportsel']      = 'Seçilmişləri İxrac et';
 $labels['exportvcards']   = 'Ünvanları vCards formatında ixrac et';
 $labels['newcontactgroup'] = 'Ünvanlar qrupunu yarat';
 $labels['grouprename']    = 'Qruğun adını dəyişdir';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Cavab zamanı imzanı sil';
 $labels['autoaddsignature'] = 'İmzanı avtomatik əlavə et';
 $labels['newmessageonly'] = 'yalnız yeni məktublarda';
 $labels['replyandforwardonly'] = 'Yalnız cavab və yönəldilənlərdə';
-$labels['replysignaturepos'] = 'Cavab və yönəltmə zamanı imzanı bərkid';
-$labels['belowquote'] = 'sitatdan sonra';
-$labels['abovequote'] = 'sitatdan əvvəl';
 $labels['insertsignature'] = 'İmza əlavə et';
 $labels['previewpanemarkread']  = 'Baxılmış şəkilləri oxunmuş kimi qeyd et';
 $labels['afternseconds']  = '$n saniyədən sonra';
diff --git a/program/localization/az_AZ/messages.inc b/program/localization/az_AZ/messages.inc
index 939827247..418f270be 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -17,20 +17,22 @@
 */
 
 $messages = array();
-$messages['errortitle']  = 'Xəta baş verib!';
-$messages['loginfailed']  = 'Giriş uğursuz oldu';
-$messages['cookiesdisabled'] = 'Sizin brauzer kukiləri qəbul etmir';
-$messages['sessionerror'] = 'Sizin sessiya köhnəlib';
-$messages['storageerror'] = 'IMAP serverlə bağlantı alınmadı';
-$messages['servererror'] = 'Server xətası!';
-$messages['servererrormsg'] = 'Server xətası: $msg';
-$messages['dberror'] = 'Məlumatlar bazasında xəta!';
+$messages['errortitle']  = 'Xəta baş verdi!';
+$messages['loginfailed']  = 'Giriş uğursuz oldu.';
+$messages['cookiesdisabled'] = 'Sizin brauzer kukiləri qəbul etmir.';
+$messages['sessionerror'] = 'Sizin sessiya köhnəlib.';
+$messages['storageerror'] = 'IMAP serverlə bağlantı alınmadı.';
+$messages['servererror'] = 'Server Xətası!';
+$messages['servererrormsg'] = 'Server Xətası: $msg';
+$messages['dberror'] = 'Məlumatlar Bazasında Xəta!';
 $messages['requesttimedout'] = 'Sorğunun gözləmə müddəti bitdi';
-$messages['errorreadonly'] = 'Əməliyyatı etmək mümkün deyil. Qovluq yalnız oxunuş üçündür.';
+$messages['errorreadonly'] = 'Əməliyyatı icra etmək mümkün deyil. Qovluq yalnız oxunuş üçündür.';
 $messages['errornoperm'] = 'Əməliyyatı etmək mümkün deyil. Giriş qadağandır.';
+$messages['erroroverquota'] = 'Əməliyyat icra edilə bilinmir. Boş disk həcmi yoxdur.';
+$messages['erroroverquotadelete'] = 'Boş disk həcmi yoxdur. Məktubu silmək üçün SHIFT+DEL düyməsini istifadə edin.';
 $messages['invalidrequest'] = 'Səhv sorğu! Məlumat yaddaşda qalmadı.';
-$messages['invalidhost'] = 'Səhv server adı';
-$messages['nomessagesfound'] = 'Poçt qutusunda məktub tapılmadı';
+$messages['invalidhost'] = 'Səhv server adı.';
+$messages['nomessagesfound'] = 'Poçt qutusunda məktub tapılmadı.';
 $messages['loggedout'] = 'Çıxış uğurlu oldu. Sağ olun!';
 $messages['mailboxempty'] = 'Poçt qutusu boşdur';
 $messages['refreshing'] = 'Yenilənmə...';
diff --git a/program/localization/be_BE/labels.inc b/program/localization/be_BE/labels.inc
index db3893ced..3bb5c4436 100644
--- a/program/localization/be_BE/labels.inc
+++ b/program/localization/be_BE/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index fa92ec042..dfe9d2d26 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Страница';
 $labels['unread'] = 'Нови';
 $labels['flagged'] = 'Отбелязано';
 $labels['unanswered'] = 'Без отговор';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Изтрито';
 $labels['undeleted'] = 'Не е изтрит';
 $labels['invert'] = 'Инвертирай';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Премахване на предишния
 $labels['autoaddsignature'] = 'Автоматично добавяне на подпис';
 $labels['newmessageonly'] = 'само на нови съобщения';
 $labels['replyandforwardonly'] = 'само на отговори и препратени';
-$labels['replysignaturepos'] = 'Поставяне на подпис при отговор или препращане';
-$labels['belowquote'] = 'над цитатът';
-$labels['abovequote'] = 'под цитатът';
 $labels['insertsignature'] = 'Вмъкване на подпис';
 $labels['previewpanemarkread']  = 'Маркиране на прегледаните съобщения като прочетени';
 $labels['afternseconds']  = 'след $n секунди';
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index 0f20bba37..58f4467d3 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'নাদেখা (unread)';
 $labels['flagged'] = 'দাগানো (flagged)';
 $labels['unanswered'] = 'উত্তর না দেওয়া গুলো';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index 95756e393..0755a6d9b 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Na lennet';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index f2a871cdd..d81d97320 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Trenutna stranica';
 $labels['unread'] = 'Nepročitano';
 $labels['flagged'] = 'Važno';
 $labels['unanswered'] = 'Neodgovoreno';
+$labels['withattachment'] = 'Sa prilogom';
 $labels['deleted'] = 'Obrisano';
 $labels['undeleted'] = 'Nije obrisano';
 $labels['invert'] = 'Izokreni';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Prilikom odgovaranja na poruku, ukloni origin
 $labels['autoaddsignature'] = 'Automatski dodaj potpis';
 $labels['newmessageonly'] = 'samo za nove poruke';
 $labels['replyandforwardonly'] = 'samo za odgovore i prosljeđivanja';
-$labels['replysignaturepos'] = 'Prilikom odgovaranja ili prosljeđivanja potpis ubaci';
-$labels['belowquote'] = 'ispod citata';
-$labels['abovequote'] = 'iznad citata';
 $labels['insertsignature'] = 'Umetni potpis';
 $labels['previewpanemarkread']  = 'Obilježi prikazane poruke kao pročitane';
 $labels['afternseconds']  = 'nakon $n sekundi';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 1bcb526ea..25dbb1155 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Pàgina actual';
 $labels['unread'] = 'No llegits';
 $labels['flagged'] = 'Marcat';
 $labels['unanswered'] = 'No respost';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Suprimit';
 $labels['undeleted'] = 'No s\'ha suprimit';
 $labels['invert'] = 'Inverteix';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Quan es contesti, suprimeix la signatura orig
 $labels['autoaddsignature'] = 'Afegeix la signatura automàticament';
 $labels['newmessageonly'] = 'només si és un missatge nou';
 $labels['replyandforwardonly'] = 'només a respostes i reenviaments';
-$labels['replysignaturepos'] = 'Quan es contesti o reenviï, posa-hi la signatura';
-$labels['belowquote'] = 'sota les cometes';
-$labels['abovequote'] = 'sobre les cometes';
 $labels['insertsignature'] = 'Inserta la signatura';
 $labels['previewpanemarkread']  = 'Marca els missatges previsualitzats com a llegits';
 $labels['afternseconds']  = 'després de $n segons';
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index 2240065e7..cb94c71c9 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Aktuální stránka';
 $labels['unread'] = 'Nepřečtené';
 $labels['flagged'] = 'Označené';
 $labels['unanswered'] = 'Neoznačené';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Smazané';
 $labels['undeleted'] = 'Nesmazáno';
 $labels['invert'] = 'Převrátit';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Při odpovídání odstranit ze zprávy půvo
 $labels['autoaddsignature'] = 'Automaticky přidat podpis';
 $labels['newmessageonly'] = 'pouze k novým zprávám';
 $labels['replyandforwardonly'] = 'jen k odpovědi a přeposílané zprávě';
-$labels['replysignaturepos'] = 'Při odpovídání nebo přeposílání zprávy vložit podpis';
-$labels['belowquote'] = 'pod citaci';
-$labels['abovequote'] = 'nad citaci';
 $labels['insertsignature'] = 'Vložit podpis';
 $labels['previewpanemarkread']  = 'Označit zobrazené zprávy jako přečtené';
 $labels['afternseconds']  = 'po $n sekundách';
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index 9b695e140..2a22827bf 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Tudalen gyfredol';
 $labels['unread'] = 'Heb eu darllen';
 $labels['flagged'] = 'Nodwyd';
 $labels['unanswered'] = 'Heb ei ateb';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Dilewyd';
 $labels['undeleted'] = 'Heb ei ddileu';
 $labels['invert'] = 'Gwrth-droi';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Wrth ateb, dileu\'r llofnod gwreiddiol o\'r n
 $labels['autoaddsignature'] = 'Ychwanegu llofnod yn awtomatig';
 $labels['newmessageonly'] = 'negeseuon newydd yn unig';
 $labels['replyandforwardonly'] = 'atebion a danfon ymlaen yn unig';
-$labels['replysignaturepos'] = 'Wrth ateb neu ddanfon ymlaen, rhoi\'r llofnod';
-$labels['belowquote'] = 'o dan y dyfynniad';
-$labels['abovequote'] = 'uwchben y dyfynniad';
 $labels['insertsignature'] = 'Mewnosod llofnod';
 $labels['previewpanemarkread']  = 'Nodi negeseuon rhagolwg fel darllenwyd';
 $labels['afternseconds']  = 'ar ôl $n eiliad';
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index cb4e3b55c..da92c2fcc 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Aktuel side';
 $labels['unread'] = 'Ulæste';
 $labels['flagged'] = 'Markeret';
 $labels['unanswered'] = 'Ubesvaret';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Slettede';
 $labels['undeleted'] = 'Ikke slettet';
 $labels['invert'] = 'Invertér';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Fjern original signatur fra besked, når der
 $labels['autoaddsignature'] = 'Indsæt automatisk signatur';
 $labels['newmessageonly'] = 'kun på nye beskeder';
 $labels['replyandforwardonly'] = 'kun på svar og videresendelse af beskeder';
-$labels['replysignaturepos'] = 'Når beskeder besvares eller videresendes; indsæt signatur';
-$labels['belowquote'] = 'under det citerede';
-$labels['abovequote'] = 'over det citerede';
 $labels['insertsignature'] = 'Indsæt signatur';
 $labels['previewpanemarkread']  = 'Markér forhåndsviste beskeder som læst';
 $labels['afternseconds']  = 'efter $n sekunder';
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 98bbd8837..82cee4fe2 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Aktuelle Seite';
 $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
 $labels['unanswered'] = 'Unbeantwortete';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Gelöschte';
 $labels['undeleted'] = 'Nicht gelöscht';
 $labels['invert'] = 'Umkehren';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Beim Antworten die Signatur der Originalnachr
 $labels['autoaddsignature'] = 'Signatur automatisch einfügen';
 $labels['newmessageonly'] = 'nur bei neuen Nachrichten';
 $labels['replyandforwardonly'] = 'nur bei Antworten und Weiterleitungen';
-$labels['replysignaturepos'] = 'Beim Antworten oder Weiterleiten die Signatur';
-$labels['belowquote'] = 'unter der Originalnachricht einfügen';
-$labels['abovequote'] = 'über der Originalnachricht einfügen';
 $labels['insertsignature'] = 'Signatur einfügen';
 $labels['previewpanemarkread']  = 'Nachricht in Vorschau als gelesen markieren';
 $labels['afternseconds']  = 'nach $n Sekunden';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 956e32aa4..211607288 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Aktuelle Seite';
 $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
 $labels['unanswered'] = 'Unbeantwortete';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Gelöschte';
 $labels['undeleted'] = 'Nicht gelöscht';
 $labels['invert'] = 'Invertieren';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Beim Antworten Signatur der Originalnachricht
 $labels['autoaddsignature'] = 'Signatur automatisch einfügen';
 $labels['newmessageonly'] = 'nur bei neuen Nachrichten';
 $labels['replyandforwardonly'] = 'nur bei Antworten und Weiterleitungen';
-$labels['replysignaturepos'] = 'Beim Antworten die Signatur';
-$labels['belowquote'] = 'unter der Originalnachricht einfügen';
-$labels['abovequote'] = 'über der Originalnachricht einfügen';
 $labels['insertsignature'] = 'Signatur einfügen';
 $labels['previewpanemarkread']  = 'Nachricht in Vorschau als gelesen markieren';
 $labels['afternseconds']  = 'nach $n Sekunden';
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index b3166730f..4e1db7002 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Τρέχουσα σελίδα';
 $labels['unread'] = 'Μη αναγνωσμένο';
 $labels['flagged'] = 'Σημειωμένο';
 $labels['unanswered'] = 'Αναπάντητο';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Διεγραμμένο';
 $labels['undeleted'] = 'Μη διεγραμμένο';
 $labels['invert'] = 'Αναστροφή';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Όταν το μήνυμα είναι απά�
 $labels['autoaddsignature'] = 'Η υπογραφή να προστίθεται αυτόματα';
 $labels['newmessageonly'] = 'μόνο στα νέα μηνύματα';
 $labels['replyandforwardonly'] = 'μόνο στις απαντήσεις και προωθήσεις';
-$labels['replysignaturepos'] = 'Όταν γίνεται απάντηση ή προώθηση, η υπογραφή να τοποθετείτε';
-$labels['belowquote'] = 'πάνω από την παράθεση';
-$labels['abovequote'] = 'κάτω από την παράθεση';
 $labels['insertsignature'] = 'Προσθήκη υπογραφής';
 $labels['previewpanemarkread']  = 'Στα μηνύματα που έγινε προεπισκόπηση να μαρκάρονται σαν αναγνωσμένα';
 $labels['afternseconds']  = 'μετά από $n δευτερόλεπτα';
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 49b6be519..8d5509b64 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index 823fc25cb..bb678479e 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Nuna paĝo';
 $labels['unread'] = 'Nelegitan';
 $labels['flagged'] = 'Markita';
 $labels['unanswered'] = 'Nerespondita';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Forigita';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inversigu';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index 3e6793e51..b4b318053 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -41,7 +41,7 @@ $labels['junk']   = 'Basura';
 // message listing
 $labels['subject'] = 'Asunto';
 $labels['from']    = 'Remitente';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Remitente';
 $labels['to']      = 'Destinatario';
 $labels['cc']      = 'Copia';
 $labels['bcc']     = 'Cco';
@@ -52,21 +52,21 @@ $labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
+$labels['listoptions'] = 'Listar opciones...';
 
 $labels['mailboxlist'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
+$labels['threadsfromto'] = '$from a $to de $count conversaciones';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
-$labels['fromtoshort'] = '$from – $to of $count';
+$labels['fromtoshort'] = '$from – $to de $count';
 
 $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
 $labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
+$labels['showattachment'] = 'Mostrar';
+$labels['showanyway'] = 'Mostrar esto siempre';
 
 $labels['filename'] = 'Nombre del archivo';
 $labels['filesize'] = 'Tamaño del archivo';
@@ -122,18 +122,18 @@ $labels['longdec']	= 'Diciembre';
 $labels['today'] = 'Hoy';
 
 // toolbar buttons
-$labels['refresh']          = 'Refresh';
+$labels['refresh']          = 'Actualizar';
 $labels['checkmail']        = 'Revisar si hay nuevos mensajes';
 $labels['compose']          = 'Escribir un mensaje';
 $labels['writenewmessage']  = 'Crear nuevo mensaje';
-$labels['reply']            = 'Reply';
+$labels['reply']            = 'Responder';
 $labels['replytomessage']   = 'Responder mensaje';
 $labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
+$labels['replyall']         = 'Responder a todos';
+$labels['replylist']        = 'Responder a lista';
+$labels['forward']          = 'Reenviar';
+$labels['forwardinline']    = 'Reenviar en linea';
+$labels['forwardattachment'] = 'Reenviar como adjunto';
 $labels['forwardmessage']   = 'Reenviar mensaje';
 $labels['deletemessage']    = 'Eliminar mensaje';
 $labels['movemessagetotrash'] = 'Mover mensaje a la papelera';
@@ -144,16 +144,16 @@ $labels['nextmessage']      = 'Mostrar siguente mensaje';
 $labels['lastmessage']      = 'Mostrar último mensaje';
 $labels['backtolist']       = 'Volver a la lista de mensajes';
 $labels['viewsource']       = 'Mostrar código';
-$labels['mark']             = 'Mark';
+$labels['mark']             = 'Marcar';
 $labels['markmessages']     = 'Marcar mensajes';
 $labels['markread']         = 'Como leído';
 $labels['markunread']       = 'Como no leído';
 $labels['markflagged']      = 'Como marcado';
 $labels['markunflagged']    = 'Como no marcado';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
+$labels['moreactions']      = 'Mas acciones...';
+$labels['more']             = 'Más';
+$labels['back']             = 'Atrás';
+$labels['options']          = 'Opciones';
 
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
@@ -162,34 +162,35 @@ $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Marcado';
 $labels['unanswered'] = 'Sin respuesta';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Eliminado';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = 'No eliminado';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtrar';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
+$labels['list'] = 'Lista';
+$labels['threads'] = 'Conversaciones';
 $labels['expand-all'] = 'Expandir Todos';
 $labels['expand-unread'] = 'Expandir No Leidos';
 $labels['collapse-all'] = 'Colapsar Todos';
-$labels['threaded'] = 'Threaded';
+$labels['threaded'] = 'Como conversaciones';
 
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
+$labels['autoexpand_threads'] = 'Expandir mensajes en conversación';
+$labels['do_expand'] = 'todas las conversaciones';
 $labels['expand_only_unread'] = 'solo con mensajes no leídos';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
+$labels['fromto'] = 'De/A';
+$labels['flag'] = 'Marca';
 $labels['attachment'] = 'Adjunto';
 $labels['nonesort'] = 'Ninguno';
 $labels['sentdate'] = 'Fecha de Enviado';
 $labels['arrival'] = 'Fecha de Recepción';
 $labels['asc'] = 'Ascendente';
 $labels['desc'] = 'Descendente';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
+$labels['listcolumns'] = 'Listar columnas';
+$labels['listsorting'] = 'Ordenar por';
+$labels['listorder'] = 'Ordenado por';
 $labels['listmode'] = 'List view mode';
 
-$labels['folderactions'] = 'Folder actions...';
+$labels['folderactions'] = 'Acciones de carpeta...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
 
@@ -210,29 +211,29 @@ $labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Editar como nuevo';
-$labels['send']           = 'Send';
+$labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar ahora el mensaje';
 $labels['savemessage']    = 'Guardar como borrador';
 $labels['addattachment']  = 'Añadir un archivo';
 $labels['charset']        = 'Codificación';
 $labels['editortype']     = 'Tipo de editor';
 $labels['returnreceipt']  = 'Acuse de recibo';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
+$labels['dsn']            = 'Notificación de estado del envío';
+$labels['mailreplyintro'] = 'El $date, $sender escribió:';
+$labels['originalmessage'] = 'Mensaje original';
 
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
+$labels['editidents']    = 'Editar identidades';
+$labels['spellcheck']    = 'Gramática';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Continuar edición';
 $labels['revertto']      = 'Revertir a';
 
-$labels['attach'] = 'Attach';
+$labels['attach'] = 'Adjuntar';
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Agregar';
-$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close']  = 'Cerrar';
-$labels['messageoptions']  = 'Message options...';
+$labels['messageoptions']  = 'Opciones de mensaje...';
 
 $labels['low']     = 'Bajo';
 $labels['lowest']  = 'Bajísimo';
@@ -243,9 +244,9 @@ $labels['highest'] = 'Altísimo';
 $labels['nosubject']  = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imágenes';
 $labels['alwaysshow'] = 'Siempre mostrar imágenes de $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['isdraft']    = 'Este es un borrador.';
+$labels['andnmore']   = '$nr más...';
+$labels['togglemoreheaders'] = 'Mostrarme más encabezados de mensaje';
 $labels['togglefullheaders'] = 'Toggle raw message headers';
 
 $labels['htmltoggle'] = 'HTML';
@@ -269,68 +270,68 @@ $labels['receiptnote'] = 'Nota: Esta notificación sólo significa que su mensaj
 $labels['name']         = 'Nombre completo';
 $labels['firstname']    = 'Nombre';
 $labels['surname']      = 'Apellido';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
+$labels['middlename']   = 'Segundo nombre';
+$labels['nameprefix']   = 'Prefijo';
+$labels['namesuffix']   = 'Subfijo';
+$labels['nickname']     = 'Sobre nombre';
+$labels['jobtitle']     = 'Puesto';
+$labels['department']   = 'Departamento';
+$labels['gender']       = 'Sexo';
+$labels['maidenname']   = 'Apellido de soltera';
 $labels['email']        = 'Correo';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
+$labels['phone']        = 'Teléfono';
+$labels['address']      = 'Dirección';
+$labels['street']       = 'Calle';
+$labels['locality']     = 'Ciudad';
+$labels['zipcode']      = 'Código Postal';
+$labels['region']       = 'Estado/Provincia';
+$labels['country']      = 'País';
+$labels['birthday']     = 'Cumpleaños';
+$labels['anniversary']  = 'Aniversario';
+$labels['website']      = 'Sitio Web';
+$labels['instantmessenger'] = 'Mensajería Instantanea';
+$labels['notes'] = 'Notas';
+$labels['male']   = 'masculino';
+$labels['female'] = 'femenino';
+$labels['manager'] = 'Administrador';
+$labels['assistant'] = 'Asistente';
+$labels['spouse'] = 'Cónygue';
+$labels['allfields'] = 'Todos los campos';
+$labels['search'] = 'Buscar';
+$labels['advsearch'] = 'Búsqueda Avanzada';
+$labels['advanced'] = 'Avanzado';
+$labels['other'] = 'Otro';
+
+$labels['typehome']   = 'Particular';
+$labels['typework']   = 'Laboral';
+$labels['typeother']  = 'Otro';
+$labels['typemobile']  = 'Móvil';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax Particular';
+$labels['typeworkfax']  = 'Fax Laboral';
+$labels['typecar']  = 'Auto';
 $labels['typepager']  = 'Pager';
 $labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
+$labels['typeassistant']  = 'Asistente';
+$labels['typehomepage']  = 'Página Personal';
 $labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
+$labels['typeprofile'] = 'Perfil';
 
-$labels['addfield'] = 'Add field...';
+$labels['addfield'] = 'Agregar campo...';
 $labels['addcontact'] = 'Añadir nuevo contacto';
 $labels['editcontact'] = 'Editar contacto';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
+$labels['contacts'] = 'Contactos';
+$labels['contactproperties'] = 'Propiedades del contacto';
+$labels['personalinfo'] = 'Información personal';
 
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
+$labels['rename'] = 'Renombrar';
+$labels['addphoto'] = 'Agregar';
+$labels['replacephoto'] = 'Reemplazar';
+$labels['uploadphoto'] = 'Subir foto';
 
 $labels['newcontact']     = 'Añadir nuevo contacto';
 $labels['deletecontact']  = 'Eliminar contactos seleccionados';
@@ -342,9 +343,9 @@ $labels['exportall']      = 'Export all';
 $labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Exportar contactos en format vCard';
 $labels['newcontactgroup'] = 'Crear Nuevo Grupo de Contacto';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
+$labels['grouprename']    = 'Renombrar grupo';
+$labels['groupdelete']    = 'Eliminar grupo';
+$labels['groupremoveselected'] = 'Remover del grupo los contactos seleccionados';
 
 $labels['previouspage']   = 'Mostrar grupo anterior';
 $labels['firstpage']      = 'Mostrar primer grupo';
@@ -355,20 +356,20 @@ $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Direcciones personales';
 
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
+$labels['searchsave'] = 'Guardar búsqueda';
+$labels['searchdelete'] = 'Eliminar búsqueda';
 
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde el archivo:';
-$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importtarget'] = 'Agregar nuevos contactos a la libreta de direcciones:';
 $labels['importreplace'] = 'Reemplazar completamente la lista de contactos';
-$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'] = 'Puedes subir contactos desde una libreta de direcciones existente.<br/>Actualmente soportamos la importación de direcciones utilizando el formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> o CSV (Valores Separados por Coma).';
 $labels['done'] = 'Hecho';
 
 // settings
 $labels['settingsfor'] = 'Configuración para';
-$labels['about'] = 'About';
+$labels['about'] = 'Acerca de';
 $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
@@ -385,8 +386,8 @@ $labels['defaultcharset'] = 'Juego de Caracteres por Defecto';
 $labels['htmlmessage'] = 'Mensaje HTML';
 $labels['messagepart'] = 'Part';
 $labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
+$labels['dateformat'] = 'Formato de fecha';
+$labels['timeformat'] = 'Formato de tiempo';
 $labels['prettydate'] = 'Fecha detallada';
 $labels['setdefault']  = 'Seleccionar opción por defecto';
 $labels['autodetect']  = 'Automático';
@@ -395,11 +396,11 @@ $labels['timezone']  = 'Zona horaria';
 $labels['pagesize']  = 'Filas por página';
 $labels['signature'] = 'Firma';
 $labels['dstactive']  = 'Cambio de horario';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
+$labels['showinextwin'] = 'Abrir mensaje en nueva ventana';
+$labels['composeextwin'] = 'Redactar en nueva ventana';
 $labels['htmleditor'] = 'Componer mensaje en HTML';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreply'] = 'al responder un mensaje HTML';
+$labels['htmlonreplyandforward'] = 'al reenviar o responder un mensaje HTML';
 $labels['htmlsignature'] = 'Firma HTML';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Al responder, eliminar la firma del mensaje o
 $labels['autoaddsignature'] = 'Agregar la firma automáticamente';
 $labels['newmessageonly'] = 'nuevos mensajes solamente';
 $labels['replyandforwardonly'] = 'respuestas o reenvios solamente';
-$labels['replysignaturepos'] = 'Agregar firma al responder o reenviar';
-$labels['belowquote'] = 'debajo de la cita';
-$labels['abovequote'] = 'sobre la cita';
 $labels['insertsignature'] = 'Insertar firma';
 $labels['previewpanemarkread']  = 'Marcar mensajes previsualizados como leidos';
 $labels['afternseconds']  = 'despues de $n segundos';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index cbee58b6e..451b762b6 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -64,7 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a…';
 $labels['download'] = 'Descargar';
-$labels['open']     = 'Open';
+$labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrarlo de todos modos';
 
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Señalado';
 $labels['unanswered'] = 'Sin respuesta';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Eliminado';
 $labels['undeleted'] = 'No eliminado';
 $labels['invert'] = 'Invertir';
@@ -205,8 +206,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';
+$labels['changeformattext'] = 'Mostrar en formato de texto sencillo';
+$labels['changeformathtml'] = 'Mostrar en formato HTML';
 
 // message compose
 $labels['editasnew']      = 'Editar como nuevo';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Eliminar la firma original del mensaje al res
 $labels['autoaddsignature'] = 'Añadir firma automáticamente';
 $labels['newmessageonly'] = 'solamente mensaje nuevo';
 $labels['replyandforwardonly'] = 'respuestas y reenvíos solamente';
-$labels['replysignaturepos'] = 'Colocar firma al responder o reenviar';
-$labels['belowquote'] = 'abajo del texto seleccionado';
-$labels['abovequote'] = 'arriba del texto seleccionado';
 $labels['insertsignature'] = 'Insertar firma';
 $labels['previewpanemarkread']  = 'Marcar mensaje previsualizado como leído';
 $labels['afternseconds']  = 'después de $n segundos';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index cb184b086..ad47c15f1 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Praegune leht';
 $labels['unread'] = 'Lugemata';
 $labels['flagged'] = 'Märgistatud';
 $labels['unanswered'] = 'Vastamata';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Kustutatud';
 $labels['undeleted'] = 'Pole kustutatud';
 $labels['invert'] = 'Vaheta';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Vastates eemalda kirjast esialgne allkiri';
 $labels['autoaddsignature'] = 'Lisa allkiri automaatselt';
 $labels['newmessageonly'] = 'ainult uutele';
 $labels['replyandforwardonly'] = 'ainult vastates ja edastades';
-$labels['replysignaturepos'] = 'Vastates või edastades aseta allkiri';
-$labels['belowquote'] = 'tsiteeritu alla';
-$labels['abovequote'] = 'tsiteeritu kohale';
 $labels['insertsignature'] = 'Sisesta allkiri';
 $labels['previewpanemarkread']  = 'Märgi eelvaadatud kirjad loetuks';
 $labels['afternseconds']  = '$n sekundi pärast';
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index eb61f4c8c..f6b3cfba6 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Uneko orrialdea';
 $labels['unread'] = 'Irakurri gabeak';
 $labels['flagged'] = 'Banderaduna';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Ezabatuak';
 $labels['undeleted'] = 'Ezabatu gabeak';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index 6a4904d7e..c8eab1d2c 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'ناخوانده';
 $labels['flagged'] = 'نشانی شده';
 $labels['unanswered'] = 'پیامهای جواب نداده شده';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/fa_IR/labels.inc b/program/localization/fa_IR/labels.inc
index 8bba66c26..a1c45fb36 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -22,7 +22,7 @@ $labels = array();
 $labels['welcome']   = 'به $product خوش آمدید';
 $labels['username']  = 'نام کاربری';
 $labels['password']  = 'گذرواژه';
-$labels['server']    = 'سرور';
+$labels['server']    = 'سرویس‌دهنده';
 $labels['login']     = 'ورود';
 
 // taskbar
@@ -34,8 +34,8 @@ $labels['addressbook'] = 'دفتر نشانی';
 // mailbox names
 $labels['inbox']  = 'صندوق ورودی';
 $labels['drafts'] = 'پیش‌نویس‌ها';
-$labels['sent']   = 'ارسال شده';
-$labels['trash']  = 'زباله‌دان';
+$labels['sent']   = 'فرستاده شده';
+$labels['trash']  = 'سطل آشغال';
 $labels['junk']   = 'بنجل';
 
 // message listing
@@ -162,6 +162,7 @@ $labels['currpage'] = 'صفحه جاری';
 $labels['unread'] = 'خوانده‌نشده';
 $labels['flagged'] = 'پرچم‌دار';
 $labels['unanswered'] = 'پاسخ داده نشده';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'حذف شده';
 $labels['undeleted'] = 'حذف نشده';
 $labels['invert'] = 'وارونه';
@@ -205,8 +206,8 @@ $labels['body']  = 'بدنه';
 
 $labels['openinextwin'] = 'باز کردن در پنجره‌ی جدید';
 $labels['emlsave'] = 'بارگیری (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
+$labels['changeformattext'] = 'نمایش در قالب متنی';
+$labels['changeformathtml'] = 'نمایش در قالب اچ‌تی‌ام‌ال';
 
 // message compose
 $labels['editasnew']      = 'ویرایش به عنوان جدید';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'هنگام پاسخ امضاء اصلی را
 $labels['autoaddsignature'] = 'اضافه کردن خودکار امضاء';
 $labels['newmessageonly'] = 'فقط پیغام جدید';
 $labels['replyandforwardonly'] = 'فقط پاسخ‌ها و ارجاع‌ها';
-$labels['replysignaturepos'] = 'هنگام پاسخ یا ارجاع امضاء را قرار داده شود';
-$labels['belowquote'] = 'زیر نقل‌قول';
-$labels['abovequote'] = 'بالای نقل‌قول';
 $labels['insertsignature'] = 'درج امضاء';
 $labels['previewpanemarkread']  = 'نشانه‌گذاری پیغام‌های پیش مرور شده به عنوان خوانده شده';
 $labels['afternseconds']  = 'بعد از $s ثانیه';
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index 62c2d6b07..ccf14da93 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopioi';
 $labels['move']     = 'Siirrä';
 $labels['moveto']   = 'siirrä kansioon...';
 $labels['download'] = 'lataa';
+$labels['open']     = 'Avaa';
 $labels['showattachment'] = 'Näytä';
 $labels['showanyway'] = 'Näytä silti';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Nykyinen sivu';
 $labels['unread'] = 'Lukemattomat';
 $labels['flagged'] = 'Korostettu';
 $labels['unanswered'] = 'Vastaamaton';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Poistettu';
 $labels['undeleted'] = 'Ei poistettu';
 $labels['invert'] = 'Käännä';
@@ -204,6 +206,8 @@ $labels['body']  = 'Runko';
 
 $labels['openinextwin'] = 'Avaa uudessa ikkunassa';
 $labels['emlsave'] = 'Tallenna (.eml)';
+$labels['changeformattext'] = 'Näytä raakatekstimuodossa';
+$labels['changeformathtml'] = 'Näytä HTML-muodossa';
 
 // message compose
 $labels['editasnew']      = 'Muokkaa uutena';
@@ -360,7 +364,7 @@ $labels['importcontacts'] = 'Tuo yhteystiedot';
 $labels['importfromfile'] = 'Tuo tiedostosta:';
 $labels['importtarget'] = 'Lisää uudet yhteystiedot osoitekirjaan:';
 $labels['importreplace'] = 'Korvaa koko osoitekirja';
-$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'] = 'Voit tuoda yhteystietoja olemassa olevasta osoitekirjasta.<br/>Tuettuja muotoja ovat <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ja CSV (pilkuin erotetut arvot).';
 $labels['done'] = 'Valmis';
 
 // settings
@@ -451,9 +455,6 @@ $labels['replyremovesignature'] = 'Vastattaessa poista alkuperäinen allekirjoit
 $labels['autoaddsignature'] = 'Lisää allekirjoitus automaattisesti';
 $labels['newmessageonly'] = 'vain uuteen viestiin';
 $labels['replyandforwardonly'] = 'vain vastauksiin ja välityksiin';
-$labels['replysignaturepos'] = 'Vastattaessa tai välitettäessä laita allekirjoitus';
-$labels['belowquote'] = 'lainauksen alle';
-$labels['abovequote'] = 'lainauksen ylle';
 $labels['insertsignature'] = 'Lisää allekirjoitus';
 $labels['previewpanemarkread']  = 'Merkitse esikatsellut viestit luetuiksi';
 $labels['afternseconds']  = '$n sekunnin jälkeen';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 4a78e565f..bc1078e8d 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Page courante';
 $labels['unread'] = 'Non lus';
 $labels['flagged'] = 'Marqué';
 $labels['unanswered'] = 'Non répondu';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Supprimé';
 $labels['undeleted'] = 'Non supprimé';
 $labels['invert'] = 'Inverser';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'En répondant, supprimer la signature d\'orig
 $labels['autoaddsignature'] = 'Ajouter la signature automatiquement';
 $labels['newmessageonly'] = 'nouveau message uniquement';
 $labels['replyandforwardonly'] = 'réponses et transferts uniquement';
-$labels['replysignaturepos'] = 'En répondant ou en transférant, placer la signature';
-$labels['belowquote'] = 'en-dessous de la citation';
-$labels['abovequote'] = 'au-dessus de la citation';
 $labels['insertsignature'] = 'Insérer la signature';
 $labels['previewpanemarkread']  = 'Marquer les messages prévisualisés comme lus';
 $labels['afternseconds']  = 'après $n secondes';
diff --git a/program/localization/fy_NL/labels.inc b/program/localization/fy_NL/labels.inc
index d04d7e89c..1db0fe384 100644
--- a/program/localization/fy_NL/labels.inc
+++ b/program/localization/fy_NL/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 7169a8800..39541bff8 100755
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Na rudaí nach bhuil corraithe';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 13fdfa793..49c5f5b68 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Páxina actual';
 $labels['unread'] = 'Non lidas';
 $labels['flagged'] = 'Marcadas';
 $labels['unanswered'] = 'Non respostadas';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Marcadas como eliminadas';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inverter';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Eliminar a firma do remitente ao respostar';
 $labels['autoaddsignature'] = 'Engadir firma automáticamente';
 $labels['newmessageonly'] = 'só nas mensaxes novas';
 $labels['replyandforwardonly'] = 'só nas respostas e reenvíos';
-$labels['replysignaturepos'] = 'Ao respostar ou reenviar colocar a firma';
-$labels['belowquote'] = 'embaixo do texto citado';
-$labels['abovequote'] = 'enriba do texto citado';
 $labels['insertsignature'] = 'Engadir firma';
 $labels['previewpanemarkread']  = 'Marcar como lidas as mensaxes previsualizadas';
 $labels['afternseconds']  = 'logo de $n segundos';
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 698b73493..5176a5f5a 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'דף נוכחי';
 $labels['unread'] = 'לא נקראו';
 $labels['flagged'] = 'מסומן';
 $labels['unanswered'] = 'לא נענה';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'נמחק';
 $labels['undeleted'] = 'לא נמחק';
 $labels['invert'] = 'היפוך הסימון';
@@ -456,9 +457,6 @@ $labels['replyremovesignature'] = 'החתימה תוסר מההודעה המקו
 $labels['autoaddsignature'] = 'הוספה אוטומטית של חתימה';
 $labels['newmessageonly'] = 'הודעה חדשה בלבד';
 $labels['replyandforwardonly'] = 'מענה והעברת הודעה בלבד';
-$labels['replysignaturepos'] = 'במענה או בהעברת הודעה, החתימה תופיע';
-$labels['belowquote'] = 'בסוף ההודעה המקורית';
-$labels['abovequote'] = 'בתחילת ההודעה המקורית';
 $labels['insertsignature'] = 'שיבוץ חתימה';
 $labels['previewpanemarkread']  = 'סימון הודעה שנצפתה כנקראה';
 $labels['afternseconds']  = 'לאחר $n שניות';
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index 4564e1226..f446a3e65 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'अनदेखी';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index bf5364653..fe85feccc 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Trenutna stranica';
 $labels['unread'] = 'Nepročitane';
 $labels['flagged'] = 'Označene';
 $labels['unanswered'] = 'Neodgovrene';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Obrisano';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Obrni';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Kod odgovaranja, makni originalni potpis iz p
 $labels['autoaddsignature'] = 'Automatski dodaj potpis';
 $labels['newmessageonly'] = 'samo nova poruka';
 $labels['replyandforwardonly'] = 'samo odgovori i proslijeđivanja';
-$labels['replysignaturepos'] = 'Kod downloada ili proslijeđivanja postavi potpis';
-$labels['belowquote'] = 'ispod citata';
-$labels['abovequote'] = 'iznad citata';
 $labels['insertsignature'] = 'Umetni potpis';
 $labels['previewpanemarkread']  = 'Obilježi pregledane poruke kao pročitane';
 $labels['afternseconds']  = 'nakon $n sekundi';
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index 96c43d146..03846cdff 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Aktuális oldal';
 $labels['unread'] = 'Olvasatlan';
 $labels['flagged'] = 'Megjelölt';
 $labels['unanswered'] = 'Megválaszolatlan';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Törölt';
 $labels['undeleted'] = 'Nem lett törölve';
 $labels['invert'] = 'Invertálás';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Válasznál az eredeti aláírás eltávolít
 $labels['autoaddsignature'] = 'Aláírás automatikus hozzáadása';
 $labels['newmessageonly'] = 'csak új üzenetnél';
 $labels['replyandforwardonly'] = 'válasznál és továbbításnál';
-$labels['replysignaturepos'] = 'Válasznál és továbbításnál kerüljön az aláírás';
-$labels['belowquote'] = 'az idézett szöveg alá';
-$labels['abovequote'] = 'az idézett szöveg fölé';
 $labels['insertsignature'] = 'Aláírás beillesztése';
 $labels['previewpanemarkread']  = 'Előnézetben megjelent üzenetek megjelölése olvasottként';
 $labels['afternseconds']  = '$n másodperc elteltével';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 3612dc974..a27a19a9d 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Առկա էջ';
 $labels['unread'] = 'Չկարդացածը';
 $labels['flagged'] = 'Նշված';
 $labels['unanswered'] = 'Անպատասխան';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Ջնջված';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Փոխատեղել';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Պատասխանելիս հեռացնել հ�
 $labels['autoaddsignature'] = 'Ավելացնել ստորագրություն';
 $labels['newmessageonly'] = 'միայն նոր հաղորդագրություններում';
 $labels['replyandforwardonly'] = 'պատասխաններում և փոխանցումներում';
-$labels['replysignaturepos'] = 'Ավելացնել ստորագրությունը պատասխանելիս կամ փոխանցելիս';
-$labels['belowquote'] = 'Մեջբերման ներքևում';
-$labels['abovequote'] = 'Մեջբերման վերևում';
 $labels['insertsignature'] = 'Ներդնել ստորագրությունը';
 $labels['previewpanemarkread']  = 'Նշել նախադիտված հաղորդագրությունները որպես ընթերցված';
 $labels['afternseconds']  = '$n վարկյան հետո';
diff --git a/program/localization/ia/labels.inc b/program/localization/ia/labels.inc
index 89273c147..55e7fc2ad 100644
--- a/program/localization/ia/labels.inc
+++ b/program/localization/ia/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Non legite';
 $labels['flagged'] = 'Marcate';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Delete';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inverter';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automaticamente inserta signatura';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insertar signatura';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 4877434ed..c75c27196 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Halaman sekarang';
 $labels['unread'] = 'Belum terbaca';
 $labels['flagged'] = 'Ditandai';
 $labels['unanswered'] = 'Belum terjawab';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Terhapus';
 $labels['undeleted'] = 'Tidak terhapus';
 $labels['invert'] = 'Sebaliknya';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'ketika membalas pesan hapus tanda tangan dari
 $labels['autoaddsignature'] = 'Otomatis tambahkan tanda tangan';
 $labels['newmessageonly'] = 'Hanya untuk pesan baru';
 $labels['replyandforwardonly'] = 'Hanya untuk dijawab dan diteruskan';
-$labels['replysignaturepos'] = 'ketika membalas atau meneruskan pesan tambahkan tanda tangan';
-$labels['belowquote'] = 'Dibawah kutipan';
-$labels['abovequote'] = 'Diatas kutipan';
 $labels['insertsignature'] = 'Isi tanda tangan';
 $labels['previewpanemarkread']  = 'Tandai pesan yang sudah dilihat';
 $labels['afternseconds']  = 'setelah $n detik';
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index c8d49bf23..b9d3fbc90 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Núverandi síða';
 $labels['unread'] = 'Ólesið';
 $labels['flagged'] = 'Flaggað';
 $labels['unanswered'] = 'Ósvarað';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Eytt';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Umhverfa';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Þegar svarað fjarlægja upphaflega undirskr
 $labels['autoaddsignature'] = 'Bæta undirskrift við sjálfkrafa';
 $labels['newmessageonly'] = 'ný skeyti eingöngu';
 $labels['replyandforwardonly'] = 'svör og áframsendingar eingöngu';
-$labels['replysignaturepos'] = 'Þegar skeytum er svarað eða áframsend setja undirskrift';
-$labels['belowquote'] = 'undir tilvitnun';
-$labels['abovequote'] = 'fyrir ofan tilvitnun';
 $labels['insertsignature'] = 'Bæta undirskrift við';
 $labels['previewpanemarkread']  = 'Merka forskoðuð skeyti sem lesin';
 $labels['afternseconds']  = 'eftir $n sekúndur';
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index 97be929cf..29b708ec7 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Pagina corrente';
 $labels['unread'] = 'Non letti';
 $labels['flagged'] = 'Contrassegnato';
 $labels['unanswered'] = 'Senza risposta';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Cancellato';
 $labels['undeleted'] = 'Non eliminato';
 $labels['invert'] = 'Inverti';
@@ -205,8 +206,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';
+$labels['changeformattext'] = 'Visualizza nel formato testo semplice';
+$labels['changeformathtml'] = 'Visualizza nel formato HTML';
 
 // message compose
 $labels['editasnew']      = 'Modifica come nuovo';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Quando rispondi, rimuovi la firma dal messagg
 $labels['autoaddsignature'] = 'Aggiungi automaticamente la firma';
 $labels['newmessageonly'] = 'solo ai nuovi messaggi';
 $labels['replyandforwardonly'] = 'solo alle risposte e inoltri';
-$labels['replysignaturepos'] = 'In risposta o inoltro, posiziona la firma';
-$labels['belowquote'] = 'sotto la citazione';
-$labels['abovequote'] = 'sopra la citazione';
 $labels['insertsignature'] = 'Inserisci firma';
 $labels['previewpanemarkread']  = 'Segna i messagi in anteprima come letti';
 $labels['afternseconds']  = 'dopo $n secondi';
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index 685dba0b3..6f1597593 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = '現在のページ';
 $labels['unread'] = '未読';
 $labels['flagged'] = 'フラグ付き';
 $labels['unanswered'] = '未返信';
+$labels['withattachment'] = '添付ファイルあり';
 $labels['deleted'] = '削除済み';
 $labels['undeleted'] = '削除済みでない';
 $labels['invert'] = '反転';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = '返信時に元の署名をメッセージか
 $labels['autoaddsignature'] = '自動的に署名を付加';
 $labels['newmessageonly'] = '新しいメッセージだけ';
 $labels['replyandforwardonly'] = '返信と転送だけ';
-$labels['replysignaturepos'] = '返信や転送で署名を挿入する位置';
-$labels['belowquote'] = '引用の後';
-$labels['abovequote'] = '引用の前';
 $labels['insertsignature'] = '署名を挿入';
 $labels['previewpanemarkread']  = 'プレビューしたメッセージを既読に設定';
 $labels['afternseconds']  = '$n秒後';
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index b3a712515..eb95c8264 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'მიმდინარე გვერდი';
 $labels['unread'] = 'წაუკითხავი';
 $labels['flagged'] = 'მონიშნული';
 $labels['unanswered'] = 'უპასუხო';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'წაშლილი';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'შებრუნებული';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'წაიშალოს ხელმოწ�
 $labels['autoaddsignature'] = 'ავტომატურად დაემატოს ხელმოწერა';
 $labels['newmessageonly'] = 'მხოლოდ ახალი შეტყობინება';
 $labels['replyandforwardonly'] = 'მხოლოდ გადაგზავნის და პასუხის შემთხვევაში';
-$labels['replysignaturepos'] = 'მხოლოდ პასუხის ან გადაგზავნის შემთხვევაში გაყვეს ხელმოწერა';
-$labels['belowquote'] = 'ციტატის შემდეგ';
-$labels['abovequote'] = 'ციტატამდე';
 $labels['insertsignature'] = 'ხელმოცერის ჩასმა';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = '$n წამის შემდეგ';
diff --git a/program/localization/km_KH/labels.inc b/program/localization/km_KH/labels.inc
index a344e60c2..f9d57812b 100644
--- a/program/localization/km_KH/labels.inc
+++ b/program/localization/km_KH/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'ទំព័រនេះ';
 $labels['unread'] = 'មិនទាន់អាន';
 $labels['flagged'] = 'មានកំណត់សំគាល់ដោយផ្កាយ';
 $labels['unanswered'] = 'មិនទាន់ឆ្លើយតប';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'បានលុបរួច';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'បញ្ច្រស់';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'នៅ​ពេល​ឆ្លើយ​តប
 $labels['autoaddsignature'] = 'បញ្ចូលហត្តលេខាដោយស្វ័យប្រវត្តិ';
 $labels['newmessageonly'] = 'សំរាប់សំបុត្រថ្មីតែប៉ុណ្ណោះ';
 $labels['replyandforwardonly'] = 'សំរាប់ឆើ្លយតប​និងផ្ញើបន្តតែ​ប៉ុណ្ណោះ';
-$labels['replysignaturepos'] = 'បញ្ចូលហត្តលេខានៅពេលឆើ្លយតប​និងផ្ញើបន្ត';
-$labels['belowquote'] = 'ពីក្រោមសម្រង់អត្ថបទ';
-$labels['abovequote'] = 'ពីលើសម្រង់អត្ថបទ';
 $labels['insertsignature'] = 'បញ្ចូលហត្តលេខា';
 $labels['previewpanemarkread']  = 'កំណត់សំបុត្រ​ដែល​បាន​បង្ហាញ​​ជា​សំបុត្របាន​អាន​រួច';
 $labels['afternseconds']  = 'ក្រោយពី $n វិនាទី';
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index 667fb422a..c1e54590a 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = '현재 페이지';
 $labels['unread'] = '읽지 않음';
 $labels['flagged'] = '깃발로 표시됨';
 $labels['unanswered'] = '답장하지 않음';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '삭제됨';
 $labels['undeleted'] = '삭제되지 않음';
 $labels['invert'] = '반전';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = '회신 시 메시지에서 원문 서명을 �
 $labels['autoaddsignature'] = '서명 자동으로 추가';
 $labels['newmessageonly'] = '새로운 메시지에만';
 $labels['replyandforwardonly'] = '회신 및 전달 시에만';
-$labels['replysignaturepos'] = '회신 또는 전달 시 서명 추가';
-$labels['belowquote'] = '인용문 하단';
-$labels['abovequote'] = '인용문 상단';
 $labels['insertsignature'] = '서명 삽입';
 $labels['previewpanemarkread']  = '미리 본 메시지를 읽음으로 표시';
 $labels['afternseconds']  = '$n초 후';
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index 5c6786502..d4544de91 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Nexwendî';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 376f9c771..0d6776550 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'matomus šiame puslapyje';
 $labels['unread'] = 'neskaitytus';
 $labels['flagged'] = 'su gairele';
 $labels['unanswered'] = 'neatsakytus';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'pašalintus';
 $labels['undeleted'] = 'Neištrintas';
 $labels['invert'] = 'invertuoti';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Pašalinti cituojamame laiške esantį paraš
 $labels['autoaddsignature'] = 'Automatiškai pridėti parašą';
 $labels['newmessageonly'] = 'tik naujuose laiškuose';
 $labels['replyandforwardonly'] = 'tik atsakymuose ir persiunčiamuose laiškuose';
-$labels['replysignaturepos'] = 'Atsakant ir persiunčiant laiškus, parašą pridėti';
-$labels['belowquote'] = 'po citata';
-$labels['abovequote'] = 'virš citatos';
 $labels['insertsignature'] = 'Pridėti parašą';
 $labels['previewpanemarkread']  = 'Peržiūros polangyje parodytus laiškus žymėti skaitytais';
 $labels['afternseconds']  = 'praėjus $n sek.';
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index a71d5e554..70369b4dd 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Pašreizējā lapa';
 $labels['unread'] = 'nelasītās';
 $labels['flagged'] = 'iezīmētās';
 $labels['unanswered'] = 'neatbildētās';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'dzēstās';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'invertēt';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Atbildot izņemt oriģinālo parakstu no vēs
 $labels['autoaddsignature'] = 'Automātiski pievienot parakstu';
 $labels['newmessageonly'] = 'tikai jaunas vēstules';
 $labels['replyandforwardonly'] = 'tikai atbildes un pārsūtījumi';
-$labels['replysignaturepos'] = 'Atbildot vai pārsūtot ievietot parakstu';
-$labels['belowquote'] = 'zem citāta';
-$labels['abovequote'] = 'virs citāta';
 $labels['insertsignature'] = 'Ievietot parakstu';
 $labels['previewpanemarkread']  = 'Atzīmēt priekšskatītās vēstules kā lasītas';
 $labels['afternseconds']  = 'pēc $n sekundēm';
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index c8190276e..dc11b98cc 100755
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Непрочитани';
 $labels['flagged'] = 'Обележано';
 $labels['unanswered'] = 'Неодговорено';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Избришано';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Обратно';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'При одговарање отстрани
 $labels['autoaddsignature'] = 'Автоматски додавај потпис';
 $labels['newmessageonly'] = 'само нови писма';
 $labels['replyandforwardonly'] = 'само одгорови и препраќања';
-$labels['replysignaturepos'] = 'При одговарање или препраќање стави потпис';
-$labels['belowquote'] = 'под цитираното';
-$labels['abovequote'] = 'над цитираното';
 $labels['insertsignature'] = 'Вметни потпис';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ml_IN/labels.inc b/program/localization/ml_IN/labels.inc
index 463256c0e..145d90b83 100644
--- a/program/localization/ml_IN/labels.inc
+++ b/program/localization/ml_IN/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'നിലവിലുളള പേജ്';
 $labels['unread'] = 'വായിക്കാത്തത്';
 $labels['flagged'] = 'അടയാളപ്പെടുത്തിയവ';
 $labels['unanswered'] = 'മറുപടി കൊടുക്കാത്ത';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'മായ്ച്ചവ';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'തലതിരിക്കുക';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'പുതിയ സന്ദേശം മാത്രം';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'ഉദ്ധാരണത്തിനു താഴെ';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = '$n നിമിഷങ്ങള്‍ കഴിഞ്ഞു്';
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index 804fb5651..e0143b293 100755
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'सध्‍याचे पान';
 $labels['unread'] = 'न वाचलेले';
 $labels['flagged'] = 'खूण लावलेले';
 $labels['unanswered'] = 'उत्तर न दिलेले';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'काढून टाकलेला(ले)';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'उलट करा';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'उत्‍तर देताना मु�
 $labels['autoaddsignature'] = 'आपोआप सही करा';
 $labels['newmessageonly'] = 'फक्‍त नवीन संदेश';
 $labels['replyandforwardonly'] = 'फक्‍त उत्‍तरे आ‍णी पुढे पाठवलेले संदेश';
-$labels['replysignaturepos'] = 'उत्‍तर देताना किंवा पुढे पाठवताना सही करा';
-$labels['belowquote'] = 'उतारया खाली';
-$labels['abovequote'] = 'उतारयाच्‍या वर';
 $labels['insertsignature'] = 'सही मध्‍ये टाका';
 $labels['previewpanemarkread']  = 'प्रदर्शित संदेश पाहीले अशी खुण करा';
 $labels['afternseconds']  = '$n क्षणानंतर';
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index 43884e986..dae5caada 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Muka terkini';
 $labels['unread'] = 'Belum dibaca';
 $labels['flagged'] = 'Ditanda';
 $labels['unanswered'] = 'Belum dijawab';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Telah dipadam';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Songsangkan';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index ecbe8545e..de71714c6 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -41,7 +41,7 @@ $labels['junk']   = 'Spam';
 // message listing
 $labels['subject'] = 'Emne';
 $labels['from']    = 'Avsender';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Avsender';
 $labels['to']      = 'Mottaker';
 $labels['cc']      = 'Kopi til';
 $labels['bcc']     = 'Blindkopi til';
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopier';
 $labels['move']     = 'Flytt';
 $labels['moveto']   = 'flytt til...';
 $labels['download'] = 'last ned';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis likevel';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Gjeldende side';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagget';
 $labels['unanswered'] = 'Ubesvarte';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Slettet';
 $labels['undeleted'] = 'Ikke slettet';
 $labels['invert'] = 'Inverter';
@@ -200,10 +202,12 @@ $labels['quicksearch']  = 'Hurtigsøk';
 $labels['resetsearch']  = 'Nullstill søk';
 $labels['searchmod']  = 'Søke felt';
 $labels['msgtext']  = 'Hele meldingen';
-$labels['body']  = 'Body';
+$labels['body']  = 'Meldingstekst';
 
 $labels['openinextwin'] = 'Åpne i nytt vindu';
 $labels['emlsave'] = 'Last ned (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Rediger som ny';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Skriv e-post til';
 $labels['contactsfromto'] = 'Kontakter $from til $to av $count';
 $labels['print']          = 'Skriv ut';
 $labels['export']         = 'Eksporter';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Eksporter alle';
+$labels['exportsel']      = 'Eksporter valgte';
 $labels['exportvcards']   = 'Eksporter kontakter i vCard-format';
 $labels['newcontactgroup'] = 'Opprett ny kontaktgruppe';
 $labels['grouprename']    = 'Endre navn på gruppe';
@@ -380,7 +384,7 @@ $labels['edititem'] = 'Rediger punkt';
 $labels['preferhtml'] = 'Foretrekk HTML';
 $labels['defaultcharset'] = 'Standard tegnsett';
 $labels['htmlmessage'] = 'HTML-melding';
-$labels['messagepart'] = 'Part';
+$labels['messagepart'] = 'Del';
 $labels['digitalsig'] = 'Digital signatur';
 $labels['dateformat'] = 'Datoformat';
 $labels['timeformat'] = 'Tidsformat';
@@ -451,9 +455,6 @@ $labels['replyremovesignature'] = 'Fjern orginalsignaturen i svar på melding';
 $labels['autoaddsignature'] = 'Legg til signatur';
 $labels['newmessageonly'] = 'kun på nye meldinger';
 $labels['replyandforwardonly'] = 'kun i svar og videresendinger';
-$labels['replysignaturepos'] = 'Plassering av signatur ved svar eller videresending';
-$labels['belowquote'] = 'over sitert melding';
-$labels['abovequote'] = 'under sitert melding';
 $labels['insertsignature'] = 'Sett inn signatur';
 $labels['previewpanemarkread']  = 'Merk forhåndsviste meldinger som lest';
 $labels['afternseconds']  = 'etter $n sekunder';
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index 26be68f35..10aa1e2b7 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'नपढिएका |';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index 82cf3a023..c9f07fa35 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Huidige pagina';
 $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Geselecteerd';
 $labels['unanswered'] = 'Onbeantwoord';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Verwijderd';
 $labels['undeleted'] = 'Niet verwijderd';
 $labels['invert'] = 'Selectie omkeren';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Verwijder handtekening uit het origneel bij b
 $labels['autoaddsignature'] = 'Handtekening automatisch toevoegen';
 $labels['newmessageonly'] = 'alleen bij nieuwe berichten';
 $labels['replyandforwardonly'] = 'alleen bij beantwoorden en doorsturen';
-$labels['replysignaturepos'] = 'Ondertekening plaatsen bij beantwoorden of doorsturen';
-$labels['belowquote'] = 'onder het citaat';
-$labels['abovequote'] = 'boven het citaat';
 $labels['insertsignature'] = 'Handtekening invoegen';
 $labels['previewpanemarkread']  = 'Markeer voorbeeldbericht als gelezen';
 $labels['afternseconds']  = 'Na $n seconden';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 2d34a5135..042879b4b 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Huidige pagina';
 $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Gemarkeerd';
 $labels['unanswered'] = 'Onbeantwoord';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Verwijderd';
 $labels['undeleted'] = 'Niet verwijderd';
 $labels['invert'] = 'Selectie omkeren';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Verwijder oorspronkelijke ondertekening van b
 $labels['autoaddsignature'] = 'Ondertekening automatisch toevoegen';
 $labels['newmessageonly'] = 'alleen bij nieuwe berichten';
 $labels['replyandforwardonly'] = 'alleen bij antwoorden en doorsturen';
-$labels['replysignaturepos'] = 'Ondertekening plaatsen bij antwoorden of doorsturen';
-$labels['belowquote'] = 'onder het citaat';
-$labels['abovequote'] = 'boven het citaat';
 $labels['insertsignature'] = 'Ondertekening invoegen';
 $labels['previewpanemarkread']  = 'Markeer voorbeeldberichten als gelezen';
 $labels['afternseconds']  = 'na $n seconden';
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index 725919d14..8fd281c97 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopier';
 $labels['move']     = 'Flytt';
 $labels['moveto']   = 'flytt til …';
 $labels['download'] = 'Last ned';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis likevel';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Gjeldande side';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagga';
 $labels['unanswered'] = 'Ikkje svara';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Sletta';
 $labels['undeleted'] = 'Ikkje sletta';
 $labels['invert'] = 'Inverter';
@@ -204,6 +206,8 @@ $labels['body']  = 'Meldingstekst';
 
 $labels['openinextwin'] = 'Opna i nytt vindauga';
 $labels['emlsave'] = 'Last ned (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Rediger som ny';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Ny melding til';
 $labels['contactsfromto'] = 'Kontaktar $from til $to av $count';
 $labels['print']          = 'Skriv ut';
 $labels['export']         = 'Eksport';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Eksporter alle';
+$labels['exportsel']      = 'Eksporter valde';
 $labels['exportvcards']   = 'Eksporter kontaktar i vCard-format';
 $labels['newcontactgroup'] = 'Lag ny kontaktgruppe';
 $labels['grouprename']    = 'Endre namn på gruppe';
@@ -451,9 +455,6 @@ $labels['replyremovesignature'] = 'Fjern den original signatur frå eposten når
 $labels['autoaddsignature'] = 'Legg signatur til automatisk';
 $labels['newmessageonly'] = 'berre på nye epostar';
 $labels['replyandforwardonly'] = 'berre på svar og vidaresending';
-$labels['replysignaturepos'] = 'Når du svarar eller sender vidare, plasser signaturen';
-$labels['belowquote'] = 'nedanfor siteringa';
-$labels['abovequote'] = 'oppanfor siteringa';
 $labels['insertsignature'] = 'Sett inn signatur';
 $labels['previewpanemarkread']  = 'Merk forehandsviste epostar som leste';
 $labels['afternseconds']  = 'etter $n sekund';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 7a4248830..eb6fe9b9a 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Bieżąca strona';
 $labels['unread'] = 'Nieprzeczytane';
 $labels['flagged'] = 'Oznaczone';
 $labels['unanswered'] = 'Bez odpowiedzi';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Usunięte';
 $labels['undeleted'] = 'Nieusunięte';
 $labels['invert'] = 'Odwróć';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Podczas odpowiedzi usuń podpis z cytowanej t
 $labels['autoaddsignature'] = 'Automatycznie wstaw podpis';
 $labels['newmessageonly'] = 'tylko dla nowych wiadomości';
 $labels['replyandforwardonly'] = 'tylko dla przekazywania i odpowiedzi';
-$labels['replysignaturepos'] = 'Podczas odpowiedzi wstaw podpis';
-$labels['belowquote'] = 'poniżej cytowanej treści';
-$labels['abovequote'] = 'ponad cytowaną treścią';
 $labels['insertsignature'] = 'Wstaw podpis';
 $labels['previewpanemarkread']  = 'Oznacz podglądane wiadomości jako przeczytane';
 $labels['afternseconds']  = 'po $n sekundach';
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index 05f6c3d32..f4f2f5380 100755
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'نالوستي';
 $labels['flagged'] = 'بې کاره';
 $labels['unanswered'] = 'ناځواب شوي';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 55068df5b..858fcbe7c 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Página atual';
 $labels['unread'] = 'Não lidas';
 $labels['flagged'] = 'Marcadas';
 $labels['unanswered'] = 'Não respondidas';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Excluídas';
 $labels['undeleted'] = 'Não excluídas';
 $labels['invert'] = 'Inverter';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Remover assinatura original da mensagem ao re
 $labels['autoaddsignature'] = 'Adicionar assinatura automaticamente';
 $labels['newmessageonly'] = 'somente em novas mensagens';
 $labels['replyandforwardonly'] = 'somente em respostas e encaminhamentos';
-$labels['replysignaturepos'] = 'Inserir assinatura ao responder ou encaminhar';
-$labels['belowquote'] = 'abaixo da citação';
-$labels['abovequote'] = 'acima da citação';
 $labels['insertsignature'] = 'Inserir assinatura';
 $labels['previewpanemarkread']  = 'Marcar mensagens pré-visualizadas como lidas';
 $labels['afternseconds']  = 'depois de $n segundos';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 62fa8bbb4..17cae3795 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Não lidas';
 $labels['flagged'] = 'Sinalizadas';
 $labels['unanswered'] = 'Não respondidas';
+$labels['withattachment'] = 'Com anexo';
 $labels['deleted'] = 'Eliminadas';
 $labels['undeleted'] = 'Não eliminada';
 $labels['invert'] = 'Inverter selecção';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Ao responder, remover a assinatura original d
 $labels['autoaddsignature'] = 'Adicionar assinatura automaticamente';
 $labels['newmessageonly'] = 'apenas em novas mensagens';
 $labels['replyandforwardonly'] = 'apenas em respostas e reenvios';
-$labels['replysignaturepos'] = 'Ao responder ou reencaminhar colocar assinatura';
-$labels['belowquote'] = 'depois da citação';
-$labels['abovequote'] = 'antes da citação';
 $labels['insertsignature'] = 'Inserir assinatura';
 $labels['previewpanemarkread']  = 'Marcar mensagem como lida';
 $labels['afternseconds']  = 'após $n segundos';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index 0dcd97919..7f458a543 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Pagina curentă';
 $labels['unread'] = 'Necitite';
 $labels['flagged'] = 'Marcat';
 $labels['unanswered'] = 'Fără răspuns';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Şterse';
 $labels['undeleted'] = 'Nu a fost șters';
 $labels['invert'] = 'Inversează';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Când răspundeţi, se şterge semnătura ori
 $labels['autoaddsignature'] = 'Adăugarea automată a semnăturii';
 $labels['newmessageonly'] = 'numai la mesajele noi';
 $labels['replyandforwardonly'] = 'numai la răspunsuri si cele trimise mai departe';
-$labels['replysignaturepos'] = 'Când răspundeţi sau trimiteţi mai departe, semnătura se va plasa';
-$labels['belowquote'] = 'dedesubtul citatului';
-$labels['abovequote'] = 'deasupra citatului';
 $labels['insertsignature'] = 'Introduce o semnătură';
 $labels['previewpanemarkread']  = 'Marchează mesajele previzualizate ca citite';
 $labels['afternseconds']  = 'după $n secunde';
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 6b6d0c6bd..970e30b88 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Текущая страница';
 $labels['unread'] = 'Непрочитанные';
 $labels['flagged'] = 'Помеченные';
 $labels['unanswered'] = 'Неотвеченные';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Удаленное';
 $labels['undeleted'] = 'Не удалено';
 $labels['invert'] = 'Инвертное';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Удалить подпись при отве
 $labels['autoaddsignature'] = 'Автоматически добавлять подпись';
 $labels['newmessageonly'] = 'только в новых сообщениях';
 $labels['replyandforwardonly'] = 'только в ответах и пересылках';
-$labels['replysignaturepos'] = 'Прикрепить подпись при ответе и пересылке';
-$labels['belowquote'] = 'после цитаты';
-$labels['abovequote'] = 'до цитаты';
 $labels['insertsignature'] = 'Вставить подпись';
 $labels['previewpanemarkread']  = 'Отмечать просмотренные сообщения как прочитанные';
 $labels['afternseconds']  = 'через $n секунд';
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index eddc01b57..be091f4cf 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'දැනට ඇති පිටුව';
 $labels['unread'] = 'නොකියවූ';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'මකා දැමූ';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'ස්වයංක්‍රීයව අත්සන ඇතුලත් කරන්න';
 $labels['newmessageonly'] = 'අලුත් පණිවිඩය පමණක්';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'අත්සන ඇතුලත් කරන්න';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'තත්පර $nකට පසු';
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 7b993e77a..a48d265e8 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Aktuálna stránka';
 $labels['unread'] = 'Neprečítané';
 $labels['flagged'] = 'Označené';
 $labels['unanswered'] = 'Neoznačené';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Zmazané';
 $labels['undeleted'] = 'Nevymazané';
 $labels['invert'] = 'Prevrátiť';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Pri odpovedaní odstrániť zo správy pôvod
 $labels['autoaddsignature'] = 'Automaticky pridať podpis';
 $labels['newmessageonly'] = 'iba k novým správam';
 $labels['replyandforwardonly'] = 'len k odpovede a preposílanej správe';
-$labels['replysignaturepos'] = 'Pri odpovedaní alebo preposielanie správy vložiť podpis';
-$labels['belowquote'] = 'nad citáciu';
-$labels['abovequote'] = 'pod citáciu';
 $labels['insertsignature'] = 'Vložit podpis';
 $labels['previewpanemarkread']  = 'Označiť zobrazenej správy ako prečítané';
 $labels['afternseconds']  = 'po $n sekundách';
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index 70150e4d9..8542acb9a 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Trenutna stran';
 $labels['unread'] = 'Neprebrano';
 $labels['flagged'] = 'Označeno';
 $labels['unanswered'] = 'Neoznačeno';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Izbrisano';
 $labels['undeleted'] = 'Ni izbrisano';
 $labels['invert'] = 'Zamenjaj';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Pri odgovoru na sporočilo odstrani izvorni p
 $labels['autoaddsignature'] = 'Samodejno dodaj podpis';
 $labels['newmessageonly'] = 'samo novim sporočilom';
 $labels['replyandforwardonly'] = 'samo k odgovorom in posredovanim sporočilom';
-$labels['replysignaturepos'] = 'Pri odgovoru ali posredovanju sporočila vstavi podpis';
-$labels['belowquote'] = 'pod citiran tekst';
-$labels['abovequote'] = 'nad citiran tekst';
 $labels['insertsignature'] = 'Vstavi podpis';
 $labels['previewpanemarkread']  = 'Označi predogledana sporočila kot prebrana';
 $labels['afternseconds']  = 'po $n sekundah';
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index 52ff45cd6..0c61af687 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Palexuar';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index 1e84735e6..15de82e52 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Тренутна страница';
 $labels['unread'] = 'Непрочитане';
 $labels['flagged'] = 'Означено';
 $labels['unanswered'] = 'Неодговорено';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Обрисано';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Уведи';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'При одговору одстрани ор
 $labels['autoaddsignature'] = 'Аутоматски додај потпис';
 $labels['newmessageonly'] = 'само нове поруке';
 $labels['replyandforwardonly'] = 'само одговори и прослеђивања';
-$labels['replysignaturepos'] = 'При одговору или прослеђивању додај потпис';
-$labels['belowquote'] = 'испод квоте';
-$labels['abovequote'] = 'изнад квоте';
 $labels['insertsignature'] = 'Убаци потпис';
 $labels['previewpanemarkread']  = 'Прегледану поруку означи као прочитану';
 $labels['afternseconds']  = 'након $n секунди';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index c1a91cf82..e9def21f6 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Sida';
 $labels['unread'] = 'Olästa';
 $labels['flagged'] = 'Flaggade';
 $labels['unanswered'] = 'Obesvarade';
+$labels['withattachment'] = 'Med bilaga';
 $labels['deleted'] = 'Borttagna';
 $labels['undeleted'] = 'Inte borttaget';
 $labels['invert'] = 'Invertera';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Ta bort befintlig signatur från meddelandet
 $labels['autoaddsignature'] = 'Infoga signatur automatiskt';
 $labels['newmessageonly'] = 'Vid nytt meddelande';
 $labels['replyandforwardonly'] = 'Vid svar och vidarebefordran';
-$labels['replysignaturepos'] = 'Vid svar eller vidarebefordran infoga signatur';
-$labels['belowquote'] = 'Nedanför befintligt meddelande';
-$labels['abovequote'] = 'Ovanför befintligt meddelande';
 $labels['insertsignature'] = 'Infoga signatur';
 $labels['previewpanemarkread']  = 'Märk meddelande som läst vid visning';
 $labels['afternseconds']  = 'Efter $n sekunder';
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index 1cbffb588..ff0f5e0cc 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'படிக்காதது';
 $labels['flagged'] = 'நட்சத்திரமிட்டது';
 $labels['unanswered'] = 'பதிலளிக்காதது';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'நீக்கியது';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'தலைகீழ்';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'பதிலளிக்கும் பே�
 $labels['autoaddsignature'] = 'தானாக கையொப்பத்தை சேர்';
 $labels['newmessageonly'] = 'புது செய்தி மட்டும்';
 $labels['replyandforwardonly'] = 'பதிலளிப்பு முன்அனுப்பு மட்டும்';
-$labels['replysignaturepos'] = 'பதிலளிக்கும் போதும் முன்அனுப்பும் போதும் கையோப்பமிடு';
-$labels['belowquote'] = 'மேற்கோளுக்கு கீழே';
-$labels['abovequote'] = 'மேற்கோளுக்கு மேலே';
 $labels['insertsignature'] = 'கையோப்பமிடு';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index 93f2304e1..7853cdd9d 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'หน้าปัจจุบัน';
 $labels['unread'] = 'จดหมายที่ไม่ได้อ่าน';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'ยังไม่ได้ตอบ';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'ลบแล้ว';
 $labels['undeleted'] = 'ยังไม่ได้ลบ';
 $labels['invert'] = 'Invert';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $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['insertsignature'] = 'แทรกลายเซ็นต์';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index d8e9e20cf..0b525ff55 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Şimdiki sayfa';
 $labels['unread'] = 'Okunmamışları';
 $labels['flagged'] = 'İşaretlenmişleri';
 $labels['unanswered'] = 'Yanıtlanmamışları';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Silinmişleri';
 $labels['undeleted'] = 'Silinmemiş';
 $labels['invert'] = 'Seçimi Tersine Çevir';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'Yanıtlarken önceki imzaları sil';
 $labels['autoaddsignature'] = 'Otomatik olarak imza ekle';
 $labels['newmessageonly'] = 'sadece yeni postalarda';
 $labels['replyandforwardonly'] = 'sadece yanıtlar ve yönlendirmelerde';
-$labels['replysignaturepos'] = 'Yanıtlarken veya yönlendirirken imzayı yerleştir';
-$labels['belowquote'] = 'alıntının altına';
-$labels['abovequote'] = 'alıntının üstüne';
 $labels['insertsignature'] = 'İmza ekle';
 $labels['previewpanemarkread']  = 'Önzilemede görünen postaları okunmuş işaretle';
 $labels['afternseconds']  = '$n saniye sonra';
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index 35be96cab..67ca0ed31 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = 'Поточна сторінка';
 $labels['unread'] = 'Непрочитані';
 $labels['flagged'] = 'Із зірочкою';
 $labels['unanswered'] = 'Без відповіді';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Видалені';
 $labels['undeleted'] = 'Не видалено';
 $labels['invert'] = 'Інвертувати виділення';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = 'При відповіді видаляти п
 $labels['autoaddsignature'] = 'Автоматично додавати підпис';
 $labels['newmessageonly'] = 'тільки до нових листів';
 $labels['replyandforwardonly'] = 'тільки при відповідях та пересилках';
-$labels['replysignaturepos'] = 'При відповідях чи пересилках додавати підпис';
-$labels['belowquote'] = 'після цитати';
-$labels['abovequote'] = 'перед цитатою';
 $labels['insertsignature'] = 'Додати підпис';
 $labels['previewpanemarkread']  = 'Позначити переглянуті листи як прочитані';
 $labels['afternseconds']  = 'через $n секунд';
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index 00d04b46b..bece2f47d 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Sao chép';
 $labels['move']     = 'Di Chuyển';
 $labels['moveto']   = 'Di chuyển tới...';
 $labels['download'] = 'Tải về';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Hiển thị';
 $labels['showanyway'] = 'Tiếp tục hiển thị';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Trang hiện tại';
 $labels['unread'] = 'Chưa đọc';
 $labels['flagged'] = 'Đã đánh dấu';
 $labels['unanswered'] = 'Chưa trả lời';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Đã xóa';
 $labels['undeleted'] = 'Chưa xóa được';
 $labels['invert'] = 'Đảo ngược';
@@ -204,6 +206,8 @@ $labels['body']  = 'Nội dung thư';
 
 $labels['openinextwin'] = 'Mở trong khung cửa mới';
 $labels['emlsave'] = 'Tải về theo định dạng .eml';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Sửa như một email mới';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Soạn thư cho';
 $labels['contactsfromto'] = 'Liên hệ từ $from - $to / $count';
 $labels['print']          = 'In ra';
 $labels['export']         = 'Trích xuất';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Xuất tất cả';
+$labels['exportsel']      = 'Xuất mục chọn';
 $labels['exportvcards']   = 'Tải dữ liệu máy theo định dạng vCard';
 $labels['newcontactgroup'] = 'Tạo nhóm liên lạc mới';
 $labels['grouprename']    = 'Đổi tên nhóm';
@@ -451,9 +455,6 @@ $labels['replyremovesignature'] = 'Khi trả lời bỏ chữ ký cũ khỏi n�
 $labels['autoaddsignature'] = 'Tự động thêm chữ ký';
 $labels['newmessageonly'] = 'chỉ thư mới';
 $labels['replyandforwardonly'] = 'chỉ trả lời và chuyển tiếp thư';
-$labels['replysignaturepos'] = 'Khi trả lời hoặc chuyển tiếp thư thêm vào chữ ký';
-$labels['belowquote'] = 'Dưới phần nội dung cũ';
-$labels['abovequote'] = 'trên phần nội dung cũ';
 $labels['insertsignature'] = 'Chèn chữ ký';
 $labels['previewpanemarkread']  = 'Đánh dẫu thư xem thử là đã đọc';
 $labels['afternseconds']  = 'sau $n giây';
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index 9b79283b1..2d896d7c3 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = '当前页';
 $labels['unread'] = '未读邮件';
 $labels['flagged'] = '已标记邮件';
 $labels['unanswered'] = '未回复邮件';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '已删除邮件';
 $labels['undeleted'] = '未删除邮件';
 $labels['invert'] = '反选';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = '当回复时从邮件移除原始签名';
 $labels['autoaddsignature'] = '自动插入签名';
 $labels['newmessageonly'] = '仅新邮件';
 $labels['replyandforwardonly'] = '仅回复和转发邮件';
-$labels['replysignaturepos'] = '当回复或转发时插入签名';
-$labels['belowquote'] = '位于原文下方';
-$labels['abovequote'] = '位于原文上方';
 $labels['insertsignature'] = '插入签名';
 $labels['previewpanemarkread']  = '标记预览邮件为已读';
 $labels['afternseconds']  = '$n 秒之后';
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 488a7ab2d..f53a5a969 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -162,6 +162,7 @@ $labels['currpage'] = '目前頁面';
 $labels['unread'] = '未讀取的郵件';
 $labels['flagged'] = '已加標記的郵件';
 $labels['unanswered'] = '未回覆的郵件';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '已刪除的郵件';
 $labels['undeleted'] = '未刪除的郵件';
 $labels['invert'] = '反選';
@@ -454,9 +455,6 @@ $labels['replyremovesignature'] = '回覆時移除原有簽名檔';
 $labels['autoaddsignature'] = '自動附加簽名';
 $labels['newmessageonly'] = '只有新訊息';
 $labels['replyandforwardonly'] = '只有回覆或轉寄';
-$labels['replysignaturepos'] = '當回覆或轉寄時附上簽名檔';
-$labels['belowquote'] = '引用的下方';
-$labels['abovequote'] = '引用的上方';
 $labels['insertsignature'] = '插入簽名檔';
 $labels['previewpanemarkread']  = '標示已預覽訊息為已讀取';
 $labels['afternseconds']  = '$n 秒之後';