Updated translations from launchpad

77 files changed, 334 insertions, 175 deletions

diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index cff5a4e39..4e69520e3 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'نوفمبر';
 $labels['longdec'] = 'ديسمبر';
 $labels['today'] = 'اليوم';
 $labels['checkmail'] = 'التحقق من وجود رسائل جديدة';
+$labels['compose'] = 'إنشاء رسالة';
 $labels['writenewmessage'] = 'إنشاء رسالة جديدة';
 $labels['replytomessage'] = 'الرد على الرسالة';
 $labels['replytoallmessage'] = 'الرد على المرسل وجميع مستقبلي الرسالة';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'أماكن البحث';
 $labels['msgtext'] = 'كامل الرسالة';
 $labels['openinextwin'] = 'افتح في نافذة جديدة';
 $labels['emlsave'] = 'تنزيل (.eml)';
-$labels['compose'] = 'إنشاء رسالة';
 $labels['editasnew'] = 'تعديل كجديد';
 $labels['savemessage'] = 'حفظ هذه المسودة';
 $labels['sendmessage'] = 'إرسال الرسالة الآن';
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 39f47743f..d63aecd99 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Noyabr';
 $labels['longdec'] = 'Dekabr';
 $labels['today'] = 'Bu gün';
 $labels['checkmail'] = 'Gələnləri yoxla';
+$labels['compose'] = 'Məktub yaz';
 $labels['writenewmessage'] = 'Yeni məktub';
 $labels['replytomessage'] = 'Göndərənə cavabla';
 $labels['replytoallmessage'] = 'Hamıya cavabla';
@@ -156,7 +157,6 @@ $labels['searchmod'] = 'Axtarış variantları';
 $labels['msgtext'] = 'Bütün məktub';
 $labels['openinextwin'] = 'Yeni pəncərədə aç';
 $labels['emlsave'] = 'Saxla (.eml)';
-$labels['compose'] = 'Məktub yaz';
 $labels['editasnew'] = 'Yeni kimi redaktə et';
 $labels['savemessage'] = 'Qaralama saxla';
 $labels['sendmessage'] = 'İndi göndər';
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index a487ee610..0dde2147d 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Ноември';
 $labels['longdec'] = 'Декември';
 $labels['today'] = 'Днес';
 $labels['checkmail'] = 'Провери за нови писма';
+$labels['compose'] = 'Ново писмо';
 $labels['writenewmessage'] = 'Създай ново писмо';
 $labels['replytomessage'] = 'Отговори на писмото';
 $labels['replytoallmessage'] = 'Отговор до изпращача и всички получатели';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Търсене във';
 $labels['msgtext'] = 'Цялото съобщение';
 $labels['openinextwin'] = 'Отвори в нов прозорец';
 $labels['emlsave'] = 'Изтегли като .eml';
-$labels['compose'] = 'Ново писмо';
 $labels['editasnew'] = 'Редактирай като ново';
 $labels['savemessage'] = 'Запиши в Чернови';
 $labels['sendmessage'] = 'Изпрати писмото';
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index 10ad27ffa..273284ca6 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -89,6 +89,7 @@ $labels['longnov'] = 'নবেমবার (November)';
 $labels['longdec'] = 'দিশেমবার (December)';
 $labels['today'] = 'আজকে';
 $labels['checkmail'] = 'দেখুন নতুন কোনো মেইল/চিঠি এলো কিনা';
+$labels['compose'] = 'নতুন মেইল/চিঠি লিখুন';
 $labels['writenewmessage'] = 'নতুন মেইল/চিঠি লিখুন';
 $labels['replytomessage'] = 'শুধু প্রেরকের কাছে উত্তর পাঠান';
 $labels['replytoallmessage'] = 'প্রেরক ও এই চিঠির অন্যান্য প্রাপকদের কাছে উত্তর পাঠান';
@@ -123,7 +124,6 @@ $labels['unlimited'] = 'সীমাহীন';
 $labels['quicksearch'] = 'ঝটকরে খোজা';
 $labels['resetsearch'] = 'নতুনকরে খুজুন';
 $labels['openinextwin'] = 'নতুন উইন্ডো তে দেখুন';
-$labels['compose'] = 'নতুন মেইল/চিঠি লিখুন';
 $labels['savemessage'] = 'খসড়া হিসাবে জমা করে রাখুন';
 $labels['sendmessage'] = 'এখুনি মেইল / চিঠিটি পাঠান';
 $labels['addattachment'] = 'একটা ফাইল জুড়ে দিন চিঠির সাথে';
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index 8080714fe..41c35804b 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -65,6 +65,7 @@ $labels['friday'] = 'Gwener';
 $labels['saturday'] = 'Sadorn';
 $labels['today'] = 'Hiziv';
 $labels['checkmail'] = 'Gwiriañ kemennadoù nevez';
+$labels['compose'] = 'Skrivañ ur c\'hemennad nevez';
 $labels['writenewmessage'] = 'Skrivañ ur c\'hemennad nevez';
 $labels['replytomessage'] = 'Respont kemennad';
 $labels['replytoallmessage'] = 'Respont d\'an holl';
@@ -89,7 +90,6 @@ $labels['unknown'] = 'Dianav';
 $labels['unlimited'] = 'didermen';
 $labels['quicksearch'] = 'Klask prim';
 $labels['resetsearch'] = 'Aderaouekaat ar glask';
-$labels['compose'] = 'Skrivañ ur c\'hemennad nevez';
 $labels['savemessage'] = 'Gwarediñ ar brouilhed-se';
 $labels['sendmessage'] = 'Kas ar c\'hemennad diouzhtu';
 $labels['addattachment'] = 'Stagañ ur restr';
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index b524942c1..c1f782445 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Novembar';
 $labels['longdec'] = 'Decembar';
 $labels['today'] = 'danas';
 $labels['checkmail'] = 'Provjera novih poruka';
+$labels['compose'] = 'Nova poruka';
 $labels['writenewmessage'] = 'Nova poruka';
 $labels['replytomessage'] = 'Odgovori na poruku';
 $labels['replytoallmessage'] = 'Odgovori pošiljaocu i svim primaocima';
@@ -155,7 +156,6 @@ $labels['searchmod'] = 'Modifikacija pretrage';
 $labels['msgtext'] = 'Cjela poruka';
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Snimi (.eml)';
-$labels['compose'] = 'Nova poruka';
 $labels['editasnew'] = 'Uredi kao novo';
 $labels['savemessage'] = 'Sačuvaj nacrt';
 $labels['sendmessage'] = 'Pošalji poruku';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index cc401caf6..f0f23f732 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'novembre';
 $labels['longdec'] = 'desembre';
 $labels['today'] = 'Avui';
 $labels['checkmail'] = 'Recupera missatges nous';
+$labels['compose'] = 'Escriu un missatge';
 $labels['writenewmessage'] = 'Crea nou missatge';
 $labels['replytomessage'] = 'Respon al missatge';
 $labels['replytoallmessage'] = 'Respon al remitent i a tots els destinataris';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Cerca modificadors';
 $labels['msgtext'] = 'Missatge sencer';
 $labels['openinextwin'] = 'Obre a una nova finestra';
 $labels['emlsave'] = 'Descarrega (.eml)';
-$labels['compose'] = 'Escriu un missatge';
 $labels['editasnew'] = 'Edita com a nou';
 $labels['savemessage'] = 'Desa aquest esborrany';
 $labels['sendmessage'] = 'Envia ara el missatge';
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index c169038f3..dfdda3029 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: pek <Unknown>                                                 |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Listopad';
 $labels['longdec'] = 'Prosinec';
 $labels['today'] = 'Dnes';
 $labels['checkmail'] = 'Zkontrolovat nové zprávy';
+$labels['compose'] = 'Napsat zprávu';
 $labels['writenewmessage'] = 'Vytvořit novou zprávu';
 $labels['replytomessage'] = 'Odpovědět odesílateli';
 $labels['replytoallmessage'] = 'Odpovědět všem';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Parametry hledání';
 $labels['msgtext'] = 'Celá zpráva';
 $labels['openinextwin'] = 'Otevřít v novém okně';
 $labels['emlsave'] = 'Stáhnout (.eml)';
-$labels['compose'] = 'Napsat zprávu';
 $labels['editasnew'] = 'Upravit jako novou';
 $labels['savemessage'] = 'Uložit do rozepsaných';
 $labels['sendmessage'] = 'Odeslat zprávu nyní';
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index 29e7286ee..e2f8720ea 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Tachwedd';
 $labels['longdec'] = 'Rhagfyr';
 $labels['today'] = 'Heddiw';
 $labels['checkmail'] = 'Edrych am negeseuon newydd';
+$labels['compose'] = 'Ysgrifennu neges';
 $labels['writenewmessage'] = 'Creu neges newydd';
 $labels['replytomessage'] = 'Ymateb i\'r anfonwr';
 $labels['replytoallmessage'] = 'Ymateb i\'r anfonwr a phob derbyniwr';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Addasyddion chwilio';
 $labels['msgtext'] = 'Y neges yn llawn';
 $labels['openinextwin'] = 'Agor mewn ffenest newydd';
 $labels['emlsave'] = 'Llwytho lawr (.eml)';
-$labels['compose'] = 'Ysgrifennu neges';
 $labels['editasnew'] = 'Golygu fel neges newydd';
 $labels['savemessage'] = 'Cadw\'r drafft hwn';
 $labels['sendmessage'] = 'Danfon nawr';
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index ac3849218..6c1b7360d 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'I dag';
 $labels['checkmail'] = 'Se efter nye beskeder';
+$labels['compose'] = 'Forfat en besked';
 $labels['writenewmessage'] = 'Skriv en ny besked';
 $labels['replytomessage'] = 'Svar på denne besked';
 $labels['replytoallmessage'] = 'Svar til alle modtagere';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Søgeparametere';
 $labels['msgtext'] = 'Hele beskeden';
 $labels['openinextwin'] = 'Åbn i nyt vindue';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['compose'] = 'Forfat en besked';
 $labels['editasnew'] = 'Redigér som ny';
 $labels['savemessage'] = 'Gem denne kladde';
 $labels['sendmessage'] = 'Send beskeden nu';
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index c8a593112..a12a82f2c 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -46,6 +46,7 @@ $labels['folders'] = 'Ordner';
 $labels['messagesfromto'] = 'Nachrichten $from bis $to von $count';
 $labels['threadsfromto'] = 'Konversationen $from bis $to von $count';
 $labels['messagenrof'] = 'Nachricht $nr von $count';
+$labels['fromtoshort'] = '$from – $to von $count';
 $labels['copy'] = 'Kopieren';
 $labels['move'] = 'Verschieben';
 $labels['moveto'] = 'Verschieben nach...';
@@ -92,12 +93,16 @@ $labels['longoct'] = 'Oktober';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'Dezember';
 $labels['today'] = 'Heute';
+$labels['refresh'] = 'Aktualisieren';
 $labels['checkmail'] = 'Auf neue Nachrichten prüfen';
+$labels['compose'] = 'Schreiben';
 $labels['writenewmessage'] = 'Neue Nachricht schreiben';
+$labels['reply'] = 'Antworten';
 $labels['replytomessage'] = 'Antwort verfassen';
 $labels['replytoallmessage'] = 'Antwort an Absender und alle Empfänger verfassen';
 $labels['replyall'] = 'Allen antworten';
 $labels['replylist'] = 'Liste antworten';
+$labels['forward'] = 'Weiterleiten';
 $labels['forwardinline'] = 'Eingebunden weiterleiten';
 $labels['forwardattachment'] = 'Als Anhang weiterleiten';
 $labels['forwardmessage'] = 'Nachricht weiterleiten';
@@ -110,12 +115,16 @@ $labels['nextmessage'] = 'Nächste Nachricht anzeigen';
 $labels['lastmessage'] = 'Die letzte Nachricht anzeigen';
 $labels['backtolist'] = 'Zurück zur Liste';
 $labels['viewsource'] = 'Quelltext anzeigen';
+$labels['mark'] = 'Markieren';
 $labels['markmessages'] = 'Nachrichten markieren';
 $labels['markread'] = 'Als gelesen';
 $labels['markunread'] = 'Als ungelesen';
 $labels['markflagged'] = 'Stern hinzufügen';
 $labels['markunflagged'] = 'Stern entfernen';
 $labels['moreactions'] = 'Mehr ...';
+$labels['more'] = 'Mehr';
+$labels['back'] = 'Zurück';
+$labels['options'] = 'Optionen';
 $labels['select'] = 'Auswählen';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
@@ -159,7 +168,6 @@ $labels['searchmod'] = 'Suchkriterien ändern';
 $labels['msgtext'] = 'Ganze Nachricht';
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Herunterladen (.eml)';
-$labels['compose'] = 'Neue Nachricht verfassen';
 $labels['editasnew'] = 'Als neue Nachricht öffnen';
 $labels['savemessage'] = 'Nachricht speichern';
 $labels['sendmessage'] = 'Nachricht jetzt senden';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Übermittlungsbestätigung (DSN)';
 $labels['mailreplyintro'] = 'Am $date, schrieb $sender:';
 $labels['originalmessage'] = 'Originalnachricht';
 $labels['editidents'] = 'Absender bearbeiten';
+$labels['spellcheck'] = 'Rechtschreibung';
 $labels['checkspelling'] = 'Rechtschreibung prüfen';
 $labels['resumeediting'] = 'Bearbeitung fortsetzen';
 $labels['revertto'] = 'Zurück zu';
+$labels['attach'] = 'Anhängen';
 $labels['attachments'] = 'Anhänge';
 $labels['upload'] = 'Hochladen';
 $labels['uploadprogress'] = '$percent ($current von $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Partner/in';
 $labels['allfields'] = 'Alle Felder';
 $labels['search'] = 'Suche';
 $labels['advsearch'] = 'Erweiterte Suche';
+$labels['advanced'] = 'Erweitert';
 $labels['other'] = 'Andere';
 $labels['typeother'] = 'Andere';
 $labels['typehome'] = 'Zuhause';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index 8d1001651..c130f7f39 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -39,8 +39,8 @@ $messages['savingmessage'] = 'Nachricht wird gespeichert...';
 $messages['messagesaved'] = 'Nachricht als Entwurf gespeichert';
 $messages['successfullysaved'] = 'Erfolgreich gespeichert';
 $messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugefügt';
-$messages['contactexists'] = 'Es existiert bereits ein Eintrag mit dieser E-Mail-Adresse';
-$messages['contactnameexists'] = 'Ein Kontakt mit demselben Namen existiert bereits.';
+$messages['contactexists'] = 'Es existiert bereits ein Kontakt mit dieser E-Mail-Adresse.';
+$messages['contactnameexists'] = 'Es existiert bereits ein Kontakt mit diesem Namen';
 $messages['blockedimages'] = 'Um Ihre Privatsphäre zur schützen, wurden externe Bilder blockiert.';
 $messages['encryptedmessage'] = 'Dies ist eine verschlüsselte Nachricht und kann leider nicht angezeigt werden.';
 $messages['nocontactsfound'] = 'Keine Kontakte gefunden';
@@ -48,111 +48,111 @@ $messages['contactnotfound'] = 'Die gewählte Adresse wurde nicht gefunden';
 $messages['contactsearchonly'] = 'Geben Sie einen Suchbegriff ein, um Kontakte zu finden';
 $messages['sendingfailed'] = 'Versand der Nachricht fehlgeschlagen';
 $messages['senttooquickly'] = 'Bitte warten Sie $sec Sekunde(n) vor dem Senden dieser Nachricht';
-$messages['errorsavingsent'] = 'Ein Fehler ist beim Speichern der gesendeten Nachricht aufgetreten';
+$messages['errorsavingsent'] = 'Beim Speichern der gesendeten Nachricht ist ein Fehler aufgetreten.';
 $messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten';
-$messages['errormoving'] = 'Nachricht konnte nicht verschoben werden';
-$messages['errorcopying'] = 'Konnte Nachrichten nicht kopieren';
-$messages['errordeleting'] = 'Nachricht konnte nicht gelöscht werden';
-$messages['errormarking'] = 'Nachricht konnte nicht markiert werden';
+$messages['errormoving'] = 'Nachricht(en) konnte(n) nicht verschoben werden.';
+$messages['errorcopying'] = 'Nachticht(en) konnte(n) nicht kopiert werden.';
+$messages['errordeleting'] = 'Nachricht(en) konnte(n) nicht gelöscht werden.';
+$messages['errormarking'] = 'Nachricht(en) konnte(n) nicht markiert werden.';
 $messages['deletecontactconfirm'] = 'Wollen Sie die ausgewählten Kontakte wirklich löschen?';
 $messages['deletegroupconfirm'] = 'Wollen Sie die gewählte Gruppe wirklich löschen?';
 $messages['deletemessagesconfirm'] = 'Wollen Sie die ausgewählten Nachrichten wirklich löschen?';
 $messages['deletefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich löschen?';
 $messages['purgefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich leeren?';
-$messages['contactdeleting'] = 'Lösche Kontakt(e)...';
+$messages['contactdeleting'] = 'Kontakte werden gelöscht...';
 $messages['groupdeleting'] = 'Gruppe wird gelöscht...';
-$messages['folderdeleting'] = 'Lösche Ordner...';
-$messages['foldermoving'] = 'Verschiebe Ordner...';
-$messages['foldersubscribing'] = 'Abonniere Ordner...';
-$messages['folderunsubscribing'] = 'Ordner abbstellen...';
-$messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt';
-$messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein';
-$messages['nonamewarning'] = 'Bitte geben Sie einen Namen ein';
-$messages['nopagesizewarning'] = 'Bitte geben Sie die Einträge pro Seite an';
-$messages['nosenderwarning'] = 'Bitte geben Sie die E-Mail-Adresse des Senders an';
-$messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an';
+$messages['folderdeleting'] = 'Order wird gelöscht...';
+$messages['foldermoving'] = 'Ordner wird verschoben...';
+$messages['foldersubscribing'] = 'Ordner wird abonniert...';
+$messages['folderunsubscribing'] = 'Ordner wird abbestellt...';
+$messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt.';
+$messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein.';
+$messages['nonamewarning'] = 'Bitte geben Sie einen Namen ein.';
+$messages['nopagesizewarning'] = 'Bitte geben Sie die Einträge pro Seite an.';
+$messages['nosenderwarning'] = 'Bitte geben Sie die E-Mail-Adresse des Senders an.';
+$messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an.';
 $messages['nosubjectwarning'] = 'Die Betreffzeile ist leer. Möchten Sie jetzt einen Betreff eingeben?';
-$messages['nobodywarning'] = 'Diese Nachricht ohne Inhalt senden?';
+$messages['nobodywarning'] = 'Wollen Sie diese Nachricht ohne Inhalt senden?';
 $messages['notsentwarning'] = 'Ihre Nachricht wurde nicht gesendet. Wollen Sie die Nachricht verwerfen?';
 $messages['noldapserver'] = 'Bitte wählen Sie einen LDAP-Server aus';
-$messages['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein';
-$messages['notuploadedwarning'] = 'Es wurden noch nicht alle Dateien hochgeladen. Bitte warten oder Upload abbrechen.';
-$messages['searchsuccessful'] = '$nr Nachrichten gefunden';
-$messages['contactsearchsuccessful'] = '$nr Kontakte gefunden';
-$messages['searchnomatch'] = 'Die Suche lieferte keine Treffer';
+$messages['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein.';
+$messages['searchsuccessful'] = '$nr Nachrichten gefunden.';
+$messages['contactsearchsuccessful'] = '$nr Kontakte gefunden.';
+$messages['searchnomatch'] = 'Die Suche lieferte keine Treffer.';
 $messages['searching'] = 'Suche...';
-$messages['checking'] = 'Prüfe...';
-$messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden';
-$messages['folderdeleted'] = 'Ordner erfolgreich gelöscht';
-$messages['foldersubscribed'] = 'Der Ordner wurde erfolgreich abonniert';
-$messages['folderunsubscribed'] = 'Der Ordner wurde erfolgreich abbestellt';
-$messages['folderpurged'] = 'Der Ordner wurde erfolgreich gelöscht';
-$messages['folderexpunged'] = 'Der Ordner wurde erfolgreich gepackt';
-$messages['deletedsuccessfully'] = 'Erfolgreich gelöscht';
-$messages['converting'] = 'Entferne Formatierungen...';
-$messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden';
-$messages['fileuploaderror'] = 'Der Dateiupload ist fehlgeschlagen';
-$messages['filesizeerror'] = 'Die Datei überschreitet die maximale Grösse von $size';
-$messages['copysuccess'] = '$nr Adressen erfolgreich kopiert';
-$messages['copyerror'] = 'Die Adressen konnten nicht kopiert werden';
-$messages['sourceisreadonly'] = 'Das Adressverzeichnis kann nicht verändert werden';
-$messages['errorsavingcontact'] = 'Die Änderungen konnten nicht gespeichert werden';
-$messages['movingmessage'] = 'Die E-Mail wird verschoben...';
-$messages['copyingmessage'] = 'Kopiere Nachrichten...';
+$messages['checking'] = 'Überprüfung...';
+$messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden.';
+$messages['folderdeleted'] = 'Der Ordner wurde erfolgreich gelöscht.';
+$messages['foldersubscribed'] = 'Der Ordner wurde erfolgreich abonniert.';
+$messages['folderunsubscribed'] = 'Der Ordner wurde erfolgreich abbestellt.';
+$messages['folderpurged'] = 'Der Ordner wurde erfolgreich gelöscht.';
+$messages['folderexpunged'] = 'Der Ordner wurde erfolgreich gepackt.';
+$messages['deletedsuccessfully'] = 'Erfolgreich gelöscht.';
+$messages['converting'] = 'Formatierung wird entfernt...';
+$messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden.';
+$messages['fileuploaderror'] = 'Der Dateiupload ist fehlgeschlagen.';
+$messages['filesizeerror'] = 'Die Datei überschreitet die maximale Grösse von $size.';
+$messages['copysuccess'] = '$nr Adressen erfolgreich kopiert.';
+$messages['copyerror'] = 'Die Adressen konnten nicht kopiert werden.';
+$messages['sourceisreadonly'] = 'Das Adressverzeichnis kann nicht verändert werden.';
+$messages['errorsavingcontact'] = 'Die Änderungen konnten nicht gespeichert werden.';
+$messages['movingmessage'] = 'Nachrichten werden verschoben...';
+$messages['copyingmessage'] = 'Nachrichten werden kopiert...';
 $messages['copyingcontact'] = 'Kontakte werden kopiert...';
-$messages['deletingmessage'] = 'Lösche Nachricht(en)...';
-$messages['markingmessage'] = 'Markiere Nachricht(en)...';
-$messages['addingmember'] = 'Füge Kontakte der Gruppe hinzu...';
-$messages['removingmember'] = 'Entferne Kontakte von der Gruppe...';
-$messages['receiptsent'] = 'Lesebestätigung erfolgreich gesendet';
-$messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden';
+$messages['deletingmessage'] = 'Nachrichten werden gelöscht...';
+$messages['markingmessage'] = 'Nachrichten werden markiert...';
+$messages['addingmember'] = 'Kontakte werden der Gruppe hinzugefügt...';
+$messages['removingmember'] = 'Kontakte werden von der Gruppe entfernt...';
+$messages['receiptsent'] = 'Lesebestätigung erfolgreich gesendet.';
+$messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden.';
+$messages['deleteidentityconfirm'] = 'Möchten Sie diese Identität wirklich löschen?';
 $messages['nodeletelastidentity'] = 'Diese Identität kann nicht gelöscht werden, da dies die letzte ist.';
-$messages['forbiddencharacter'] = 'Der Ordnername enthält ein ungültiges Zeichen';
-$messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren aus';
-$messages['addresswriterror'] = 'Das gewählte Adressbuch kann nicht verändert werden';
-$messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt';
-$messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt';
+$messages['forbiddencharacter'] = 'Der Ordnername enthält ein ungültiges Zeichen.';
+$messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren aus.';
+$messages['addresswriterror'] = 'Das gewählte Adressbuch kann nicht verändert werden.';
+$messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt.';
+$messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.';
 $messages['importwait'] = 'Daten werden importiert, bitte warten...';
 $messages['importerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist nicht im vCard-Format.';
 $messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert</b>';
 $messages['importconfirmskipped'] = '<b>$skipped bestehende Einträge wurden übersprungen</b>';
 $messages['opnotpermitted'] = 'Operation nicht erlaubt!';
-$messages['nofromaddress'] = 'Fehlende E-Mail-Adresse in ausgewählter Identität';
+$messages['nofromaddress'] = 'Fehlende E-Mail-Adresse in ausgewählter Identität.';
 $messages['editorwarning'] = 'Beim Wechseln in den Texteditor gehen alle Textformatierungen verloren. Möchten Sie fortfahren?';
 $messages['httpreceivedencrypterror'] = 'Ein gravierender Konfigurationsfehler ist aufgetreten. Kontaktieren Sie den Server-Administrator. <b>Die Nachricht wurde nicht gesendet!</b>';
-$messages['smtpconnerror'] = 'SMTP Fehler ($code): Die Verbindung ist fehlgeschlagen';
-$messages['smtpautherror'] = 'SMTP Fehler ($code): Die Authentisierung ist fehlgeschlagen';
-$messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender "$from" konnte nicht gesetzt werden ($msg)';
-$messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger "$to" konnte nicht gesetzt werden ($msg)';
-$messages['smtprecipientserror'] = 'SMTP Fehler: Die Empfängerliste konnte nicht verarbeitet werden';
+$messages['smtpconnerror'] = 'SMTP Fehler ($code): Die Verbindung ist fehlgeschlagen.';
+$messages['smtpautherror'] = 'SMTP Fehler ($code): Die Authentisierung ist fehlgeschlagen.';
+$messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender "$from" konnte nicht gesetzt werden ($msg).';
+$messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger "$to" konnte nicht gesetzt werden ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Fehler: Die Empfängerliste konnte nicht verarbeitet werden.';
 $messages['smtperror'] = 'SMTP Fehler: $msg';
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
 $messages['toomanyrecipients'] = 'Zuviele Empfänger angegeben. Reduzieren Sie die Empfängeradressen auf $max.';
-$messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max';
+$messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max.';
 $messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen Sie den Vorgang erneut.';
-$messages['contactdelerror'] = 'Fehler beim Löschen';
-$messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht';
-$messages['contactrestoreerror'] = 'Konnte die gelöschten Kontakte nicht wiederherstellen';
+$messages['contactdelerror'] = 'Fehler beim Löschen.';
+$messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht.';
+$messages['contactrestoreerror'] = 'Die gelöschten Kontakte konnten nicht wiederhergestellt werden.';
 $messages['contactrestored'] = 'Kontakte erfolgreich wiederhergestellt.';
-$messages['groupdeleted'] = 'Gruppe erfolgreich gelöscht';
-$messages['grouprenamed'] = 'Gruppe erlogreich umbenannt';
-$messages['groupcreated'] = 'Gruppe erlogreich erstellt';
-$messages['savedsearchdeleted'] = 'Suche erfolgreich gelöscht';
-$messages['savedsearchdeleteerror'] = 'Suche konnte nicht gelöscht werden';
-$messages['savedsearchcreated'] = 'Suche erfolgreich gespeichert';
-$messages['savedsearchcreateerror'] = 'Suche konnte nicht gespeichert werden';
-$messages['messagedeleted'] = 'Nachricht(en) erfolgreich gelöscht';
-$messages['messagemoved'] = 'Nachricht(en) erfolgreich verschoben';
-$messages['messagecopied'] = 'Nachricht(en) erfolgreich kopiert';
-$messages['messagemarked'] = 'Nachricht(en) erfolgreich markiert';
-$messages['autocompletechars'] = 'Geben Sie mind. $min Zeichen für die Auto-Vervollständigung ein';
-$messages['autocompletemore'] = 'Mehrere Treffer. Bitte geben Sie mehr Buchstaben ein';
-$messages['namecannotbeempty'] = 'Der Name darf nicht leer sein';
-$messages['nametoolong'] = 'Der Name ist zu lang';
-$messages['folderupdated'] = 'Der Ordner wurde erfolgreich aktualisiert';
-$messages['foldercreated'] = 'Der Ordner wurde erfolgreich erstellt';
-$messages['invalidimageformat'] = 'Ungültiges Bildformat';
+$messages['groupdeleted'] = 'Gruppe erfolgreich gelöscht.';
+$messages['grouprenamed'] = 'Gruppe erlogreich umbenannt.';
+$messages['groupcreated'] = 'Gruppe erlogreich erstellt.';
+$messages['savedsearchdeleted'] = 'Suche erfolgreich gelöscht.';
+$messages['savedsearchdeleteerror'] = 'Suche konnte nicht gelöscht werden.';
+$messages['savedsearchcreated'] = 'Suche erfolgreich gespeichert.';
+$messages['savedsearchcreateerror'] = 'Suche konnte nicht gespeichert werden.';
+$messages['messagedeleted'] = 'Nachricht(en) erfolgreich gelöscht.';
+$messages['messagemoved'] = 'Nachricht(en) erfolgreich verschoben.';
+$messages['messagecopied'] = 'Nachricht(en) erfolgreich kopiert.';
+$messages['messagemarked'] = 'Nachricht(en) erfolgreich markiert.';
+$messages['autocompletechars'] = 'Geben Sie mind. $min Zeichen für die Auto-Vervollständigung ein.';
+$messages['autocompletemore'] = 'Mehrere Treffer. Bitte geben Sie mehr Buchstaben ein.';
+$messages['namecannotbeempty'] = 'Der Name darf nicht leer sein.';
+$messages['nametoolong'] = 'Der Name ist zu lang.';
+$messages['folderupdated'] = 'Der Ordner wurde erfolgreich aktualisiert.';
+$messages['foldercreated'] = 'Der Ordner wurde erfolgreich erstellt.';
+$messages['invalidimageformat'] = 'Kein gültiges Bildformat.';
 $messages['mispellingsfound'] = 'Es wurden noch Rechtschreibfehler in der Nachricht gefunden.';
 $messages['parentnotwritable'] = 'Konnte den Ordner nicht erstellen/verschieben. Keine Berechtigung.';
-$messages['messagetoobig'] = 'Die Nachricht ist zu gross, um verarbeitet zu werden';
+$messages['messagetoobig'] = 'Die Nachricht ist zu gross und kann nicht verarbeitet werden.';
 
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 17ac78244..db921a305 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Daniel Winzen <d@winzen4.de>                                  |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -46,6 +46,7 @@ $labels['folders'] = 'Ordner';
 $labels['messagesfromto'] = 'Nachrichten $from bis $to von $count';
 $labels['threadsfromto'] = 'Konversationen $from bis $to von $count';
 $labels['messagenrof'] = 'Nachricht $nr von $count';
+$labels['fromtoshort'] = '$from – $to von $count';
 $labels['copy'] = 'Kopieren';
 $labels['move'] = 'Verschieben';
 $labels['moveto'] = 'Verschieben nach...';
@@ -92,12 +93,16 @@ $labels['longoct'] = 'Oktober';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'Dezember';
 $labels['today'] = 'Heute';
+$labels['refresh'] = 'Aktualisieren';
 $labels['checkmail'] = 'Auf neue Nachrichten überprüfen';
+$labels['compose'] = 'Schreiben';
 $labels['writenewmessage'] = 'Neue Nachricht schreiben';
+$labels['reply'] = 'Antworten';
 $labels['replytomessage'] = 'Antwort verfassen';
 $labels['replytoallmessage'] = 'Antwort an Mailingliste oder an Absender und alle Empfänger verfassen';
 $labels['replyall'] = 'Allen antworten';
 $labels['replylist'] = 'Liste antworten';
+$labels['forward'] = 'Weiterleiten';
 $labels['forwardinline'] = 'innerhalb der Nachricht';
 $labels['forwardattachment'] = 'als Dateianhang';
 $labels['forwardmessage'] = 'Nachricht weiterleiten';
@@ -110,12 +115,16 @@ $labels['nextmessage'] = 'Nächste Nachricht anzeigen';
 $labels['lastmessage'] = 'Die letzte Nachricht anzeigen';
 $labels['backtolist'] = 'Zurück zur Liste';
 $labels['viewsource'] = 'Quelltext anzeigen';
+$labels['mark'] = 'Markieren';
 $labels['markmessages'] = 'Nachrichten markieren';
 $labels['markread'] = 'Als gelesen';
 $labels['markunread'] = 'Als ungelesen';
 $labels['markflagged'] = 'Stern hinzufügen';
 $labels['markunflagged'] = 'Stern entfernen';
 $labels['moreactions'] = 'Mehr...';
+$labels['more'] = 'Mehr';
+$labels['back'] = 'Zurück';
+$labels['options'] = 'Optionen';
 $labels['select'] = 'Auswahl';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
@@ -159,7 +168,6 @@ $labels['searchmod'] = 'Suchkriterien ändern';
 $labels['msgtext'] = 'Nachricht';
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Lokal speichern (.eml)';
-$labels['compose'] = 'Neue Nachricht verfassen';
 $labels['editasnew'] = 'Als neue Nachricht öffnen';
 $labels['savemessage'] = 'Nachricht speichern';
 $labels['sendmessage'] = 'Nachricht jetzt senden';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Übermittlungsbestätigung (DSN)';
 $labels['mailreplyintro'] = 'Am $date, schrieb $sender:';
 $labels['originalmessage'] = 'Originalnachricht';
 $labels['editidents'] = 'Absender ändern';
+$labels['spellcheck'] = 'Rechtschreibung';
 $labels['checkspelling'] = 'Rechtschreibung prüfen';
 $labels['resumeediting'] = 'Bearbeitung fortsetzen';
 $labels['revertto'] = 'Zurück zu';
+$labels['attach'] = 'Anhängen';
 $labels['attachments'] = 'Anhänge';
 $labels['upload'] = 'Hochladen';
 $labels['uploadprogress'] = '$percent ($current von $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Partner/in';
 $labels['allfields'] = 'Alle Felder';
 $labels['search'] = 'Suche';
 $labels['advsearch'] = 'Detaillierte Suche';
+$labels['advanced'] = 'Erweitert';
 $labels['other'] = 'Andere';
 $labels['typeother'] = 'Andere';
 $labels['typehome'] = 'Privat';
@@ -258,7 +269,7 @@ $labels['edit'] = 'Bearbeiten';
 $labels['cancel'] = 'Abbrechen';
 $labels['save'] = 'Speichern';
 $labels['delete'] = 'Löschen';
-$labels['rename'] = 'umbenennen';
+$labels['rename'] = 'Umbenennen';
 $labels['addphoto'] = 'Kontaktbild hinzufügen';
 $labels['replacephoto'] = 'Bild ändern';
 $labels['newcontact'] = 'Neuen Kontakt erstellen';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index 1b06e9bec..dc8811686 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: akn <Unknown>                                                 |
+ | Author: Daniel Winzen <d@winzen4.de>                                  |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Füge Kontakte der Gruppe hinzu...';
 $messages['removingmember'] = 'Entferne Kontakte von der Gruppe...';
 $messages['receiptsent'] = 'Lesebestätigung erfolgreich gesendet.';
 $messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden.';
+$messages['deleteidentityconfirm'] = 'Möchten Sie wirklich diese Identität löschen?';
 $messages['nodeletelastidentity'] = 'Diese Identität kann nicht gelöscht werden, da dies die letzte ist.';
 $messages['forbiddencharacter'] = 'Der Ordnername enthält ein ungültiges Zeichen.';
 $messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren aus.';
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index aa1835f2f..ca4872967 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -89,6 +89,7 @@ $labels['longnov'] = 'Νοέμβριος';
 $labels['longdec'] = 'Δεκέμβριος';
 $labels['today'] = 'Σήμερα';
 $labels['checkmail'] = 'Έλεγχος για νέα μηνύματα';
+$labels['compose'] = 'Συγγραφή μηνύματος';
 $labels['writenewmessage'] = 'Δημιουργία νέου μηνύματος';
 $labels['replytomessage'] = 'Απάντηση';
 $labels['replytoallmessage'] = 'Απάντηση στον αποστολέα και όλους τους παραλήπτες';
@@ -125,7 +126,6 @@ $labels['quicksearch'] = 'Γρήγορη Αναζήτηση';
 $labels['resetsearch'] = 'Επαναφορά Αναζήτησης';
 $labels['msgtext'] = 'Σε όλο το μήνυμα';
 $labels['openinextwin'] = 'Άνοιγμα σε νέο παράθυρο';
-$labels['compose'] = 'Συγγραφή μηνύματος';
 $labels['savemessage'] = 'Αποθήκευση ως πρόχειρου';
 $labels['sendmessage'] = 'Αποστολή μηνύματος τώρα';
 $labels['addattachment'] = 'Επισύναψη αρχείου';
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 9a33edaf6..c33d60b76 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Today';
 $labels['checkmail'] = 'Check for new messages';
+$labels['compose'] = 'Compose a message';
 $labels['writenewmessage'] = 'Create a new message';
 $labels['replytomessage'] = 'Reply to sender';
 $labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Search modifiers';
 $labels['msgtext'] = 'Entire message';
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['compose'] = 'Compose a message';
 $labels['editasnew'] = 'Edit as new';
 $labels['savemessage'] = 'Save this draft';
 $labels['sendmessage'] = 'Send now';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index 0a8f8ef3b..1a1a7fb95 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Kristjan SCHMIDT <Unknown>                                    |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -89,6 +89,7 @@ $labels['longnov'] = 'Novembro';
 $labels['longdec'] = 'Decembro';
 $labels['today'] = 'Hodiaŭ';
 $labels['checkmail'] = 'Kontrolu, ĉu novaj mesaĝoj';
+$labels['compose'] = 'Verku mesaĝon';
 $labels['writenewmessage'] = 'Verku novan mesaĝon';
 $labels['replytomessage'] = 'Respondu al mesaĝo';
 $labels['replytoallmessage'] = 'Respondu al sendinto kaj ĉiu ricevinto';
@@ -119,7 +120,6 @@ $labels['unknown'] = 'nekonata';
 $labels['unlimited'] = 'senlima';
 $labels['quicksearch'] = 'Rapida serĉo';
 $labels['resetsearch'] = 'Vakigu serĉon';
-$labels['compose'] = 'Verku mesaĝon';
 $labels['savemessage'] = 'Savu ĉi tiun malneton';
 $labels['sendmessage'] = 'Sendu mesaĝon';
 $labels['addattachment'] = 'Alfiksu dosieron';
@@ -157,14 +157,14 @@ $labels['addcontact'] = 'Aldonu kontakton';
 $labels['editcontact'] = 'Redaktu kontakton';
 $labels['edit'] = 'Redaktu';
 $labels['cancel'] = 'Rezignu';
-$labels['save'] = 'Savu';
-$labels['delete'] = 'Forigu';
+$labels['save'] = 'Konservi';
+$labels['delete'] = 'Forigi';
 $labels['newcontact'] = 'Kreu novan kontakton';
 $labels['deletecontact'] = 'Forigu elektatajn kontaktojn';
 $labels['composeto'] = 'Verku mesaĝon al';
 $labels['contactsfromto'] = 'Kontaktoj ekde $from ĝis $to de $count';
-$labels['print'] = 'Printu';
-$labels['export'] = 'Eksportu';
+$labels['print'] = 'Presi';
+$labels['export'] = 'Elporti';
 $labels['previouspage'] = 'Montru auntaŭan';
 $labels['firstpage'] = 'Montru unuan';
 $labels['nextpage'] = 'Montru sekvan';
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index 9b2f2cb4a..ec69eea6c 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -90,6 +90,7 @@ $labels['longnov'] = 'Noviembre';
 $labels['longdec'] = 'Diciembre';
 $labels['today'] = 'Hoy';
 $labels['checkmail'] = 'Revisar si hay nuevos mensajes';
+$labels['compose'] = 'Escribir un mensaje';
 $labels['writenewmessage'] = 'Crear nuevo mensaje';
 $labels['replytomessage'] = 'Responder mensaje';
 $labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
@@ -139,7 +140,6 @@ $labels['searchmod'] = 'Opciones de búsqueda';
 $labels['msgtext'] = 'Mensaje completo';
 $labels['openinextwin'] = 'Abrir en ventana nueva';
 $labels['emlsave'] = 'Guardar (.eml)';
-$labels['compose'] = 'Escribir un mensaje';
 $labels['editasnew'] = 'Editar como nuevo';
 $labels['savemessage'] = 'Guardar como borrador';
 $labels['sendmessage'] = 'Enviar ahora el mensaje';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index 4f650121f..e95d2164b 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David Marzal <Unknown>                                        |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Noviembre';
 $labels['longdec'] = 'Diciembre';
 $labels['today'] = 'Hoy';
 $labels['checkmail'] = 'Revisar si hay nuevos mensajes';
+$labels['compose'] = 'Escribir un mensaje';
 $labels['writenewmessage'] = 'Crear nuevo mensaje';
 $labels['replytomessage'] = 'Responder mensaje';
 $labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Opciones de búsqueda';
 $labels['msgtext'] = 'Mensaje completo';
 $labels['openinextwin'] = 'Abrir en nueva ventana';
 $labels['emlsave'] = 'Descargar (.eml)';
-$labels['compose'] = 'Escribir un mensaje';
 $labels['editasnew'] = 'Editar como nuevo';
 $labels['savemessage'] = 'Guardar como borrador';
 $labels['sendmessage'] = 'Enviar ahora el mensaje';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index 611f34cb7..fadd64dc6 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -46,6 +46,7 @@ $labels['folders'] = 'Kaustad';
 $labels['messagesfromto'] = 'Kirjed $from kuni $to, kokku $count';
 $labels['threadsfromto'] = 'Lõimed $from kuni $to, kokku $count';
 $labels['messagenrof'] = 'Kiri $nr, kokku $count';
+$labels['fromtoshort'] = '$from – $to kokku $count';
 $labels['copy'] = 'Kopeeri';
 $labels['move'] = 'Liiguta';
 $labels['moveto'] = 'liiguta kausta...';
@@ -92,12 +93,16 @@ $labels['longoct'] = 'Oktoober';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'Detsember';
 $labels['today'] = 'Täna';
+$labels['refresh'] = 'Värskenda';
 $labels['checkmail'] = 'Kontrolli uusi kirju';
+$labels['compose'] = 'Koosta kiri';
 $labels['writenewmessage'] = 'Kirjuta uus kiri';
+$labels['reply'] = 'Vasta';
 $labels['replytomessage'] = 'Vasta kirjale';
 $labels['replytoallmessage'] = 'Vasta saatjale ja teistele kirja saanutele';
 $labels['replyall'] = 'Vasta kõigile';
 $labels['replylist'] = 'Vasta meilinglisti';
+$labels['forward'] = 'Edasta';
 $labels['forwardinline'] = 'Edasta kirja sees';
 $labels['forwardattachment'] = 'Edasta manusena';
 $labels['forwardmessage'] = 'Edasta see kiri';
@@ -110,12 +115,16 @@ $labels['nextmessage'] = 'Näita järgmist kirja';
 $labels['lastmessage'] = 'Näita viimast kirja';
 $labels['backtolist'] = 'Tagasi kirjade nimekirja';
 $labels['viewsource'] = 'Näita lähtekoodi';
+$labels['mark'] = 'Märgista';
 $labels['markmessages'] = 'Märgi kirjad';
 $labels['markread'] = 'Loetuks';
 $labels['markunread'] = 'Mitte loetuks';
 $labels['markflagged'] = 'Lisa lipik';
 $labels['markunflagged'] = 'Eemalda lipik';
 $labels['moreactions'] = 'Muud toimingud...';
+$labels['more'] = 'Rohkem';
+$labels['back'] = 'Tagasi';
+$labels['options'] = 'Valikud';
 $labels['select'] = 'Vali';
 $labels['all'] = 'kõik';
 $labels['none'] = 'Puudub';
@@ -159,7 +168,6 @@ $labels['searchmod'] = 'Otsingu laiendid';
 $labels['msgtext'] = 'Kogu kirjast';
 $labels['openinextwin'] = 'Ava uues aknas';
 $labels['emlsave'] = 'Salvesta (.eml)';
-$labels['compose'] = 'Koosta kiri';
 $labels['editasnew'] = 'Kasuta uue kirja põhjana';
 $labels['savemessage'] = 'Salvesta mustand';
 $labels['sendmessage'] = 'Saada kiri kohe';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Kohalejõudmise teavitus';
 $labels['mailreplyintro'] = '$date kirjutas $sender:';
 $labels['originalmessage'] = 'Esialgne kiri';
 $labels['editidents'] = 'Muuda Identiteete';
+$labels['spellcheck'] = 'Õigekiri';
 $labels['checkspelling'] = 'Kontrolli õigekirja';
 $labels['resumeediting'] = 'Jätka muutmist';
 $labels['revertto'] = 'Pööra tagasi';
+$labels['attach'] = 'Manusta';
 $labels['attachments'] = 'Manused';
 $labels['upload'] = 'Kinnita manus';
 $labels['uploadprogress'] = '$percent ($current, kokku $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Abikaasa';
 $labels['allfields'] = 'Kõik väljad';
 $labels['search'] = 'Otsi';
 $labels['advsearch'] = 'Täpsem otsing';
+$labels['advanced'] = 'Edasijõudnutele';
 $labels['other'] = 'Muu';
 $labels['typeother'] = 'Muu';
 $labels['typehome'] = 'Kodu';
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 886e82ba7..ef99c37e2 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: yllar <Unknown>                                               |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Kontakti(de) gruppi lisamine…';
 $messages['removingmember'] = 'Kontakti(de) grupist eemaldamine…';
 $messages['receiptsent'] = 'Kättesaamiskinnitus saadetud';
 $messages['errorsendingreceipt'] = 'Ei õnnestunud kättesaamiskinnitust saata';
+$messages['deleteidentityconfirm'] = 'Soovid selle identiteedi kustutada?';
 $messages['nodeletelastidentity'] = 'See identiteet on viimane ja seda ei saa kustutada.';
 $messages['forbiddencharacter'] = 'Kausta nimi sisaldab keelatud sümbolit';
 $messages['selectimportfile'] = 'Palun vali üleslaadimiseks fail';
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index f95a592c3..0e6906014 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -89,6 +89,7 @@ $labels['longnov'] = 'Azaroa';
 $labels['longdec'] = 'Abendua';
 $labels['today'] = 'Gaur';
 $labels['checkmail'] = 'Mezu berrien bila arakatu';
+$labels['compose'] = 'Mezu bat sortu';
 $labels['writenewmessage'] = 'Mezu berri bat sortu';
 $labels['replytomessage'] = 'Mezuari erantzun';
 $labels['replytoallmessage'] = 'Bidaltzaile eta hartzaile guztiei erantzun';
@@ -119,7 +120,6 @@ $labels['unknown'] = 'ezezaguna';
 $labels['unlimited'] = 'mugagabea';
 $labels['quicksearch'] = 'Bilaketa azkarra';
 $labels['resetsearch'] = 'Bilaketa berrabiarazi';
-$labels['compose'] = 'Mezu bat sortu';
 $labels['savemessage'] = 'Zirriborro hau gorde';
 $labels['sendmessage'] = 'Mezua orain bidali';
 $labels['addattachment'] = 'Fitxategia erantsi';
diff --git a/program/localization/fa/labels.inc b/program/localization/fa/labels.inc
index 30b670194..3e9962b26 100644
--- a/program/localization/fa/labels.inc
+++ b/program/localization/fa/labels.inc
@@ -89,6 +89,7 @@ $labels['longnov'] = 'نوامبر';
 $labels['longdec'] = 'دسامبر';
 $labels['today'] = 'امروز';
 $labels['checkmail'] = 'بررسی برای پیغام‌های جدید';
+$labels['compose'] = 'نوشتن پیغام';
 $labels['writenewmessage'] = 'ایجاد پیغام جدید';
 $labels['replytomessage'] = 'پاسخ به پیغام';
 $labels['replytoallmessage'] = 'پاسخ به فرستنده وتمام گیرنده‌ها';
@@ -123,7 +124,6 @@ $labels['unlimited'] = 'نامحدود';
 $labels['quicksearch'] = 'جستجوی سریع';
 $labels['resetsearch'] = 'شروع مجدد جستجو';
 $labels['openinextwin'] = 'نمایش در صفحه جدید';
-$labels['compose'] = 'نوشتن پیغام';
 $labels['savemessage'] = 'ذخیره‌ی این پیش‌نویس';
 $labels['sendmessage'] = 'ارسال پیغام';
 $labels['addattachment'] = 'پیوست کردن یک پرونده';
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index 7e5eb4414..742668ccd 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -89,6 +89,7 @@ $labels['longnov'] = 'نومبر';
 $labels['longdec'] = 'دسمبر';
 $labels['today'] = 'امروز';
 $labels['checkmail'] = 'بررسي کردن پيغام های جديد';
+$labels['compose'] = 'نوشتن پیام حدید';
 $labels['writenewmessage'] = 'ساختن پيغام جديد';
 $labels['replytomessage'] = 'جواب دادن به پيغام';
 $labels['replytoallmessage'] = 'به فرستنده و تمام گيرينده ها جواب بدهيد';
@@ -123,7 +124,6 @@ $labels['unlimited'] = 'نامعين/ نامحدود';
 $labels['quicksearch'] = 'جستجوی سریع';
 $labels['resetsearch'] = 'بازنشاندن جستجو';
 $labels['openinextwin'] = 'در پینجره ای جدید باز کنید';
-$labels['compose'] = 'نوشتن پیام حدید';
 $labels['savemessage'] = 'این پیش نویس را حفظ نمایید';
 $labels['sendmessage'] = 'پيغام را همين حالا ارسال کنيد';
 $labels['addattachment'] = 'ضميمه نمودن يک فايل';
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index def6f21b1..fb742b0c4 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -90,11 +90,15 @@ $labels['longoct'] = 'Lokakuu';
 $labels['longnov'] = 'Marraskuu';
 $labels['longdec'] = 'Joulukuu';
 $labels['today'] = 'Tänään';
+$labels['refresh'] = 'Päivitä';
 $labels['checkmail'] = 'Tarkista saapuneet viestit';
+$labels['compose'] = 'Viestin kirjoitus';
 $labels['writenewmessage'] = 'Kirjoita uusi viesti';
+$labels['reply'] = 'Vastaa';
 $labels['replytomessage'] = 'Vastaa viestiin';
 $labels['replytoallmessage'] = 'Vastaa kaikille';
 $labels['replyall'] = 'Vastaa kaikille';
+$labels['forward'] = 'Välitä eteenpäin';
 $labels['forwardattachment'] = 'Välitä viesti liitteenä';
 $labels['forwardmessage'] = 'Välitä viesti';
 $labels['deletemessage'] = 'Poista viesti';
@@ -112,6 +116,8 @@ $labels['markunread'] = 'ei-luetuiksi';
 $labels['markflagged'] = 'korostetuiksi';
 $labels['markunflagged'] = 'ei-korostetuiksi';
 $labels['moreactions'] = 'Lisää toimintoja...';
+$labels['more'] = 'Lisää';
+$labels['back'] = 'Takaisin';
 $labels['select'] = 'Valitse';
 $labels['all'] = 'Kaikki';
 $labels['none'] = 'Ei mikään';
@@ -140,6 +146,7 @@ $labels['desc'] = 'laskeva';
 $labels['listcolumns'] = 'Näkyvät kentät';
 $labels['listsorting'] = 'Lajittelu kenttä';
 $labels['listorder'] = 'Lajittelu järjestys';
+$labels['folderactions'] = 'Kansiotoiminnot...';
 $labels['compact'] = 'Tiivistä';
 $labels['empty'] = 'Tyhjennä';
 $labels['quota'] = 'Levytila';
@@ -151,7 +158,6 @@ $labels['searchmod'] = 'Hakukriteerit';
 $labels['msgtext'] = 'Koko viesti';
 $labels['openinextwin'] = 'Avaa uudessa ikkunassa';
 $labels['emlsave'] = 'Tallenna (.eml)';
-$labels['compose'] = 'Viestin kirjoitus';
 $labels['editasnew'] = 'Muokkaa uutena';
 $labels['savemessage'] = 'Tallenna tämä luonnos';
 $labels['sendmessage'] = 'Lähetä viesti';
@@ -348,7 +354,11 @@ $labels['abovequote'] = 'lainauksen ylle';
 $labels['insertsignature'] = 'Lisää allekirjoitus';
 $labels['previewpanemarkread'] = 'Merkitse esikatsellut viestit luetuiksi';
 $labels['afternseconds'] = '$n sekunnin jälkeen';
+$labels['spellcheckbeforesend'] = 'Tarkista oikeinkirjoitus ennen viestin lähetystä';
 $labels['spellcheckoptions'] = 'Oikuluvun asetukset';
+$labels['spellcheckignoresyms'] = 'Jätä huomiotta sanat, joissa on symboleja';
+$labels['spellcheckignorenums'] = 'Jätä huomiotta sanat, joissa on numeroita';
+$labels['spellcheckignorecaps'] = 'Jätä huomiotta sanat, joissa kaikki kirjaimet on isoja';
 $labels['addtodict'] = 'Lisää sanakirjaan';
 $labels['folder'] = 'Kansio';
 $labels['foldername'] = 'Kansion nimi';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 26b2e9420..93e8677c7 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Edouard Moreau <Unknown>                                      |
+ | Author: Nicolas Delvaux <Unknown>                                     |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -46,6 +46,7 @@ $labels['folders'] = 'Dossiers';
 $labels['messagesfromto'] = 'Messages de $from à $to sur $count';
 $labels['threadsfromto'] = 'Fil de $from à $to sur $count';
 $labels['messagenrof'] = 'Message $nr sur $count';
+$labels['fromtoshort'] = '$from – $to de $count';
 $labels['copy'] = 'Copier';
 $labels['move'] = 'Déplacer';
 $labels['moveto'] = 'Déplacer vers...';
@@ -92,12 +93,16 @@ $labels['longoct'] = 'Octobre';
 $labels['longnov'] = 'Novembre';
 $labels['longdec'] = 'Décembre';
 $labels['today'] = 'Aujourd\'hui';
+$labels['refresh'] = 'Actualiser';
 $labels['checkmail'] = 'Vérification des nouveaux messages';
+$labels['compose'] = 'Composer un nouveau message';
 $labels['writenewmessage'] = 'Écrire un nouveau message';
+$labels['reply'] = 'Répondre';
 $labels['replytomessage'] = 'Répondre au message';
 $labels['replytoallmessage'] = 'Répondre à tous';
 $labels['replyall'] = 'Répondre à tous';
 $labels['replylist'] = 'Répondre à la liste';
+$labels['forward'] = 'Transférer';
 $labels['forwardinline'] = 'Transférer dans le corps du message';
 $labels['forwardattachment'] = 'Transférer en pièce-jointe';
 $labels['forwardmessage'] = 'Transmettre le message';
@@ -110,12 +115,16 @@ $labels['nextmessage'] = 'Voir le message suivant';
 $labels['lastmessage'] = 'Voir le dernier message';
 $labels['backtolist'] = 'Retourner à la liste des messages';
 $labels['viewsource'] = 'Voir le source';
+$labels['mark'] = 'Marquer';
 $labels['markmessages'] = 'Marquer les messages';
 $labels['markread'] = 'Comme lus';
 $labels['markunread'] = 'Comme non lus';
 $labels['markflagged'] = 'Comme suivi';
 $labels['markunflagged'] = 'Comme non-suivi';
 $labels['moreactions'] = 'Plus d\'actions...';
+$labels['more'] = 'Plus';
+$labels['back'] = 'Retour';
+$labels['options'] = 'Paramètres';
 $labels['select'] = 'Sélectionner';
 $labels['all'] = 'Tous';
 $labels['none'] = 'Aucun';
@@ -159,7 +168,6 @@ $labels['searchmod'] = 'Portée de la recherche';
 $labels['msgtext'] = 'Message entier';
 $labels['openinextwin'] = 'Ouvrir dans une nouvelle fenêtre';
 $labels['emlsave'] = 'Télécharger (.eml)';
-$labels['compose'] = 'Composer un nouveau message';
 $labels['editasnew'] = 'Éditer en tant que nouveau message';
 $labels['savemessage'] = 'Enregistrer ce brouillon';
 $labels['sendmessage'] = 'Envoyer le message maintenant';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Notification d\'état de distribution';
 $labels['mailreplyintro'] = 'Le $date, $sender a écrit :';
 $labels['originalmessage'] = 'Message original';
 $labels['editidents'] = 'Modifier les identités';
+$labels['spellcheck'] = 'Vérifier l\'orthographe';
 $labels['checkspelling'] = 'Vérifier l\'orthographe';
 $labels['resumeediting'] = 'Retourner à l\'édition';
 $labels['revertto'] = 'Revenir à';
+$labels['attach'] = 'Joindre';
 $labels['attachments'] = 'Fichiers joints';
 $labels['upload'] = 'Joindre';
 $labels['uploadprogress'] = '$percent ($current sur $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Épouse';
 $labels['allfields'] = 'Tous les champs';
 $labels['search'] = 'Rechercher';
 $labels['advsearch'] = 'Recherche avancée';
+$labels['advanced'] = 'Détails';
 $labels['other'] = 'Autre';
 $labels['typeother'] = 'Autre';
 $labels['typehome'] = 'Domicile';
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index 55be0d4c4..219e3abd3 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Nicolas Delvaux <Unknown>                                     |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Ajout des contacts dans le groupe ...';
 $messages['removingmember'] = 'Suppression des contacts du groupe ...';
 $messages['receiptsent'] = 'L\'accusé de réception a bien été envoyé';
 $messages['errorsendingreceipt'] = 'L\'accusé de réception n\'a pas pu être envoyé';
+$messages['deleteidentityconfirm'] = 'Voulez vous vraiment supprimer cette identités ?';
 $messages['nodeletelastidentity'] = 'Vous ne pouvez pas effacer votre seule identité.';
 $messages['forbiddencharacter'] = 'Le nom du dossier contient un caractère interdit';
 $messages['selectimportfile'] = 'Veuillez sélectionner un fichier à envoyer';
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 145d4b839..b312ddcc5 100755
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Stephen Ryan <Unknown>                                        |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -88,6 +88,7 @@ $labels['longnov'] = 'Samhain';
 $labels['longdec'] = 'Nollag';
 $labels['today'] = 'Inniu';
 $labels['checkmail'] = 'Seiceáil chun teachtaireacht nua';
+$labels['compose'] = 'Scríobh teachtaireacht';
 $labels['writenewmessage'] = 'Scríobh teachtaireacht nua';
 $labels['replytomessage'] = 'Scríobh freagra chun an seolaí';
 $labels['replytoallmessage'] = 'Scríobh freagra chun an seolaí agus na faighteoir';
@@ -113,7 +114,6 @@ $labels['unknown'] = 'gan aithne';
 $labels['unlimited'] = 'gan teorainn';
 $labels['quicksearch'] = 'Mearcuardaigh';
 $labels['resetsearch'] = 'Athshocraigh an cuardach';
-$labels['compose'] = 'Scríobh teachtaireacht';
 $labels['savemessage'] = 'Sábháil an dréachta seo';
 $labels['sendmessage'] = 'Seol mo teachtaireacht láithreach bonn';
 $labels['addattachment'] = 'Suimigh Iatán';
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 78f47f214..3ccf6929f 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Novembro';
 $labels['longdec'] = 'Decembro';
 $labels['today'] = 'Hoxe';
 $labels['checkmail'] = 'Procurar novas mensaxes';
+$labels['compose'] = 'Redactar unha mensaxe';
 $labels['writenewmessage'] = 'Redactar unha mensaxe nova';
 $labels['replytomessage'] = 'Respostar a mensaxe';
 $labels['replytoallmessage'] = 'Respostar á lista ou ao remitente e a tódolos destinatarios';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Modificadores de busca';
 $labels['msgtext'] = 'Mensaxe enteira';
 $labels['openinextwin'] = 'Abrir nunha nova fiestra';
 $labels['emlsave'] = 'Gardar (.eml)';
-$labels['compose'] = 'Redactar unha mensaxe';
 $labels['editasnew'] = 'Editar como nova';
 $labels['savemessage'] = 'Gardar a mensaxe como borrador';
 $labels['sendmessage'] = 'Enviar a mensaxe agora';
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 1a207a367..57e8aa12e 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'נובמבר';
 $labels['longdec'] = 'דצמבר';
 $labels['today'] = 'היום';
 $labels['checkmail'] = 'משיכת הודעות חדשות';
+$labels['compose'] = 'כתיבת הודעה';
 $labels['writenewmessage'] = 'יצירת הודעה חדשה';
 $labels['replytomessage'] = 'מענה לשולח';
 $labels['replytoallmessage'] = 'מענה לשולח ולכל הנמענים';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'מאפייני חיפוש';
 $labels['msgtext'] = 'כל ההודעה';
 $labels['openinextwin'] = 'פתיחה בחלון חדש';
 $labels['emlsave'] = 'הורדת הודעה בפורמט  EML';
-$labels['compose'] = 'כתיבת הודעה';
 $labels['editasnew'] = 'עריכת ההודעה כחדשה';
 $labels['savemessage'] = 'שמירת טיוטה';
 $labels['sendmessage'] = 'משלוח מיידי';
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index 8ef62e210..fb068b443 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Vibhav Pant <vibhavp@gmail.com>                               |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -35,6 +35,7 @@ $labels['to'] = 'पाने वाला';
 $labels['cc'] = 'कार्बन';
 $labels['bcc'] = 'अंधा कार्बन';
 $labels['replyto'] = 'जवाब यहाँ';
+$labels['followupto'] = 'को- फॉलोअप';
 $labels['date'] = 'तारीख';
 $labels['size'] = 'माप';
 $labels['priority'] = 'मेल की महत्वपूर्णता';
@@ -44,6 +45,7 @@ $labels['folders'] = 'फ़ोल्डर';
 $labels['messagesfromto'] = '$from से ले कर $to, $count मेल में से';
 $labels['messagenrof'] = '$nr नम्बर मेल, $count में से';
 $labels['copy'] = 'कार्बन';
+$labels['move'] = 'स्थानांतरित करें';
 $labels['moveto'] = 'खीस्काऐं...';
 $labels['download'] = 'डाऊनलोड';
 $labels['filename'] = 'फ़ाईल नाम';
@@ -63,11 +65,34 @@ $labels['wednesday'] = 'बुधवार';
 $labels['thursday'] = 'गुरुवार';
 $labels['friday'] = 'शुक्रवार';
 $labels['saturday'] = 'शनिवार';
+$labels['jan'] = 'जनवरी';
+$labels['feb'] = 'फ़रवरी';
+$labels['mar'] = 'मार्च';
+$labels['apr'] = 'अप्रेल';
+$labels['may'] = 'मई';
+$labels['longmay'] = 'मई';
+$labels['jun'] = 'जून';
+$labels['jul'] = 'जुलाई';
+$labels['longjan'] = 'जनवरी';
+$labels['longfeb'] = 'फ़रवरी';
+$labels['longmar'] = 'मार्च';
+$labels['longapr'] = 'अप्रैल';
+$labels['longjun'] = 'जून';
+$labels['longjul'] = 'जुलाई';
+$labels['longaug'] = 'अगस्त';
+$labels['longsep'] = 'सितंबर';
+$labels['longoct'] = 'अक्टूबर';
+$labels['longnov'] = 'नवम्बर';
+$labels['longdec'] = 'दिसंबर';
 $labels['today'] = 'आज';
+$labels['refresh'] = 'ताज़ा करें';
 $labels['checkmail'] = 'नये मेल लाऐं';
+$labels['compose'] = 'मेल लिखें';
 $labels['writenewmessage'] = 'मेल लिखें';
+$labels['reply'] = 'जवाब';
 $labels['replytomessage'] = 'मेल का जवाब दें';
 $labels['replytoallmessage'] = 'सभी को जवाब लिखें';
+$labels['forward'] = 'अग्रेषित करें';
 $labels['forwardmessage'] = 'आगे भेजें';
 $labels['deletemessage'] = 'रद्द करें';
 $labels['printmessage'] = 'मेल छापें';
@@ -77,6 +102,7 @@ $labels['nextmessage'] = 'अगला मेल दिखाऐं';
 $labels['lastmessage'] = 'आखीरी मेल दिखाऐं';
 $labels['backtolist'] = 'मेल सूची देखें';
 $labels['viewsource'] = 'सोर्स दिखाऐं';
+$labels['mark'] = 'चिह्नित';
 $labels['select'] = 'चुनें';
 $labels['all'] = 'सभी';
 $labels['none'] = 'कोई नहीं';
@@ -89,7 +115,6 @@ $labels['unknown'] = 'अज्ञात';
 $labels['unlimited'] = 'असीम';
 $labels['quicksearch'] = 'तेज़ खोज';
 $labels['resetsearch'] = 'खोज खाली करें';
-$labels['compose'] = 'मेल लिखें';
 $labels['savemessage'] = 'ड्राफ़ट सहेजें';
 $labels['sendmessage'] = 'मेल भेजें';
 $labels['addattachment'] = 'फ़ाईल जोडें';
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index ab438f223..17aa78dc7 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Studeni';
 $labels['longdec'] = 'Prosinac';
 $labels['today'] = 'danas';
 $labels['checkmail'] = 'Provjera novih poruka';
+$labels['compose'] = 'Nova poruka';
 $labels['writenewmessage'] = 'Nova poruka';
 $labels['replytomessage'] = 'Odgovori na poruku';
 $labels['replytoallmessage'] = 'Odgovori pošiljaocu i svim primateljima';
@@ -158,7 +159,6 @@ $labels['searchmod'] = 'Postavke pretrage';
 $labels['msgtext'] = 'Cijela poruka';
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['compose'] = 'Nova poruka';
 $labels['editasnew'] = 'Uredi kao novo';
 $labels['savemessage'] = 'Spremi u \'Predlošci\'';
 $labels['sendmessage'] = 'Pošalji poruku';
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index ba74fb3ff..ed8eeb5f5 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Ma';
 $labels['checkmail'] = 'Új üzenetek ellenőrzése';
+$labels['compose'] = 'Üzenet létrehozása';
 $labels['writenewmessage'] = 'Új üzenet';
 $labels['replytomessage'] = 'Válasz';
 $labels['replytoallmessage'] = 'Válasz a listának vagy a feladónak és az összes címzettnek';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Keresési opciók';
 $labels['msgtext'] = 'Teljes üzenet';
 $labels['openinextwin'] = 'Megnyitás új ablakban';
 $labels['emlsave'] = 'Letöltés (.eml)';
-$labels['compose'] = 'Üzenet létrehozása';
 $labels['editasnew'] = 'Szerkesztés újként';
 $labels['savemessage'] = 'Vázlat mentése';
 $labels['sendmessage'] = 'Üzenet küldése';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 173daef60..01a24f7be 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -89,6 +89,7 @@ $labels['longnov'] = 'Նոյեմբեր';
 $labels['longdec'] = 'Դեկտեմբեր';
 $labels['today'] = 'Այսօր';
 $labels['checkmail'] = 'Ստուգել նոր նամակները';
+$labels['compose'] = 'Գրել նամակ';
 $labels['writenewmessage'] = 'Նոր նամակ';
 $labels['replytomessage'] = 'Պատասխանել նամակին';
 $labels['replytoallmessage'] = 'Պատասխանել բոլորին';
@@ -123,7 +124,6 @@ $labels['unlimited'] = 'անսահմանափակ';
 $labels['quicksearch'] = 'Արագ որոնում';
 $labels['resetsearch'] = 'Վերսկսել որոնումը';
 $labels['openinextwin'] = 'Բացել նոր պատուհանում';
-$labels['compose'] = 'Գրել նամակ';
 $labels['savemessage'] = 'Հիշել որպես սևագիր';
 $labels['sendmessage'] = 'Ուղարկել';
 $labels['addattachment'] = 'Կցել ֆայլ';
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 34392c0cf..1aae6fa11 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Putu Arya Sabda Wijaya <Unknown>                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -46,6 +46,7 @@ $labels['folders'] = 'Semua Folder';
 $labels['messagesfromto'] = 'Pesan ke $from sampai $to dari $count';
 $labels['threadsfromto'] = 'Untaian ke $from sampai $to dari $count';
 $labels['messagenrof'] = 'Pesan $nr sebanyak $count';
+$labels['fromtoshort'] = '$from - $to dari $count';
 $labels['copy'] = 'Salin';
 $labels['move'] = 'Pindahkan';
 $labels['moveto'] = 'Pindahkan ke...';
@@ -92,12 +93,16 @@ $labels['longoct'] = 'Oktober';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'Desember';
 $labels['today'] = 'Hari ini';
+$labels['refresh'] = 'Segarkan';
 $labels['checkmail'] = 'Periksa pesan baru';
+$labels['compose'] = 'Tulis sebuah pesan';
 $labels['writenewmessage'] = 'Buat pesan baru';
+$labels['reply'] = 'Balas';
 $labels['replytomessage'] = 'Balas pesan';
 $labels['replytoallmessage'] = 'Balas ke pengirim dan yang lain';
 $labels['replyall'] = 'Balas ke semua';
 $labels['replylist'] = 'Balas ke milis';
+$labels['forward'] = 'Teruskan';
 $labels['forwardinline'] = 'Teruskan bersama surat';
 $labels['forwardattachment'] = 'Teruskan sebagai sisipan';
 $labels['forwardmessage'] = 'Teruskan pesan';
@@ -110,12 +115,16 @@ $labels['nextmessage'] = 'Perlihatkan pesan berikutnya';
 $labels['lastmessage'] = 'Perlihatkan pesan terakhir';
 $labels['backtolist'] = 'Kembali ke daftar pesan';
 $labels['viewsource'] = 'Perlihatkan kode sumber';
+$labels['mark'] = 'Tandai';
 $labels['markmessages'] = 'Tandai Pesan';
 $labels['markread'] = 'Terbaca';
 $labels['markunread'] = 'Belum Terbaca';
 $labels['markflagged'] = 'Sudah ditandai';
 $labels['markunflagged'] = 'Belum ditandai';
 $labels['moreactions'] = 'Tindakan lain..';
+$labels['more'] = 'Selebihnya';
+$labels['back'] = 'Kembali';
+$labels['options'] = 'Pilihan';
 $labels['select'] = 'Pilih';
 $labels['all'] = 'Semua';
 $labels['none'] = 'Tidak ada';
@@ -159,7 +168,6 @@ $labels['searchmod'] = 'Peubah pencarian';
 $labels['msgtext'] = 'Seluruh pesan';
 $labels['openinextwin'] = 'Buka dalam jendela baru';
 $labels['emlsave'] = 'Unduh (.eml)';
-$labels['compose'] = 'Tulis sebuah pesan';
 $labels['editasnew'] = 'Sunting sebagai pesan baru';
 $labels['savemessage'] = 'Simpan konsep surat  ini';
 $labels['sendmessage'] = 'Kirim pesan sekarang';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Pemberitahuan status terkirim';
 $labels['mailreplyintro'] = 'Pada $date, $sender menulis:';
 $labels['originalmessage'] = 'Pesan Sebenarnya';
 $labels['editidents'] = 'Ubah identitas';
+$labels['spellcheck'] = 'Ejaan';
 $labels['checkspelling'] = 'Pemeriksaan ejaan';
 $labels['resumeediting'] = 'Lanjutkan menyunting';
 $labels['revertto'] = 'Balikkan ke';
+$labels['attach'] = 'Lampirkan';
 $labels['attachments'] = 'Sisipan';
 $labels['upload'] = 'Unggah';
 $labels['uploadprogress'] = '$percent ($current dari $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Suami/Istri';
 $labels['allfields'] = 'Semua isian';
 $labels['search'] = 'Cari';
 $labels['advsearch'] = 'Pencarian Lebih Lanjut';
+$labels['advanced'] = 'Tingkat lanjut';
 $labels['other'] = 'Lainnya';
 $labels['typeother'] = 'Lainnya';
 $labels['typehome'] = 'Rumah';
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index 18cf8e39c..fa7cb4114 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Putu Arya Sabda Wijaya <Unknown>                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Menambahkan kontak ke grup...';
 $messages['removingmember'] = 'Menyingkirkan kontak dari grup...';
 $messages['receiptsent'] = 'Berhasil mengirim pemberitahuan tanda terima telah terbaca';
 $messages['errorsendingreceipt'] = 'Tidak dapat mengirim tanda terima';
+$messages['deleteidentityconfirm'] = 'Yakin untuk menghapus identitas ini?';
 $messages['nodeletelastidentity'] = 'Anda tidak bida mengapus identitas ini, ini identitas yang terakhir';
 $messages['forbiddencharacter'] = 'Nama folder mengandung karakter terlarang';
 $messages['selectimportfile'] = 'Mohon pilih sebuah berkas untuk diunggah';
diff --git a/program/localization/index.inc b/program/localization/index.inc
index 498b96858..4e6545409 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -105,6 +105,7 @@ $rcube_language_aliases = array(
   'ca' => 'ca_ES',
   'cn' => 'zh_CN',
   'cs' => 'cs_CZ',
+  'cy' => 'cy_GB',
   'cz' => 'cs_CZ',
   'da' => 'da_DK',
   'de' => 'de_DE',
@@ -123,6 +124,7 @@ $rcube_language_aliases = array(
   'ko' => 'ko_KR',
   'kr' => 'ko_KR',
   'kh' => 'km_KH',
+  'kh_KH' => 'km_KH',
   'km' => 'km_KH',
   'ne' => 'ne_NP',
   'no' => 'nn_NO',
@@ -137,6 +139,7 @@ $rcube_language_aliases = array(
   'sr_latin' => 'bs_BA',
   'se' => 'sv_SE',
   'sv' => 'sv_SE',
+  'sq' => 'sq_AL',
   'uk' => 'uk_UA',
   'vn' => 'vi_VN',
   'vi' => 'vi_VN',
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index a7044c6c9..958bd37f2 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -89,6 +89,7 @@ $labels['longnov'] = 'Nóvember';
 $labels['longdec'] = 'Desember';
 $labels['today'] = 'í dag';
 $labels['checkmail'] = 'Gá að nýjum skeytum';
+$labels['compose'] = 'Semja skeyti';
 $labels['writenewmessage'] = 'Búa til nýtt skeyti';
 $labels['replytomessage'] = 'Svara skeyti';
 $labels['replytoallmessage'] = 'Svara sendanda og öllum viðtakendum';
@@ -123,7 +124,6 @@ $labels['unlimited'] = 'ótakmarkað';
 $labels['quicksearch'] = 'Flýtileit';
 $labels['resetsearch'] = 'Tæma leit';
 $labels['openinextwin'] = 'Opna í nýjum glugga';
-$labels['compose'] = 'Semja skeyti';
 $labels['savemessage'] = 'Vista drög';
 $labels['sendmessage'] = 'Senda skeytið núna';
 $labels['addattachment'] = 'Hengja við';
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index b86240d56..23a6370c4 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: simone <Unknown>                                              |
+ | Author: emilio brambilla <Unknown>                                    |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -46,6 +46,7 @@ $labels['folders'] = 'Cartelle';
 $labels['messagesfromto'] = 'Messaggi da $from a $to di $count';
 $labels['threadsfromto'] = 'Thread da $from a $to di $count';
 $labels['messagenrof'] = 'Messaggio $nr di $count';
+$labels['fromtoshort'] = '$from – $to di $count';
 $labels['copy'] = 'Copia';
 $labels['move'] = 'Sposta';
 $labels['moveto'] = 'Sposta in...';
@@ -92,12 +93,16 @@ $labels['longoct'] = 'Ottobre';
 $labels['longnov'] = 'Novembre';
 $labels['longdec'] = 'Dicembre';
 $labels['today'] = 'Oggi';
+$labels['refresh'] = 'Aggiorna';
 $labels['checkmail'] = 'Controlla nuovi messaggi';
+$labels['compose'] = 'Scrivi un messaggio';
 $labels['writenewmessage'] = 'Scrivi un nuovo messaggio';
+$labels['reply'] = 'Rispondi';
 $labels['replytomessage'] = 'Rispondi al mittente';
 $labels['replytoallmessage'] = 'Rispondi al mittente e ai destinatari';
 $labels['replyall'] = 'Rispondi a tutti';
 $labels['replylist'] = 'Rispondi alla mailing list';
+$labels['forward'] = 'Inoltra';
 $labels['forwardinline'] = 'Inoltra come messaggio';
 $labels['forwardattachment'] = 'Inoltre come allegato';
 $labels['forwardmessage'] = 'Inoltra il messaggio';
@@ -110,12 +115,16 @@ $labels['nextmessage'] = 'Visualizza il messaggio successivo';
 $labels['lastmessage'] = 'Visualizza l\'ultimo messaggio';
 $labels['backtolist'] = 'Torna alla lista messaggi';
 $labels['viewsource'] = 'Visualizza sorgente messaggio';
+$labels['mark'] = 'Contrassegna';
 $labels['markmessages'] = 'Marca i messaggi';
 $labels['markread'] = 'Letti';
 $labels['markunread'] = 'Non letti';
 $labels['markflagged'] = 'Contrassegnato';
 $labels['markunflagged'] = 'Non contrassegnato';
 $labels['moreactions'] = 'Altre operazioni...';
+$labels['more'] = 'Di più';
+$labels['back'] = 'Indietro';
+$labels['options'] = 'Opzioni';
 $labels['select'] = 'Seleziona';
 $labels['all'] = 'Tutti';
 $labels['none'] = 'Nessuno';
@@ -159,7 +168,6 @@ $labels['searchmod'] = 'Ambito di ricerca';
 $labels['msgtext'] = 'Intero messaggio';
 $labels['openinextwin'] = 'Apri in una nuova finestra';
 $labels['emlsave'] = 'Scarica (.eml)';
-$labels['compose'] = 'Scrivi un messaggio';
 $labels['editasnew'] = 'Modifica come nuovo';
 $labels['savemessage'] = 'Salva come bozza';
 $labels['sendmessage'] = 'Invia il messaggio adesso';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Notifica di consegna';
 $labels['mailreplyintro'] = 'Il $date $sender ha scritto:';
 $labels['originalmessage'] = 'Messaggio originale';
 $labels['editidents'] = 'Modifica identità';
+$labels['spellcheck'] = 'Controllo ortografico';
 $labels['checkspelling'] = 'Controlla ortografia';
 $labels['resumeediting'] = 'Torna al messaggio';
 $labels['revertto'] = 'Ripristina';
+$labels['attach'] = 'Allega';
 $labels['attachments'] = 'Allegati';
 $labels['upload'] = 'Aggiungi';
 $labels['uploadprogress'] = '$percent ($current di $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Coniuge';
 $labels['allfields'] = 'Tutti i campi';
 $labels['search'] = 'Ricerca';
 $labels['advsearch'] = 'Ricerca avanzata';
+$labels['advanced'] = 'Opzioni avanzate';
 $labels['other'] = 'Altro';
 $labels['typeother'] = 'Altro';
 $labels['typehome'] = 'Casa';
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index 08cdbcb68..db0363d34 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: emilio brambilla <Unknown>                                    |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Aggiunta contatto al gruppo...';
 $messages['removingmember'] = 'Rimozione contatto dal gruppo...';
 $messages['receiptsent'] = 'Ricevuta di ritorno inviata con successo';
 $messages['errorsendingreceipt'] = 'Impossibile spedire la ricevuta di ritorno';
+$messages['deleteidentityconfirm'] = 'sei sicuro di voler cancellare questo profilo?';
 $messages['nodeletelastidentity'] = 'Impossibile eliminare l\'unica identità disponibile';
 $messages['forbiddencharacter'] = 'Il nome della cartella contiene un carattere vietato';
 $messages['selectimportfile'] = 'Per favore, seleziona il file da caricare';
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index 9d2313a57..caee7139f 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = '11 月';
 $labels['longdec'] = '12 月';
 $labels['today'] = '今日';
 $labels['checkmail'] = '新着の確認';
+$labels['compose'] = 'メールの作成';
 $labels['writenewmessage'] = '新規メールの作成';
 $labels['replytomessage'] = '返信';
 $labels['replytoallmessage'] = '差出人とすべての宛先に返信';
@@ -159,7 +160,6 @@ $labels['searchmod'] = '検索条件';
 $labels['msgtext'] = 'すべてのメール';
 $labels['openinextwin'] = '新しいウィンドウで開く';
 $labels['emlsave'] = 'eml 形式で保存する';
-$labels['compose'] = 'メールの作成';
 $labels['editasnew'] = '新規として編集';
 $labels['savemessage'] = '下書きに保存';
 $labels['sendmessage'] = '今すぐ送信';
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index 66f4589bd..c963c988f 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -89,6 +89,7 @@ $labels['longnov'] = 'ნოემბერი';
 $labels['longdec'] = 'დეკემბერი';
 $labels['today'] = 'დღეს';
 $labels['checkmail'] = 'შემოწმება ახალ შეტყობინებაზე';
+$labels['compose'] = 'შეტყობინების დაწერა';
 $labels['writenewmessage'] = 'ახალი შეტყობინება';
 $labels['replytomessage'] = 'პასუხი';
 $labels['replytoallmessage'] = 'პასუხი ყველას';
@@ -141,7 +142,6 @@ $labels['searchmod'] = 'ძებნის ვარიანტები';
 $labels['msgtext'] = 'ყველა შეტყობინება';
 $labels['openinextwin'] = 'გახსნა ახალ ფანჯარაში';
 $labels['emlsave'] = 'გადმოწერა (.eml)';
-$labels['compose'] = 'შეტყობინების დაწერა';
 $labels['editasnew'] = 'რედაქტირება როგორც ახლის';
 $labels['savemessage'] = 'დროებით შენახვა';
 $labels['sendmessage'] = 'შეტყობინების გაგზავნა';
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index 545e07d1a..6a40dcf38 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -89,6 +89,7 @@ $labels['longnov'] = '11월';
 $labels['longdec'] = '12월';
 $labels['today'] = '오늘';
 $labels['checkmail'] = '새 메일 확인';
+$labels['compose'] = '메일 쓰기';
 $labels['writenewmessage'] = '새 메일 작성';
 $labels['replytomessage'] = '회신 작성';
 $labels['replytoallmessage'] = '보낸이와 모든 수신자에게 회신';
@@ -123,7 +124,6 @@ $labels['unlimited'] = '제한 없음';
 $labels['quicksearch'] = '빨리 찾기';
 $labels['resetsearch'] = '찾기 리셋';
 $labels['openinextwin'] = '새 창에서 열기';
-$labels['compose'] = '메일 쓰기';
 $labels['savemessage'] = '드래프트 저장';
 $labels['sendmessage'] = '메일 지금 보냄';
 $labels['addattachment'] = '파일 첨부';
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index 4b207868b..093696587 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -65,6 +65,7 @@ $labels['friday'] = 'În';
 $labels['saturday'] = 'Şemî';
 $labels['today'] = 'Îro';
 $labels['checkmail'] = 'Li peyamên nû venihêre';
+$labels['compose'] = 'Peyamekê biafirîne';
 $labels['writenewmessage'] = 'Peyameke nû biafirîne';
 $labels['replytomessage'] = 'Bersivê bide peyamê';
 $labels['replytoallmessage'] = 'Bersivê ji bo hemû kesên ku ev peyan standine bişîne';
@@ -93,7 +94,6 @@ $labels['unknown'] = 'nayê zanîn';
 $labels['unlimited'] = 'bêsînor';
 $labels['quicksearch'] = 'Lêgerîna bilez';
 $labels['resetsearch'] = 'Lêgerînê reset bike';
-$labels['compose'] = 'Peyamekê biafirîne';
 $labels['savemessage'] = 'Hilîne';
 $labels['sendmessage'] = 'Peyamê niha bişîne';
 $labels['addattachment'] = 'Pelekê lê zêde bike';
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 240c33e32..57803118c 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Lapkritis';
 $labels['longdec'] = 'Gruodis';
 $labels['today'] = 'Šiandien';
 $labels['checkmail'] = 'Tikrinti, ar yra naujų laiškų';
+$labels['compose'] = 'Rašyti naują laišką';
 $labels['writenewmessage'] = 'Rašyti naują laišką';
 $labels['replytomessage'] = 'Atsakyti siuntėjui';
 $labels['replytoallmessage'] = 'Atsakyti el. pašto grupei arba laiško siuntėjui ir visiems jo gavėjams';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Paieškos modifikatoriai';
 $labels['msgtext'] = 'Visas laiškas';
 $labels['openinextwin'] = 'Atverti naujame lange';
 $labels['emlsave'] = 'Parsisiųsti (.eml)';
-$labels['compose'] = 'Rašyti naują laišką';
 $labels['editasnew'] = 'Redaguoti kaip naują';
 $labels['savemessage'] = 'Išsaugoti šį juodraštį';
 $labels['sendmessage'] = 'Išsiųsti laiską';
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index de19998d6..e324815ed 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Novembris';
 $labels['longdec'] = 'Decembris';
 $labels['today'] = 'Šodien';
 $labels['checkmail'] = 'Pārbaudīt pastu';
+$labels['compose'] = 'Rakstīt vēstuli';
 $labels['writenewmessage'] = 'Rakstīt jaunu vēstuli';
 $labels['replytomessage'] = 'Atbildēt';
 $labels['replytoallmessage'] = 'Atbildēt sūtītājam un visiem saņēmējiem';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Meklēt laukos:';
 $labels['msgtext'] = 'Vēstules tekstā';
 $labels['openinextwin'] = 'atvērt jaunā logā';
 $labels['emlsave'] = 'lejupielādēt (.eml)';
-$labels['compose'] = 'Rakstīt vēstuli';
 $labels['editasnew'] = 'rediģēt kā jaunu';
 $labels['savemessage'] = 'Saglabāt uzmetumu';
 $labels['sendmessage'] = 'Sūtīt vēstuli';
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index 8a552aa53..75747b32f 100755
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -89,6 +89,7 @@ $labels['longnov'] = 'Ноември';
 $labels['longdec'] = 'Декември';
 $labels['today'] = 'Денес';
 $labels['checkmail'] = 'Провери пошта';
+$labels['compose'] = 'Пиши ново писмо';
 $labels['writenewmessage'] = 'Ново писмо';
 $labels['replytomessage'] = 'Одговори на испраќачот';
 $labels['replytoallmessage'] = 'Одговори на испраќачот и сите примачи';
@@ -128,7 +129,6 @@ $labels['searchmod'] = 'Модификатори на пребарувањето
 $labels['msgtext'] = 'Цело писмо';
 $labels['openinextwin'] = 'Отвори во нов прозорец';
 $labels['emlsave'] = 'Преземи (.eml)';
-$labels['compose'] = 'Пиши ново писмо';
 $labels['editasnew'] = 'Уреди како ново';
 $labels['savemessage'] = 'Зачувај го писмото во Непратени';
 $labels['sendmessage'] = 'Испрати сега';
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index e30d48542..e7a3fd7d5 100755
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -91,6 +91,7 @@ $labels['longnov'] = 'नोव्हेंबर';
 $labels['longdec'] = 'डिसेंबर';
 $labels['today'] = 'आज';
 $labels['checkmail'] = 'नवीन संदेश आले आहेत का पहा';
+$labels['compose'] = 'नवीन संदेश तयार करा';
 $labels['writenewmessage'] = 'नवीन संदेश तयार करा';
 $labels['replytomessage'] = 'पाठवणार्‍याला उत्तर द्या';
 $labels['replytoallmessage'] = 'पाठवणार्‍याला आणि प्रत केलेल्या सर्वांना संदेश पाठवा';
@@ -151,7 +152,6 @@ $labels['searchmod'] = 'बदलकर्त्‍यांना शोधा'
 $labels['msgtext'] = 'संपूर्ण संदेश';
 $labels['openinextwin'] = 'नवीन खिडकी उघडा';
 $labels['emlsave'] = 'इएमएल स्‍वरूपात उतरवून घ्या';
-$labels['compose'] = 'नवीन संदेश तयार करा';
 $labels['editasnew'] = 'नवीन आहे असा संपादित करा';
 $labels['savemessage'] = 'हा मसूदा साठवून ठेवा';
 $labels['sendmessage'] = 'आत्ता पाठवा';
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index cba1b0bea..034968995 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -21,7 +21,7 @@ $labels['password'] = 'Kata Laluan';
 $labels['server'] = 'Pelayan';
 $labels['login'] = 'Log Masuk';
 $labels['logout'] = 'Log Keluar';
-$labels['mail'] = 'E-Mel';
+$labels['mail'] = 'Mel';
 $labels['settings'] = 'Tetapan';
 $labels['addressbook'] = 'Buku Alamat';
 $labels['inbox'] = 'Masuk';
@@ -90,6 +90,7 @@ $labels['longnov'] = 'November';
 $labels['longdec'] = 'Disember';
 $labels['today'] = 'Hari Ini';
 $labels['checkmail'] = 'Semak mesej baru';
+$labels['compose'] = 'Karang mesej';
 $labels['writenewmessage'] = 'Cipta mesej baru';
 $labels['replytomessage'] = 'Balas mesej';
 $labels['replytoallmessage'] = 'Balas kepada penghantar dan semua penerima';
@@ -118,7 +119,6 @@ $labels['unknown'] = 'tidak diketahui';
 $labels['unlimited'] = 'tidak terhad';
 $labels['quicksearch'] = 'Carian pantas';
 $labels['resetsearch'] = 'Set semula carian';
-$labels['compose'] = 'Karang mesej';
 $labels['savemessage'] = 'Simpan draf ini';
 $labels['sendmessage'] = 'Hantar mesej sekarang';
 $labels['addattachment'] = 'Lampir fail';
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index 54b7f5e79..addbc7681 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -91,6 +91,7 @@ $labels['longnov'] = 'November';
 $labels['longdec'] = 'Desember';
 $labels['today'] = 'I dag';
 $labels['checkmail'] = 'Se etter nye meldinger';
+$labels['compose'] = 'Skriv ny e-post';
 $labels['writenewmessage'] = 'Opprett ny e-post';
 $labels['replytomessage'] = 'Svar på denne e-posten';
 $labels['replytoallmessage'] = 'Svar til alle mottakere';
@@ -151,7 +152,6 @@ $labels['searchmod'] = 'Søke felt';
 $labels['msgtext'] = 'Hele meldingen';
 $labels['openinextwin'] = 'Åpne i nytt vindu';
 $labels['emlsave'] = 'Last ned (.eml)';
-$labels['compose'] = 'Skriv ny e-post';
 $labels['editasnew'] = 'Rediger som ny';
 $labels['savemessage'] = 'Lagre kladd';
 $labels['sendmessage'] = 'Send e-posten';
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index a751ef4cb..bfeb8ec35 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -65,6 +65,7 @@ $labels['friday'] = 'शुक्रवार';
 $labels['saturday'] = 'शनिवार';
 $labels['today'] = 'आज';
 $labels['checkmail'] = 'नया मेल खोज्नुहोस';
+$labels['compose'] = 'मेल लखन गर्नुहोस';
 $labels['writenewmessage'] = 'नया मेल लेखनुहोस';
 $labels['replytomessage'] = 'मेलको जवाफ दिनुहोस';
 $labels['replytoallmessage'] = 'प्रेषक लगायत सबैलाई जवाफ दिनुहोस';
@@ -89,7 +90,6 @@ $labels['unknown'] = 'अज्ञात';
 $labels['unlimited'] = 'अनगिन्ति';
 $labels['quicksearch'] = 'स्फुर्ति खोज';
 $labels['resetsearch'] = 'पन: खोज';
-$labels['compose'] = 'मेल लखन गर्नुहोस';
 $labels['savemessage'] = 'ड्राफ्ट जोगाउनुहोस';
 $labels['sendmessage'] = 'तुरुन्तै मेल पठाउनुहोस';
 $labels['addattachment'] = 'फाइल टाँस्नुहोस';
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index 2d5b9d823..e9c0e7873 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Vandaag';
 $labels['checkmail'] = 'Controleer op nieuwe berichten';
+$labels['compose'] = 'Nieuw bericht opstellen';
 $labels['writenewmessage'] = 'Nieuw bericht';
 $labels['replytomessage'] = 'Beantwoorden';
 $labels['replytoallmessage'] = 'Allen beantwoorden';
@@ -156,7 +157,6 @@ $labels['searchmod'] = 'Zoekopties';
 $labels['msgtext'] = 'Volledig bericht';
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
-$labels['compose'] = 'Nieuw bericht opstellen';
 $labels['editasnew'] = 'Als nieuw bewerken';
 $labels['savemessage'] = 'Bewaar als concept';
 $labels['sendmessage'] = 'Verzenden';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 0ce2d8e2f..e45727bdc 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -46,6 +46,7 @@ $labels['folders'] = 'Mappen';
 $labels['messagesfromto'] = 'Bericht $from t/m $to van $count';
 $labels['threadsfromto'] = 'Conversatie $from t/m $to van $count';
 $labels['messagenrof'] = 'Bericht $nr van $count';
+$labels['fromtoshort'] = '$from – $to van $count';
 $labels['copy'] = 'Kopiëren';
 $labels['move'] = 'Verplaats';
 $labels['moveto'] = 'Verplaats naar...';
@@ -92,12 +93,16 @@ $labels['longoct'] = 'Oktober';
 $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Vandaag';
+$labels['refresh'] = 'Vernieuwen';
 $labels['checkmail'] = 'Controleer op nieuwe berichten';
+$labels['compose'] = 'Nieuw bericht aanmaken';
 $labels['writenewmessage'] = 'Maak een nieuw bericht';
+$labels['reply'] = 'Beantwoorden';
 $labels['replytomessage'] = 'Beantwoord het bericht';
 $labels['replytoallmessage'] = 'Beantwoord lijst of afzender en alle ontvangers';
 $labels['replyall'] = 'Beantwoord alle ontvangers';
 $labels['replylist'] = 'Beantwoord lijst';
+$labels['forward'] = 'Doorsturen';
 $labels['forwardinline'] = 'Doorsturen in bericht';
 $labels['forwardattachment'] = 'Doorsturen als bijlage';
 $labels['forwardmessage'] = 'Bericht doorsturen';
@@ -110,12 +115,16 @@ $labels['nextmessage'] = 'Toon het volgende bericht';
 $labels['lastmessage'] = 'Toon het laatste bericht';
 $labels['backtolist'] = 'Terug naar berichtenoverzicht';
 $labels['viewsource'] = 'Toon bron';
+$labels['mark'] = 'Markeren';
 $labels['markmessages'] = 'Markeer berichten';
 $labels['markread'] = 'Gelezen';
 $labels['markunread'] = 'Ongelezen';
 $labels['markflagged'] = 'Selecteren';
 $labels['markunflagged'] = 'Niet selecteren';
 $labels['moreactions'] = 'Meer acties';
+$labels['more'] = 'Meer';
+$labels['back'] = 'Terug';
+$labels['options'] = 'Opties';
 $labels['select'] = 'Selecteer';
 $labels['all'] = 'Allemaal';
 $labels['none'] = 'Geen';
@@ -159,7 +168,6 @@ $labels['searchmod'] = 'Zoekopties';
 $labels['msgtext'] = 'Gehele bericht';
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
-$labels['compose'] = 'Nieuw bericht aanmaken';
 $labels['editasnew'] = 'Als nieuw bewerken';
 $labels['savemessage'] = 'Bewaar als concept';
 $labels['sendmessage'] = 'Verstuur het bericht nu';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Afleveringsbericht (DSN)';
 $labels['mailreplyintro'] = '$sender schreef op $date:';
 $labels['originalmessage'] = 'Originele bericht';
 $labels['editidents'] = 'Bewerk identiteiten';
+$labels['spellcheck'] = 'Spelling';
 $labels['checkspelling'] = 'Controleer spelling';
 $labels['resumeediting'] = 'Doorgaan met opstellen';
 $labels['revertto'] = 'Wijzig terug in';
+$labels['attach'] = 'Bijvoegen';
 $labels['attachments'] = 'Bijlagen';
 $labels['upload'] = 'Toevoegen';
 $labels['uploadprogress'] = '$percent ($current van $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Echtgenoot';
 $labels['allfields'] = 'Alle velden';
 $labels['search'] = 'Zoeken';
 $labels['advsearch'] = 'Geavanceerd zoeken';
+$labels['advanced'] = 'Geavanceerd';
 $labels['other'] = 'Anders';
 $labels['typeother'] = 'Anders';
 $labels['typehome'] = 'Thuis';
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 321a88eef..0eefa5ec2 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Justin van Beusekom <Unknown>                                 |
+ | Author: Geert Wirken <Unknown>                                        |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -47,7 +47,7 @@ $messages['nocontactsfound'] = 'Geen contactpersonen gevonden.';
 $messages['contactnotfound'] = 'Contactpersoon niet gevonden.';
 $messages['contactsearchonly'] = 'Voer enkele zoektermen in om contactpersonen te zoeken';
 $messages['sendingfailed'] = 'Verzenden van bericht is mislukt.';
-$messages['senttooquickly'] = 'U moet $sec seconde(n) wachten om het bericht te versturen.';
+$messages['senttooquickly'] = 'Wacht alstublieft $sec seconde(n) voordat u dit bericht verstuurt.';
 $messages['errorsavingsent'] = 'Er is een fout opgetreden tijdens het opslaan van het verzonden bericht.';
 $messages['errorsaving'] = 'Er is een fout opgetreden tijdens het opslaan.';
 $messages['errormoving'] = 'Kan bericht(en) niet verplaatsen.';
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Contactpersonen worden toegevoegd aan de groep...';
 $messages['removingmember'] = 'Contactpersonen worden verwijderd uit de groep...';
 $messages['receiptsent'] = 'Ontvangstbevestiging is verstuurd.';
 $messages['errorsendingreceipt'] = 'Kan de ontvangstbevestiging niet versturen.';
+$messages['deleteidentityconfirm'] = 'Weet u zeker dat u deze identiteit wilt verwijderen?';
 $messages['nodeletelastidentity'] = 'U kunt uw enige identiteit niet verwijderen.';
 $messages['forbiddencharacter'] = 'De naam van de map bevat een karakter dat niet is toegestaan.';
 $messages['selectimportfile'] = 'Selecteer een bestand om de uploaden.';
@@ -118,7 +119,7 @@ $messages['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol ge�
 $messages['importconfirmskipped'] = '<b>$skipped bestaande contactpersonen overgeslagen</b>';
 $messages['opnotpermitted'] = 'Deze verrichting is niet toegestaan!';
 $messages['nofromaddress'] = 'Het e-mailadres mist in de geselecteerde identiteit.';
-$messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor gaat alle opmaak verloren. Weet je zeker dat je verder wil gaan?';
+$messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor gaat alle opmaak verloren. Weet u zeker dat u verder wilt gaan?';
 $messages['httpreceivedencrypterror'] = 'Er is een fatale fout opgetreden. Neem direct contact op met uw systeembeheerder. <b>Uw bericht kon niet worden verzonden.</b>';
 $messages['smtpconnerror'] = 'SMTP Fout ($code): Verbinding met server mislukt.';
 $messages['smtpautherror'] = 'SMTP Fout ($code): Autenticatie mislukt.';
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index a6d111cf4..d932057ae 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -92,6 +92,7 @@ $labels['longnov'] = 'November';
 $labels['longdec'] = 'Desember';
 $labels['today'] = 'I dag';
 $labels['checkmail'] = 'Sjå etter nye meldingar';
+$labels['compose'] = 'Skriv ei melding';
 $labels['writenewmessage'] = 'Skriv ei ny melding';
 $labels['replytomessage'] = 'Svar på meldinga';
 $labels['replytoallmessage'] = 'Svar til sendar og alle mottakarar';
@@ -158,7 +159,6 @@ $labels['searchmod'] = 'Søkeutsagn';
 $labels['msgtext'] = 'Heile eposten';
 $labels['openinextwin'] = 'Opna i nytt vindauga';
 $labels['emlsave'] = 'Last ned (.eml)';
-$labels['compose'] = 'Skriv ei melding';
 $labels['editasnew'] = 'Rediger som ny';
 $labels['savemessage'] = 'Lagra kladd';
 $labels['sendmessage'] = 'Send meldinga no';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index e83a330e2..1ee7b711d 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'listopad';
 $labels['longdec'] = 'grudzień';
 $labels['today'] = 'Dzisiaj';
 $labels['checkmail'] = 'Sprawdź skrzynkę';
+$labels['compose'] = 'Utwórz wiadomość';
 $labels['writenewmessage'] = 'Utwórz nową wiadomość';
 $labels['replytomessage'] = 'Odpowiedz nadawcy';
 $labels['replytoallmessage'] = 'Odpowiedz wszystkim';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Parametry wyszukiwania';
 $labels['msgtext'] = 'Cała wiadomość';
 $labels['openinextwin'] = 'Otwórz w nowym oknie';
 $labels['emlsave'] = 'Pobierz (.eml)';
-$labels['compose'] = 'Utwórz wiadomość';
 $labels['editasnew'] = 'Edytuj jako nową';
 $labels['savemessage'] = 'Zapisz kopię roboczą';
 $labels['sendmessage'] = 'Wyślij teraz';
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index 53bed2352..5c927019b 100755
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -89,6 +89,7 @@ $labels['longnov'] = 'نومبر';
 $labels['longdec'] = 'ډسمبر';
 $labels['today'] = 'نن';
 $labels['checkmail'] = 'نوي استوزي وګوره';
+$labels['compose'] = 'استوزه وليکه';
 $labels['writenewmessage'] = 'نوي استوزي جوړول';
 $labels['replytomessage'] = 'استوونکي ته ځواب ورکړئ';
 $labels['replytoallmessage'] = 'استوونکي او ټولو ترلاسه کوونکو ته ځواب لېږل';
@@ -123,7 +124,6 @@ $labels['unlimited'] = 'بي کچه';
 $labels['quicksearch'] = 'ژر پلټنه';
 $labels['resetsearch'] = 'د پلټنې بياسمون';
 $labels['openinextwin'] = 'په نوي کړکۍ کې پرانيزه';
-$labels['compose'] = 'استوزه وليکه';
 $labels['savemessage'] = 'دا ګارليک خوندي کړه';
 $labels['sendmessage'] = 'اوس يې واستوه';
 $labels['addattachment'] = 'يو فايل ونښلوه';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 855af35ff..c72be33a6 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -46,6 +46,7 @@ $labels['folders'] = 'Pastas';
 $labels['messagesfromto'] = 'Mensagens $from - $to de $count';
 $labels['threadsfromto'] = 'Tópicos $from - $to de $count';
 $labels['messagenrof'] = 'Mensagem $nr de $count';
+$labels['fromtoshort'] = '$from - $to de $count';
 $labels['copy'] = 'Copiar';
 $labels['move'] = 'Mover';
 $labels['moveto'] = 'Mover para...';
@@ -92,12 +93,16 @@ $labels['longoct'] = 'Outubro';
 $labels['longnov'] = 'Novembro';
 $labels['longdec'] = 'Dezembro';
 $labels['today'] = 'Hoje';
+$labels['refresh'] = 'Atualizar';
 $labels['checkmail'] = 'Verificar se há novas mensagens';
+$labels['compose'] = 'Escrever mensagem';
 $labels['writenewmessage'] = 'Criar nova mensagem';
+$labels['reply'] = 'Responder';
 $labels['replytomessage'] = 'Responder para o remetente';
 $labels['replytoallmessage'] = 'Responder para o remetente e todos destinatários';
 $labels['replyall'] = 'Responder a todos';
 $labels['replylist'] = 'Responder para a lista';
+$labels['forward'] = 'Encaminhar';
 $labels['forwardinline'] = 'Encaminhar junto ao corpo da mensagem';
 $labels['forwardattachment'] = 'Encaminhar como anexo';
 $labels['forwardmessage'] = 'Encaminhar a mensagem';
@@ -110,12 +115,16 @@ $labels['nextmessage'] = 'Próxima Mensagem';
 $labels['lastmessage'] = 'Última Mensagem';
 $labels['backtolist'] = 'Voltar para a lista de mensagens';
 $labels['viewsource'] = 'Exibir código-fonte';
+$labels['mark'] = 'Marcar';
 $labels['markmessages'] = 'Marcar mensagens';
 $labels['markread'] = 'como lidas';
 $labels['markunread'] = 'como não lidas';
 $labels['markflagged'] = 'Como marcadas';
 $labels['markunflagged'] = 'Como não marcadas';
 $labels['moreactions'] = 'Mais ações...';
+$labels['more'] = 'Mais';
+$labels['back'] = 'Voltar';
+$labels['options'] = 'Opções';
 $labels['select'] = 'Selecionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhuma';
@@ -159,7 +168,6 @@ $labels['searchmod'] = 'Opções da pesquisa';
 $labels['msgtext'] = 'Mensagem inteira';
 $labels['openinextwin'] = 'Abrir em nova janela';
 $labels['emlsave'] = 'Baixar (em .eml)';
-$labels['compose'] = 'Escrever mensagem';
 $labels['editasnew'] = 'Editar como novo';
 $labels['savemessage'] = 'Salvar Rascunho';
 $labels['sendmessage'] = 'Enviar agora';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Recibo de entrega';
 $labels['mailreplyintro'] = 'Em $date, $sender escreveu:';
 $labels['originalmessage'] = 'Mensagem original';
 $labels['editidents'] = 'Editar identidades';
+$labels['spellcheck'] = 'Soletrar';
 $labels['checkspelling'] = 'Verificar ortografia';
 $labels['resumeediting'] = 'Continuar a edição';
 $labels['revertto'] = 'Reverter para';
+$labels['attach'] = 'Anexar';
 $labels['attachments'] = 'Anexos';
 $labels['upload'] = 'Enviar';
 $labels['uploadprogress'] = '$percent ($current de $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Cônjuge';
 $labels['allfields'] = 'Todos os campos';
 $labels['search'] = 'Pesquisar';
 $labels['advsearch'] = 'Pesquisa Avançada';
+$labels['advanced'] = 'Avançado';
 $labels['other'] = 'Outro';
 $labels['typeother'] = 'Outro';
 $labels['typehome'] = 'Residencial';
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index 8ef6ca59f..9d14c3de3 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'Adicionando contato(s) para o grupo...';
 $messages['removingmember'] = 'Removendo contato(s) do grupo...';
 $messages['receiptsent'] = 'Confirmação de recebimento enviada com sucesso';
 $messages['errorsendingreceipt'] = 'Não foi possível enviar a confirmação de recebimento';
+$messages['deleteidentityconfirm'] = 'Você realmente deseja excluir esta identidade?';
 $messages['nodeletelastidentity'] = 'Você não pode excluir sua única identidade';
 $messages['forbiddencharacter'] = 'O nome da pasta contém um caractere não permitido';
 $messages['selectimportfile'] = 'Selecione o arquivo para envio';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 4ae27501c..72ade764f 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -46,6 +46,7 @@ $labels['folders'] = 'Pastas';
 $labels['messagesfromto'] = 'Mensagens de $from a $to de $count';
 $labels['threadsfromto'] = 'Tópicos de $from a $to de $count';
 $labels['messagenrof'] = 'Mensagem $nr de $count';
+$labels['fromtoshort'] = '$from – $to de $count';
 $labels['copy'] = 'Copiar';
 $labels['move'] = 'Mover';
 $labels['moveto'] = 'mover para...';
@@ -92,12 +93,16 @@ $labels['longoct'] = 'Outubro';
 $labels['longnov'] = 'Novembro';
 $labels['longdec'] = 'Dezembro';
 $labels['today'] = 'Hoje';
+$labels['refresh'] = 'Actualizar';
 $labels['checkmail'] = 'Verificar existência de novas mensagens';
+$labels['compose'] = 'Escrever mensagem';
 $labels['writenewmessage'] = 'Criar nova mensagem';
+$labels['reply'] = 'Responder';
 $labels['replytomessage'] = 'Responder';
 $labels['replytoallmessage'] = 'Responder a todos';
 $labels['replyall'] = 'Responder a todos';
 $labels['replylist'] = 'Lista de resposta';
+$labels['forward'] = 'Reencaminhar';
 $labels['forwardinline'] = 'Reencaminhar';
 $labels['forwardattachment'] = 'Reencaminhar como anexo';
 $labels['forwardmessage'] = 'Reencaminhar';
@@ -110,12 +115,16 @@ $labels['nextmessage'] = 'Próxima mensagem';
 $labels['lastmessage'] = 'Última mensagem';
 $labels['backtolist'] = 'Voltar';
 $labels['viewsource'] = 'Mostrar código fonte';
+$labels['mark'] = 'Marcar';
 $labels['markmessages'] = 'Marcar mensagens';
 $labels['markread'] = 'Como lida(s)';
 $labels['markunread'] = 'Como não lida(s)';
 $labels['markflagged'] = 'Com sinalização';
 $labels['markunflagged'] = 'Sem sinalização';
 $labels['moreactions'] = 'Mais acções...';
+$labels['more'] = 'Mais';
+$labels['back'] = 'Voltar';
+$labels['options'] = 'Opções';
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhum';
@@ -159,7 +168,6 @@ $labels['searchmod'] = 'Pesquisar em';
 $labels['msgtext'] = 'Mensagem completa';
 $labels['openinextwin'] = 'Abrir numa nova janela';
 $labels['emlsave'] = 'Guardar como (.eml)';
-$labels['compose'] = 'Escrever mensagem';
 $labels['editasnew'] = 'Editar como novo';
 $labels['savemessage'] = 'Guardar como rascunho';
 $labels['sendmessage'] = 'Enviar';
@@ -171,9 +179,11 @@ $labels['dsn'] = 'Recibo de entrega';
 $labels['mailreplyintro'] = 'Em $date, $sender escreveu:';
 $labels['originalmessage'] = 'Mensagem Original';
 $labels['editidents'] = 'Editar entidades';
+$labels['spellcheck'] = 'Corrector Ortográfico';
 $labels['checkspelling'] = 'Verificar ortografia';
 $labels['resumeediting'] = 'Continuar a edição';
 $labels['revertto'] = 'Reverter para';
+$labels['attach'] = 'Anexar';
 $labels['attachments'] = 'Anexos';
 $labels['upload'] = 'Carregar';
 $labels['uploadprogress'] = '$percent ($current de $total)';
@@ -234,6 +244,7 @@ $labels['spouse'] = 'Cônjuge';
 $labels['allfields'] = 'Todos os campos';
 $labels['search'] = 'Pesquisa';
 $labels['advsearch'] = 'Pesquisa avançada';
+$labels['advanced'] = 'Configurações Avançadas';
 $labels['other'] = 'Outro';
 $labels['typeother'] = 'Outro';
 $labels['typehome'] = 'Residência';
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index c80327e7e..68c802119 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -106,6 +106,7 @@ $messages['addingmember'] = 'A adicionar contacto(s) ao grupo...';
 $messages['removingmember'] = 'A remover contacto(s) do grupo...';
 $messages['receiptsent'] = 'Recibo de leitura enviado com sucesso';
 $messages['errorsendingreceipt'] = 'Não foi possível enviar o recibo';
+$messages['deleteidentityconfirm'] = 'Pretende realmente eliminar esta identidade?';
 $messages['nodeletelastidentity'] = 'Esta é a sua última identidade, não é possível eliminá-la.';
 $messages['forbiddencharacter'] = 'O nome da pasta contém um caractere inválido';
 $messages['selectimportfile'] = 'Por favor, seleccione um ficheiro para enviar.';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index a9257d5bf..9663c62d4 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -91,6 +91,7 @@ $labels['longnov'] = 'Noiembrie';
 $labels['longdec'] = 'Decembrie';
 $labels['today'] = 'Astăzi';
 $labels['checkmail'] = 'Verifică mesaje noi';
+$labels['compose'] = 'Scrie un mesaj';
 $labels['writenewmessage'] = 'Scrie mesaj nou';
 $labels['replytomessage'] = 'Răspunde la mesaj';
 $labels['replytoallmessage'] = 'Răspunde la toţi';
@@ -151,7 +152,6 @@ $labels['searchmod'] = 'Parametrii de căutare';
 $labels['msgtext'] = 'Tot mesajul';
 $labels['openinextwin'] = 'Deschide într-o fereastră nouă';
 $labels['emlsave'] = 'Salvează în format .eml';
-$labels['compose'] = 'Scrie un mesaj';
 $labels['editasnew'] = 'Editează ca nou';
 $labels['savemessage'] = 'Salvează această ciornă';
 $labels['sendmessage'] = 'Trimite mesaj';
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 60ddba4e1..e1ec97e75 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Ноябрь';
 $labels['longdec'] = 'Декабрь';
 $labels['today'] = 'Сегодня';
 $labels['checkmail'] = 'Доставить почту';
+$labels['compose'] = 'Написать сообщение';
 $labels['writenewmessage'] = 'Новое сообщение';
 $labels['replytomessage'] = 'Ответить';
 $labels['replytoallmessage'] = 'Ответить по списку или отправителю и всем получателям';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Варианты поиска';
 $labels['msgtext'] = 'Всё сообщение';
 $labels['openinextwin'] = 'Открыть в новом окне';
 $labels['emlsave'] = 'Сохранить (.eml)';
-$labels['compose'] = 'Написать сообщение';
 $labels['editasnew'] = 'Редактировать как новое';
 $labels['savemessage'] = 'Сохранить черновик';
 $labels['sendmessage'] = 'Отправить сейчас';
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index f79b764d0..045e97dd8 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -65,6 +65,7 @@ $labels['friday'] = 'සිකුරාදා';
 $labels['saturday'] = 'සෙනසුරාදා';
 $labels['today'] = 'අද';
 $labels['checkmail'] = 'අඵත් පනිවුඩ සඳහා පිරික්සීම';
+$labels['compose'] = 'පනිවුඩයක් සෑදීම';
 $labels['writenewmessage'] = 'අඵත් පනිවුඩක්';
 $labels['replytomessage'] = 'පනිවුඩයට පිළිතුරු';
 $labels['replytoallmessage'] = 'එවන්නාට සහ සැමට පිළිතුරු';
@@ -93,7 +94,6 @@ $labels['unknown'] = 'නාඳුනන';
 $labels['unlimited'] = 'අසීමිත';
 $labels['quicksearch'] = 'ඉක්මන් සෙවුම';
 $labels['resetsearch'] = 'සෙවුම යලි පිහිටවීම';
-$labels['compose'] = 'පනිවුඩයක් සෑදීම';
 $labels['savemessage'] = 'කටු සටහනේ තැන්පත කරන්න';
 $labels['sendmessage'] = 'පනිවුඩය දැන් යවන්න';
 $labels['addattachment'] = 'ගොනුවක් ඇතුලත් කිරීම';
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 65688b89b..62f2053c8 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Dnes';
 $labels['checkmail'] = 'Skontrolovať nové správy';
+$labels['compose'] = 'Vytvoriť správu';
 $labels['writenewmessage'] = 'Vytvoriť novú správu';
 $labels['replytomessage'] = 'Odpovedať';
 $labels['replytoallmessage'] = 'Odpovedať všetkým';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Parametre hľadanie';
 $labels['msgtext'] = 'Celá správa';
 $labels['openinextwin'] = 'Otvoriť v novom okne';
 $labels['emlsave'] = 'Stiahnuť';
-$labels['compose'] = 'Vytvoriť správu';
 $labels['editasnew'] = 'Upraviť ako novú';
 $labels['savemessage'] = 'Uložiť do rozpísaných';
 $labels['sendmessage'] = 'Odoslať správu';
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index 96acab4f6..a08a419f6 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Danes';
 $labels['checkmail'] = 'Preglej nova sporočila';
+$labels['compose'] = 'Sestavi sporočilo';
 $labels['writenewmessage'] = 'Novo sporočilo';
 $labels['replytomessage'] = 'Odgovori';
 $labels['replytoallmessage'] = 'Odgovori listi ali vsem prejemnikom';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Spremembe iskanja';
 $labels['msgtext'] = 'Celotno sporočilo';
 $labels['openinextwin'] = 'Odpri v novem oknu';
 $labels['emlsave'] = 'Prenos datoteke (.eml)';
-$labels['compose'] = 'Sestavi sporočilo';
 $labels['editasnew'] = 'Uredi kot novo';
 $labels['savemessage'] = 'Shrani kot osnutek';
 $labels['sendmessage'] = 'Pošlji sporočilo';
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index c26652aaf..707234ea6 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -65,6 +65,7 @@ $labels['friday'] = 'e premte';
 $labels['saturday'] = 'e shtunë';
 $labels['today'] = 'sot';
 $labels['checkmail'] = 'Shiko për mesazhe të reja';
+$labels['compose'] = 'Shkruaj një mesazh';
 $labels['writenewmessage'] = 'Krijo një mesazh të ri';
 $labels['replytomessage'] = 'Ktheji përgjigje mesazhit';
 $labels['replytoallmessage'] = 'Ktheji përgjigje dërguesit dhe të gjithë marrësve';
@@ -93,7 +94,6 @@ $labels['unknown'] = 'i panjohur';
 $labels['unlimited'] = 'i pakufizuar';
 $labels['quicksearch'] = 'Kërkim i shpejtë';
 $labels['resetsearch'] = 'Pastro kërkimin';
-$labels['compose'] = 'Shkruaj një mesazh';
 $labels['savemessage'] = 'Ruaje si draft';
 $labels['sendmessage'] = 'Dërgoje mesazhin tani';
 $labels['addattachment'] = 'Bashkangjit një skedar';
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index 0c6a69923..1685a4e32 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -92,6 +92,7 @@ $labels['longnov'] = 'Новембар';
 $labels['longdec'] = 'Децембар';
 $labels['today'] = 'Данас';
 $labels['checkmail'] = 'Провера нових порука';
+$labels['compose'] = 'Нова порука';
 $labels['writenewmessage'] = 'Нова порука';
 $labels['replytomessage'] = 'Одговори на поруку';
 $labels['replytoallmessage'] = 'Одговори пошиљаоцу и свим примаоцима';
@@ -136,7 +137,6 @@ $labels['quicksearch'] = 'Брза претрага';
 $labels['resetsearch'] = 'Прикажи све поруке';
 $labels['msgtext'] = 'Цела порука';
 $labels['openinextwin'] = 'Отвори у новом прозору';
-$labels['compose'] = 'Нова порука';
 $labels['editasnew'] = 'Модификуј као ново';
 $labels['savemessage'] = 'Сачувај у Снимљене';
 $labels['sendmessage'] = 'Пошаљи поруку';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index c5c28513b..f19c20f2e 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm <Unknown>                                       |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -93,6 +93,7 @@ $labels['longnov'] = 'November';
 $labels['longdec'] = 'December';
 $labels['today'] = 'Idag';
 $labels['checkmail'] = 'Hämta nya meddelanden';
+$labels['compose'] = 'Nytt meddelande';
 $labels['writenewmessage'] = 'Nytt meddelande';
 $labels['replytomessage'] = 'Svara avsändaren';
 $labels['replytoallmessage'] = 'Svara avsändaren och alla mottagare';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Sökalternativ';
 $labels['msgtext'] = 'Hela meddelandet';
 $labels['openinextwin'] = 'Öppna i nytt fönster';
 $labels['emlsave'] = 'Spara (.eml)';
-$labels['compose'] = 'Nytt meddelande';
 $labels['editasnew'] = 'Redigera som nytt';
 $labels['savemessage'] = 'Spara utkast';
 $labels['sendmessage'] = 'Skicka meddelande';
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index 979aaf74e..79fb1a0ca 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -89,6 +89,7 @@ $labels['longnov'] = 'நவம்பர்';
 $labels['longdec'] = 'டிசம்பர்';
 $labels['today'] = 'இன்று';
 $labels['checkmail'] = 'புது அஞ்சல்களை பார்க்கவும்';
+$labels['compose'] = 'அஞ்சல் எழுது';
 $labels['writenewmessage'] = 'புது அஞ்சல் எழுதவும்';
 $labels['replytomessage'] = 'அனுப்புனருக்கு பதிலளி';
 $labels['replytoallmessage'] = 'அனுப்புனர் மற்றும் எல்லா பெறுனர்களுக்கும் பதிலளி';
@@ -128,7 +129,6 @@ $labels['searchmod'] = 'மாற்றிகளை தேடு';
 $labels['msgtext'] = 'முழு செய்தி';
 $labels['openinextwin'] = 'புது சாளரத்தில் திற';
 $labels['emlsave'] = 'பதிவிறக்கு (.eml)';
-$labels['compose'] = 'அஞ்சல் எழுது';
 $labels['editasnew'] = 'புதியதாக திருத்து';
 $labels['savemessage'] = 'இந்த வரைவை சேமி';
 $labels['sendmessage'] = 'இப்போது அனுப்பு';
diff --git a/program/localization/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index 0d46b9ed7..63a1fc481 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -65,6 +65,7 @@ $labels['friday'] = 'วันศุกร์';
 $labels['saturday'] = 'วันเสาร์';
 $labels['today'] = 'วันนี้';
 $labels['checkmail'] = 'ตรวจสอบจดหมายใหม่';
+$labels['compose'] = 'เขียนจดหมายใหม่';
 $labels['writenewmessage'] = 'สร้างจดหมายใหม่';
 $labels['replytomessage'] = 'ตอบกลับจดหมาย';
 $labels['replytoallmessage'] = 'ตอบกลับถึงทุกคนในจดหมาย';
@@ -89,7 +90,6 @@ $labels['unknown'] = 'ไม่ทราบ';
 $labels['unlimited'] = 'ไม่จำกัด';
 $labels['quicksearch'] = 'ค้นหาแบบด่วน';
 $labels['resetsearch'] = 'ล้างการค้นหา';
-$labels['compose'] = 'เขียนจดหมายใหม่';
 $labels['savemessage'] = 'บันทึกฉบับร่าง';
 $labels['sendmessage'] = 'ส่งจดหมาย';
 $labels['addattachment'] = 'แนบไฟล์';
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index 6f5ec3ee3..a3843c683 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul <Unknown>                                      |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Kasım';
 $labels['longdec'] = 'Aralık';
 $labels['today'] = 'Bugün';
 $labels['checkmail'] = 'Yeni postaları kontrol et';
+$labels['compose'] = 'Yeni posta oluştur';
 $labels['writenewmessage'] = 'Yeni posta oluştur';
 $labels['replytomessage'] = 'Gönderene yanıtla';
 $labels['replytoallmessage'] = 'Gönderene ve tüm alıcılara yanıtla';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Arama detayları';
 $labels['msgtext'] = 'Tüm posta gövdesi';
 $labels['openinextwin'] = 'Yeni pencerede aç';
 $labels['emlsave'] = 'İndir (.eml)';
-$labels['compose'] = 'Yeni posta oluştur';
 $labels['editasnew'] = 'Postayı yeni olarak düzenle';
 $labels['savemessage'] = 'Taslak olarak kaydet';
 $labels['sendmessage'] = 'Postayı gönder';
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index 5941c3ae5..c373a3a2d 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = 'Листопад';
 $labels['longdec'] = 'Грудень';
 $labels['today'] = 'Сьогодні';
 $labels['checkmail'] = 'Перевірити пошту';
+$labels['compose'] = 'Написати листа';
 $labels['writenewmessage'] = 'Написати листа';
 $labels['replytomessage'] = 'Відповісти відправнику';
 $labels['replytoallmessage'] = 'Відповісти до листа або відправнику та усім отримувачам';
@@ -159,7 +160,6 @@ $labels['searchmod'] = 'Де шукати';
 $labels['msgtext'] = 'В усьому листі';
 $labels['openinextwin'] = 'Відкрити в новому вікні';
 $labels['emlsave'] = 'Зберегти (.eml)';
-$labels['compose'] = 'Написати листа';
 $labels['editasnew'] = 'Редагувати як новий';
 $labels['savemessage'] = 'Зберегти чернетку';
 $labels['sendmessage'] = 'Надіслати зараз';
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index a15b68fe2..6f899fa5b 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -65,6 +65,7 @@ $labels['friday'] = 'Thứ sáu';
 $labels['saturday'] = 'Thứ bẩy';
 $labels['today'] = 'Hôm nay';
 $labels['checkmail'] = 'Kiểm tra thư mới';
+$labels['compose'] = 'Soạn thư';
 $labels['writenewmessage'] = 'Soạn thư mới';
 $labels['replytomessage'] = 'Trả lời thư';
 $labels['replytoallmessage'] = 'Trả lời tất cả';
@@ -85,7 +86,6 @@ $labels['unknown'] = 'không rõ';
 $labels['unlimited'] = 'không hạn chế';
 $labels['quicksearch'] = 'Tìm nhanh';
 $labels['resetsearch'] = 'Xóa bỏ tìm kiếm';
-$labels['compose'] = 'Soạn thư';
 $labels['savemessage'] = 'Lưu thư đang soạn';
 $labels['sendmessage'] = 'Gửi thư';
 $labels['addattachment'] = 'Gửi kèm';
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index 7c96ddec6..ca74d816f 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -93,6 +93,7 @@ $labels['longnov'] = '十一月';
 $labels['longdec'] = '十二月';
 $labels['today'] = '今日';
 $labels['checkmail'] = '收取新邮件';
+$labels['compose'] = '写新邮件';
 $labels['writenewmessage'] = '写新邮件';
 $labels['replytomessage'] = '回复发件人';
 $labels['replytoallmessage'] = '回复所有';
@@ -159,7 +160,6 @@ $labels['searchmod'] = '搜寻模式';
 $labels['msgtext'] = '整个邮件';
 $labels['openinextwin'] = '在新窗口中打开';
 $labels['emlsave'] = '下载（.eml）';
-$labels['compose'] = '写新邮件';
 $labels['editasnew'] = '编辑为新邮件';
 $labels['savemessage'] = '保存为草稿';
 $labels['sendmessage'] = '立即发送';
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 3a089bbc3..fe0e81da1 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Nansen <Unknown>                                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -92,12 +92,16 @@ $labels['longoct'] = '十月';
 $labels['longnov'] = '十一月';
 $labels['longdec'] = '十二月';
 $labels['today'] = '今日';
+$labels['refresh'] = '重新整理';
 $labels['checkmail'] = '檢查新郵件';
+$labels['compose'] = '撰寫新郵件';
 $labels['writenewmessage'] = '撰寫新郵件';
+$labels['reply'] = '回覆';
 $labels['replytomessage'] = '回覆';
 $labels['replytoallmessage'] = '全部回覆';
 $labels['replyall'] = '全部回覆';
 $labels['replylist'] = '清單回覆';
+$labels['forward'] = '轉寄';
 $labels['forwardinline'] = '轉寄';
 $labels['forwardattachment'] = '以附件方式轉寄';
 $labels['forwardmessage'] = '轉寄';
@@ -110,12 +114,16 @@ $labels['nextmessage'] = '顯示下一封郵件';
 $labels['lastmessage'] = '顯示最後一封郵件';
 $labels['backtolist'] = '回到郵件清單';
 $labels['viewsource'] = '顯示原始郵件';
+$labels['mark'] = '標記';
 $labels['markmessages'] = '標記選取的郵件為';
 $labels['markread'] = '標示為已讀取';
 $labels['markunread'] = '標示為未讀取';
 $labels['markflagged'] = '標上旗標';
 $labels['markunflagged'] = '移除旗標';
 $labels['moreactions'] = '資料夾動做...';
+$labels['more'] = '更多';
+$labels['back'] = '上一頁';
+$labels['options'] = '選項';
 $labels['select'] = '選取';
 $labels['all'] = '全部郵件';
 $labels['none'] = '無';
@@ -159,7 +167,6 @@ $labels['searchmod'] = '修改搜尋';
 $labels['msgtext'] = '整封郵件';
 $labels['openinextwin'] = '在新視窗開啟';
 $labels['emlsave'] = '下載（.eml）';
-$labels['compose'] = '撰寫新郵件';
 $labels['editasnew'] = '已新郵件編輯';
 $labels['savemessage'] = '儲存成草稿';
 $labels['sendmessage'] = '立即寄出';
@@ -174,6 +181,7 @@ $labels['editidents'] = '編輯身份資訊';
 $labels['checkspelling'] = '拼字檢查';
 $labels['resumeediting'] = '繼續編輯';
 $labels['revertto'] = '恢復至';
+$labels['attach'] = '附件';
 $labels['attachments'] = '附加檔案';
 $labels['upload'] = '上傳';
 $labels['close'] = '關閉';
@@ -233,6 +241,7 @@ $labels['spouse'] = '配偶';
 $labels['allfields'] = '所有欄位';
 $labels['search'] = '搜尋';
 $labels['advsearch'] = '進階搜尋';
+$labels['advanced'] = '進階設定';
 $labels['other'] = '其他';
 $labels['typeother'] = '其他';
 $labels['typehome'] = '住家';
@@ -374,6 +383,10 @@ $labels['replysamefolder'] = '將回覆與回覆信件放置於相同資料夾';
 $labels['defaultaddressbook'] = '新增連絡人至指定通訊錄';
 $labels['spellcheckbeforesend'] = '寄送前執行拼字檢查';
 $labels['spellcheckoptions'] = '拼字檢查選項';
+$labels['spellcheckignoresyms'] = '忽略符號';
+$labels['spellcheckignorenums'] = '忽略數字';
+$labels['spellcheckignorecaps'] = '忽略大寫字母';
+$labels['addtodict'] = '加入詞典';
 $labels['folder'] = '資料夾';
 $labels['foldername'] = '資料夾名稱';
 $labels['subscribed'] = '顯示';
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index a6610c436..3f89b8feb 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Nansen <Unknown>                                              |
  +-----------------------------------------------------------------------+
  @version $Id$
 */
@@ -106,6 +106,7 @@ $messages['addingmember'] = '新增連絡人至群組';
 $messages['removingmember'] = '從群組刪除連絡人';
 $messages['receiptsent'] = '閱讀回條傳送成功';
 $messages['errorsendingreceipt'] = '無法傳送回條';
+$messages['deleteidentityconfirm'] = '您確定要刪除這位連絡人嗎?';
 $messages['nodeletelastidentity'] = '你不能刪除此身份，因為只剩一個身份。';
 $messages['forbiddencharacter'] = '資料夾名稱中包含非法的字元';
 $messages['selectimportfile'] = '請選擇一個上傳的檔案';