Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0

author: Aleksander Machniak <alec@alec.pl> 2014-11-15 10:03:58 +0100
committer: Aleksander Machniak <alec@alec.pl> 2014-11-15 10:03:58 +0100
commit: 7e34e4c5b5dac037435d0fc2c6db1f71199006e0 (patch)
tree: d3de8c0f9b8f609efa3e5434da2da48a4cf5b00b
parent: 9f1fd396951dd1bf9a082422d0835ca1a229255d (diff)
parent: ced9e5a5bf5d6ffe051b42f474d7a97203641913 (diff)
398 files changed, 7658 insertions, 2325 deletions
diff --git a/plugins/acl/localization/ast.inc b/plugins/acl/localization/ast.inc
new file mode 100644
index 000000000..2932d3bd4
--- /dev/null
+++ b/plugins/acl/localization/ast.inc
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+$labels['sharing'] = 'Compartición';
+$labels['myrights'] = 'Drechos d\'accesu';
+$labels['username'] = 'Usuariu:';
+$labels['advanced'] = 'Mou avanzáu';
+$labels['newuser'] = 'Amestar entrada';
+$labels['editperms'] = 'Editar permisos';
+$labels['actions'] = 'Aición de drechos d\'accesu...';
+$labels['anyone'] = 'Tolos usuarios (toos)';
+$labels['anonymous'] = 'Convidaos (anónimos)';
+$labels['identifier'] = 'Identificador';
+$labels['acll'] = 'Guetar';
+$labels['aclr'] = 'Lleer mensaxes';
+$labels['acls'] = 'Estáu Caltener Vistu';
+$labels['aclw'] = 'Escribir banderes';
+$labels['acli'] = 'Inxertar (copiar a)';
+$labels['aclc'] = 'Crear subcarpetes';
+$labels['aclk'] = 'Crear subcarpetes';
+$labels['acld'] = 'Desaniciar mensaxes';
+$labels['aclt'] = 'Desaniciar mensaxes';
+$labels['acle'] = 'Desanciar';
+$labels['aclx'] = 'Desaniciar carpeta';
+$labels['acla'] = 'Alministrar';
+$labels['aclfull'] = 'Control total';
+$labels['aclother'] = 'Otru';
+$labels['aclread'] = 'Lleer';
+$labels['aclwrite'] = 'Escribir';
+$labels['acldelete'] = 'Desaniciar';
+$labels['shortacll'] = 'Guetar';
+$labels['shortaclr'] = 'Lleer';
+$labels['shortacls'] = 'Caltener';
+$labels['shortaclw'] = 'Escribir';
+$labels['shortacli'] = 'Inxertar';
+$labels['shortaclc'] = 'Crear';
+$labels['shortaclk'] = 'Crear';
+$labels['shortacld'] = 'Desaniciar';
+$labels['shortaclt'] = 'Desaniciar';
+$labels['shortacle'] = 'Desaniciar';
+$labels['shortaclx'] = 'Desaniciu de carpeta';
+$labels['shortacla'] = 'Alministrar';
+$labels['shortaclother'] = 'Otru';
+$labels['shortaclread'] = 'Lleer';
+$labels['shortaclwrite'] = 'Escribir';
+$labels['shortacldelete'] = 'Desaniciar';
+$labels['longacll'] = 'La carpeta ye visible nes llistes y pue soscribise a';
+$labels['longaclr'] = 'La carpeta nun pue abrise pa leer';
+$labels['longaclx'] = 'La carpeta pue desaniciase o renomase';
+$labels['longacla'] = 'Puen camudase los drechos d\'accesu de la carpeta';
+$labels['longaclfull'] = 'Control completu incluyendo l\'alminitración de carpeta';
+$labels['longaclread'] = 'La carpeta pue abrise pa llectura';
+$labels['longaclwrite'] = 'Los mensaxes puen conseñase, escribise o copiase a la carpeta';
+$labels['longacldelete'] = 'Los mensaxes puen desaniciase';
+$labels['longaclother'] = 'Otros drechos d\'accesu';
+$labels['ariasummaryacltable'] = 'Llista de drechos d\'accesu';
+$messages['deleting'] = 'Desaniciando los drechos d\'accesu...';
+$messages['saving'] = 'Guardando los drechos d\'accesu...';
+$messages['updatesuccess'] = 'Camudaos con ésitu los drechos d\'accesu';
+$messages['deletesuccess'] = 'Desaniciaos con ésitu los drechos d\'accesu';
+$messages['createsuccess'] = 'Amestaos con ésitu los drechos d\'accesu';
+$messages['updateerror'] = 'Nun puen anovase los drechos d\'accesu';
+$messages['deleteerror'] = 'Nun puen desaniciase los drechos d\'accesu';
+$messages['createerror'] = 'Nun puen amestase los drechos d\'accesu';
+$messages['deleteconfirm'] = '¿De xuru quies desaniciar los drechos d\'accesu al(a los) usuariu(os) esbilláu(os)?';
+?>
diff --git a/plugins/acl/localization/be_BE.inc b/plugins/acl/localization/be_BE.inc
index 82bafcec4..4aac05b67 100644
--- a/plugins/acl/localization/be_BE.inc
+++ b/plugins/acl/localization/be_BE.inc
@@ -16,12 +16,12 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 $labels['sharing'] = 'Сумесны доступ';
-$labels['myrights'] = 'Правы доступа';
+$labels['myrights'] = 'Правы доступу';
 $labels['username'] = 'Карыстальнік:';
 $labels['advanced'] = 'Пашыраны рэжым';
 $labels['newuser'] = 'Дадаць запіс';
 $labels['editperms'] = 'Рэдагаваць правы доступу';
-$labels['actions'] = 'Дзеянні з правамі доступа...';
+$labels['actions'] = 'Дзеянні з правамі доступу...';
 $labels['anyone'] = 'Усе карыстальнікі (любыя)';
 $labels['anonymous'] = 'Госці (ананімныя)';
 $labels['identifier'] = 'Ідэнтыфікатар';
@@ -38,6 +38,7 @@ $labels['aclt'] = 'Выдаліць паведамленні';
 $labels['acle'] = 'Знішчыць паведамленні';
 $labels['aclx'] = 'Выдаліць папку';
 $labels['acla'] = 'Адміністраваць';
+$labels['acln'] = 'Анатаваць паведамленні';
 $labels['aclfull'] = 'Поўны доступ';
 $labels['aclother'] = 'Іншае';
 $labels['aclread'] = 'Чытанне';
@@ -56,12 +57,13 @@ $labels['shortaclt'] = 'Выдаленне';
 $labels['shortacle'] = 'Знішчэнне';
 $labels['shortaclx'] = 'Выдаленне папкі';
 $labels['shortacla'] = 'Адміністраванне';
+$labels['shortacln'] = 'Анатаваць';
 $labels['shortaclother'] = 'Іншае';
 $labels['shortaclread'] = 'Чытанне';
 $labels['shortaclwrite'] = 'Запіс';
 $labels['shortacldelete'] = 'Выдаленне';
 $labels['longacll'] = 'Папку можна пабачыць у спісах і падпісацца на яе';
-$labels['longaclr'] = 'Папку можна адчыніць для чытання';
+$labels['longaclr'] = 'Папку можна адкрыць для чытання';
 $labels['longacls'] = 'На паведамленнях можна пераключаць флаг Бачанае';
 $labels['longaclw'] = 'На паведамленнях можна мяняць ключавыя словы і пераключаць флагі, апроч Бачанае і Выдаленае';
 $labels['longacli'] = 'Паведамленні могуць быць запісаныя альбо скапіяваныя ў папку';
@@ -73,10 +75,15 @@ $labels['longaclt'] = 'На паведамленнях можна пераклю
 $labels['longacle'] = 'Паведамленні могуць быць знішчаны';
 $labels['longaclx'] = 'Папку можна выдаліць альбо перайменаваць';
 $labels['longacla'] = 'Правы доступу на папку можна змяняць';
+$labels['longacln'] = 'Анатацыі паведамленняў (супольныя метаданыя) можна змяняць';
 $labels['longaclfull'] = 'Поўны доступ, уключна з адмінстраваннем папкі';
-$labels['longaclread'] = 'Папку можна адчыніць для чытання';
+$labels['longaclread'] = 'Папку можна адкрыць для чытання';
 $labels['longaclwrite'] = 'Паведамленні могуць быць пазначаныя, запісаныя альбо скапіяваныя ў папку';
-$labels['longacldelete'] = 'Паведамленні можна выдаляць';
+$labels['longacldelete'] = 'Паведамленні можна выдаліць';
+$labels['longaclother'] = 'Іншыя правы доступу';
+$labels['ariasummaryacltable'] = 'Спіс правоў доступу';
+$labels['arialabelaclactions'] = 'Спіс дзеянняў';
+$labels['arialabelaclform'] = 'Форма правоў доступу';
 $messages['deleting'] = 'Правы доступу выдаляюцца...';
 $messages['saving'] = 'Правы доступу захоўваюцца...';
 $messages['updatesuccess'] = 'Правы доступу зменены';
diff --git a/plugins/acl/localization/bg_BG.inc b/plugins/acl/localization/bg_BG.inc
index c30fa6eb5..f38cc9e2b 100644
--- a/plugins/acl/localization/bg_BG.inc
+++ b/plugins/acl/localization/bg_BG.inc
@@ -38,6 +38,7 @@ $labels['aclt'] = 'Изтриване на писмо';
 $labels['acle'] = 'Заличаване';
 $labels['aclx'] = 'Изтриване на папка';
 $labels['acla'] = 'Администриране';
+$labels['acln'] = 'Анотиране на писма';
 $labels['aclfull'] = 'Пълен контрол';
 $labels['aclother'] = 'Други';
 $labels['aclread'] = 'Четене';
@@ -56,6 +57,7 @@ $labels['shortaclt'] = 'Изтриване';
 $labels['shortacle'] = 'Заличаване';
 $labels['shortaclx'] = 'Изтриване на папка';
 $labels['shortacla'] = 'Администриране';
+$labels['shortacln'] = 'Анотирай';
 $labels['shortaclother'] = 'Други';
 $labels['shortaclread'] = 'Четене';
 $labels['shortaclwrite'] = 'Писане';
@@ -73,6 +75,7 @@ $labels['longaclt'] = 'Флагът Изтрито може да бъде про
 $labels['longacle'] = 'Писмата могат да бъдат заличавани';
 $labels['longaclx'] = 'Папката може да бъде изтривана или преименувана';
 $labels['longacla'] = 'Правата за достъп до папката могат да бъдат променяни';
+$labels['longacln'] = 'Могат да се променят споделените метаданни (антоции) на писмата';
 $labels['longaclfull'] = 'Пълен контрол, включително и администриране на папките';
 $labels['longaclread'] = 'Папката може да бъде отворена за четене';
 $labels['longaclwrite'] = 'Писмата могат да бъдат маркирани, записвани или копирани в папката';
diff --git a/plugins/acl/localization/bs_BA.inc b/plugins/acl/localization/bs_BA.inc
index 208d26a07..371dd17af 100644
--- a/plugins/acl/localization/bs_BA.inc
+++ b/plugins/acl/localization/bs_BA.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Puna kontrola uključujući i administraciju foldera';
 $labels['longaclread'] = 'Folder je moguće otvoriti radi čitanja';
 $labels['longaclwrite'] = 'Moguće je označavati, zapisivati i kopirati poruke u folder';
 $labels['longacldelete'] = 'Moguće je obrisati poruke';
+$labels['longaclother'] = 'Ostala prava pristupa';
+$labels['ariasummaryacltable'] = 'Lista prava pristupa';
+$labels['arialabelaclactions'] = 'Lista akcija';
+$labels['arialabelaclform'] = 'Obrazac za prava pristupa';
 $messages['deleting'] = 'Brišem prava pristupa...';
 $messages['saving'] = 'Snimam prava pristupa...';
 $messages['updatesuccess'] = 'Prava pristupa su uspješno promijenjena';
diff --git a/plugins/acl/localization/ca_ES.inc b/plugins/acl/localization/ca_ES.inc
index fccce75f7..b9df1209a 100644
--- a/plugins/acl/localization/ca_ES.inc
+++ b/plugins/acl/localization/ca_ES.inc
@@ -38,6 +38,7 @@ $labels['aclt'] = 'Suprimeix missatges';
 $labels['acle'] = 'Buida';
 $labels['aclx'] = 'Suprimeix carpeta';
 $labels['acla'] = 'Administra';
+$labels['acln'] = 'Anota missatges';
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Un altre';
 $labels['aclread'] = 'Lectura';
@@ -56,6 +57,7 @@ $labels['shortaclt'] = 'Suprimeix';
 $labels['shortacle'] = 'Buida';
 $labels['shortaclx'] = 'Suprimeix carpeta';
 $labels['shortacla'] = 'Administra';
+$labels['shortacln'] = 'Anota';
 $labels['shortaclother'] = 'Un altre';
 $labels['shortaclread'] = 'Lectura';
 $labels['shortaclwrite'] = 'Escriptura';
@@ -73,10 +75,15 @@ $labels['longaclt'] = 'Els missatges amb l\'indicador Suprimit poden ser canviat
 $labels['longacle'] = 'Els missatges poden ser purgats';
 $labels['longaclx'] = 'La carpeta pot ser suprimida o reanomenada';
 $labels['longacla'] = 'Els permisos d\'accés a la carpeta poden ser canviats';
+$labels['longacln'] = 'Les metadades compartides dels missatges (anotacions) poden ser canviades';
 $labels['longaclfull'] = 'Control total fins i tot la gestió de carpetes';
 $labels['longaclread'] = 'La carpeta pot ser oberta per llegir';
 $labels['longaclwrite'] = 'Els missatges poden ser marcats, escrits o copiats a la carpeta';
 $labels['longacldelete'] = 'Els missatges poden ser suprimits';
+$labels['longaclother'] = 'Altres drets d\'accés';
+$labels['ariasummaryacltable'] = 'Llista els drets d\'accés';
+$labels['arialabelaclactions'] = 'Llista les accions';
+$labels['arialabelaclform'] = 'Formulari de drets d\'accés';
 $messages['deleting'] = 'S\'estan suprimint els permisos d\'accés...';
 $messages['saving'] = 'S\'estan desant els permisos d\'accés...';
 $messages['updatesuccess'] = 'Els permisos d\'accés han estat canviats correctament';
diff --git a/plugins/acl/localization/cs_CZ.inc b/plugins/acl/localization/cs_CZ.inc
index fd8fdca73..d91795f88 100644
--- a/plugins/acl/localization/cs_CZ.inc
+++ b/plugins/acl/localization/cs_CZ.inc
@@ -77,6 +77,7 @@ $labels['longaclfull'] = 'Plný přístup včetně správy složky';
 $labels['longaclread'] = 'Složka může být otevřena pro čtení';
 $labels['longaclwrite'] = 'Zpráva může být označena, napsána nebo zkopírována do složky';
 $labels['longacldelete'] = 'Zprávy mohou být smazány';
+$labels['ariasummaryacltable'] = 'Seznam oprávnění';
 $messages['deleting'] = 'Odstraňuji přístupová práva...';
 $messages['saving'] = 'Ukládám přístupová práva...';
 $messages['updatesuccess'] = 'Přístupová práva byla úspěšně změněna';
diff --git a/plugins/acl/localization/cy_GB.inc b/plugins/acl/localization/cy_GB.inc
index 0b9d11979..816d6335c 100644
--- a/plugins/acl/localization/cy_GB.inc
+++ b/plugins/acl/localization/cy_GB.inc
@@ -38,6 +38,7 @@ $labels['aclt'] = 'Dileu negeseuon';
 $labels['acle'] = 'Dileu';
 $labels['aclx'] = 'Dileu ffolder';
 $labels['acla'] = 'Gweinyddu';
+$labels['acln'] = 'Anodi negeseuon';
 $labels['aclfull'] = 'Rheolaeth lawn';
 $labels['aclother'] = 'Arall';
 $labels['aclread'] = 'Darllen';
@@ -56,6 +57,7 @@ $labels['shortaclt'] = 'Dileu';
 $labels['shortacle'] = 'Dileu';
 $labels['shortaclx'] = 'Dileu ffolder';
 $labels['shortacla'] = 'Gweinyddu';
+$labels['shortacln'] = 'Anodi';
 $labels['shortaclother'] = 'Arall';
 $labels['shortaclread'] = 'Darllen';
 $labels['shortaclwrite'] = 'Ysgrifennu';
@@ -73,10 +75,15 @@ $labels['longaclt'] = 'Gellir newid fflag neges Dileu';
 $labels['longacle'] = 'Gellir gwaredu negeseuon';
 $labels['longaclx'] = 'Gellir dileu neu ail-enwi\'r ffolder';
 $labels['longacla'] = 'Gellir newid hawliau mynediad y ffolder';
+$labels['longacln'] = 'Gellir newid negeseuon metadata (anodiadau) a rannwyd';
 $labels['longaclfull'] = 'Rheolaeth lawn yn cynnwys rheolaeth ffolderi';
 $labels['longaclread'] = 'Gellir agor y ffolder hwn i\'w ddarllen';
 $labels['longaclwrite'] = 'Gellir nodi, ysgrifennu neu copïo negeseuon i\'r ffolder';
 $labels['longacldelete'] = 'Gellir dileu negeseuon';
+$labels['longaclother'] = 'Hawliau mynediad eraill';
+$labels['ariasummaryacltable'] = 'Rhestr o hawliau mynediad';
+$labels['arialabelaclactions'] = 'Rhestru gweithrediadau';
+$labels['arialabelaclform'] = 'Ffurflen hawliau mynediad';
 $messages['deleting'] = 'Yn dileu hawliau mynediad...';
 $messages['saving'] = 'Yn cadw hawliau mynediad...';
 $messages['updatesuccess'] = 'Wedi newid hawliau mynediad yn llwyddiannus';
diff --git a/plugins/acl/localization/de_CH.inc b/plugins/acl/localization/de_CH.inc
index 9f3b99c05..9e4f3b269 100644
--- a/plugins/acl/localization/de_CH.inc
+++ b/plugins/acl/localization/de_CH.inc
@@ -38,6 +38,7 @@ $labels['aclt'] = 'Nachrichten als gelöscht markieren';
 $labels['acle'] = 'Endgültig löschen';
 $labels['aclx'] = 'Ordner löschen';
 $labels['acla'] = 'Verwalten';
+$labels['acln'] = 'Nachrichten auszeichnen';
 $labels['aclfull'] = 'Vollzugriff';
 $labels['aclother'] = 'Andere';
 $labels['aclread'] = 'Lesen';
@@ -56,6 +57,7 @@ $labels['shortaclt'] = 'Löschen';
 $labels['shortacle'] = 'Endgültig löschen';
 $labels['shortaclx'] = 'Ordner löschen';
 $labels['shortacla'] = 'Verwalten';
+$labels['shortacln'] = 'Auszeichnen';
 $labels['shortaclother'] = 'Andere';
 $labels['shortaclread'] = 'Lesen';
 $labels['shortaclwrite'] = 'Schreiben';
@@ -73,10 +75,15 @@ $labels['longaclt'] = 'Der "gelöscht" Status von Nachrichten kann geändert wer
 $labels['longacle'] = 'Als "gelöscht" markierte Nachrichten können entfernt werden';
 $labels['longaclx'] = 'Der Ordner kann gelöscht oder umbenannt werden';
 $labels['longacla'] = 'Die Zugriffsrechte des Ordners können geändert werden';
+$labels['longacln'] = 'Geteilte Nachrichten-Auszeichnungen (Metadaten) können nicht geändert werden';
 $labels['longaclfull'] = 'Vollzugriff inklusive Ordner-Verwaltung';
 $labels['longaclread'] = 'Der Ordnerinhalt kann gelesen werden';
 $labels['longaclwrite'] = 'Nachrichten können markiert, an den Ordner gesendet und in den Ordner kopiert oder verschoben werden';
 $labels['longacldelete'] = 'Nachrichten können gelöscht werden';
+$labels['longaclother'] = 'Andere Zugriffsrechte ';
+$labels['ariasummaryacltable'] = 'Liste der Zugriffsrechte';
+$labels['arialabelaclactions'] = 'Listen-Aktionen';
+$labels['arialabelaclform'] = 'Zugriffsrechte (Formular)';
 $messages['deleting'] = 'Zugriffsrechte werden entzogen...';
 $messages['saving'] = 'Zugriffsrechte werden gespeichert...';
 $messages['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';
diff --git a/plugins/acl/localization/de_DE.inc b/plugins/acl/localization/de_DE.inc
index 50522fc8c..01c330076 100644
--- a/plugins/acl/localization/de_DE.inc
+++ b/plugins/acl/localization/de_DE.inc
@@ -75,10 +75,15 @@ $labels['longaclt'] = 'Der "gelöscht" Status von Nachrichten kann geändert wer
 $labels['longacle'] = 'Als "gelöscht" markiert Nachrichten können gelöscht werden.';
 $labels['longaclx'] = 'Der Ordner kann gelöscht oder umbenannt werden';
 $labels['longacla'] = 'Die Zugriffsrechte des Ordners können geändert werden';
+$labels['longacln'] = 'Nachrichten Metadaten (Vermerke) können geändert werden';
 $labels['longaclfull'] = 'Vollzugriff inklusive Ordner-Verwaltung';
 $labels['longaclread'] = 'Der Ordnerinhalt kann gelesen werden';
 $labels['longaclwrite'] = 'Nachrichten können markiert, an den Ordner gesendet und in den Ordner kopiert oder verschoben werden';
 $labels['longacldelete'] = 'Nachrichten können gelöscht werden';
+$labels['longaclother'] = 'Andere Zugriffsrechte';
+$labels['ariasummaryacltable'] = 'Liste von Zugriffsrechten';
+$labels['arialabelaclactions'] = 'Aktionen anzeigen';
+$labels['arialabelaclform'] = 'Zugriffsrechteformular';
 $messages['deleting'] = 'Zugriffsrechte werden entzogen...';
 $messages['saving'] = 'Zugriffsrechte werden gewährt...';
 $messages['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';
diff --git a/plugins/acl/localization/el_GR.inc b/plugins/acl/localization/el_GR.inc
index 67b109adb..0ba63463f 100644
--- a/plugins/acl/localization/el_GR.inc
+++ b/plugins/acl/localization/el_GR.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Πλήρης έλεγχος συμπεριλαμβαν
 $labels['longaclread'] = 'Ο φάκελος είναι δυνατό να προσπελαστεί για ανάγνωση';
 $labels['longaclwrite'] = 'Τα μηνύματα μπορούν να σημαδεύονται, να εγγράφονται ή να αντιγράφονται στον φάκελο';
 $labels['longacldelete'] = 'Τα μηνύματα μπορούν να διαγραφούν';
+$labels['longaclother'] = 'Άλλα δικαιώματα πρόσβασης';
+$labels['ariasummaryacltable'] = 'Λίστα δικαιωμάτων πρόσβασης';
+$labels['arialabelaclactions'] = 'Λίστα ενεργειών';
+$labels['arialabelaclform'] = 'Φόρμα δικαιωμάτων πρόσβασης';
 $messages['deleting'] = 'Διαγραφή των δικαιωμάτων πρόσβασης...';
 $messages['saving'] = 'Αποθήκευση δικαιώματων πρόσβασης...';
 $messages['updatesuccess'] = 'Επιτυχής μεταβολή των δικαιωμάτων πρόσβασης';
diff --git a/plugins/acl/localization/en_CA.inc b/plugins/acl/localization/en_CA.inc
index 53d14ff9a..ae9cb8bbe 100644
--- a/plugins/acl/localization/en_CA.inc
+++ b/plugins/acl/localization/en_CA.inc
@@ -18,7 +18,9 @@
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
+$labels['advanced'] = 'Advanced mode';
 $labels['newuser'] = 'Add entry';
+$labels['editperms'] = 'Edit permissions';
 $labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'All users (anyone)';
 $labels['anonymous'] = 'Guests (anonymous)';
@@ -36,6 +38,7 @@ $labels['aclt'] = 'Delete messages';
 $labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Delete folder';
 $labels['acla'] = 'Administer';
+$labels['acln'] = 'Annotate messages';
 $labels['aclfull'] = 'Full control';
 $labels['aclother'] = 'Other';
 $labels['aclread'] = 'Read';
@@ -54,6 +57,7 @@ $labels['shortaclt'] = 'Delete';
 $labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Folder delete';
 $labels['shortacla'] = 'Administer';
+$labels['shortacln'] = 'Annotate';
 $labels['shortaclother'] = 'Other';
 $labels['shortaclread'] = 'Read';
 $labels['shortaclwrite'] = 'Write';
@@ -71,6 +75,7 @@ $labels['longaclt'] = 'Messages Delete flag can be changed';
 $labels['longacle'] = 'Messages can be expunged';
 $labels['longaclx'] = 'The folder can be deleted or renamed';
 $labels['longacla'] = 'The folder access rights can be changed';
+$labels['longacln'] = 'Messages shared metadata (annotations) can be changed';
 $labels['longaclfull'] = 'Full control including folder administration';
 $labels['longaclread'] = 'The folder can be opened for reading';
 $labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
diff --git a/plugins/acl/localization/en_GB.inc b/plugins/acl/localization/en_GB.inc
index 58d57fe7e..cd6393a6a 100644
--- a/plugins/acl/localization/en_GB.inc
+++ b/plugins/acl/localization/en_GB.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Full control including folder administration';
 $labels['longaclread'] = 'The folder can be opened for reading';
 $labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
 $labels['longacldelete'] = 'Messages can be deleted';
+$labels['longaclother'] = 'Other access rights';
+$labels['ariasummaryacltable'] = 'List of access rights';
+$labels['arialabelaclactions'] = 'List actions';
+$labels['arialabelaclform'] = 'Access rights form';
 $messages['deleting'] = 'Deleting access rights...';
 $messages['saving'] = 'Saving access rights...';
 $messages['updatesuccess'] = 'Successfully changed access rights';
diff --git a/plugins/acl/localization/es_419.inc b/plugins/acl/localization/es_419.inc
index 4b045aa25..5fc2be11a 100644
--- a/plugins/acl/localization/es_419.inc
+++ b/plugins/acl/localization/es_419.inc
@@ -15,35 +15,84 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
+$labels['sharing'] = 'Compartiendo';
+$labels['myrights'] = 'Derechos de acceso';
 $labels['username'] = 'Usuario:';
+$labels['advanced'] = 'Modo avanzado';
 $labels['newuser'] = 'Agregar entrada';
-$labels['anyone'] = 'Todos los usuarios ';
-$labels['anonymous'] = 'Invitados (anonimos)';
+$labels['editperms'] = 'Editar permisos';
+$labels['actions'] = 'Acciones de derecho de acceso...';
+$labels['anyone'] = 'Todos los usuarios (cualquiera)';
+$labels['anonymous'] = 'Invitados (anónimos)';
 $labels['identifier'] = 'Identificador';
-$labels['acll'] = 'Busqueda';
+$labels['acll'] = 'Búsqueda';
 $labels['aclr'] = 'Leer mensajes';
+$labels['acls'] = 'Mantener estado de visto';
+$labels['aclw'] = 'Etiquetas de escritura';
 $labels['acli'] = 'Insertar (copiar a)';
+$labels['aclp'] = 'Publicar';
 $labels['aclc'] = 'Crear subcarpetas';
-$labels['aclk'] = 'crear subcarpetas';
-$labels['acld'] = 'Eliminar mensaje';
+$labels['aclk'] = 'Crear subcarpetas';
+$labels['acld'] = 'Eliminar mensajes';
 $labels['aclt'] = 'Eliminar mensajes';
+$labels['acle'] = 'Borrar';
 $labels['aclx'] = 'Eliminar carpeta';
+$labels['acla'] = 'Administrar';
+$labels['acln'] = 'Anotar mensajes';
+$labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Otro';
 $labels['aclread'] = 'Leer';
 $labels['aclwrite'] = 'Escribir';
 $labels['acldelete'] = 'Eliminar';
-$labels['shortacll'] = 'Busqueda';
+$labels['shortacll'] = 'Búsqueda';
 $labels['shortaclr'] = 'Leer';
+$labels['shortacls'] = 'Mantener';
 $labels['shortaclw'] = 'Escribir';
 $labels['shortacli'] = 'Insertar';
+$labels['shortaclp'] = 'Publicar';
 $labels['shortaclc'] = 'Crear';
 $labels['shortaclk'] = 'Crear';
 $labels['shortacld'] = 'Eliminar';
 $labels['shortaclt'] = 'Eliminar';
+$labels['shortacle'] = 'Borrar';
+$labels['shortaclx'] = 'Eliminar carpeta';
+$labels['shortacla'] = 'Administrar';
+$labels['shortacln'] = 'Anotar';
 $labels['shortaclother'] = 'Otro';
 $labels['shortaclread'] = 'Leer';
 $labels['shortaclwrite'] = 'Escribir';
 $labels['shortacldelete'] = 'Eliminar';
+$labels['longacll'] = 'La carpeta es visible en listas y se la puede suscribir';
 $labels['longaclr'] = 'La carpeta puede ser abierta para lectura';
+$labels['longacls'] = 'Etiqueta de mensajes leídos puede ser cambiada';
+$labels['longaclw'] = 'Las etiquetas de mensajes y palabras clave puede ser cambiada, excepto Leídos y Eliminados';
 $labels['longacli'] = 'Se pueden escribir o copiar mensajes a la carpeta';
+$labels['longaclp'] = 'Los mensajes pueden ser publicados en esta carpeta';
+$labels['longaclc'] = 'Las carpetas pueden ser creadas (o renombradas) directamente desde esta carpeta';
+$labels['longaclk'] = 'Las carpetas pueden ser creadas (o renombradas) directamente desde esta carpeta';
+$labels['longacld'] = 'La etiqueta de mensajes eliminados puede ser cambiada';
+$labels['longaclt'] = 'La etiqueta de mensajes eliminados puede ser cambiada';
+$labels['longacle'] = 'Los mensajes pueden ser borrados';
+$labels['longaclx'] = 'La carpeta puede ser eliminada o renombrada';
+$labels['longacla'] = 'Los derechos de acceso de la carpeta pueden ser cambiados';
+$labels['longacln'] = 'Los metadatos compartidos de los mensajes (anotaciones) puede ser cambiado';
+$labels['longaclfull'] = 'Control total incluyendo administración de carpetas';
+$labels['longaclread'] = 'La carpeta puede ser abierta para lectura';
+$labels['longaclwrite'] = 'Los mensajes pueden ser marcados, escritos o copiados a la carpeta';
+$labels['longacldelete'] = 'Los mensajes pueden ser eliminados';
+$labels['longaclother'] = 'Otros derechos de acceso';
+$labels['ariasummaryacltable'] = 'Lista de derechos de acceso';
+$labels['arialabelaclactions'] = 'Listar acciones';
+$labels['arialabelaclform'] = 'Formulario de derechos de acceso';
+$messages['deleting'] = 'Derechos de acceso de eliminación...';
+$messages['saving'] = 'Guardando derechos de acceso...';
+$messages['updatesuccess'] = 'Se han cambiado los derechos de acceso exitosamente';
+$messages['deletesuccess'] = 'Se han eliminado los derechos de acceso exitosamente';
+$messages['createsuccess'] = 'Se han agregado los derechos de acceso exitosamente';
+$messages['updateerror'] = 'No es posible actualizar los derechos de acceso';
+$messages['deleteerror'] = 'No es posible eliminar los derechos de acceso';
+$messages['createerror'] = 'No es posible agregar los derechos de acceso';
+$messages['deleteconfirm'] = '¿Estás seguro de que deseas eliminar los derechos de acceso a usuario(s) seleccionado(s)?';
+$messages['norights'] = '¡No se hace especificado un derecho!';
+$messages['nouser'] = '¡No se ha especificado un nombre de usuario!';
 ?>
diff --git a/plugins/acl/localization/es_AR.inc b/plugins/acl/localization/es_AR.inc
index 3611e898b..8ed9f12fd 100644
--- a/plugins/acl/localization/es_AR.inc
+++ b/plugins/acl/localization/es_AR.inc
@@ -18,7 +18,9 @@
 $labels['sharing'] = 'Compartiendo';
 $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Usuario:';
+$labels['advanced'] = 'Modo avanzado';
 $labels['newuser'] = 'Agregar entrada';
+$labels['editperms'] = 'Editar permisos';
 $labels['actions'] = 'Acciones para los permisos de acceso...';
 $labels['anyone'] = 'Todos los usuarios (cualquiera)';
 $labels['anonymous'] = 'Invitado (anonimo)';
@@ -36,6 +38,7 @@ $labels['aclt'] = 'Eliminar mensajes';
 $labels['acle'] = 'Descartar';
 $labels['aclx'] = 'Eliminar carpeta';
 $labels['acla'] = 'Administrar';
+$labels['acln'] = 'Anotar mensajes';
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Otro';
 $labels['aclread'] = 'Leer';
@@ -54,6 +57,7 @@ $labels['shortaclt'] = 'Eliminar';
 $labels['shortacle'] = 'Descartar';
 $labels['shortaclx'] = 'Borrado de carpeta';
 $labels['shortacla'] = 'Administrar';
+$labels['shortacln'] = 'Anotar';
 $labels['shortaclother'] = 'Otro';
 $labels['shortaclread'] = 'Leer';
 $labels['shortaclwrite'] = 'Escribir';
@@ -71,15 +75,21 @@ $labels['longaclt'] = 'El marcador de Mensaje Eliminado puede ser modificado';
 $labels['longacle'] = 'Los mensajes pueden ser descartados';
 $labels['longaclx'] = 'La carpeta puede ser eliminada o renombrada';
 $labels['longacla'] = 'Los permisos de acceso de esta carpeta pueden ser modificados';
+$labels['longacln'] = 'La metainformación de mensajes compartidos (anotaciones) puede ser cambiada';
 $labels['longaclfull'] = 'Control total incluyendo la administracion de carpeta';
 $labels['longaclread'] = 'La carpeta se puede abrir para lectura';
 $labels['longaclwrite'] = 'En esta carpeta los mensajes pueden ser marcados, escritos o copiados';
 $labels['longacldelete'] = 'Los mensajes se pueden eliminar';
+$labels['longaclother'] = 'Otros permisos de acceso';
+$labels['ariasummaryacltable'] = 'Listado de permisos de acceso';
+$labels['arialabelaclactions'] = 'Listar acciones';
+$labels['arialabelaclform'] = 'Formulario de permisos de acceso';
 $messages['deleting'] = 'Eliminando permisos de acceso...';
 $messages['saving'] = 'Salvando permisos de acceso...';
 $messages['updatesuccess'] = 'Permisos de acceso modificados satisfactoriamente';
 $messages['deletesuccess'] = 'Permisos de acceso eliminados correctamente';
 $messages['createsuccess'] = 'Permisos de acceso agregados satisfactoriamente';
+$messages['updateerror'] = 'No se pudieron actualizar los permisos de acceso';
 $messages['deleteerror'] = 'No se pueden eliminar los permisos de acceso';
 $messages['createerror'] = 'No se pueden agregar los permisos de acceso';
 $messages['deleteconfirm'] = 'Estas seguro que queres remover los permisos de acceso a el/los usuario(s) seleccionado/s?';
diff --git a/plugins/acl/localization/es_ES.inc b/plugins/acl/localization/es_ES.inc
index 4b6bfa075..c90c3e5b9 100644
--- a/plugins/acl/localization/es_ES.inc
+++ b/plugins/acl/localization/es_ES.inc
@@ -38,6 +38,7 @@ $labels['aclt'] = 'Borrar mensajes';
 $labels['acle'] = 'Expurgar';
 $labels['aclx'] = 'Borrar carpeta';
 $labels['acla'] = 'Administrar';
+$labels['acln'] = 'Anotar mensajes';
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Otro';
 $labels['aclread'] = 'Leer';
@@ -56,6 +57,7 @@ $labels['shortaclt'] = 'Borrar';
 $labels['shortacle'] = 'Expurgar';
 $labels['shortaclx'] = 'Borrar carpeta';
 $labels['shortacla'] = 'Administrar';
+$labels['shortacln'] = 'Anotar';
 $labels['shortaclother'] = 'Otro';
 $labels['shortaclread'] = 'Leer';
 $labels['shortaclwrite'] = 'Escribir';
@@ -73,10 +75,15 @@ $labels['longaclt'] = 'No se pueden cambiar los mensajes etiquetados como "Borra
 $labels['longacle'] = 'No se pueden expurgar los mensajes';
 $labels['longaclx'] = 'La carpeta se puede borrar o renombrar';
 $labels['longacla'] = 'Se pueden cambiar los permisos de acceso';
+$labels['longacln'] = 'Los metadatos compartidos de los mensajes (anotaciones) pueden cambiarse';
 $labels['longaclfull'] = 'Control total, incluyendo la gestión de carpetas';
 $labels['longaclread'] = 'Se puede abrir la carpeta para leer';
 $labels['longaclwrite'] = 'Se pueden etiquetar, escribir o copiar mensajes a la carpeta';
 $labels['longacldelete'] = 'Los mensajes se pueden borrar';
+$labels['longaclother'] = 'Otros derechos de acceso';
+$labels['ariasummaryacltable'] = 'Lista de derechos de acceso';
+$labels['arialabelaclactions'] = 'Lista de acciones';
+$labels['arialabelaclform'] = 'Formulario de derechos de acceso';
 $messages['deleting'] = 'Borrando permisos de acceso…';
 $messages['saving'] = 'Guardando permisos de acceso…';
 $messages['updatesuccess'] = 'Se han cambiado los permisos de acceso';
diff --git a/plugins/acl/localization/et_EE.inc b/plugins/acl/localization/et_EE.inc
index 4b6f437aa..ecd5f7e8f 100644
--- a/plugins/acl/localization/et_EE.inc
+++ b/plugins/acl/localization/et_EE.inc
@@ -18,12 +18,17 @@
 $labels['sharing'] = 'Jagamine';
 $labels['myrights'] = 'Ligipääsuõigused';
 $labels['username'] = 'Kasutaja:';
+$labels['advanced'] = 'laiendatud režiim';
 $labels['newuser'] = 'Lisa sissekanne';
+$labels['editperms'] = 'Muuda õigusi';
 $labels['actions'] = 'Ligipääsuõiguste toimingud...';
 $labels['anyone'] = 'Kõik kasutajad';
 $labels['anonymous'] = 'Külalised (anonüümsed)';
 $labels['identifier'] = 'Tuvastaja';
+$labels['acll'] = 'Ülevaade';
 $labels['aclr'] = 'Lugeda kirju';
+$labels['acls'] = 'Hoia nähtud olekut';
+$labels['aclw'] = 'Salvesta lipud';
 $labels['acli'] = 'Sisesta (kopeeri)';
 $labels['aclp'] = 'Postita';
 $labels['aclc'] = 'Luua alamkaustu';
@@ -33,11 +38,13 @@ $labels['aclt'] = 'Kustutada kirju';
 $labels['acle'] = 'Eemalda';
 $labels['aclx'] = 'Kustutada kausta';
 $labels['acla'] = 'Administreerida';
+$labels['acln'] = 'Annoteeri kirja';
 $labels['aclfull'] = 'Täis kontroll';
 $labels['aclother'] = 'Muu';
 $labels['aclread'] = 'Loe';
 $labels['aclwrite'] = 'Kirjuta';
 $labels['acldelete'] = 'Kustuta';
+$labels['shortacll'] = 'Ülevaade';
 $labels['shortaclr'] = 'Loe';
 $labels['shortacls'] = 'Säilita';
 $labels['shortaclw'] = 'Kirjuta';
@@ -50,20 +57,33 @@ $labels['shortaclt'] = 'Kustuta';
 $labels['shortacle'] = 'Eemalda';
 $labels['shortaclx'] = 'Kausta kustutamine';
 $labels['shortacla'] = 'Administreerida';
+$labels['shortacln'] = 'Annoteeri';
 $labels['shortaclother'] = 'Muu';
 $labels['shortaclread'] = 'Loe';
 $labels['shortaclwrite'] = 'Kirjuta';
 $labels['shortacldelete'] = 'Kustuta';
 $labels['longacll'] = 'See kaust on nimekirjas nähtav ja seda saab tellida';
 $labels['longaclr'] = 'Kausta saab lugemiseks avada';
+$labels['longacls'] = 'Kirja loetuse lippu saab muuta';
+$labels['longaclw'] = 'Kirja lippe ja otsingusõnu saab muuta, väljaarvatud loetud ja kustutatud';
+$labels['longacli'] = 'Kirju saab salvestada ja kopeerida antud kausta';
+$labels['longaclp'] = 'Kirju saab postitada antud kausta';
+$labels['longaclc'] = 'Kaustasi saab luua (või ümber nimetada) otse siia kausta alla.';
+$labels['longaclk'] = 'Kaustu saab luua (või ümber nimetada) otse siia kausta alla';
 $labels['longacld'] = 'Kirja kustutamis lippu saab muuta';
 $labels['longaclt'] = 'Kirja kustutamis lippu saab muuta';
 $labels['longacle'] = 'Kirju saab eemaldada';
 $labels['longaclx'] = 'Seda kausta ei saa kustutada ega ümber nimetada';
 $labels['longacla'] = 'Selle kausta ligipääsuõigusi saab muuta';
+$labels['longacln'] = 'Kirja jagatud metainfot (annotatsioonid) saab muuta';
 $labels['longaclfull'] = 'Täielik kontroll koos kaustade haldamisega';
 $labels['longaclread'] = 'Kausta saab lugemiseks avada';
+$labels['longaclwrite'] = 'Kirju saab märgistada, salvestada või kopeerida kausta';
 $labels['longacldelete'] = 'Kirju saab kustutada';
+$labels['longaclother'] = 'Muud ligipääsu õigused';
+$labels['ariasummaryacltable'] = 'Nimekir ligipääsu õigustest';
+$labels['arialabelaclactions'] = 'Näita tegevusi';
+$labels['arialabelaclform'] = 'Ligipääsu õiguste vorm';
 $messages['deleting'] = 'Ligipääsuõiguste kustutamine...';
 $messages['saving'] = 'Ligipääsuõiguste salvestamine...';
 $messages['updatesuccess'] = 'Ligipääsuõigused on muudetud';
diff --git a/plugins/acl/localization/eu_ES.inc b/plugins/acl/localization/eu_ES.inc
index e13d2033a..8625f4d76 100644
--- a/plugins/acl/localization/eu_ES.inc
+++ b/plugins/acl/localization/eu_ES.inc
@@ -18,7 +18,9 @@
 $labels['sharing'] = 'Partekatzen';
 $labels['myrights'] = 'Sarbide-eskubideak';
 $labels['username'] = 'Erabiltzailea:';
+$labels['advanced'] = 'modu aurreratua';
 $labels['newuser'] = 'Gehitu sarrera';
+$labels['editperms'] = 'Editatu baimenak';
 $labels['actions'] = 'Sarbide-eskubideen ekintzak...';
 $labels['anyone'] = 'Erabiltzaile guztiak (edozein)';
 $labels['anonymous'] = 'Gonbidatuak (anonimo)';
@@ -36,6 +38,7 @@ $labels['aclt'] = 'Ezabatu mezuak';
 $labels['acle'] = 'Kendu';
 $labels['aclx'] = 'Ezabatu karpeta';
 $labels['acla'] = 'Administratu';
+$labels['acln'] = 'Idatzi mezuak';
 $labels['aclfull'] = 'Kontrol osoa';
 $labels['aclother'] = 'Beste';
 $labels['aclread'] = 'Irakurri';
@@ -54,6 +57,7 @@ $labels['shortaclt'] = 'Ezabatu';
 $labels['shortacle'] = 'Kendu';
 $labels['shortaclx'] = 'Ezabatu karpeta';
 $labels['shortacla'] = 'Administratu';
+$labels['shortacln'] = 'Idatzi';
 $labels['shortaclother'] = 'Beste';
 $labels['shortaclread'] = 'Irakurri';
 $labels['shortaclwrite'] = 'Idatzi';
@@ -71,10 +75,15 @@ $labels['longaclt'] = 'Mezuen ezabatu bandera alda daiteke';
 $labels['longacle'] = 'Mezuak betiko ezaba daitezke';
 $labels['longaclx'] = 'Karpeta ezaba edo berrizenda daiteke';
 $labels['longacla'] = 'Karpetaren sarbide eskubideak alda daitezke';
+$labels['longacln'] = 'Partekatutatko mezuen metadatuak (oharrak) alda daitezke';
 $labels['longaclfull'] = 'Kontrol osoa, karpetaren administrazioa barne';
 $labels['longaclread'] = 'Karpeta ireki daiteke irakurtzeko';
 $labels['longaclwrite'] = 'Mezuak marka, idatzi edo kopia daitezke karpetara';
 $labels['longacldelete'] = 'Mezuak ezaba daitezke';
+$labels['longaclother'] = 'Beste sarbide-eskubideak';
+$labels['ariasummaryacltable'] = 'Sarbide-eskubideen zerrenda';
+$labels['arialabelaclactions'] = 'Zerrendatu ekintzak';
+$labels['arialabelaclform'] = 'Sarbide-eskubideen formularioa';
 $messages['deleting'] = 'Sarbide-eskubideak ezabatzen...';
 $messages['saving'] = 'Sarbide-eskubideak gordetzen...';
 $messages['updatesuccess'] = 'Sarbide-eskubideak ongi aldatu dira';
diff --git a/plugins/acl/localization/fa_AF.inc b/plugins/acl/localization/fa_AF.inc
new file mode 100644
index 000000000..cb051f6c4
--- /dev/null
+++ b/plugins/acl/localization/fa_AF.inc
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+$labels['sharing'] = 'اشتراک گذاری';
+$labels['username'] = 'کاربر:';
+$labels['newuser'] = 'افزودن مدخل';
+$labels['aclw'] = 'نوشتن نشانه ها';
+$labels['aclp'] = 'ارسال';
+$labels['acla'] = 'مدیر';
+$labels['aclfull'] = 'کنترل کامل';
+$labels['aclother'] = 'دیگر';
+?>
diff --git a/plugins/acl/localization/fa_IR.inc b/plugins/acl/localization/fa_IR.inc
index 8b030bebd..263ff6547 100644
--- a/plugins/acl/localization/fa_IR.inc
+++ b/plugins/acl/localization/fa_IR.inc
@@ -38,6 +38,7 @@ $labels['aclt'] = 'حذف پیغام‌ها';
 $labels['acle'] = 'پاک کردن';
 $labels['aclx'] = 'حذف پوشه';
 $labels['acla'] = 'اداره کردن';
+$labels['acln'] = 'حاشیه نویسی پیغام ها';
 $labels['aclfull'] = 'کنترل کامل';
 $labels['aclother'] = 'دیگر';
 $labels['aclread'] = 'خواندن';
@@ -56,6 +57,7 @@ $labels['shortaclt'] = 'حذف';
 $labels['shortacle'] = 'پاک کردن';
 $labels['shortaclx'] = 'حذف پوشه';
 $labels['shortacla'] = 'اداره کردن';
+$labels['shortacln'] = 'حاشیه نویسی';
 $labels['shortaclother'] = 'دیگر';
 $labels['shortaclread'] = 'خواندن';
 $labels['shortaclwrite'] = 'نوشتن';
@@ -73,6 +75,7 @@ $labels['longaclt'] = 'پرچم حذف پیغام‌ها می‌تواند تغ�
 $labels['longacle'] = 'پیغام‌ها می‌توانند حذف شوند';
 $labels['longaclx'] = 'پوشه می‌تواند حذف یا تغییر نام داده شود';
 $labels['longacla'] = 'حقوق دسترسی پوشه می‌تواند تغییر داده شود';
+$labels['longacln'] = 'اطلاعات متا اشتراک گذاشته شده پیغام‌ها (حاشیه‌ها) می‌تواند تغییر داده شوند';
 $labels['longaclfull'] = 'کنترل کامل شما مدیریت پوشه';
 $labels['longaclread'] = 'پوشه می‌تواند برای خواندن باز شود';
 $labels['longaclwrite'] = 'پیغام‌ها می‌توانند علامتگذاری، نوشته و یا کپی شوند در پوشه';
diff --git a/plugins/acl/localization/fi_FI.inc b/plugins/acl/localization/fi_FI.inc
index eb69eda3a..27510e849 100644
--- a/plugins/acl/localization/fi_FI.inc
+++ b/plugins/acl/localization/fi_FI.inc
@@ -21,12 +21,24 @@ $labels['username'] = 'Käyttäjä:';
 $labels['editperms'] = 'Muokkaa oikeuksia';
 $labels['anyone'] = 'Kaikki käyttäjät (kuka tahansa)';
 $labels['anonymous'] = 'Vieraat (anonyymit)';
+$labels['aclc'] = 'Luo alikansioita';
+$labels['aclk'] = 'Luo alikansioita';
+$labels['acld'] = 'Poista viestejä';
+$labels['aclt'] = 'Poista viestejä';
+$labels['aclx'] = 'Poista kansio';
+$labels['aclfull'] = 'Täydet käyttöoikeudet';
 $labels['aclother'] = 'Muu';
+$labels['aclread'] = 'Luku';
+$labels['aclwrite'] = 'Kirjoitus';
+$labels['acldelete'] = 'Poisto';
 $labels['shortaclc'] = 'Luo';
 $labels['shortaclk'] = 'Luo';
 $labels['shortacld'] = 'Poista';
 $labels['shortaclt'] = 'Poista';
 $labels['shortaclother'] = 'Muu';
+$labels['shortaclread'] = 'Luku';
+$labels['shortaclwrite'] = 'Kirjoitus';
+$labels['shortacldelete'] = 'Poisto';
 $labels['longaclr'] = 'Kansion voi avata lukua varten';
 $labels['longaclx'] = 'Kansio voidaan poistaa tai nimetä uudelleen';
 $labels['longacla'] = 'Kansion käyttöoikeuksia voi muuttaa';
diff --git a/plugins/acl/localization/fr_FR.inc b/plugins/acl/localization/fr_FR.inc
index 6e73fa0e0..ba0f1015d 100644
--- a/plugins/acl/localization/fr_FR.inc
+++ b/plugins/acl/localization/fr_FR.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Contrôle total, incluant l\'administration des dossie
 $labels['longaclread'] = 'Le dossier peut-être ouvert en lecture';
 $labels['longaclwrite'] = 'Les messages peuvent-être marqués, écrits ou copiés dans ce dossier';
 $labels['longacldelete'] = 'Les messages peuvent être supprimés';
+$labels['longaclother'] = 'Autres droits d\'accès';
+$labels['ariasummaryacltable'] = 'Liste de droits d\'accès';
+$labels['arialabelaclactions'] = 'Lister les actions';
+$labels['arialabelaclform'] = 'Formulaire de droits d\'accès';
 $messages['deleting'] = 'Suppression des droits d\'accès…';
 $messages['saving'] = 'Enregistrement des droits d\'accès…';
 $messages['updatesuccess'] = 'Les droits d\'accès ont été changés avec succès';
@@ -88,7 +92,7 @@ $messages['createsuccess'] = 'Les droits d\'accès ont été ajoutés avec succ�
 $messages['updateerror'] = 'Impossible de mettre à jour les droits d\'accès';
 $messages['deleteerror'] = 'Impossible de supprimer les droits d\'accès';
 $messages['createerror'] = 'Impossible d\'ajouter des droits d\'accès';
-$messages['deleteconfirm'] = 'Êtes-vous sûr de vouloir retirer les droits d\'accès des utilisateurs sélectionnés?';
-$messages['norights'] = 'Aucun droit n\'a été spécifié!';
-$messages['nouser'] = 'Aucun nom d\'utilisateur n\'a été spécifié!';
+$messages['deleteconfirm'] = 'Êtes-vous sûr de vouloir retirer les droits d\'accès des utilisateurs sélectionnés ?';
+$messages['norights'] = 'Aucun droit n\'a été spécifié !';
+$messages['nouser'] = 'Aucun nom d\'utilisateur n\'a été spécifié !';
 ?>
diff --git a/plugins/acl/localization/gl_ES.inc b/plugins/acl/localization/gl_ES.inc
index 4f2e7f456..c1841f5aa 100644
--- a/plugins/acl/localization/gl_ES.inc
+++ b/plugins/acl/localization/gl_ES.inc
@@ -18,7 +18,9 @@
 $labels['sharing'] = 'Compartindo';
 $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Utente:';
+$labels['advanced'] = 'Modo avanzado';
 $labels['newuser'] = 'Engadir entrada';
+$labels['editperms'] = 'Editar permisos';
 $labels['actions'] = 'Accións sobre os Permisos de acceso...';
 $labels['anyone'] = 'Todas as persoas usuarias (calquera)';
 $labels['anonymous'] = 'Persoas convidadas (anónimo)';
@@ -36,6 +38,7 @@ $labels['aclt'] = 'Borrar mensaxes';
 $labels['acle'] = 'Expurga';
 $labels['aclx'] = 'Eliminar cartafol';
 $labels['acla'] = 'Administrar';
+$labels['acln'] = 'Crear anotacións para as mensaxes';
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Outros';
 $labels['aclread'] = 'Lectura';
@@ -54,6 +57,7 @@ $labels['shortaclt'] = 'Eliminar';
 $labels['shortacle'] = 'Expurga';
 $labels['shortaclx'] = 'Eliminar cartafol';
 $labels['shortacla'] = 'Administrar';
+$labels['shortacln'] = 'Crear anotación';
 $labels['shortaclother'] = 'Outros';
 $labels['shortaclread'] = 'Lectura';
 $labels['shortaclwrite'] = 'Escritura';
@@ -71,10 +75,15 @@ $labels['longaclt'] = 'Pódense mudar as mensaxes coa marca Eliminar';
 $labels['longacle'] = 'As mensaxes poden ser expurgadas';
 $labels['longaclx'] = 'Pódese borrar ou renomear o cartafol';
 $labels['longacla'] = 'Pódense mudar os permisos de acceso ao cartafol';
+$labels['longacln'] = 'Pódense trocar as anotacións das mensaxes';
 $labels['longaclfull'] = 'Control total inclúe administración de cartafoles';
 $labels['longaclread'] = 'Pódese abrir o cartafol para lectura';
 $labels['longaclwrite'] = 'Pódense marcar, escribir ou copiar as mensaxes no cartafol';
 $labels['longacldelete'] = 'Pódense borrar as mensaxes';
+$labels['longaclother'] = 'Outros dereitos de acceso';
+$labels['ariasummaryacltable'] = 'Lista de dereitos de acceso';
+$labels['arialabelaclactions'] = 'Accións de lista';
+$labels['arialabelaclform'] = 'Formulario de dereitos de acceso';
 $messages['deleting'] = 'Borrando permisos de acceso...';
 $messages['saving'] = 'Gardando permisos de acceso...';
 $messages['updatesuccess'] = 'Mudados con éxito os permisos de acceso';
diff --git a/plugins/acl/localization/he_IL.inc b/plugins/acl/localization/he_IL.inc
index 199f9d05e..e2bc22696 100644
--- a/plugins/acl/localization/he_IL.inc
+++ b/plugins/acl/localization/he_IL.inc
@@ -38,6 +38,7 @@ $labels['aclt'] = 'מחיקת הודעות';
 $labels['acle'] = 'ניקוי רשומות שבוטלו';
 $labels['aclx'] = 'מחיקת תיקיה';
 $labels['acla'] = 'מנהל';
+$labels['acln'] = 'הוספה של הערת תיוג להודעות';
 $labels['aclfull'] = 'שליטה מלאה';
 $labels['aclother'] = 'אחר';
 $labels['aclread'] = 'קריאה';
@@ -56,6 +57,7 @@ $labels['shortaclt'] = 'מחיקה';
 $labels['shortacle'] = 'ניקוי רשומות שבוטלו';
 $labels['shortaclx'] = 'מחיקת תיקיה';
 $labels['shortacla'] = 'מנהל';
+$labels['shortacln'] = 'הוספה של הערת תיוג';
 $labels['shortaclother'] = 'אחר';
 $labels['shortaclread'] = 'קריאה';
 $labels['shortaclwrite'] = 'כתיבה';
@@ -73,10 +75,15 @@ $labels['longaclt'] = 'ניתן לשנות דגל נמחק של הודעות';
 $labels['longacle'] = 'ניתן לנקות הודעות שסומנו כמבוטלות';
 $labels['longaclx'] = 'ניתן למחוק תיקיה זו או לשנות שמה';
 $labels['longacla'] = 'ניתן לשנות זכויות גישה של תיקיה זו';
+$labels['longacln'] = 'ניתן לשנות הערות תיוג המשותפות להודעות';
 $labels['longaclfull'] = 'שליטה מלאה כולל ניהול התיקיה';
 $labels['longaclread'] = 'ניתן לפתוח את התיקיה ולקרוא בה';
 $labels['longaclwrite'] = 'ניתן לסמן, לכתוב או להעתיק הודעות לתיקיה זו';
 $labels['longacldelete'] = 'ניתן למחוק הודעות';
+$labels['longaclother'] = 'זכויות גישה אחרות';
+$labels['ariasummaryacltable'] = 'רשימת זכויות גישה';
+$labels['arialabelaclactions'] = 'רשימת פעולות';
+$labels['arialabelaclform'] = 'טופס זכויות גישה';
 $messages['deleting'] = 'זכויות גישה נמחקות...';
 $messages['saving'] = 'זכויות גישה נשמרות...';
 $messages['updatesuccess'] = 'זכויות גישה שונו בהצלחה';
diff --git a/plugins/acl/localization/hu_HU.inc b/plugins/acl/localization/hu_HU.inc
index f393a917a..3b813ac3f 100644
--- a/plugins/acl/localization/hu_HU.inc
+++ b/plugins/acl/localization/hu_HU.inc
@@ -38,6 +38,7 @@ $labels['aclt'] = 'Üzenetek törlése';
 $labels['acle'] = 'Törölt üzenetek eltávolítása';
 $labels['aclx'] = 'Mappa törlés';
 $labels['acla'] = 'Adminisztrátor';
+$labels['acln'] = 'Üzenetekhez címkézés';
 $labels['aclfull'] = 'Teljes hozzáférés';
 $labels['aclother'] = 'Egyéb';
 $labels['aclread'] = 'Olvasás';
@@ -56,6 +57,7 @@ $labels['shortaclt'] = 'Törlés';
 $labels['shortacle'] = 'Törölt üzenetek eltávolítása';
 $labels['shortaclx'] = 'Mappa törlése';
 $labels['shortacla'] = 'Adminisztrátor';
+$labels['shortacln'] = 'Cimkézés';
 $labels['shortaclother'] = 'Egyéb';
 $labels['shortaclread'] = 'Olvasás';
 $labels['shortaclwrite'] = 'Írás';
@@ -73,6 +75,7 @@ $labels['longaclt'] = 'Üzenet törölve jelző módositható.';
 $labels['longacle'] = 'Az üzenetek véglegesen eltávolíthatóak';
 $labels['longaclx'] = 'A mappa törölhető vagy átnevezhető';
 $labels['longacla'] = 'A mappa hozzáférési jogai módosíthatóak';
+$labels['longacln'] = 'Üzenetek megosztott metaadatai(cimkéi) módosíthatoak';
 $labels['longaclfull'] = 'Teljes hozzáférés beleértve a mappák kezelését';
 $labels['longaclread'] = 'A mappa olvasásra megnyitható';
 $labels['longaclwrite'] = 'Az üzenetek megjelölhetök, irhatók és másolhatók ebbe a mappába';
diff --git a/plugins/acl/localization/id_ID.inc b/plugins/acl/localization/id_ID.inc
index 6099e0e44..348ec045e 100644
--- a/plugins/acl/localization/id_ID.inc
+++ b/plugins/acl/localization/id_ID.inc
@@ -18,7 +18,9 @@
 $labels['sharing'] = 'Berbagi';
 $labels['myrights'] = 'Hak Akses';
 $labels['username'] = 'Pengguna:';
+$labels['advanced'] = 'Mode Lanjut';
 $labels['newuser'] = 'Tambahkan entri';
+$labels['editperms'] = 'Ubah izin';
 $labels['actions'] = 'Aksi hak akses...';
 $labels['anyone'] = 'Semua pengguna (siapa saja)';
 $labels['anonymous'] = 'Para tamu (anonim)';
@@ -36,6 +38,7 @@ $labels['aclt'] = 'Hapus pesan';
 $labels['acle'] = 'Menghapus';
 $labels['aclx'] = 'Hapus folder';
 $labels['acla'] = 'Kelola';
+$labels['acln'] = 'Berikan keterangan pesan';
 $labels['aclfull'] = 'Kendali penuh';
 $labels['aclother'] = 'Lainnya';
 $labels['aclread'] = 'Baca';
@@ -54,6 +57,7 @@ $labels['shortaclt'] = 'Hapus';
 $labels['shortacle'] = 'Buang';
 $labels['shortaclx'] = 'Hapus folder';
 $labels['shortacla'] = 'Kelola';
+$labels['shortacln'] = 'Berikan keterangan';
 $labels['shortaclother'] = 'Lainnya';
 $labels['shortaclread'] = 'Baca';
 $labels['shortaclwrite'] = 'Tulis';
@@ -71,6 +75,7 @@ $labels['longaclt'] = 'Tanda hapus pesan dapat diubah';
 $labels['longacle'] = 'Pesan dapat dibuang';
 $labels['longaclx'] = 'Folder dapat dihapus atau diubah namanya';
 $labels['longacla'] = 'Hak akses folder dapat diubah';
+$labels['longacln'] = 'Metadata pesan bersama (penjelasan) dapat diubah';
 $labels['longaclfull'] = 'Kendali penuh penuh termasuk administrasi';
 $labels['longaclread'] = 'Folder dapat dibuka untuk dibaca';
 $labels['longaclwrite'] = 'Pesan dapat ditandai, ditulis atau disalin kedalam folder';
diff --git a/plugins/acl/localization/it_IT.inc b/plugins/acl/localization/it_IT.inc
index 36c66cda5..1201c7ea1 100644
--- a/plugins/acl/localization/it_IT.inc
+++ b/plugins/acl/localization/it_IT.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Controllo completo incluso cartella di amministrazione
 $labels['longaclread'] = 'Questa cartella può essere aperta in lettura';
 $labels['longaclwrite'] = 'I messaggi possono essere marcati, scritti o copiati nella cartella';
 $labels['longacldelete'] = 'I messaggi possono essere eliminati';
+$labels['longaclother'] = 'Altri diritti di accesso';
+$labels['ariasummaryacltable'] = 'Elenco dei diritti di accesso';
+$labels['arialabelaclactions'] = 'Lista azioni';
+$labels['arialabelaclform'] = 'Modulo di accesso';
 $messages['deleting'] = 'Sto eliminando i diritti di accesso...';
 $messages['saving'] = 'Sto salvando i diritti di accesso...';
 $messages['updatesuccess'] = 'I diritti d\'accesso sono stati cambiati';
diff --git a/plugins/acl/localization/ja_JP.inc b/plugins/acl/localization/ja_JP.inc
index 42a386714..52c5940e6 100644
--- a/plugins/acl/localization/ja_JP.inc
+++ b/plugins/acl/localization/ja_JP.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'フォルダーの管理を含めた完全な制御を
 $labels['longaclread'] = 'フォルダーを読むことを可能';
 $labels['longaclwrite'] = 'メッセージにマークの設定、書き込み、フォルダーに複製を可能';
 $labels['longacldelete'] = 'メッセージの削除を可能';
+$labels['longaclother'] = '他のアクセス権';
+$labels['ariasummaryacltable'] = 'アクセス権の一覧';
+$labels['arialabelaclactions'] = '動作を一覧';
+$labels['arialabelaclform'] = 'アクセス権の欄';
 $messages['deleting'] = 'アクセス権を削除中...';
 $messages['saving'] = 'アクセス権を保存中...';
 $messages['updatesuccess'] = 'アクセス権を変更しました。';
diff --git a/plugins/acl/localization/km_KH.inc b/plugins/acl/localization/km_KH.inc
index 2e562e221..8310d4e81 100644
--- a/plugins/acl/localization/km_KH.inc
+++ b/plugins/acl/localization/km_KH.inc
@@ -18,6 +18,7 @@
 $labels['sharing'] = 'ការចែករំលែក';
 $labels['myrights'] = 'សិទ្ធិចូល';
 $labels['username'] = 'អ្នកប្រើ៖';
+$labels['advanced'] = 'បែបកម្រិតខ្ពស់';
 $labels['newuser'] = 'បន្ថែមធាតុ';
 $labels['actions'] = 'សកម្មភាពសិទ្ធិចូល...';
 $labels['anyone'] = 'អ្នកប្រើទាំងអស់ (នរណាម្នាក់)';
@@ -56,10 +57,16 @@ $labels['shortaclread'] = 'អាន';
 $labels['shortaclwrite'] = 'សរសេរ';
 $labels['shortacldelete'] = 'លុប';
 $labels['longaclr'] = 'ថតនេះអាចបើកសម្រាប់អាន';
+$labels['longacle'] = 'សារនេះអាចត្រូវបានដកចេញ';
+$labels['longaclx'] = 'ថតនេះ អាចត្រូវបានលុប ឬ ប្ដូរឈ្មោះ';
+$labels['longacla'] = 'សិទ្ធិចូលទៅកាន់ថតនេះអាចត្រូវបានផ្លាស់ប្ដូរ';
 $labels['longacldelete'] = 'សារនេះអាចត្រូវបានលុប';
 $messages['deleting'] = 'កំពុងលុបសិទ្ធិចូល...';
 $messages['saving'] = 'រក្សាទុកសិទ្ធិចូល...';
+$messages['deletesuccess'] = 'លុបសិទ្ធិចូលដោយជោគជ័យ';
+$messages['createsuccess'] = 'បន្ថែមសិទ្ធិចូលដោយជោគជ័យ';
 $messages['updateerror'] = 'មិនអាចធ្វើបច្ចុប្បន្នភាពសិទ្ធិចូល';
+$messages['deleteerror'] = 'មិនអាចលុបសិទ្ធិចូល';
 $messages['createerror'] = 'មិនអាចបន្ថែមសិទ្ធិចូល';
 $messages['deleteconfirm'] = 'តើអ្នកពិតជាចង់ដកសិទ្ធចូលពីអ្នកប្រើប្រាស់ដែលបានរើសមែនទេ?';
 $messages['norights'] = 'មិនបានបញ្ជាក់សិទ្ធិច្បាស់លាស់!';
diff --git a/plugins/acl/localization/ko_KR.inc b/plugins/acl/localization/ko_KR.inc
index dc93541f3..60b4b302b 100644
--- a/plugins/acl/localization/ko_KR.inc
+++ b/plugins/acl/localization/ko_KR.inc
@@ -19,7 +19,7 @@ $labels['sharing'] = '공유';
 $labels['myrights'] = '접근 권한';
 $labels['username'] = '사용자:';
 $labels['advanced'] = '고급 모드';
-$labels['newuser'] = '엔트리 추가';
+$labels['newuser'] = '입력내용 추가';
 $labels['editperms'] = '권한 수정';
 $labels['actions'] = '접근 권한 동작...';
 $labels['anyone'] = '모든 사용자 (아무나)';
@@ -27,24 +27,25 @@ $labels['anonymous'] = '방문자 (익명)';
 $labels['identifier'] = '식별자';
 $labels['acll'] = '조회';
 $labels['aclr'] = '읽은 메시지';
-$labels['acls'] = '읽은 상태로 유지';
+$labels['acls'] = '읽은 상태 유지';
 $labels['aclw'] = '쓰기 깃발';
 $labels['acli'] = '삽입 (복사할 위치)';
 $labels['aclp'] = '게시';
-$labels['aclc'] = '하위 폴더 만들기';
-$labels['aclk'] = '하위 폴더 만들기';
+$labels['aclc'] = '하위 폴더 생성';
+$labels['aclk'] = '하위 폴더 생성';
 $labels['acld'] = '메시지 삭제';
 $labels['aclt'] = '메시지 삭제';
 $labels['acle'] = '영구 제거';
 $labels['aclx'] = '폴더 삭제';
-$labels['acla'] = '관리자';
-$labels['aclfull'] = '전체 제어권';
+$labels['acla'] = '관리';
+$labels['acln'] = '메시지에 주석 추가';
+$labels['aclfull'] = '전체 제어 권한';
 $labels['aclother'] = '기타';
-$labels['aclread'] = '읽기';
+$labels['aclread'] = '읽음';
 $labels['aclwrite'] = '쓰기';
 $labels['acldelete'] = '삭제';
 $labels['shortacll'] = '조회';
-$labels['shortaclr'] = '읽기';
+$labels['shortaclr'] = '읽음';
 $labels['shortacls'] = '보관';
 $labels['shortaclw'] = '쓰기';
 $labels['shortacli'] = '삽입';
@@ -56,6 +57,7 @@ $labels['shortaclt'] = '삭제';
 $labels['shortacle'] = '지움';
 $labels['shortaclx'] = '폴더 삭제';
 $labels['shortacla'] = '관리';
+$labels['shortacln'] = '주석 추가';
 $labels['shortaclother'] = '기타';
 $labels['shortaclread'] = '읽기';
 $labels['shortaclwrite'] = '쓱';
@@ -73,13 +75,18 @@ $labels['longaclt'] = '메시지 삭제 깃발이 변경될 수 있음';
 $labels['longacle'] = '메시지가 영구 제거될 수 있음';
 $labels['longaclx'] = '폴더를 삭제하거나 이름을 변경 할 수 있음';
 $labels['longacla'] = '폴더의 접근 권한을 변경할 수 있음';
-$labels['longaclfull'] = '폴더 관리를 포함한 모든 제어권';
+$labels['longacln'] = '공유된 메타데이터(주석)은 변경될 수 있습니다';
+$labels['longaclfull'] = '폴더 관리를 포함한 전체 제어 권한';
 $labels['longaclread'] = '폴더를 열어 읽을 수 있음';
 $labels['longaclwrite'] = '메시지를 표시하거나, 폴더로 이동 또는 복사할 수 있음';
 $labels['longacldelete'] = '메시지를 삭제할 수 있음';
+$labels['longaclother'] = '기타 접근 권한';
+$labels['ariasummaryacltable'] = '접근 권한 목록';
+$labels['arialabelaclactions'] = '목록 동작';
+$labels['arialabelaclform'] = '접근 권한 양식';
 $messages['deleting'] = '접근 권한을 삭제하는 중...';
 $messages['saving'] = '접근 권한을 저장하는 중...';
-$messages['updatesuccess'] = '접근 권한을 성공적으로 변경함.';
+$messages['updatesuccess'] = '접근 권한을 성공적으로 변경함';
 $messages['deletesuccess'] = '접근 권한을 성공적으로 삭제함.';
 $messages['createsuccess'] = '접근 권한을 성공적으로 추가함.';
 $messages['updateerror'] = '접근 권한을 업데이트 할 수 없음';
diff --git a/plugins/acl/localization/ku.inc b/plugins/acl/localization/ku.inc
new file mode 100644
index 000000000..ef95c1443
--- /dev/null
+++ b/plugins/acl/localization/ku.inc
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+$labels['sharing'] = 'Parvekirin';
+$labels['myrights'] = 'Mafên Têketinê';
+$labels['username'] = 'Bikarhêner:';
+$labels['advanced'] = 'Moda pêşketî';
+$labels['newuser'] = 'Têketinek zêde bike';
+$labels['editperms'] = 'Destûrdayînan Sererast Bike';
+$labels['actions'] = 'Digihîje tevgerên çê..';
+$labels['anyone'] = 'Hemû bikarhêner (her kes)';
+$labels['anonymous'] = 'Mêvan (gelêrî)';
+$labels['identifier'] = 'Danasîner';
+$labels['acll'] = 'Lê bigere';
+$labels['aclr'] = 'Peyaman bixwîne';
+$labels['aclw'] = 'Alayan binivîse';
+$labels['aclp'] = 'Şandî';
+$labels['aclc'] = 'Bindosyeyan çêke';
+$labels['aclk'] = 'Bindosyeyan çêke';
+$labels['acld'] = 'Peyaman binivîse';
+$labels['aclt'] = 'Peyaman jê bibe';
+$labels['acle'] = 'Jê derxîne';
+$labels['aclx'] = 'Dosyeyê jê bibe';
+$labels['acla'] = 'Birêvebir';
+$labels['acln'] = 'Bi nîşeyan peyaman rave bike';
+$labels['aclfull'] = 'Tam venêrîn';
+$labels['aclother'] = 'Ên din';
+$labels['aclread'] = 'Bixwîne';
+$labels['aclwrite'] = 'Binivîse';
+$labels['acldelete'] = 'Jê bibe';
+$labels['shortacll'] = 'Lê bigere';
+$labels['shortaclr'] = 'Bixwîne';
+$labels['shortacls'] = 'Bihêle';
+$labels['shortaclw'] = 'Binivîse';
+$labels['shortacli'] = 'Tev bike';
+$labels['shortaclp'] = 'Şandî';
+$labels['shortaclc'] = 'Çêke';
+$labels['shortaclk'] = 'Çêke';
+$labels['shortacld'] = 'Jê bibe';
+$labels['shortaclt'] = 'Jê bibe';
+$labels['shortacle'] = 'Jê derxîne';
+$labels['shortaclx'] = 'Dosye-jêbirin';
+$labels['shortacla'] = 'Bikarhêner';
+$labels['shortacln'] = 'Bi nîşeyan rave bike';
+$labels['shortaclother'] = 'Ên din';
+$labels['shortaclread'] = 'Bixwîne';
+$labels['shortaclwrite'] = 'Binivîse';
+$labels['shortacldelete'] = 'Jê bibe';
+$labels['longaclr'] = 'Dosye ji bo xwendinê dikare bê vekirin';
+$labels['longacls'] = 'Alaya peyamên Dîtî dikare bête guhartin';
+$labels['longaclread'] = 'Dosye ji bo xwendinê dikare bê vekirin';
+$labels['longaclwrite'] = 'Peyam dikarin kopiyî dosyeyê bên kirin, nîşankirin, nivîsandin.';
+$labels['longacldelete'] = 'Hêmî peyam dikarin werin jêbirin';
+$labels['longaclother'] = 'Mafên din ên têketinê';
+$labels['ariasummaryacltable'] = 'Lîsteya mafên têketinê';
+$labels['arialabelaclactions'] = 'Tevgeran liste bike';
+$labels['arialabelaclform'] = 'Forma mafên têketinê';
+$messages['deleting'] = 'Mafên têketinê tên jêbirin...';
+$messages['saving'] = 'Mafên têketinê tên tomarkirin...';
+$messages['updatesuccess'] = 'Mafên têketinê bi serkeftin hatin guhartin';
+$messages['deletesuccess'] = 'Mafên têketinê bi serkeftin hatin jêbirin';
+$messages['createsuccess'] = 'Mafên têketinê bi serkeftin hatin tevkirin';
+$messages['updateerror'] = 'Nûkirina mafên têketinê bigire';
+$messages['deleteerror'] = 'Jêbirina mafên têketinê bigire';
+$messages['createerror'] = 'Tevkirina mafên têketinê bigire';
+$messages['deleteconfirm'] = 'Tu ewle yî, dixwazî mafên têketinê yên bikarhênerê(n) bijartî rakî?';
+$messages['norights'] = 'Tu maf nehat diyarkirin!';
+$messages['nouser'] = 'Tu bikarhêner nehat diyarkirin!';
+?>
diff --git a/plugins/acl/localization/ku_IQ.inc b/plugins/acl/localization/ku_IQ.inc
new file mode 100644
index 000000000..bc80848b4
--- /dev/null
+++ b/plugins/acl/localization/ku_IQ.inc
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+$labels['sharing'] = 'هاوبەشکردن';
+$labels['username'] = 'بەکارهێنەر:';
+$labels['advanced'] = 'شێوازی پێشکەوتوو';
+$labels['shortaclc'] = 'دروستکردن';
+$labels['shortaclk'] = 'دروستکردن';
+$labels['shortacld'] = 'سڕینەوە';
+$labels['shortaclt'] = 'سڕینەوە';
+$labels['shortaclx'] = 'سڕینەوەی بوخچە';
+?>
diff --git a/plugins/acl/localization/lt_LT.inc b/plugins/acl/localization/lt_LT.inc
index d0851ac87..cea41d6d9 100644
--- a/plugins/acl/localization/lt_LT.inc
+++ b/plugins/acl/localization/lt_LT.inc
@@ -18,7 +18,9 @@
 $labels['sharing'] = 'Dalinimasis';
 $labels['myrights'] = 'Prieigos teisės';
 $labels['username'] = 'Vartotojas:';
+$labels['advanced'] = 'Pažengusio vartotojo rėžimas';
 $labels['newuser'] = 'Pridėti įrašą';
+$labels['editperms'] = 'Tvarkyti leidimus';
 $labels['actions'] = 'Prieigos teisių veiksmai...';
 $labels['anyone'] = 'Visi vartotojai (bet kas)';
 $labels['anonymous'] = 'Svečias (anonimas)';
@@ -36,6 +38,7 @@ $labels['aclt'] = 'Ištrinti žinutes';
 $labels['acle'] = 'Išbraukti';
 $labels['aclx'] = 'Ištrinti aplanką';
 $labels['acla'] = 'Valdyti';
+$labels['acln'] = 'Anotuoti laiškus';
 $labels['aclfull'] = 'Visiška kontrolė';
 $labels['aclother'] = 'Kita';
 $labels['aclread'] = 'Skaityti';
@@ -54,6 +57,7 @@ $labels['shortaclt'] = 'Trinti';
 $labels['shortacle'] = 'Išbraukti';
 $labels['shortaclx'] = 'Ištrinti aplanką';
 $labels['shortacla'] = 'Valdyti';
+$labels['shortacln'] = 'Anotuoti';
 $labels['shortaclother'] = 'Kita';
 $labels['shortaclread'] = 'Skaityti';
 $labels['shortaclwrite'] = 'Įrašyti';
@@ -71,10 +75,15 @@ $labels['longaclt'] = 'Pranešimų vėliavėlė "Ištrintas" gali būti pakeista
 $labels['longacle'] = 'Pranešimai gali būti išbraukti';
 $labels['longaclx'] = 'Aplankas gali būti pašalintas arba pervadintas';
 $labels['longacla'] = 'Aplanko prieigos teisės gali būti pakeistos';
+$labels['longacln'] = 'Bendrieji laiškų meta-duomenys (anotacijos) gali būti pakeisti';
 $labels['longaclfull'] = 'Visiška kontrolė įskaitant aplanko administravimą';
 $labels['longaclread'] = 'Aplanką galima peržiūrėti';
 $labels['longaclwrite'] = 'Pranešimai gali būti pažymėti, įrašyti arba nukopijuoti į aplanką';
 $labels['longacldelete'] = 'Pranešimai gali būti ištrinti';
+$labels['longaclother'] = 'Kitos prieigos teisės';
+$labels['ariasummaryacltable'] = 'Prieigos teisių sąrašas';
+$labels['arialabelaclactions'] = 'Rodyti veiksmus';
+$labels['arialabelaclform'] = 'Prieigos teisių forma';
 $messages['deleting'] = 'Panaikinamos prieigos teisės';
 $messages['saving'] = 'Išsaugomos prieigos teisės';
 $messages['updatesuccess'] = 'Prieigos teisės sėkmingai pakeistos';
diff --git a/plugins/acl/localization/nl_NL.inc b/plugins/acl/localization/nl_NL.inc
index 9bb2e3bae..f820846bb 100644
--- a/plugins/acl/localization/nl_NL.inc
+++ b/plugins/acl/localization/nl_NL.inc
@@ -38,6 +38,7 @@ $labels['aclt'] = 'Berichten verwijderen';
 $labels['acle'] = 'Vernietigen';
 $labels['aclx'] = 'Map verwijderen';
 $labels['acla'] = 'Beheren';
+$labels['acln'] = 'Annoteer berichten';
 $labels['aclfull'] = 'Volledige toegang';
 $labels['aclother'] = 'Overig';
 $labels['aclread'] = 'Lezen';
@@ -56,6 +57,7 @@ $labels['shortaclt'] = 'Verwijderen';
 $labels['shortacle'] = 'Vernietigen';
 $labels['shortaclx'] = 'Map verwijderen';
 $labels['shortacla'] = 'Beheren';
+$labels['shortacln'] = 'Annoteren';
 $labels['shortaclother'] = 'Overig';
 $labels['shortaclread'] = 'Lezen';
 $labels['shortaclwrite'] = 'Schrijven';
@@ -73,10 +75,15 @@ $labels['longaclt'] = 'De berichtmarkering \'Verwijderd\' kan aangepast worden';
 $labels['longacle'] = 'Berichten kunnen vernietigd worden';
 $labels['longaclx'] = 'De map kan verwijderd of hernoemd worden';
 $labels['longacla'] = 'De toegangsrechten voor deze map kunnen veranderd worden';
+$labels['longacln'] = 'Gedeelde metadata (annotaties) van berichten kan aangepast worden';
 $labels['longaclfull'] = 'Volledige controle inclusief mappenbeheer';
 $labels['longaclread'] = 'De map kan geopend worden om te lezen';
 $labels['longaclwrite'] = 'Berichten kunnen gemarkeerd worden, opgesteld worden of gekopieerd worden naar deze map';
 $labels['longacldelete'] = 'Berichten kunnen verwijderd worden';
+$labels['longaclother'] = 'Overige toegangsrechten';
+$labels['ariasummaryacltable'] = 'Lijst van toegangsrechten';
+$labels['arialabelaclactions'] = 'Lijstacties';
+$labels['arialabelaclform'] = 'Formulier voor toegangsrechten';
 $messages['deleting'] = 'Toegangsrechten worden verwijderd...';
 $messages['saving'] = 'Toegangsrechten worden opgeslagen...';
 $messages['updatesuccess'] = 'Toegangsrechten succesvol veranderd';
diff --git a/plugins/acl/localization/pl_PL.inc b/plugins/acl/localization/pl_PL.inc
index 642fde1b6..053873068 100644
--- a/plugins/acl/localization/pl_PL.inc
+++ b/plugins/acl/localization/pl_PL.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Pełna kontrola włącznie z administrowaniem folderem
 $labels['longaclread'] = 'Folder może być otwarty w trybie do odczytu';
 $labels['longaclwrite'] = 'Wiadomości mogą być oznaczane, zapisywane i kopiowane do folderu';
 $labels['longacldelete'] = 'Wiadomości mogą być usuwane';
+$labels['longaclother'] = 'Inne prawa dostępu';
+$labels['ariasummaryacltable'] = 'Spis praw dostępu';
+$labels['arialabelaclactions'] = 'Lista działań';
+$labels['arialabelaclform'] = 'Formularz praw dostępu';
 $messages['deleting'] = 'Usuwanie praw dostępu...';
 $messages['saving'] = 'Zapisywanie praw dostępu...';
 $messages['updatesuccess'] = 'Pomyślnie zmieniono prawa dostępu';
diff --git a/plugins/acl/localization/pt_BR.inc b/plugins/acl/localization/pt_BR.inc
index a7cf8354d..badb91f50 100644
--- a/plugins/acl/localization/pt_BR.inc
+++ b/plugins/acl/localization/pt_BR.inc
@@ -36,7 +36,7 @@ $labels['aclk'] = 'Criar subpastas';
 $labels['acld'] = 'Apagar mensagens';
 $labels['aclt'] = 'Apagar mensagens';
 $labels['acle'] = 'Expurgar';
-$labels['aclx'] = 'Apagar pasta';
+$labels['aclx'] = 'Excluir pasta';
 $labels['acla'] = 'Administrar';
 $labels['acln'] = 'Inserir anotações nas mensagens';
 $labels['aclfull'] = 'Controle total';
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Controle total incluindo a pasta de administração';
 $labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longaclwrite'] = 'As mensagens podem ser marcadas, salvas ou copiadas para a pasta';
 $labels['longacldelete'] = 'Mensagens podem ser apagadas';
+$labels['longaclother'] = 'Outras permissões de acesso';
+$labels['ariasummaryacltable'] = 'Lista de permissões de acesso';
+$labels['arialabelaclactions'] = 'Lista de ações';
+$labels['arialabelaclform'] = 'Formulário de permissões de acesso';
 $messages['deleting'] = 'Apagando permissões de acesso...';
 $messages['saving'] = 'Salvando permissões de acesso...';
 $messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
diff --git a/plugins/acl/localization/pt_PT.inc b/plugins/acl/localization/pt_PT.inc
index 77f831375..745f36bef 100644
--- a/plugins/acl/localization/pt_PT.inc
+++ b/plugins/acl/localization/pt_PT.inc
@@ -75,11 +75,15 @@ $labels['longaclt'] = 'O marcador Apagar Mensagens pode ser alterado';
 $labels['longacle'] = 'As mensagens podem ser purgadas';
 $labels['longaclx'] = 'A pasta pode ser eliminada ou renomeada';
 $labels['longacla'] = 'As permissões de acesso da pasta podem ser alteradas';
-$labels['longacln'] = 'Mensagens partilhadas de metadados (anotações) podem ser alteradas';
+$labels['longacln'] = 'Mensagens de metadados (anotações) partilhadas podem ser alteradas';
 $labels['longaclfull'] = 'Controlo total incluindo administração de pastas';
 $labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longaclwrite'] = 'As mensagens podem ser marcadas, guardadas ou copiadas para a pasta';
 $labels['longacldelete'] = 'As mensagens podem ser eliminadas';
+$labels['longaclother'] = 'Outros direitos de acesso';
+$labels['ariasummaryacltable'] = 'Lista de direitos de acesso';
+$labels['arialabelaclactions'] = 'Lista de acções';
+$labels['arialabelaclform'] = 'Formulário de direitos de acesso';
 $messages['deleting'] = 'A eliminar permissões de acesso...';
 $messages['saving'] = 'A guardar permissões de acesso...';
 $messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
diff --git a/plugins/acl/localization/ro_RO.inc b/plugins/acl/localization/ro_RO.inc
index 7ce4ca86f..7db891aaf 100644
--- a/plugins/acl/localization/ro_RO.inc
+++ b/plugins/acl/localization/ro_RO.inc
@@ -57,7 +57,7 @@ $labels['shortaclt'] = 'Șterge';
 $labels['shortacle'] = 'Elimină';
 $labels['shortaclx'] = 'Ștergere dosar';
 $labels['shortacla'] = 'Administrează';
-$labels['shortacln'] = 'Adnota';
+$labels['shortacln'] = 'Adnotă';
 $labels['shortaclother'] = 'Altul';
 $labels['shortaclread'] = 'Citeşte';
 $labels['shortaclwrite'] = 'Scrie';
diff --git a/plugins/acl/localization/ru_RU.inc b/plugins/acl/localization/ru_RU.inc
index afc22bc8f..d583b4198 100644
--- a/plugins/acl/localization/ru_RU.inc
+++ b/plugins/acl/localization/ru_RU.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Полный доступ, включая управл
 $labels['longaclread'] = 'Эта папка может быть открыта для чтения';
 $labels['longaclwrite'] = 'Сообщения можно помечать, записывать или копировать в папку';
 $labels['longacldelete'] = 'Сообщения можно удалять';
+$labels['longaclother'] = 'Прочие права доступа';
+$labels['ariasummaryacltable'] = 'Список прав доступа';
+$labels['arialabelaclactions'] = 'Список действий';
+$labels['arialabelaclform'] = 'Форма прав доступа';
 $messages['deleting'] = 'Удаление прав доступа...';
 $messages['saving'] = 'Сохранение прав доступа...';
 $messages['updatesuccess'] = 'Права доступа успешно изменены';
diff --git a/plugins/acl/localization/sk_SK.inc b/plugins/acl/localization/sk_SK.inc
index ec15dbbe8..6acc03ee4 100644
--- a/plugins/acl/localization/sk_SK.inc
+++ b/plugins/acl/localization/sk_SK.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Úplný prístup, vrátane správy priečinka';
 $labels['longaclread'] = 'Prečinok je možné otvoriť na čítanie';
 $labels['longaclwrite'] = 'Správy je možné označiť, zapísať alebo skopírovať do prečinka';
 $labels['longacldelete'] = 'Správy je možné vymazať';
+$labels['longaclother'] = 'Iné prístupové oprávnenia';
+$labels['ariasummaryacltable'] = 'Zoznam prístupových oprávnení';
+$labels['arialabelaclactions'] = 'Zoznam akcií';
+$labels['arialabelaclform'] = 'Formulár pre prístupové oprávnenia';
 $messages['deleting'] = 'Odstraňovanie prístupových oprávnení...';
 $messages['saving'] = 'Ukladanie prístupových oprávnení...';
 $messages['updatesuccess'] = 'Prístupové oprávnenia boli úspešne zmenené';
diff --git a/plugins/acl/localization/sv_SE.inc b/plugins/acl/localization/sv_SE.inc
index ff52ea599..eebc39cc9 100644
--- a/plugins/acl/localization/sv_SE.inc
+++ b/plugins/acl/localization/sv_SE.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Full kontroll inklusive katalogadministration';
 $labels['longaclread'] = 'Katalogen kan öppnas för läsning';
 $labels['longaclwrite'] = 'Meddelanden kan märkas, skrivas eller kopieras till katalogen';
 $labels['longacldelete'] = 'Meddelanden kan tas bort';
+$labels['longaclother'] = 'Övriga åtkomsträttigheter';
+$labels['ariasummaryacltable'] = 'Lista med åtkomsträttigheter';
+$labels['arialabelaclactions'] = 'Hantera listor';
+$labels['arialabelaclform'] = 'Formulär för åtkomsträttigheter';
 $messages['deleting'] = 'Tar bort åtkomsträttigheter...';
 $messages['saving'] = 'Sparar åtkomsträttigheter...';
 $messages['updatesuccess'] = 'Åtkomsträttigheterna är ändrade';
diff --git a/plugins/acl/localization/tr_TR.inc b/plugins/acl/localization/tr_TR.inc
index 3deb31e24..fe4977f68 100644
--- a/plugins/acl/localization/tr_TR.inc
+++ b/plugins/acl/localization/tr_TR.inc
@@ -80,6 +80,10 @@ $labels['longaclfull'] = 'Dizin yönetimi de dahil olmak üzere tam kontrol';
 $labels['longaclread'] = 'Dizin yazma için okunabilir';
 $labels['longaclwrite'] = 'Dizin yönetimi de dahil olmak üzere tam kontrol';
 $labels['longacldelete'] = 'Mesajlar silinebilir';
+$labels['longaclother'] = 'Diğer erişim hakları';
+$labels['ariasummaryacltable'] = 'Erişim hakları listesi';
+$labels['arialabelaclactions'] = 'Aksiyon listesi';
+$labels['arialabelaclform'] = 'Erişim hakları formu';
 $messages['deleting'] = 'Erişim hakları siliniyor...';
 $messages['saving'] = 'Erişim hakları saklanıyor...';
 $messages['updatesuccess'] = 'Erişim hakları başarıyla değiştirildi';
diff --git a/plugins/acl/localization/vi_VN.inc b/plugins/acl/localization/vi_VN.inc
index 61ef9b142..c6ce2fd44 100644
--- a/plugins/acl/localization/vi_VN.inc
+++ b/plugins/acl/localization/vi_VN.inc
@@ -18,7 +18,9 @@
 $labels['sharing'] = 'Chia sẻ';
 $labels['myrights'] = 'Quyền truy cập';
 $labels['username'] = 'Người dùng:';
+$labels['advanced'] = 'Chế độ tính năng cao hơn';
 $labels['newuser'] = 'Thêm bài viết';
+$labels['editperms'] = 'Sửa đổi quyền sử dụng';
 $labels['actions'] = 'Các thao tác quyền truy cập';
 $labels['anyone'] = 'Tất cả người dùng (bất kỳ ai)';
 $labels['anonymous'] = 'Khách (nặc danh)';
@@ -36,6 +38,7 @@ $labels['aclt'] = 'Xóa thư';
 $labels['acle'] = 'Thải bỏ';
 $labels['aclx'] = 'Xóa giữ liệu';
 $labels['acla'] = 'Quản lý';
+$labels['acln'] = 'Thông tin chú thích';
 $labels['aclfull'] = 'Quản lý toàn bộ';
 $labels['aclother'] = 'Loại khác';
 $labels['aclread'] = 'Đọc';
@@ -54,6 +57,7 @@ $labels['shortaclt'] = 'Xoá';
 $labels['shortacle'] = 'Thải bỏ';
 $labels['shortaclx'] = 'Giữ liệu được xóa';
 $labels['shortacla'] = 'Quản lý';
+$labels['shortacln'] = 'Chú thích';
 $labels['shortaclother'] = 'Loại khác';
 $labels['shortaclread'] = 'Đọc';
 $labels['shortaclwrite'] = 'Viết';
@@ -71,10 +75,15 @@ $labels['longaclt'] = 'Cờ đánh dấu thư xóa có thể thay đổi';
 $labels['longacle'] = 'Thư có thể thải bỏ';
 $labels['longaclx'] = 'Giữ liệu có thể xóa được hoặc đặt lại tên';
 $labels['longacla'] = 'Quyên truy cập giữ liệu có thể thay đổi';
+$labels['longacln'] = 'Dữ liệu thông tin (chú thích) của thư có thể thay đổi';
 $labels['longaclfull'] = 'Quản lý toàn bộ bao gồm cả sự thi hành giữ liệu';
 $labels['longaclread'] = 'Giữ liệu có thể được mở để đọc';
 $labels['longaclwrite'] = 'Thư có thể được đánh dấu, ghi hoăc sao chép vào giữ liệu';
 $labels['longacldelete'] = 'Thư có thể bị xóa';
+$labels['longaclother'] = 'Quyền truy cập khác';
+$labels['ariasummaryacltable'] = 'Danh sách quyền truy cập';
+$labels['arialabelaclactions'] = 'Danh sách hành động';
+$labels['arialabelaclform'] = 'Bảng khai quyền truy cập';
 $messages['deleting'] = 'Xóa quyền truy cập...';
 $messages['saving'] = 'Lưu quyền truy cập...';
 $messages['updatesuccess'] = 'Thay đổi quyền truy cập thành công...';
diff --git a/plugins/archive/localization/ast.inc b/plugins/archive/localization/ast.inc
index 546c33538..0ae647fe7 100644
--- a/plugins/archive/localization/ast.inc
+++ b/plugins/archive/localization/ast.inc
@@ -17,15 +17,15 @@
 */
 $labels['buttontext'] = 'Archivu';
 $labels['buttontitle'] = 'Archivar esti mensaxe';
-$labels['archived'] = 'Mensaxe archiváu';
-$labels['archivedreload'] = 'Archiváu correchamente. Recarga la páxina pa ver les nueves carpetes d\'archivu.';
+$labels['archived'] = 'Archiváu con ésitu';
+$labels['archivedreload'] = 'Archiváu con ésitu. Recarga la páxina pa ver les nueves carpetes d\'archivos.';
 $labels['archiveerror'] = 'Nun pudieron archivase dalgunos mensaxes';
 $labels['archivefolder'] = 'Archivu';
 $labels['settingstitle'] = 'Archivu';
 $labels['archivetype'] = 'Dividir l\'archivu por';
 $labels['archivetypeyear'] = 'Añu (p.ex. Archivu/2012)';
 $labels['archivetypemonth'] = 'Mes (p.ex. Archivu/2012/06)';
-$labels['archivetypefolder'] = 'Bandexa orixinal';
+$labels['archivetypefolder'] = 'Carpeta orixinal';
 $labels['archivetypesender'] = 'Corréu-e del remitente';
 $labels['unkownsender'] = 'desconocíu';
 ?>
diff --git a/plugins/archive/localization/be_BE.inc b/plugins/archive/localization/be_BE.inc
index 90e4417d7..80850dba1 100644
--- a/plugins/archive/localization/be_BE.inc
+++ b/plugins/archive/localization/be_BE.inc
@@ -16,16 +16,16 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 $labels['buttontext'] = 'Архіў';
-$labels['buttontitle'] = 'Перанесці ў Архіў';
-$labels['archived'] = 'Перанесена ў Архіў';
-$labels['archivedreload'] = 'Перанесена ў Архіў. Перазагрузіце старонку, каб пабачыць новыя архіўныя папкі.';
+$labels['buttontitle'] = 'Перанесці ў архіў';
+$labels['archived'] = 'Перанесена ў архіў';
+$labels['archivedreload'] = 'Перанесена ў архіў. Перагрузіце старонку, каб пабачыць новыя архіўныя папкі.';
 $labels['archiveerror'] = 'Некаторыя паведамленні не могуць быць перанесены ў архіў';
 $labels['archivefolder'] = 'Архіў';
 $labels['settingstitle'] = 'Архіў';
 $labels['archivetype'] = 'Раздзяліць архіў паводле';
 $labels['archivetypeyear'] = 'года (прыкладам, Архіў/2012)';
 $labels['archivetypemonth'] = 'месяца (прыкладам, Архіў/2012/06)';
-$labels['archivetypefolder'] = 'Арыгінальная папка';
+$labels['archivetypefolder'] = 'Выточная папка';
 $labels['archivetypesender'] = 'Эл. пошта адпраўніка';
 $labels['unkownsender'] = 'невядомы';
 ?>
diff --git a/plugins/archive/localization/br.inc b/plugins/archive/localization/br.inc
index b3a322903..cc8959c43 100644
--- a/plugins/archive/localization/br.inc
+++ b/plugins/archive/localization/br.inc
@@ -19,4 +19,5 @@ $labels['buttontext'] = 'Diell';
 $labels['buttontitle'] = 'Dielliñ ar gemenadenn-mañ';
 $labels['archived'] = 'Diellet gant berzh';
 $labels['archivefolder'] = 'Diell';
+$labels['unkownsender'] = 'dianav';
 ?>
diff --git a/plugins/archive/localization/es_419.inc b/plugins/archive/localization/es_419.inc
index 3f26a018e..9bde4b1f7 100644
--- a/plugins/archive/localization/es_419.inc
+++ b/plugins/archive/localization/es_419.inc
@@ -15,15 +15,17 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-$labels['buttontext'] = 'Archivo';
+$labels['buttontext'] = 'Archivar';
 $labels['buttontitle'] = 'Archivar este mensaje';
 $labels['archived'] = 'Archivado exitosamente';
-$labels['archivedreload'] = 'Achivado exitosamente. ';
+$labels['archivedreload'] = 'Archivado exitosamente. Recarga esta página para ver las nuevas carpetas';
 $labels['archiveerror'] = 'Algunos mensajes no pudieron ser archivados';
-$labels['archivefolder'] = 'Archivo';
+$labels['archivefolder'] = 'Archivar';
+$labels['settingstitle'] = 'Archivar';
 $labels['archivetype'] = 'Dividir archivo por';
 $labels['archivetypeyear'] = 'Año (ej. Archivo/2012)';
 $labels['archivetypemonth'] = 'Mes (ej. Archivo/2012/06)';
 $labels['archivetypefolder'] = 'Carpeta original';
+$labels['archivetypesender'] = 'Remitente de correo electrónico';
 $labels['unkownsender'] = 'desconocido';
 ?>
diff --git a/plugins/archive/localization/ko_KR.inc b/plugins/archive/localization/ko_KR.inc
index bf23f3a41..650e38f0f 100644
--- a/plugins/archive/localization/ko_KR.inc
+++ b/plugins/archive/localization/ko_KR.inc
@@ -16,9 +16,9 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 $labels['buttontext'] = '보관';
-$labels['buttontitle'] = '이 메시지를 보관';
-$labels['archived'] = '성공적으로 보관됨';
-$labels['archivedreload'] = '성공적으로 보관됨. 페이지를 다시 불러와서 새 보관 폴더를 확인하세요.';
+$labels['buttontitle'] = '이 메시지를 보관함에 저장';
+$labels['archived'] = '성공적으로 보관함';
+$labels['archivedreload'] = '성공적으로 보관됨. 페이지를 다시 불러와서 새로운 보관함 폴더를 확인하세요.';
 $labels['archiveerror'] = '일부 메시지가 보관되지 않음';
 $labels['archivefolder'] = '보관';
 $labels['settingstitle'] = '보관';
@@ -26,6 +26,6 @@ $labels['archivetype'] = '보관된 메시지 정리 기준';
 $labels['archivetypeyear'] = '연도 (예: 보관 편지함/2012)';
 $labels['archivetypemonth'] = '월 (예: 보관 편지함/2012/06)';
 $labels['archivetypefolder'] = '원본 폴더';
-$labels['archivetypesender'] = '발신인 이메일';
+$labels['archivetypesender'] = '발송자 이메일';
 $labels['unkownsender'] = '알 수 없음';
 ?>
diff --git a/plugins/attachment_reminder/localization/es_MX.inc b/plugins/archive/localization/ku_IQ.inc
index c3b4aaa02..838ed8439 100644
--- a/plugins/attachment_reminder/localization/es_MX.inc
+++ b/plugins/archive/localization/ku_IQ.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
  | Localization file of the Roundcube Webmail Archive plugin             |
  | Copyright (C) 2013, The Roundcube Dev Team                            |
@@ -13,8 +13,10 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
 
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
+$labels['buttontext'] = 'ئەرشیف';
+$labels['archivefolder'] = 'ئەرشیف';
+$labels['settingstitle'] = 'ئەرشیف';
+$labels['unkownsender'] = 'نەناسراو';
+?>
diff --git a/plugins/archive/localization/tr_TR.inc b/plugins/archive/localization/tr_TR.inc
index bbadfda7c..ae827469d 100644
--- a/plugins/archive/localization/tr_TR.inc
+++ b/plugins/archive/localization/tr_TR.inc
@@ -22,7 +22,7 @@ $labels['archivedreload'] = 'Başarıyla arşivlendi. Yeni arşiv dosyalarını
 $labels['archiveerror'] = 'Bazı mesajlar arşivlenemedi.';
 $labels['archivefolder'] = 'Arşiv';
 $labels['settingstitle'] = 'Arşiv';
-$labels['archivetype'] = 'Arşivi bunla böl';
+$labels['archivetype'] = 'Arşivi bununla böl';
 $labels['archivetypeyear'] = 'Yıl (Arşiv/2012)';
 $labels['archivetypemonth'] = 'Ay(Arşiv/2012/06)';
 $labels['archivetypefolder'] = 'Özgün dosya';
diff --git a/plugins/attachment_reminder/localization/eo.inc b/plugins/attachment_reminder/localization/ast.inc
index c3b4aaa02..910f3fe90 100644
--- a/plugins/attachment_reminder/localization/eo.inc
+++ b/plugins/attachment_reminder/localization/ast.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
+$messages['forgotattachment'] = "¿Escaecisti axuntar un ficheru?";
+$messages['reminderoption'] = "Recordar alrodiu d'axuntos escaecíos";
+$messages['keywords'] = "axuntu,ficheru,axuntar,axuntáu,axuntando,axuntao,axuntada,CV,carta de presentación";
diff --git a/plugins/attachment_reminder/localization/es_AR.inc b/plugins/attachment_reminder/localization/es_AR.inc
index c3b4aaa02..2a7418348 100644
--- a/plugins/attachment_reminder/localization/es_AR.inc
+++ b/plugins/attachment_reminder/localization/es_AR.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
+$messages['forgotattachment'] = "Has olvidado adjuntar un archivo?";
+$messages['reminderoption'] = "Recordar sobre archivos adjuntos olvidados";
+$messages['keywords'] = "adjunto,archivo,adjuntar,adjuntado,adjuntando,";
diff --git a/plugins/attachment_reminder/localization/fr_FR.inc b/plugins/attachment_reminder/localization/fr_FR.inc
index 45b8e1091..1d1af5a56 100644
--- a/plugins/attachment_reminder/localization/fr_FR.inc
+++ b/plugins/attachment_reminder/localization/fr_FR.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-$messages['forgotattachment'] = "Avez-vous oublié de joindre un fichier?";
+$messages['forgotattachment'] = "Avez-vous oublié de joindre un fichier ?";
 $messages['reminderoption'] = "Rappeler les pièces jointes oubliées";
 $messages['keywords'] = "joins,joint,attaché,fichier,inclus,ci-inclus,CV";
diff --git a/plugins/attachment_reminder/localization/hi_IN.inc b/plugins/attachment_reminder/localization/hi_IN.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/hi_IN.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/hy_AM.inc b/plugins/attachment_reminder/localization/hy_AM.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/hy_AM.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/ia.inc b/plugins/attachment_reminder/localization/ia.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/ia.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/id_ID.inc b/plugins/attachment_reminder/localization/id_ID.inc
index 1f0b0bb7a..e2a606aa2 100644
--- a/plugins/attachment_reminder/localization/id_ID.inc
+++ b/plugins/attachment_reminder/localization/id_ID.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-$messages['forgotattachment'] = "Apakah anda lupa menambahkan attachment?";
-$messages['reminderoption'] = "Pengingat attachment yang terlupakan";
+$messages['forgotattachment'] = "Apakah anda lupa melampirkan sebuah file?";
+$messages['reminderoption'] = "Ingatkan tentang lampiran yang terlupakan";
 $messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter";
diff --git a/plugins/attachment_reminder/localization/kn_IN.inc b/plugins/attachment_reminder/localization/kn_IN.inc
index 9783afa97..e6aff0334 100644
--- a/plugins/attachment_reminder/localization/kn_IN.inc
+++ b/plugins/attachment_reminder/localization/kn_IN.inc
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
 $messages['forgotattachment'] = "ನೀವು ಫೈಲ್ ಅಟ್ಯಾಚ್ ಮಾಡಲು ಮರೆತಿರುವಿರಾ?";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/ko_KR.inc b/plugins/attachment_reminder/localization/ko_KR.inc
index c80dcc4c8..58391a886 100644
--- a/plugins/attachment_reminder/localization/ko_KR.inc
+++ b/plugins/attachment_reminder/localization/ko_KR.inc
@@ -16,5 +16,5 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
 $messages['forgotattachment'] = "파일을 첨부하는 것을 잊으셨습니까?";
-$messages['reminderoption'] = "잊었던 첨부파일에 대해 알리기";
+$messages['reminderoption'] = "잊었던 첨부파일 추가에 대해 알림";
 $messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter";
diff --git a/plugins/attachment_reminder/localization/bn_BD.inc b/plugins/attachment_reminder/localization/ku.inc
index c3b4aaa02..310179884 100644
--- a/plugins/attachment_reminder/localization/bn_BD.inc
+++ b/plugins/attachment_reminder/localization/ku.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
+$messages['forgotattachment'] = "Te ji bîr kir da pelekê pêve bikî?";
+$messages['reminderoption'] = "Pêvekên jibîrkirî bi bîr bixe";
+$messages['keywords'] = "pêvek, pel, pêve bike, pêvekirî, pêve dike, rapêçandî, CV, tîpa bergê";
diff --git a/plugins/attachment_reminder/localization/ar.inc b/plugins/attachment_reminder/localization/ku_IQ.inc
index c3b4aaa02..e8e32cead 100644
--- a/plugins/attachment_reminder/localization/ar.inc
+++ b/plugins/attachment_reminder/localization/ku_IQ.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
+$messages['forgotattachment'] = "ئایا لەبیرت کرد پەڕگەیەک هاوپێچ بکەی؟";
+$messages['reminderoption'] = "بیرهێنانەوە دەربارەی هاوپێچە لەبیرکراوەکان";
diff --git a/plugins/attachment_reminder/localization/ml_IN.inc b/plugins/attachment_reminder/localization/ml_IN.inc
index c3b4aaa02..74c86c923 100644
--- a/plugins/attachment_reminder/localization/ml_IN.inc
+++ b/plugins/attachment_reminder/localization/ml_IN.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
+$messages['forgotattachment'] = "താങ്കൾ ഒരു ഫയൽ ചേർക്കാൻ മറന്നുപോയി";
+$messages['reminderoption'] = "ചേർക്കാൻ മറന്നുപോയ ഫയലുകളെ പറ്റി ഓർമ്മപ്പെടുത്തുക";
diff --git a/plugins/attachment_reminder/localization/mn_MN.inc b/plugins/attachment_reminder/localization/mn_MN.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/mn_MN.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/ms_MY.inc b/plugins/attachment_reminder/localization/ms_MY.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/ms_MY.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/my_MM.inc b/plugins/attachment_reminder/localization/my_MM.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/my_MM.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/nl_BE.inc b/plugins/attachment_reminder/localization/nl_BE.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/nl_BE.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/nn_NO.inc b/plugins/attachment_reminder/localization/nn_NO.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/nn_NO.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/nqo.inc b/plugins/attachment_reminder/localization/nqo.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/nqo.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/om.inc b/plugins/attachment_reminder/localization/om.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/om.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/sr_CS.inc b/plugins/attachment_reminder/localization/sr_CS.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/sr_CS.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/te_IN.inc b/plugins/attachment_reminder/localization/te_IN.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/te_IN.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/th_TH.inc b/plugins/attachment_reminder/localization/th_TH.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/th_TH.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/ti.inc b/plugins/attachment_reminder/localization/ti.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/ti.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/tzm.inc b/plugins/attachment_reminder/localization/tzm.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/tzm.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/uk_UA.inc b/plugins/attachment_reminder/localization/uk_UA.inc
index 122fb2bee..22de70d27 100644
--- a/plugins/attachment_reminder/localization/uk_UA.inc
+++ b/plugins/attachment_reminder/localization/uk_UA.inc
@@ -17,4 +17,3 @@
 */
 $messages['forgotattachment'] = "Ви забули прикріпити файл?";
 $messages['reminderoption'] = "Нагадати про забуте вкладення";
-$messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/ur_PK.inc b/plugins/attachment_reminder/localization/ur_PK.inc
deleted file mode 100644
index c3b4aaa02..000000000
--- a/plugins/attachment_reminder/localization/ur_PK.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | plugins/attachment_reminder/localization/<lang>.inc                   |
- |                                                                       |
- | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | Licensed under the GNU General Public License version 3 or            |
- | any later version with exceptions for skins & plugins.                |
- | See the README file for a full license statement.                     |
- |                                                                       |
- +-----------------------------------------------------------------------+
-
- For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
-*/
-$messages['forgotattachment'] = "";
-$messages['reminderoption'] = "";
-$messages['keywords'] = "";
diff --git a/plugins/help/localization/hu_HU.inc b/plugins/help/localization/hu_HU.inc
index d285e670b..b41456db6 100644
--- a/plugins/help/localization/hu_HU.inc
+++ b/plugins/help/localization/hu_HU.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-$labels['help'] = 'Segítség';
+$labels['help'] = 'Súgó';
 $labels['about'] = 'Névjegy';
-$labels['license'] = 'Licenc';
+$labels['license'] = 'Licensz';
 ?>
diff --git a/plugins/help/localization/ku.inc b/plugins/help/localization/ku.inc
new file mode 100644
index 000000000..5114c197d
--- /dev/null
+++ b/plugins/help/localization/ku.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+$labels['help'] = 'Alîkarî';
+$labels['about'] = 'Dervar';
+$labels['license'] = 'Lîsans';
+?>
diff --git a/plugins/help/localization/ku_IQ.inc b/plugins/help/localization/ku_IQ.inc
new file mode 100644
index 000000000..210f8f8e0
--- /dev/null
+++ b/plugins/help/localization/ku_IQ.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+$labels['help'] = 'یارمەتی';
+$labels['about'] = 'دەربارە';
+$labels['license'] = 'مۆڵەت';
+?>
diff --git a/plugins/help/localization/ml_IN.inc b/plugins/help/localization/ml_IN.inc
new file mode 100644
index 000000000..30ae66f68
--- /dev/null
+++ b/plugins/help/localization/ml_IN.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+$labels['help'] = 'സഹായം';
+$labels['about'] = 'വിവരം';
+$labels['license'] = 'അനുമതി';
+?>
diff --git a/plugins/hide_blockquote/localization/ast.inc b/plugins/hide_blockquote/localization/ast.inc
new file mode 100644
index 000000000..f2f17c492
--- /dev/null
+++ b/plugins/hide_blockquote/localization/ast.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
+*/
+$labels['hide'] = 'Anubrir';
+$labels['show'] = 'Amosar';
+$labels['quotelimit'] = 'Anubrir la citación cuando la cuenta de llinies seya mayor de';
+?>
diff --git a/plugins/hide_blockquote/localization/br.inc b/plugins/hide_blockquote/localization/br.inc
new file mode 100644
index 000000000..8eb5dd2db
--- /dev/null
+++ b/plugins/hide_blockquote/localization/br.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
+*/
+$labels['hide'] = 'Kuzhat';
+$labels['show'] = 'Diskouez';
+$labels['quotelimit'] = 'Kuzhat ar meneg pa\'z\'eo re uhel niver a linennnoù eus';
+?>
diff --git a/plugins/hide_blockquote/localization/ko_KR.inc b/plugins/hide_blockquote/localization/ko_KR.inc
index e26d06f7f..f1e5b1b10 100644
--- a/plugins/hide_blockquote/localization/ko_KR.inc
+++ b/plugins/hide_blockquote/localization/ko_KR.inc
@@ -16,6 +16,6 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 $labels['hide'] = '숨기기';
-$labels['show'] = '보이기';
-$labels['quotelimit'] = '라인 개수가 정해진 개수보다 클 때 인용구 감추기';
+$labels['show'] = '표시';
+$labels['quotelimit'] = '행 개수가 다음보다 많을 때 인용구를 숨김:';
 ?>
diff --git a/plugins/hide_blockquote/localization/ku.inc b/plugins/hide_blockquote/localization/ku.inc
new file mode 100644
index 000000000..e0a015166
--- /dev/null
+++ b/plugins/hide_blockquote/localization/ku.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
+*/
+$labels['hide'] = 'Veşêre';
+$labels['show'] = 'Nîşan bide';
+$labels['quotelimit'] = 'Jêgirtinê bigire dema ku hejmara rêzan zêdetir be ji';
+?>
diff --git a/plugins/hide_blockquote/localization/ml_IN.inc b/plugins/hide_blockquote/localization/ml_IN.inc
new file mode 100644
index 000000000..5e2b55288
--- /dev/null
+++ b/plugins/hide_blockquote/localization/ml_IN.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
+*/
+$labels['hide'] = 'മറയ്ക്കുക';
+$labels['show'] = 'പ്രദർശിപ്പിക്കുക';
+$labels['quotelimit'] = 'ഇതിലും കൂടുതലാണ് വരികളുടെ എണ്ണമെങ്കിൽ അവലംബം മറയ്ക്കുക';
+?>
diff --git a/plugins/managesieve/localization/ar_SA.inc b/plugins/managesieve/localization/ar_SA.inc
index e55301bbd..88e89579b 100644
--- a/plugins/managesieve/localization/ar_SA.inc
+++ b/plugins/managesieve/localization/ar_SA.inc
@@ -104,10 +104,6 @@ $labels['setvarmodifiers'] = 'تعديلات:';
 $labels['varquotewildcard'] = 'أقتبس أحرف خاصة';
 $labels['varlength'] = 'الطول';
 $labels['notify'] = 'ارسل تنبية';
-$labels['notifyaddress'] = 'الى عنوان البريد الالكتروني:';
-$labels['notifybody'] = 'نص التنبية:';
-$labels['notifysubject'] = 'موضوع التنبية:';
-$labels['notifyfrom'] = 'مرسل التنبية:';
 $labels['notifyimportance'] = 'اهمية:';
 $labels['notifyimportancelow'] = 'منخفض';
 $labels['notifyimportancenormal'] = 'عادي';
@@ -147,6 +143,15 @@ $labels['detail'] = 'تفاصيل';
 $labels['default'] = 'افتراضي';
 $labels['index'] = 'الوارد:';
 $labels['indexlast'] = 'تراجع';
+$labels['vacation'] = 'اجازة ';
+$labels['vacation.advanced'] = 'اعدادات متقدمة';
+$labels['vacation.subject'] = 'موضوع';
+$labels['vacation.body'] = 'محتوى ';
+$labels['vacation.status'] = 'الحالة ';
+$labels['vacation.on'] = 'تشغيل';
+$labels['vacation.off'] = 'ايقاف';
+$labels['vacation.addresses'] = 'عناوينني الاضافية';
+$labels['vacation.saving'] = 'يتم حفظ البيانات...';
 $messages['filterunknownerror'] = 'خطا غير معروف من الخادم.';
 $messages['filterconnerror'] = 'لا يمكن الاتصال بالخادم.';
 $messages['filterdeleteerror'] = 'لا يمكن حذف التصفية.خطا في الخادم.';
@@ -178,4 +183,6 @@ $messages['nametoolong'] = 'الإسم طويل جداً';
 $messages['setexist'] = 'المجموعة موجودة مسبقا.';
 $messages['nodata'] = 'يجب تحديد موضع واحد على الأقل!';
 $messages['invaliddateformat'] = 'تاريخ غير صحيح او يوجد خطا في تنسق اجزاء التاريخ';
+$messages['saveerror'] = 'لا يمكن حفظ البيانات. خطا في الخادم.';
+$messages['vacationsaved'] = 'تم حفظ تاريخ الاجازة بنجاح.';
 ?>
diff --git a/plugins/managesieve/localization/ast.inc b/plugins/managesieve/localization/ast.inc
new file mode 100644
index 000000000..e1c469b80
--- /dev/null
+++ b/plugins/managesieve/localization/ast.inc
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/managesieve/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
+*/
+$labels['filters'] = 'Filtros';
+$labels['managefilters'] = 'Alministrar filtros de corréu entrante';
+$labels['filtername'] = 'Nome del filtru';
+$labels['newfilter'] = 'Filtru nuevu';
+$labels['filteradd'] = 'Amestar filtru';
+$labels['filterdel'] = 'Desaniciar filtru';
+$labels['moveup'] = 'Mover arriba';
+$labels['movedown'] = 'Mover abaxo';
+$labels['filterany'] = 'tolos mensaxes';
+$labels['filtercontains'] = 'contien';
+$labels['filternotcontains'] = 'nun contien';
+$labels['filteris'] = 'ye igual a';
+$labels['filterisnot'] = 'nun ye igual a';
+$labels['filterexists'] = 'esiste';
+$labels['filternotexists'] = 'nun esiste';
+$labels['filtermatches'] = 'espresiones que concasen';
+$labels['filternotmatches'] = 'espresiones que nun concasen';
+$labels['addrule'] = 'Amestar regla';
+$labels['delrule'] = 'Desaniciar regla';
+$labels['messagemoveto'] = 'Mover mensaxe a';
+$labels['messageredirect'] = 'Redireicionar mensaxe a';
+$labels['messagecopyto'] = 'Copiar mensaxe a';
+$labels['messagedelete'] = 'Desaniciar mensaxe';
+$labels['messagesrules'] = 'Pa corréu entrante:';
+$labels['messagesactions'] = '...executar les aiciones siguientes:';
+$labels['add'] = 'Amestar';
+$labels['del'] = 'Desaniciar';
+$labels['sender'] = 'Remitente';
+$labels['enable'] = 'Habilitar/Deshabilitar';
+$labels['flagread'] = 'Lleer';
+$labels['flagdeleted'] = 'Desaniciáu';
+$labels['flaganswered'] = 'Respondíu';
+?>
diff --git a/plugins/managesieve/localization/az_AZ.inc b/plugins/managesieve/localization/az_AZ.inc
index b11f8a670..8aec7e383 100644
--- a/plugins/managesieve/localization/az_AZ.inc
+++ b/plugins/managesieve/localization/az_AZ.inc
@@ -108,10 +108,6 @@ $labels['varupperfirst'] = 'yuxarı registrdə birinci simvol';
 $labels['varquotewildcard'] = 'dırnaq simvolu';
 $labels['varlength'] = 'uzunluq';
 $labels['notify'] = 'Bildiriş göndər';
-$labels['notifyaddress'] = 'Poçt ünvanı:';
-$labels['notifybody'] = 'Bildiriş mətni';
-$labels['notifysubject'] = 'Bildiriş mövzusu';
-$labels['notifyfrom'] = 'Bildirişi yolla:';
 $labels['notifyimportance'] = 'Vaciblik';
 $labels['notifyimportancelow'] = 'aşağı';
 $labels['notifyimportancenormal'] = 'normal';
diff --git a/plugins/managesieve/localization/be_BE.inc b/plugins/managesieve/localization/be_BE.inc
index 1dbca6003..5a691cdee 100644
--- a/plugins/managesieve/localization/be_BE.inc
+++ b/plugins/managesieve/localization/be_BE.inc
@@ -108,10 +108,6 @@ $labels['varupperfirst'] = 'першы знак у верхнім рэгістр
 $labels['varquotewildcard'] = 'службовыя знакі забіраць у апострафы';
 $labels['varlength'] = 'даўжыня';
 $labels['notify'] = 'Паслаць апавяшчэнне';
-$labels['notifyaddress'] = 'На эл. адрас:';
-$labels['notifybody'] = 'Цела апавяшчэння:';
-$labels['notifysubject'] = 'Тэма апавяшчэння:';
-$labels['notifyfrom'] = 'Адпраўнік апавяшчэння:';
 $labels['notifyimportance'] = 'Важнасць:';
 $labels['notifyimportancelow'] = 'нізкая';
 $labels['notifyimportancenormal'] = 'звычайная';
diff --git a/plugins/managesieve/localization/bg_BG.inc b/plugins/managesieve/localization/bg_BG.inc
index e940c7c05..432cb4f68 100644
--- a/plugins/managesieve/localization/bg_BG.inc
+++ b/plugins/managesieve/localization/bg_BG.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'първи знак с главна буква';
 $labels['varquotewildcard'] = 'цитиране на специални знаци';
 $labels['varlength'] = 'дължина';
 $labels['notify'] = 'Изпрати известие';
-$labels['notifyaddress'] = 'До e-mail адрес:';
-$labels['notifybody'] = 'Основен текст на известието:';
-$labels['notifysubject'] = 'Заглавие на известието:';
-$labels['notifyfrom'] = 'Подател на известието:';
+$labels['notifytarget'] = 'Известие към:';
+$labels['notifymessage'] = 'Съдържание на известие (опционално):';
+$labels['notifyoptions'] = 'Опции на известие (опционално):';
+$labels['notifyfrom'] = 'Известие от (опционално):';
 $labels['notifyimportance'] = 'Приоритет:';
 $labels['notifyimportancelow'] = 'нисък';
 $labels['notifyimportancenormal'] = 'нормален';
 $labels['notifyimportancehigh'] = 'висок';
+$labels['notifymethodmailto'] = 'Ел. поща';
+$labels['notifymethodtel'] = 'Телефон';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Използвай за нов филтър';
 $labels['usedata'] = 'Използвай следните данни във филтъра:';
 $labels['nextstep'] = 'Следваща стъпка';
@@ -157,6 +160,18 @@ $labels['asciicasemap'] = 'без значение малки/големи бу�
 $labels['asciinumeric'] = 'цифрово';
 $labels['index'] = 'индекс:';
 $labels['indexlast'] = 'наобратно';
+$labels['vacation'] = 'Отпуск';
+$labels['vacation.reply'] = 'Писмо отговор';
+$labels['vacation.advanced'] = 'Разширени настройки';
+$labels['vacation.subject'] = 'Относно';
+$labels['vacation.body'] = 'Съдържание';
+$labels['vacation.status'] = 'Статус';
+$labels['vacation.on'] = 'Вкл.';
+$labels['vacation.off'] = 'Изкл.';
+$labels['vacation.addresses'] = 'Моите допълнителни адреси';
+$labels['vacation.interval'] = 'Интервал на отговор';
+$labels['vacation.after'] = 'Постави правило за отпуск след';
+$labels['vacation.saving'] = 'Запис на данни...';
 $messages['filterunknownerror'] = 'Неизвестна сървърна грешка.';
 $messages['filterconnerror'] = 'Неуспешно свързване с managesieve сървъра.';
 $messages['filterdeleteerror'] = 'Невъзможно изтриване на филтъра. Възникна сървърна грешка.';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'Резервирано име.';
 $messages['setexist'] = 'Вече има такъв набор филтри.';
 $messages['nodata'] = 'Поне една позиция трябва да е избрана!';
 $messages['invaliddateformat'] = 'невалидна дата или формат на част от дата';
+$messages['saveerror'] = 'Невъзможен запис на данни. Грешка при достъп до сървър.';
+$messages['vacationsaved'] = 'Данните за отпуск са записани успешно.';
 ?>
diff --git a/plugins/managesieve/localization/bs_BA.inc b/plugins/managesieve/localization/bs_BA.inc
index f0fd118cb..84a85a348 100644
--- a/plugins/managesieve/localization/bs_BA.inc
+++ b/plugins/managesieve/localization/bs_BA.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'prvi znak velikim slovom';
 $labels['varquotewildcard'] = 'citiraj specijalne znakove';
 $labels['varlength'] = 'dužina';
 $labels['notify'] = 'Pošalji napomenu';
-$labels['notifyaddress'] = 'Na email adresu:';
-$labels['notifybody'] = 'Sadržaj napomene:';
-$labels['notifysubject'] = 'Naslov napomene:';
-$labels['notifyfrom'] = 'Pošiljalac napomene:';
+$labels['notifytarget'] = 'Odredište napomene:';
+$labels['notifymessage'] = 'Poruka napomene (neobavezno):';
+$labels['notifyoptions'] = 'Opcije napomene (neobavezno):';
+$labels['notifyfrom'] = 'Pošiljalac napomene (neobavezno):';
 $labels['notifyimportance'] = 'Prioritet:';
 $labels['notifyimportancelow'] = 'mali';
 $labels['notifyimportancenormal'] = 'obični';
 $labels['notifyimportancehigh'] = 'veliki';
+$labels['notifymethodmailto'] = 'Email';
+$labels['notifymethodtel'] = 'Telefon';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Kreiraj filter';
 $labels['usedata'] = 'Koristite sljedeće podatke u filteru:';
 $labels['nextstep'] = 'Sljedeći korak';
@@ -162,9 +165,8 @@ $labels['vacation.reply'] = 'Poruka sa odgovorom';
 $labels['vacation.advanced'] = 'Napredmen postavke';
 $labels['vacation.subject'] = 'Naslov';
 $labels['vacation.body'] = 'Tijelo';
-$labels['vacation.dates'] = 'Vrijeme odmora';
-$labels['vacation.from'] = 'Od:';
-$labels['vacation.to'] = 'Do:';
+$labels['vacation.start'] = 'Početak odmora';
+$labels['vacation.end'] = 'Kraj odmora';
 $labels['vacation.status'] = 'Status';
 $labels['vacation.on'] = 'Uključeno';
 $labels['vacation.off'] = 'Isključeno';
@@ -172,6 +174,18 @@ $labels['vacation.addresses'] = 'Moje dodatne adrese';
 $labels['vacation.interval'] = 'Interval odgovora';
 $labels['vacation.after'] = 'Pravilo za odmor stavi nakon';
 $labels['vacation.saving'] = 'Snimam podatke...';
+$labels['vacation.action'] = 'Akcija za dolazne poruke';
+$labels['vacation.keep'] = 'Zadrži';
+$labels['vacation.discard'] = 'Odbaci';
+$labels['vacation.redirect'] = 'Preusmeri ka';
+$labels['vacation.copy'] = 'Pošalji kopiju na';
+$labels['arialabelfiltersetactions'] = 'Akcije za filterske setove';
+$labels['arialabelfilteractions'] = 'Filterske akcije';
+$labels['arialabelfilterform'] = 'Svojstva filtera';
+$labels['ariasummaryfilterslist'] = 'Lista filtera';
+$labels['ariasummaryfiltersetslist'] = 'Lista filterskih setova';
+$labels['filterstitle'] = 'Uredi filtere za dolazni email';
+$labels['vacationtitle'] = 'Uredi pravila kada nisam na poslu';
 $messages['filterunknownerror'] = 'Nepoznata serverska greška.';
 $messages['filterconnerror'] = 'Nije se moguće povezati na server.';
 $messages['filterdeleteerror'] = 'Nije moguće obrisati filter. Desila se serverska greška.';
@@ -206,4 +220,5 @@ $messages['nodata'] = 'Morate označiti barem jednu poziciju!';
 $messages['invaliddateformat'] = 'Netačan datum ili dio formata datuma';
 $messages['saveerror'] = 'Nije moguće snimiti podatke. Desila se serverska greška.';
 $messages['vacationsaved'] = 'Podaci o odmoru su uspješno snimljeni.';
+$messages['emptyvacationbody'] = 'Tijelo poruke za odmor je neophodno!';
 ?>
diff --git a/plugins/managesieve/localization/ca_ES.inc b/plugins/managesieve/localization/ca_ES.inc
index dc461225d..0dc6863a2 100644
--- a/plugins/managesieve/localization/ca_ES.inc
+++ b/plugins/managesieve/localization/ca_ES.inc
@@ -24,7 +24,7 @@ $labels['filterdel'] = 'Suprimeix el filtre';
 $labels['moveup'] = 'Mou amunt';
 $labels['movedown'] = 'Mou avall';
 $labels['filterallof'] = 'que coincideixi amb totes les regles següents';
-$labels['filteranyof'] = 'que no coincideixi amb cap de les regles següents';
+$labels['filteranyof'] = 'que coincideixi amb qualsevol de les regles següents';
 $labels['filterany'] = 'tots els missatges';
 $labels['filtercontains'] = 'conté';
 $labels['filternotcontains'] = 'no conté';
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'el primer caràcter en majúscula';
 $labels['varquotewildcard'] = 'engloba els caràcters especials amb cometes';
 $labels['varlength'] = 'llargada';
 $labels['notify'] = 'Envia notificació';
-$labels['notifyaddress'] = 'A l\'adreça de correu electrònic:';
-$labels['notifybody'] = 'Cos de la notificació:';
-$labels['notifysubject'] = 'Assumpte de la notificació:';
-$labels['notifyfrom'] = 'Remitent de la notificació:';
+$labels['notifytarget'] = 'Objectiu de la notificació:';
+$labels['notifymessage'] = 'Missatge de notificació (opcional):';
+$labels['notifyoptions'] = 'Opcions de notificació (opcional):';
+$labels['notifyfrom'] = 'Remitent de la notificació (opcional):';
 $labels['notifyimportance'] = 'Importància:';
 $labels['notifyimportancelow'] = 'baixa';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'alta';
+$labels['notifymethodmailto'] = 'Correu electrònic';
+$labels['notifymethodtel'] = 'Telèfon';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Crea filtre';
 $labels['usedata'] = 'Fes servir les següents dades al filtre:';
 $labels['nextstep'] = 'Següent pas';
@@ -157,6 +160,32 @@ $labels['asciicasemap'] = 'No distingeix entre majúscules i minúscules  (ascii
 $labels['asciinumeric'] = 'numèric (ascii-numeric)';
 $labels['index'] = 'índex:';
 $labels['indexlast'] = 'cap enrere';
+$labels['vacation'] = 'Vacances';
+$labels['vacation.reply'] = 'Missatge de resposta';
+$labels['vacation.advanced'] = 'Paràmetres avançats';
+$labels['vacation.subject'] = 'Assumpte';
+$labels['vacation.body'] = 'Cos';
+$labels['vacation.start'] = 'Inici de vacances';
+$labels['vacation.end'] = 'Finalització de vacances';
+$labels['vacation.status'] = 'Estat';
+$labels['vacation.on'] = 'Activat';
+$labels['vacation.off'] = 'Desactivat';
+$labels['vacation.addresses'] = 'Les meves adreces addicionals:';
+$labels['vacation.interval'] = 'Interval de resposta';
+$labels['vacation.after'] = 'Posa la regla de vacances després';
+$labels['vacation.saving'] = 'S\'estan desant les dades...';
+$labels['vacation.action'] = 'Acció pel missatge entrant';
+$labels['vacation.keep'] = 'Conserva';
+$labels['vacation.discard'] = 'Descarta';
+$labels['vacation.redirect'] = 'Redirigeix cap a';
+$labels['vacation.copy'] = 'Envia còpia a';
+$labels['arialabelfiltersetactions'] = 'Accions pel conjunt de filtres';
+$labels['arialabelfilteractions'] = 'Accions del filtre';
+$labels['arialabelfilterform'] = 'Propietats del filtre';
+$labels['ariasummaryfilterslist'] = 'Llistat de filtres';
+$labels['ariasummaryfiltersetslist'] = 'Llistat de conjunts de filtres';
+$labels['filterstitle'] = 'Edita els filtres pels missatges entrants';
+$labels['vacationtitle'] = 'Edita la norma "fora de l\'oficina"';
 $messages['filterunknownerror'] = 'Error desconegut al servidor.';
 $messages['filterconnerror'] = 'No s\'ha pogut connectar al servidor.';
 $messages['filterdeleteerror'] = 'No s\'ha pogut suprimir el filtre. Hi ha hagut un error al servidor.';
@@ -189,4 +218,7 @@ $messages['namereserved'] = 'Nom reservat.';
 $messages['setexist'] = 'El conjunt ja existeix.';
 $messages['nodata'] = 'S\'ha de seleccionar com a mínim una posició!';
 $messages['invaliddateformat'] = 'data no vàlida o format no vàlid';
+$messages['saveerror'] = 'No s\'han pogut desar les dades. Hi ha hagut un error al servidor.';
+$messages['vacationsaved'] = 'Les dades de les vacances s\'han desat correctament.';
+$messages['emptyvacationbody'] = 'És obligatori definir el cos del missatge de vacances';
 ?>
diff --git a/plugins/managesieve/localization/cs_CZ.inc b/plugins/managesieve/localization/cs_CZ.inc
index 596b35b00..d77254651 100644
--- a/plugins/managesieve/localization/cs_CZ.inc
+++ b/plugins/managesieve/localization/cs_CZ.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'první písmeno velké';
 $labels['varquotewildcard'] = 'uvodit speciální znaky uvozovkama';
 $labels['varlength'] = 'délka';
 $labels['notify'] = 'Odeslat oznámení';
-$labels['notifyaddress'] = 'Na emailovou adresu:';
-$labels['notifybody'] = 'Zpráva oznámení:';
-$labels['notifysubject'] = 'Předmět oznámení:';
-$labels['notifyfrom'] = 'Odesílatel oznámení:';
+$labels['notifytarget'] = 'Cíl oznámení:';
+$labels['notifymessage'] = 'Zpráva oznámení (nepovinné):';
+$labels['notifyoptions'] = 'Možnosti oznámení (nepovinné):';
+$labels['notifyfrom'] = 'Odesílatel oznámení (nepovinné):';
 $labels['notifyimportance'] = 'Důležitost:';
 $labels['notifyimportancelow'] = 'nízká';
 $labels['notifyimportancenormal'] = 'normální';
 $labels['notifyimportancehigh'] = 'vysoká';
+$labels['notifymethodmailto'] = 'E-mail';
+$labels['notifymethodtel'] = 'Telefon';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Vytvořit filtr';
 $labels['usedata'] = 'Použít následující údaje ve filtru:';
 $labels['nextstep'] = 'Další krok';
@@ -162,9 +165,8 @@ $labels['vacation.reply'] = 'Odpověd';
 $labels['vacation.advanced'] = 'Pokročilá nastavení';
 $labels['vacation.subject'] = 'Předmět';
 $labels['vacation.body'] = 'Tělo';
-$labels['vacation.dates'] = 'Doba dovolené';
-$labels['vacation.from'] = 'Od:';
-$labels['vacation.to'] = 'Do:';
+$labels['vacation.start'] = 'Začátek dovolené';
+$labels['vacation.end'] = 'Konec dovolené';
 $labels['vacation.status'] = 'Stav';
 $labels['vacation.on'] = 'Zapnuto';
 $labels['vacation.off'] = 'Vypnuto';
@@ -172,6 +174,12 @@ $labels['vacation.addresses'] = 'Moje další adresy:';
 $labels['vacation.interval'] = 'Doba mezi odpověďmi';
 $labels['vacation.after'] = 'Uložit pravidlo o dovolené za';
 $labels['vacation.saving'] = 'Ukládám data...';
+$labels['vacation.keep'] = 'Zachovat';
+$labels['vacation.discard'] = 'Zrušit';
+$labels['vacation.copy'] = 'Odeslat kopii zprávy na';
+$labels['arialabelfilterform'] = 'Vlastnosti filtru';
+$labels['ariasummaryfilterslist'] = 'Seznam filtrů';
+$labels['ariasummaryfiltersetslist'] = 'Seznam sad filtrů';
 $messages['filterunknownerror'] = 'Neznámá chyba serveru';
 $messages['filterconnerror'] = 'Nebylo možné se připojit k sieve serveru';
 $messages['filterdeleteerror'] = 'Nebylo možné smazat filtr. Došlo k chybě serveru.';
@@ -206,4 +214,5 @@ $messages['nodata'] = 'Musí být vybrána minimálně jedna pozice!';
 $messages['invaliddateformat'] = 'Neplatné datum nebo část data';
 $messages['saveerror'] = 'Nebylo možné uložit data. Došlo k chybě serveru.';
 $messages['vacationsaved'] = 'Data o dovolené byla uložena.';
+$messages['emptyvacationbody'] = 'Tělo zprávy';
 ?>
diff --git a/plugins/managesieve/localization/cy_GB.inc b/plugins/managesieve/localization/cy_GB.inc
index 5431ef081..8d8d1a5bf 100644
--- a/plugins/managesieve/localization/cy_GB.inc
+++ b/plugins/managesieve/localization/cy_GB.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'llythyren gyntaf yn briflythyren';
 $labels['varquotewildcard'] = 'dyfynnu nodau arbennig';
 $labels['varlength'] = 'hyd';
 $labels['notify'] = 'Anfon hysbysiad';
-$labels['notifyaddress'] = 'I gyfeiriad ebost:';
-$labels['notifybody'] = 'Corff hysbysiad:';
-$labels['notifysubject'] = 'Pwnc hysbysiad:';
-$labels['notifyfrom'] = 'Anfonwr hysbysiad:';
+$labels['notifytarget'] = 'Target hysbysu:';
+$labels['notifymessage'] = 'Neges hysbysu (dewisol):';
+$labels['notifyoptions'] = 'Dewisiadau hysbysu (dewisol):';
+$labels['notifyfrom'] = 'Anfonwr hysbysiad (dewisol):';
 $labels['notifyimportance'] = 'Pwysigrwydd:';
 $labels['notifyimportancelow'] = 'isel';
 $labels['notifyimportancenormal'] = 'arferol';
 $labels['notifyimportancehigh'] = 'uchel';
+$labels['notifymethodmailto'] = 'Ebost';
+$labels['notifymethodtel'] = 'Ffôn';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Creu hidlydd';
 $labels['usedata'] = 'Defnyddio\'r wybodaeth ganlynol yn yr hidlydd:';
 $labels['nextstep'] = 'Cam nesaf';
@@ -157,6 +160,32 @@ $labels['asciicasemap'] = 'maint llythrennau (ascii-casemap)';
 $labels['asciinumeric'] = 'rhifau (ascii-numeric)';
 $labels['index'] = 'mynegai:';
 $labels['indexlast'] = 'o chwith';
+$labels['vacation'] = 'Gwyliau';
+$labels['vacation.reply'] = 'Neges ymateb';
+$labels['vacation.advanced'] = 'Gosodiadau uwch';
+$labels['vacation.subject'] = 'Pwnc';
+$labels['vacation.body'] = 'Corff';
+$labels['vacation.start'] = 'Dechrau gwyliau';
+$labels['vacation.end'] = 'Diwedd gwyliau';
+$labels['vacation.status'] = 'Statws';
+$labels['vacation.on'] = 'Ymlaen';
+$labels['vacation.off'] = 'I ffwrdd';
+$labels['vacation.addresses'] = 'Fy nghyfeiriadau ychwanegol';
+$labels['vacation.interval'] = 'Cyfnod ymateb';
+$labels['vacation.after'] = 'Rhoi rheol gwyliau ar ôl';
+$labels['vacation.saving'] = 'Yn cadw\'r data...';
+$labels['vacation.action'] = 'Gweithred neges i fewn';
+$labels['vacation.keep'] = 'Cadw';
+$labels['vacation.discard'] = 'Gwaredu';
+$labels['vacation.redirect'] = 'Ailgyfeirio i';
+$labels['vacation.copy'] = 'Danfon copi i';
+$labels['arialabelfiltersetactions'] = 'Gweithrediadau set hidlydd';
+$labels['arialabelfilteractions'] = 'Gweithrediadau hidlydd';
+$labels['arialabelfilterform'] = 'Nodweddion hidlydd';
+$labels['ariasummaryfilterslist'] = 'Rhestr o hidlyddion';
+$labels['ariasummaryfiltersetslist'] = 'Rhestr o setiau hidlyddion';
+$labels['filterstitle'] = 'Golygu hidlyddion ebost i fewn';
+$labels['vacationtitle'] = 'Golygu rheol allan-o\'r-swyddfa';
 $messages['filterunknownerror'] = 'Gwall gweinydd anhysbys.';
 $messages['filterconnerror'] = 'Methwyd cysylltu a\'r gweinydd.';
 $messages['filterdeleteerror'] = 'Methwyd dileu hidlydd. Cafwydd gwall gweinydd.';
@@ -189,4 +218,7 @@ $messages['namereserved'] = 'Enw neilltuedig.';
 $messages['setexist'] = 'Mae\'r set yn bodoli\'n barod.';
 $messages['nodata'] = 'Rhaid dewis o leia un safle!';
 $messages['invaliddateformat'] = 'Dyddiad neu fformat dyddiad annilys';
+$messages['saveerror'] = 'Methwyd cadw\'r data. Cafwyd gwall gweinydd.';
+$messages['vacationsaved'] = 'Cadwyd y data gwyliau yn llwyddiannus.';
+$messages['emptyvacationbody'] = 'Mae angen rhoi corff y neges wyliau!';
 ?>
diff --git a/plugins/managesieve/localization/da_DK.inc b/plugins/managesieve/localization/da_DK.inc
index 8f5413a35..ebf1cb077 100644
--- a/plugins/managesieve/localization/da_DK.inc
+++ b/plugins/managesieve/localization/da_DK.inc
@@ -108,14 +108,13 @@ $labels['varupperfirst'] = 'Første bogstav stort';
 $labels['varquotewildcard'] = 'Sæt specialle tegn i citationstegn ';
 $labels['varlength'] = 'længde';
 $labels['notify'] = 'Send meddelelse';
-$labels['notifyaddress'] = 'Til e-mail adresse:';
-$labels['notifybody'] = 'meddelelses indhold:';
-$labels['notifysubject'] = 'Meddelelses emne:';
-$labels['notifyfrom'] = 'Meddelelses afsender:';
 $labels['notifyimportance'] = 'Vigtighed:';
 $labels['notifyimportancelow'] = 'lav';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'høj';
+$labels['notifymethodmailto'] = 'Email';
+$labels['notifymethodtel'] = 'Telefon';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Opret filter';
 $labels['usedata'] = 'Brug følgende data i filteret:';
 $labels['nextstep'] = 'Næste trin';
@@ -157,6 +156,18 @@ $labels['asciicasemap'] = 'store og små bogstaver (ascii-bogstaver)';
 $labels['asciinumeric'] = 'numerisk (ascii-numerisk)';
 $labels['index'] = 'indeks:';
 $labels['indexlast'] = 'baglends';
+$labels['vacation'] = 'Ferie';
+$labels['vacation.reply'] = 'Svar besked';
+$labels['vacation.advanced'] = 'Avanceret indstillinger ';
+$labels['vacation.subject'] = 'Emne';
+$labels['vacation.start'] = 'Ferie star';
+$labels['vacation.end'] = 'Ferie slut';
+$labels['vacation.status'] = 'Status';
+$labels['vacation.saving'] = 'Gemmer data...';
+$labels['vacation.keep'] = 'Behold';
+$labels['vacation.discard'] = 'Kasser';
+$labels['vacation.redirect'] = 'Omdiriger til ';
+$labels['vacation.copy'] = 'Send kopi til';
 $messages['filterunknownerror'] = 'Ukendt server fejl.';
 $messages['filterconnerror'] = 'Kan ikke forbinde til server.';
 $messages['filterdeleteerror'] = 'Kunne ikke slette filter. Serverfejl opstod.';
@@ -189,4 +200,6 @@ $messages['namereserved'] = 'Reserveret navn.';
 $messages['setexist'] = 'Filterv sæt eksisterer allerede';
 $messages['nodata'] = 'Mindst en position skal vælges!';
 $messages['invaliddateformat'] = 'Ugyldigt dato- eller tidsformat';
+$messages['saveerror'] = 'Kunne ikke gemme data. Server fejl';
+$messages['vacationsaved'] = 'Ferie data gemt';
 ?>
diff --git a/plugins/managesieve/localization/de_CH.inc b/plugins/managesieve/localization/de_CH.inc
index c9cf061ca..13a4a676c 100644
--- a/plugins/managesieve/localization/de_CH.inc
+++ b/plugins/managesieve/localization/de_CH.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'Erster Buchstabe gross';
 $labels['varquotewildcard'] = 'Sonderzeichen auszeichnen';
 $labels['varlength'] = 'Länge';
 $labels['notify'] = 'Mitteilung senden';
-$labels['notifyaddress'] = 'Empfängeradresse:';
-$labels['notifybody'] = 'Mitteilungstext:';
-$labels['notifysubject'] = 'Mitteilungsbetreff:';
-$labels['notifyfrom'] = 'Absender:';
+$labels['notifytarget'] = 'Mitteilungsempfänger:';
+$labels['notifymessage'] = 'Mitteilungstext (optional):';
+$labels['notifyoptions'] = 'Mitteilungsoptionen (optional):';
+$labels['notifyfrom'] = 'Absender (optional):';
 $labels['notifyimportance'] = 'Wichtigkeit:';
 $labels['notifyimportancelow'] = 'tief';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'hoch';
+$labels['notifymethodmailto'] = 'E-Mail';
+$labels['notifymethodtel'] = 'Telefon';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Filter erstellen';
 $labels['usedata'] = 'Die folgenden Daten im Filter benutzen:';
 $labels['nextstep'] = 'Nächster Schritt';
@@ -157,6 +160,32 @@ $labels['asciicasemap'] = 'Gross-/Kleinschreibung ignorieren';
 $labels['asciinumeric'] = 'numerisch (ascii-numeric)';
 $labels['index'] = 'Index:';
 $labels['indexlast'] = 'rückwärts';
+$labels['vacation'] = 'Abwesenheit';
+$labels['vacation.reply'] = 'Antworte mit Nachricht';
+$labels['vacation.advanced'] = 'Erweiterte Einstellungen';
+$labels['vacation.subject'] = 'Betreff';
+$labels['vacation.body'] = 'Inhalt';
+$labels['vacation.start'] = 'Beginn der Abwesenheit';
+$labels['vacation.end'] = 'Ende der Abwesenheit';
+$labels['vacation.status'] = 'Status';
+$labels['vacation.on'] = 'Ein';
+$labels['vacation.off'] = 'Aus';
+$labels['vacation.addresses'] = 'Meine weiteren E-Mail-Adressen';
+$labels['vacation.interval'] = 'Antwort-Intervall';
+$labels['vacation.after'] = 'Abwesenheitsregel einfügen nach';
+$labels['vacation.saving'] = 'Speichere Daten...';
+$labels['vacation.action'] = 'Aktion für eingehende Nachrichten';
+$labels['vacation.keep'] = 'Behalten';
+$labels['vacation.discard'] = 'Verwerfen';
+$labels['vacation.redirect'] = 'Weiterleiten an';
+$labels['vacation.copy'] = 'Kopie an';
+$labels['arialabelfiltersetactions'] = 'Filtersatz-Aktionen';
+$labels['arialabelfilteractions'] = 'Filteraktionen';
+$labels['arialabelfilterform'] = 'Filtereigenschaften';
+$labels['ariasummaryfilterslist'] = 'Filterliste';
+$labels['ariasummaryfiltersetslist'] = 'Filtersatzliste';
+$labels['filterstitle'] = 'Eingehende Nachrichtenfilter bearbeiten';
+$labels['vacationtitle'] = 'Abwesenheitsregel bearbeiten';
 $messages['filterunknownerror'] = 'Unbekannter Serverfehler';
 $messages['filterconnerror'] = 'Kann nicht zum Sieve-Server verbinden';
 $messages['filterdeleteerror'] = 'Serverfehler beim Löschen des Filters.';
@@ -189,4 +218,7 @@ $messages['namereserved'] = 'Reservierter Name.';
 $messages['setexist'] = 'Filtersatz existiert bereits.';
 $messages['nodata'] = 'Mindestens eine Position muss ausgewählt werden!';
 $messages['invaliddateformat'] = 'Ungültiges Datumsformat';
+$messages['saveerror'] = 'Fehler beim Speichern (Serverfehler)';
+$messages['vacationsaved'] = 'Abwesenheitsnotiz erfolgreich gespeichert.';
+$messages['emptyvacationbody'] = 'Mitteilungstext ist erforderlich!';
 ?>
diff --git a/plugins/managesieve/localization/de_DE.inc b/plugins/managesieve/localization/de_DE.inc
index e2abacf60..f57ffa300 100644
--- a/plugins/managesieve/localization/de_DE.inc
+++ b/plugins/managesieve/localization/de_DE.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'Erster Buchstabe großgeschrieben';
 $labels['varquotewildcard'] = 'maskiere Sonderzeichen';
 $labels['varlength'] = 'Länge';
 $labels['notify'] = 'Sende Benachrichtigung';
-$labels['notifyaddress'] = 'An Email Adresse:';
-$labels['notifybody'] = 'Benachrichtigungs-Text:';
-$labels['notifysubject'] = 'Benachrichtigungs-Betreff:';
-$labels['notifyfrom'] = 'Benachrichtigungs-Absender:';
+$labels['notifytarget'] = 'Benachrichtigungs-Empfänger:';
+$labels['notifymessage'] = 'Inhalt der Benachrichtigung (optional):';
+$labels['notifyoptions'] = 'Optionen für die Benachrichtigung (optional)';
+$labels['notifyfrom'] = 'Absender der Benachrichtigung (optional):';
 $labels['notifyimportance'] = 'Priorität:';
 $labels['notifyimportancelow'] = 'niedrig';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'hoch';
+$labels['notifymethodmailto'] = 'E-Mail';
+$labels['notifymethodtel'] = 'Telefon';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Filter erstellen';
 $labels['usedata'] = 'Die folgenden Daten im Filter benutzen:';
 $labels['nextstep'] = 'Nächster Schritt';
@@ -157,6 +160,32 @@ $labels['asciicasemap'] = 'Groß-/Kleinschreibung ignorieren';
 $labels['asciinumeric'] = 'numerisch (ascii-numeric)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'rückwärts';
+$labels['vacation'] = 'Urlaub';
+$labels['vacation.reply'] = 'Antwort';
+$labels['vacation.advanced'] = 'Erweiterte Einstellungen';
+$labels['vacation.subject'] = 'Betreff';
+$labels['vacation.body'] = 'Hauptteil';
+$labels['vacation.start'] = 'Beginn des Urlaubs';
+$labels['vacation.end'] = 'Ende des Urlaubs';
+$labels['vacation.status'] = 'Status';
+$labels['vacation.on'] = 'An';
+$labels['vacation.off'] = 'Aus';
+$labels['vacation.addresses'] = 'Meine weiteren Adressen';
+$labels['vacation.interval'] = 'Antwort Intervall';
+$labels['vacation.after'] = 'Setze Urlaubsregel nach';
+$labels['vacation.saving'] = 'Speichere Daten...';
+$labels['vacation.action'] = 'Eingehende Nachrichtaktion';
+$labels['vacation.keep'] = 'Behalten';
+$labels['vacation.discard'] = 'Verwerfen';
+$labels['vacation.redirect'] = 'Weiterleiten an';
+$labels['vacation.copy'] = 'Kopie senden an';
+$labels['arialabelfiltersetactions'] = 'Aktionen für Filtersätze';
+$labels['arialabelfilteractions'] = 'Aktionen für Filter';
+$labels['arialabelfilterform'] = 'Filtereigenschaften';
+$labels['ariasummaryfilterslist'] = 'Liste von Filtern';
+$labels['ariasummaryfiltersetslist'] = 'Liste von Filtersätzen';
+$labels['filterstitle'] = 'Eingehende Mailfilter bearbeiten';
+$labels['vacationtitle'] = 'Abwesendheitsregel bearbeiten';
 $messages['filterunknownerror'] = 'Unbekannter Serverfehler';
 $messages['filterconnerror'] = 'Kann keine Verbindung mit Managesieve-Server herstellen';
 $messages['filterdeleteerror'] = 'Filter kann nicht gelöscht werden. Ein Serverfehler ist aufgetreten.';
@@ -189,4 +218,7 @@ $messages['namereserved'] = 'Reservierter Name.';
 $messages['setexist'] = 'Filtersatz existiert bereits.';
 $messages['nodata'] = 'Mindestens eine Position muss ausgewählt werden!';
 $messages['invaliddateformat'] = 'Ungültiges Datum oder Teil-Format';
+$messages['saveerror'] = 'Ein Serverfehler ist aufgetreten, Speicherung war nicht möglich.';
+$messages['vacationsaved'] = 'Urlaubsdaten erfolgreich gespeichert.';
+$messages['emptyvacationbody'] = 'Inhalt der Abwesenheitsbenachrichtigung wird benötigt!';
 ?>
diff --git a/plugins/managesieve/localization/el_GR.inc b/plugins/managesieve/localization/el_GR.inc
index c5f270247..d1c783308 100644
--- a/plugins/managesieve/localization/el_GR.inc
+++ b/plugins/managesieve/localization/el_GR.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'πρώτος χαρακτήρας κεφαλαία �
 $labels['varquotewildcard'] = 'παραθέση ειδικων χαρακτήρων';
 $labels['varlength'] = 'Μήκος';
 $labels['notify'] = 'Αποστολή ειδοποίησης ';
-$labels['notifyaddress'] = 'Σε διεύθυνση email:';
-$labels['notifybody'] = 'Οργανισμός ειδοποιησης:';
-$labels['notifysubject'] = 'Θεμα ειδοποιησης:';
-$labels['notifyfrom'] = 'Αποστολεας ειδοποιησης:';
+$labels['notifytarget'] = 'Παραλήπτης ειδοποίησης:';
+$labels['notifymessage'] = 'Μήνυμα ειδοποίησης (προαιρετικά):';
+$labels['notifyoptions'] = 'Επιλογές ειδοποίησης (προαιρετικά):';
+$labels['notifyfrom'] = 'Αποστολέας ειδοποίησης (προαιρετικά):';
 $labels['notifyimportance'] = 'Σημασία: ';
 $labels['notifyimportancelow'] = 'Χαμηλή';
 $labels['notifyimportancenormal'] = 'Κανονική';
 $labels['notifyimportancehigh'] = 'Υψηλή';
+$labels['notifymethodmailto'] = 'Email';
+$labels['notifymethodtel'] = 'Τηλέφωνο';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Δημιουργία φίλτρου';
 $labels['usedata'] = 'Χρησιμοποιηση ακολουθων δεδομενων στο φιλτρο:';
 $labels['nextstep'] = 'Επομενο βημα';
@@ -157,6 +160,32 @@ $labels['asciicasemap'] = 'πεζά ή κεφαλαία (ascii-casemap)';
 $labels['asciinumeric'] = 'αριθμητικό (ascii-αριθμητικο)';
 $labels['index'] = 'ευρετήριο:';
 $labels['indexlast'] = 'προς τα πίσω';
+$labels['vacation'] = 'Διακοπές';
+$labels['vacation.reply'] = 'Μήνυμα απάντησης';
+$labels['vacation.advanced'] = 'Προηγμένες ρυθμίσεις';
+$labels['vacation.subject'] = 'Θέμα';
+$labels['vacation.body'] = 'Σώμα';
+$labels['vacation.start'] = 'Έναρξη διακοπών';
+$labels['vacation.end'] = 'Λήξη διακοπών';
+$labels['vacation.status'] = 'Κατάσταση';
+$labels['vacation.on'] = 'Ενεργό';
+$labels['vacation.off'] = 'Ανενεργό';
+$labels['vacation.addresses'] = 'Επιπλέον διευθύνσεις';
+$labels['vacation.interval'] = 'Διάστημα απάντησης';
+$labels['vacation.after'] = 'Εισαγωγή κανόνα διακοπών μετά από';
+$labels['vacation.saving'] = 'Αποθήκευση δεδομένων...';
+$labels['vacation.action'] = 'Ενέργεια εισερχόμενου μηνύματος';
+$labels['vacation.keep'] = 'Διατήρηση';
+$labels['vacation.discard'] = 'Διαγραφή';
+$labels['vacation.redirect'] = 'Ανακατεύθυνση σε';
+$labels['vacation.copy'] = 'Αποστολή αντιγράφου σε';
+$labels['arialabelfiltersetactions'] = 'Ενέργειες ομάδας φίλτρων';
+$labels['arialabelfilteractions'] = 'Ενέργειες φίλτρων';
+$labels['arialabelfilterform'] = 'Ιδιότητες φίλτρων';
+$labels['ariasummaryfilterslist'] = 'Λίστα φίλτρων';
+$labels['ariasummaryfiltersetslist'] = 'Λίστα ομάδων φίλτρων';
+$labels['filterstitle'] = 'Επεξεργασία φίλτρων εισερχόμενης αλληλογραφίας';
+$labels['vacationtitle'] = 'Επεξεργασία κανόνα εκτός-γραφείου';
 $messages['filterunknownerror'] = 'Άγνωστο σφάλμα διακομιστή';
 $messages['filterconnerror'] = 'Αδυναμία σύνδεσης στον διακομιστή managesieve';
 $messages['filterdeleteerror'] = 'Αδυναμία διαγραφής φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
@@ -189,4 +218,7 @@ $messages['namereserved'] = 'Δεσμευμένο όνομα. ';
 $messages['setexist'] = 'Set υπάρχει ήδη. ';
 $messages['nodata'] = 'Τουλάχιστον μία θέση πρέπει να επιλεγεί!';
 $messages['invaliddateformat'] = 'Μη έγκυρη ημερομηνία ή η ημερομηνία μορφής τμήμα';
+$messages['saveerror'] = 'Αδύνατη η αποθήκευση δεδομένων. Προέκυψε σφάλμα στον διακομιστή';
+$messages['vacationsaved'] = 'Τα δεδομένα διακοπών αποθηκεύτηκαν επιτυχώς.';
+$messages['emptyvacationbody'] = 'Απαιτείται σώμα για το μήνυμα διακοπών!';
 ?>
diff --git a/plugins/managesieve/localization/en_CA.inc b/plugins/managesieve/localization/en_CA.inc
index 9cc831b99..400f835d5 100644
--- a/plugins/managesieve/localization/en_CA.inc
+++ b/plugins/managesieve/localization/en_CA.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'first character upper-case';
 $labels['varquotewildcard'] = 'quote special characters';
 $labels['varlength'] = 'length';
 $labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
+$labels['notifytarget'] = 'Notification target:';
+$labels['notifymessage'] = 'Notification message (optional):';
+$labels['notifyoptions'] = 'Notification options (optional):';
+$labels['notifyfrom'] = 'Notification sender (optional):';
 $labels['notifyimportance'] = 'Importance:';
 $labels['notifyimportancelow'] = 'low';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'high';
+$labels['notifymethodmailto'] = 'Email';
+$labels['notifymethodtel'] = 'Phone';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Create filter';
 $labels['usedata'] = 'Use following data in the filter:';
 $labels['nextstep'] = 'Next Step';
@@ -157,6 +160,18 @@ $labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'backwards';
+$labels['vacation'] = 'Vacation';
+$labels['vacation.reply'] = 'Reply message';
+$labels['vacation.advanced'] = 'Advanced settings';
+$labels['vacation.subject'] = 'Subject';
+$labels['vacation.body'] = 'Body';
+$labels['vacation.status'] = 'Status';
+$labels['vacation.on'] = 'On';
+$labels['vacation.off'] = 'Off';
+$labels['vacation.addresses'] = 'My additional addresses';
+$labels['vacation.interval'] = 'Reply interval';
+$labels['vacation.after'] = 'Put vacation rule after';
+$labels['vacation.saving'] = 'Saving data...';
 $messages['filterunknownerror'] = 'Unknown server error.';
 $messages['filterconnerror'] = 'Unable to connect to server.';
 $messages['filterdeleteerror'] = 'Unable to delete filter. Server error occurred.';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'Reserved name.';
 $messages['setexist'] = 'Set already exists.';
 $messages['nodata'] = 'At least one position must be selected!';
 $messages['invaliddateformat'] = 'Invalid date or date part format';
+$messages['saveerror'] = 'Unable to save data. Server error occurred.';
+$messages['vacationsaved'] = 'Vacation data saved successfully.';
 ?>
diff --git a/plugins/managesieve/localization/en_GB.inc b/plugins/managesieve/localization/en_GB.inc
index 59a019d4e..0cc88720f 100644
--- a/plugins/managesieve/localization/en_GB.inc
+++ b/plugins/managesieve/localization/en_GB.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'first character upper-case';
 $labels['varquotewildcard'] = 'quote special characters';
 $labels['varlength'] = 'length';
 $labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
+$labels['notifytarget'] = 'Notification target:';
+$labels['notifymessage'] = 'Notification message (optional):';
+$labels['notifyoptions'] = 'Notification options (optional):';
+$labels['notifyfrom'] = 'Notification sender (optional):';
 $labels['notifyimportance'] = 'Importance:';
 $labels['notifyimportancelow'] = 'low';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'high';
+$labels['notifymethodmailto'] = 'Email';
+$labels['notifymethodtel'] = 'Phone';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Create filter';
 $labels['usedata'] = 'Use following data in the filter:';
 $labels['nextstep'] = 'Next Step';
@@ -162,9 +165,8 @@ $labels['vacation.reply'] = 'Reply message';
 $labels['vacation.advanced'] = 'Advanced settings';
 $labels['vacation.subject'] = 'Subject';
 $labels['vacation.body'] = 'Body';
-$labels['vacation.dates'] = 'Vacation time';
-$labels['vacation.from'] = 'From:';
-$labels['vacation.to'] = 'To:';
+$labels['vacation.start'] = 'Vacation start';
+$labels['vacation.end'] = 'Vacation end';
 $labels['vacation.status'] = 'Status';
 $labels['vacation.on'] = 'On';
 $labels['vacation.off'] = 'Off';
@@ -172,6 +174,18 @@ $labels['vacation.addresses'] = 'My additional addresses';
 $labels['vacation.interval'] = 'Reply interval';
 $labels['vacation.after'] = 'Put vacation rule after';
 $labels['vacation.saving'] = 'Saving data...';
+$labels['vacation.action'] = 'Incoming message action';
+$labels['vacation.keep'] = 'Keep';
+$labels['vacation.discard'] = 'Discard';
+$labels['vacation.redirect'] = 'Redirect to';
+$labels['vacation.copy'] = 'Send copy to';
+$labels['arialabelfiltersetactions'] = 'Filter set actions';
+$labels['arialabelfilteractions'] = 'Filter actions';
+$labels['arialabelfilterform'] = 'Filter properties';
+$labels['ariasummaryfilterslist'] = 'List of filters';
+$labels['ariasummaryfiltersetslist'] = 'List of filter sets';
+$labels['filterstitle'] = 'Edit incoming mail filters';
+$labels['vacationtitle'] = 'Edit out-of-office rule';
 $messages['filterunknownerror'] = 'Unknown server error';
 $messages['filterconnerror'] = 'Unable to connect to managesieve server';
 $messages['filterdeleteerror'] = 'Unable to delete filter. Server error occurred.';
@@ -206,4 +220,5 @@ $messages['nodata'] = 'At least one position must be selected!';
 $messages['invaliddateformat'] = 'Invalid date or date part format';
 $messages['saveerror'] = 'Unable to save data. Server error occurred.';
 $messages['vacationsaved'] = 'Vacation data saved successfully.';
+$messages['emptyvacationbody'] = 'Body of vacation message is required!';
 ?>
diff --git a/plugins/managesieve/localization/es_419.inc b/plugins/managesieve/localization/es_419.inc
index bc9fbba30..613189526 100644
--- a/plugins/managesieve/localization/es_419.inc
+++ b/plugins/managesieve/localization/es_419.inc
@@ -54,17 +54,27 @@ $labels['add'] = 'Agregar';
 $labels['del'] = 'Eliminar';
 $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
-$labels['vacationdays'] = '¿Cada cuánto enviar mensajes (en días)?';
-$labels['vacationinterval'] = '¿Con que frecuencia enviar mensajes?';
+$labels['vacationaddr'] = 'Mis direccion(es) adiconal(es):';
+$labels['vacationdays'] = 'Cuan a menudo enviar mensajes (en días):';
+$labels['vacationinterval'] = '¿Con qué frecuencia enviar mensajes?:';
 $labels['vacationreason'] = 'Cuerpo del mensaje (motivo de las vacaciones):';
-$labels['vacationsubject'] = 'Título del mensaje:';
+$labels['vacationsubject'] = 'Asunto del mensaje:';
 $labels['days'] = 'días';
 $labels['seconds'] = 'segundos';
 $labels['rulestop'] = 'Detener la evaluación de reglas';
 $labels['enable'] = 'Habilitar/Deshabilitar';
+$labels['filterset'] = 'Set de filtros';
+$labels['filtersets'] = 'Filtro acciona';
+$labels['filtersetadd'] = 'Agregar set de filtros';
+$labels['filtersetdel'] = 'Eliminar set de filtros actual';
+$labels['filtersetact'] = 'Activar set de filtros actual';
+$labels['filtersetdeact'] = 'Desactivar set de filtros actual';
 $labels['filterdef'] = 'Definición del filtro';
+$labels['filtersetname'] = 'Nombre del set de filtros';
+$labels['newfilterset'] = 'Nuevo set de filtros';
 $labels['active'] = 'activo';
 $labels['none'] = 'ninguno';
+$labels['fromset'] = 'desde set';
 $labels['fromfile'] = 'desde archivo';
 $labels['filterdisabled'] = 'filtro deshabilitado';
 $labels['countisgreaterthan'] = 'la cuenta es mayor a';
@@ -72,15 +82,22 @@ $labels['countisgreaterthanequal'] = 'la cuenta es mayor o igual a ';
 $labels['countislessthan'] = 'la cuenta es menor que';
 $labels['countislessthanequal'] = 'la cuenta es menor o igual que';
 $labels['countequals'] = 'la cuenta es igual a ';
+$labels['countnotequals'] = 'la cuenta no es menor a';
 $labels['valueisgreaterthan'] = 'el valor es mayor que';
 $labels['valueisgreaterthanequal'] = 'el balor es mayor o igual que ';
 $labels['valueislessthan'] = 'el valor es menor que ';
 $labels['valueislessthanequal'] = 'el valor es menor o igual que ';
 $labels['valueequals'] = 'el valor es igual a ';
+$labels['valuenotequals'] = 'el valor no es igual a';
+$labels['setflags'] = 'Colocar etiquetas al mensaje';
+$labels['addflags'] = 'Agrega etiquetas al mensaje';
+$labels['removeflags'] = 'Eliminar etiquetas al mensaje';
 $labels['flagread'] = 'Leido';
 $labels['flagdeleted'] = 'Eliminado';
 $labels['flaganswered'] = 'Respondido';
+$labels['flagflagged'] = 'Etiquetado';
 $labels['flagdraft'] = 'Borrador';
+$labels['setvariable'] = 'Establecer variable';
 $labels['setvarname'] = 'Nombre de la variable:';
 $labels['setvarvalue'] = 'Valor de la variable:';
 $labels['setvarmodifiers'] = 'Modificadores:';
@@ -91,30 +108,36 @@ $labels['varupperfirst'] = 'primer carácter en mayúscula';
 $labels['varquotewildcard'] = 'citar carácteres especiales';
 $labels['varlength'] = 'largo';
 $labels['notify'] = 'Enviar notificación';
-$labels['notifyaddress'] = 'A la direccion de correo:';
-$labels['notifybody'] = 'Cuerpo de la notificación:';
-$labels['notifysubject'] = 'Tema de la notificación:';
-$labels['notifyfrom'] = 'Remitente de la notificación: ';
-$labels['notifyimportance'] = 'Importantcia:';
+$labels['notifytarget'] = 'Destinatario de la notificación:';
+$labels['notifymessage'] = 'Mensaje de notificación (opcional):';
+$labels['notifyoptions'] = 'Opciones de notificación (opcional):';
+$labels['notifyfrom'] = 'Remitente de la notificación (opcional):';
+$labels['notifyimportance'] = 'Importancia:';
 $labels['notifyimportancelow'] = 'baja';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'alta';
+$labels['notifymethodmailto'] = 'Correo electrónico';
+$labels['notifymethodtel'] = 'Teléfono';
+$labels['notifymethodsms'] = 'Mensaje de texto';
 $labels['filtercreate'] = 'Crear filtro';
 $labels['usedata'] = 'Usar los datos siguientes en el filtro:';
 $labels['nextstep'] = 'Paso siguiente';
 $labels['...'] = '...';
 $labels['currdate'] = 'Fecha actual';
 $labels['datetest'] = 'Fecha';
-$labels['year'] = 'Año';
+$labels['dateheader'] = 'encabezado:';
+$labels['year'] = 'año';
 $labels['month'] = 'mes';
 $labels['day'] = 'día';
 $labels['date'] = 'fecha(aaaa-mm-dd)';
+$labels['julian'] = 'fecha (julian)';
 $labels['hour'] = 'hora';
 $labels['minute'] = 'minuto';
 $labels['second'] = 'segundo';
 $labels['time'] = 'hora (hh:mm:ss)';
 $labels['iso8601'] = 'fecha (ISO8601)';
 $labels['std11'] = 'fecha (RFC2822)';
+$labels['zone'] = 'zona horaria';
 $labels['weekday'] = 'día de la semana (0-6)';
 $labels['advancedopts'] = 'Opciones avanzadas';
 $labels['body'] = 'Cuerpo';
@@ -132,22 +155,70 @@ $labels['user'] = 'usuario';
 $labels['detail'] = 'detalle';
 $labels['comparator'] = 'comparador:';
 $labels['default'] = 'predeterminado';
-$labels['octet'] = 'estricto';
-$labels['asciinumeric'] = 'numérico (ascii-numeric)';
-$messages['filterunknownerror'] = 'Error del servidor desconocido.';
-$messages['filterconnerror'] = 'Incapaz de conectarse al servidor.';
+$labels['octet'] = 'estricto (octeto)';
+$labels['asciicasemap'] = 'no sensible a mayúsculas y minúsculas (mapero-ascii)';
+$labels['asciinumeric'] = 'numérico (ascii-numérico)';
+$labels['index'] = 'índice:';
+$labels['indexlast'] = 'hacia atrás';
+$labels['vacation'] = 'Vacaciones';
+$labels['vacation.reply'] = 'Responder mensaje';
+$labels['vacation.advanced'] = 'Opciones avanzadas';
+$labels['vacation.subject'] = 'Asunto';
+$labels['vacation.body'] = 'Cuerpo';
+$labels['vacation.start'] = 'Inicio de vacaciones';
+$labels['vacation.end'] = 'Final de vacaciones';
+$labels['vacation.status'] = 'Estado';
+$labels['vacation.on'] = 'Encendido';
+$labels['vacation.off'] = 'Apagado';
+$labels['vacation.addresses'] = 'Mis direcciones adicionales';
+$labels['vacation.interval'] = 'Intervalo de respuesta';
+$labels['vacation.after'] = 'Colocar regla de vacaciones luego';
+$labels['vacation.saving'] = 'Guardando información...';
+$labels['vacation.action'] = 'Acción para mensaje entrante';
+$labels['vacation.keep'] = 'Mantener';
+$labels['vacation.discard'] = 'Descartar';
+$labels['vacation.redirect'] = 'Redireccionar a';
+$labels['vacation.copy'] = 'Enviar una copia a';
+$labels['arialabelfiltersetactions'] = 'Acciones del set de filtros';
+$labels['arialabelfilteractions'] = 'Acciones de filtros';
+$labels['arialabelfilterform'] = 'Propiedades de filtros';
+$labels['ariasummaryfilterslist'] = 'Lista de filtros';
+$labels['ariasummaryfiltersetslist'] = 'Lista de set de filtros';
+$labels['filterstitle'] = 'Administrar filtros de correos entrantes';
+$labels['vacationtitle'] = 'Editar regla de fuera de oficina';
+$messages['filterunknownerror'] = 'Error de servidor desconocido.';
+$messages['filterconnerror'] = 'No se puede conectar al servidor.';
+$messages['filterdeleteerror'] = 'No se puede eliminar el filtro. Ocurrió un error de servidor.';
 $messages['filterdeleted'] = 'Filtro eliminado exitosamente.';
 $messages['filtersaved'] = 'Filtro guardado exitosamente.';
+$messages['filtersaveerror'] = 'No es posible guardar el filtro. Ha ocurrido un error de servidor.';
 $messages['filterdeleteconfirm'] = '¿Estás seguro que quieres eliminar el filtro seleccionado?';
 $messages['ruledeleteconfirm'] = '¿Estás seguro que quieres eliminar la regla seleccionada?';
 $messages['actiondeleteconfirm'] = '¿Estás seguro que queires eliminar la acción seleccionada?';
 $messages['forbiddenchars'] = 'Carácteres ilegales en el campo.';
 $messages['cannotbeempty'] = 'El campo no puede estar vacio.';
 $messages['ruleexist'] = 'Ya existe un filtro con el nombre especificado.';
+$messages['setactivateerror'] = 'No es posible activar el set de filtros seleccionado. Ha ocurrido un error de servidor.';
+$messages['setdeactivateerror'] = 'No es posible desactivar el set de filtros selecciona. Ha ocurrido un error de servidor.';
+$messages['setdeleteerror'] = 'No es posible eliminar el set de filtros seleccionado. Ha ocurrido un error de servidor.';
+$messages['setactivated'] = 'Set de filtros activado exitosamente.';
+$messages['setdeactivated'] = 'Set de filtros desactivado exitosamente.';
+$messages['setdeleted'] = 'Set de filtroseliminado exitosamente.';
+$messages['setdeleteconfirm'] = '¿Estas seguro que deseas eliminar el set de filtros seleccionado?';
+$messages['setcreateerror'] = 'No es posible crear el set de filtros. Ha ocurrido un error de servidor.';
+$messages['setcreated'] = 'Set de filtros creado exitosamente.';
+$messages['activateerror'] = 'No es posible habilitar los filtros seleccionados. Ha ocurrido un error de servidor.';
+$messages['deactivateerror'] = 'No es posible deshabilitar los filtros seleccionados. Ha ocurrido un error de servidor.';
 $messages['deactivated'] = 'Filtro(s) deshabilitado(s) exitosamente.';
 $messages['activated'] = 'Filtro(s) habilitado(s) exitosamente.';
 $messages['moved'] = 'Filtro movido exitosamente.';
+$messages['moveerror'] = 'No es posible mover los filtros seleccionados. Ha ocurrido un error de servidor.';
 $messages['nametoolong'] = 'Nombre demasiado largo.';
 $messages['namereserved'] = 'Nombre reservado.';
+$messages['setexist'] = 'Set ya existe.';
 $messages['nodata'] = 'Debes seleccionar al menos una posición.';
+$messages['invaliddateformat'] = 'Fecha o parte del formato no válido';
+$messages['saveerror'] = 'No es posible guardar la información. Ha ocurrido un error de servidor.';
+$messages['vacationsaved'] = 'Información de vacaciones guardada exitosamente.';
+$messages['emptyvacationbody'] = 'Cuerpo del mensaje de vacaciones es requerido!';
 ?>
diff --git a/plugins/managesieve/localization/es_AR.inc b/plugins/managesieve/localization/es_AR.inc
index 7707a2b57..6ac6533d7 100644
--- a/plugins/managesieve/localization/es_AR.inc
+++ b/plugins/managesieve/localization/es_AR.inc
@@ -32,6 +32,10 @@ $labels['filteris'] = 'es igual a';
 $labels['filterisnot'] = 'no es igual a';
 $labels['filterexists'] = 'existe';
 $labels['filternotexists'] = 'no existe';
+$labels['filtermatches'] = 'coincide con la expresión';
+$labels['filternotmatches'] = 'no coindice con la expresión';
+$labels['filterregex'] = 'coincide con la expresión regular';
+$labels['filternotregex'] = 'no coincide con la expresión regular';
 $labels['filterunder'] = 'bajo';
 $labels['filterover'] = 'sobre';
 $labels['addrule'] = 'Agregar regla';
@@ -43,16 +47,24 @@ $labels['messagesendcopy'] = 'Enviar copia del mensaje a';
 $labels['messagereply'] = 'Responder con un mensaje';
 $labels['messagedelete'] = 'Eliminar mensaje';
 $labels['messagediscard'] = 'Descartar con un mensaje';
+$labels['messagekeep'] = 'Mantener mensajes en bandeja de entrada';
 $labels['messagesrules'] = 'Para el correo entrante:';
 $labels['messagesactions'] = '... ejecutar las siguientes acciones:';
 $labels['add'] = 'Agregar';
 $labels['del'] = 'Eliminar';
 $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
+$labels['vacationaddr'] = 'Mi(s) direccion(es) de e-mail adicional(es):';
 $labels['vacationdays'] = 'Cada cuanto enviar mensajes (en días):';
+$labels['vacationinterval'] = 'Enviar mensajes cada:';
 $labels['vacationreason'] = 'Cuerpo del mensaje (razón de vacaciones):';
+$labels['vacationsubject'] = 'Asunto del mensaje:';
+$labels['days'] = 'dias';
+$labels['seconds'] = 'segundos';
 $labels['rulestop'] = 'Parar de evaluar reglas';
+$labels['enable'] = 'Habilitar/Deshabilitar';
 $labels['filterset'] = 'Conjunto de filtros';
+$labels['filtersets'] = 'Filtro activa';
 $labels['filtersetadd'] = 'Agregar conjunto de filtros';
 $labels['filtersetdel'] = 'Eliminar conjunto de filtros';
 $labels['filtersetact'] = 'Activar conjunto de filtros';
@@ -65,19 +77,148 @@ $labels['none'] = 'none';
 $labels['fromset'] = 'desde conjunto';
 $labels['fromfile'] = 'desde archivo';
 $labels['filterdisabled'] = 'Filtro deshabilitado';
+$labels['countisgreaterthan'] = 'la cuenta es mayor a';
+$labels['countisgreaterthanequal'] = 'la cuenta es mayor o igual a';
+$labels['countislessthan'] = 'la cuenta es menor a';
+$labels['countislessthanequal'] = 'la cuenta es menor o igual a';
+$labels['countequals'] = 'la cuenta es igual a';
+$labels['countnotequals'] = 'la cuenta no es igual a';
+$labels['valueisgreaterthan'] = 'el valor es mayor a';
+$labels['valueisgreaterthanequal'] = 'el valor es mayor o igual a';
+$labels['valueislessthan'] = 'el valor es menor a';
+$labels['valueislessthanequal'] = 'el valor es menor o igual a';
+$labels['valueequals'] = 'el valor es igual a';
+$labels['valuenotequals'] = 'el valor no es igual a';
+$labels['setflags'] = 'Configurar marcas del mensaje';
+$labels['addflags'] = 'Agregar marcas al mensaje';
+$labels['removeflags'] = 'Eliminar marcas del mensaje';
+$labels['flagread'] = 'Leer';
+$labels['flagdeleted'] = 'Eliminado';
+$labels['flaganswered'] = 'Respondido';
+$labels['flagflagged'] = 'Marcado';
+$labels['flagdraft'] = 'Borrador';
+$labels['setvariable'] = 'Setear variable';
+$labels['setvarname'] = 'Nombre de variable:';
+$labels['setvarvalue'] = 'Valor de variable:';
+$labels['setvarmodifiers'] = 'Modificadores:';
+$labels['varlower'] = 'minúscula';
+$labels['varupper'] = 'mayúscula';
+$labels['varlowerfirst'] = 'primer caracter en minúscula';
+$labels['varupperfirst'] = 'primer caracter en mayúscula';
+$labels['varquotewildcard'] = 'citar caracteres especiales';
+$labels['varlength'] = 'longitud';
+$labels['notify'] = 'Enviar notificación';
+$labels['notifytarget'] = 'Objetivo de la notificación:';
+$labels['notifymessage'] = 'Mensaje de notificación (opcional):';
+$labels['notifyoptions'] = 'Opciones de notificación (opcional):';
+$labels['notifyfrom'] = 'Remitente de la notificación (opcional):';
+$labels['notifyimportance'] = 'Importancia:';
+$labels['notifyimportancelow'] = 'baja';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'alta';
+$labels['notifymethodmailto'] = 'Email';
+$labels['notifymethodtel'] = 'Teléfono';
+$labels['notifymethodsms'] = 'SMS';
+$labels['filtercreate'] = 'Crear filtro';
+$labels['usedata'] = 'Usar la siguiente información en el filtro:';
+$labels['nextstep'] = 'Siguiente paso';
+$labels['...'] = '...';
+$labels['currdate'] = 'Fecha actual';
+$labels['datetest'] = 'Fecha';
+$labels['dateheader'] = 'encabezado:';
+$labels['year'] = 'año';
+$labels['month'] = 'mes';
+$labels['day'] = 'dia';
+$labels['date'] = 'fecha (yyyy-mm-dd)';
+$labels['julian'] = 'fecha (juliano)';
+$labels['hour'] = 'hora';
+$labels['minute'] = 'minuto';
+$labels['second'] = 'segundo';
+$labels['time'] = 'hora (hh:mm:ss)';
+$labels['iso8601'] = 'fecha (ISO8601)';
+$labels['std11'] = 'fecha (RFC2822)';
+$labels['zone'] = 'zona horaria';
+$labels['weekday'] = 'día de la semana (0-6)';
+$labels['advancedopts'] = 'Opciones avanzadas';
+$labels['body'] = 'Cuerpo';
+$labels['address'] = 'dirección';
+$labels['envelope'] = 'envoltura';
+$labels['modifier'] = 'modificador:';
+$labels['text'] = 'texto';
+$labels['undecoded'] = 'sin decodificar (crudo)';
+$labels['contenttype'] = 'tipo de contenido';
+$labels['modtype'] = 'tipo:';
+$labels['allparts'] = 'todo';
+$labels['domain'] = 'dominio';
+$labels['localpart'] = 'parte local';
+$labels['user'] = 'usuario';
+$labels['detail'] = 'detalle';
+$labels['comparator'] = 'comparador:';
+$labels['default'] = 'por defecto';
+$labels['octet'] = 'estricto (octeto)';
+$labels['asciicasemap'] = 'no sensible a minúsculas o mayúsculas (ascii-casemap)';
+$labels['asciinumeric'] = 'numérico (ascii-numeric)';
+$labels['index'] = 'índice:';
+$labels['indexlast'] = 'hacia atrás';
+$labels['vacation'] = 'Vacaciones';
+$labels['vacation.reply'] = 'Responder mensaje';
+$labels['vacation.advanced'] = 'Opciones avanzdas';
+$labels['vacation.subject'] = 'Asunto';
+$labels['vacation.body'] = 'Cuerpo';
+$labels['vacation.start'] = 'Inicio de vacaciones';
+$labels['vacation.end'] = 'Final de vacaciones';
+$labels['vacation.status'] = 'Estado';
+$labels['vacation.on'] = 'On';
+$labels['vacation.off'] = 'Off';
+$labels['vacation.addresses'] = 'Mis direcciones adicionales';
+$labels['vacation.interval'] = 'Intervalo de respuesta';
+$labels['vacation.after'] = 'Colocar luego regla de vacaciones ';
+$labels['vacation.saving'] = 'Guardando información...';
+$labels['vacation.action'] = 'Acción para mensaje entrante';
+$labels['vacation.keep'] = 'Mantener';
+$labels['vacation.discard'] = 'Descartar';
+$labels['vacation.redirect'] = 'Reenviar a';
+$labels['vacation.copy'] = 'Enviar copia a';
+$labels['arialabelfiltersetactions'] = 'Acciones de conjunto de filtros';
+$labels['arialabelfilteractions'] = 'Filtrar acciones';
+$labels['arialabelfilterform'] = 'Filtrar propiedades';
+$labels['ariasummaryfilterslist'] = 'Listado de filtros';
+$labels['ariasummaryfiltersetslist'] = 'Listado de conjunto de filtros';
+$labels['filterstitle'] = 'Editar filtros para mensajes entrantes';
+$labels['vacationtitle'] = 'Editar reglas "fuera de la oficina"';
 $messages['filterunknownerror'] = 'Error desconocido de servidor';
 $messages['filterconnerror'] = 'Imposible conectar con el servidor managesieve';
+$messages['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor';
 $messages['filterdeleted'] = 'Filtro borrado satisfactoriamente';
 $messages['filtersaved'] = 'Filtro guardado satisfactoriamente';
+$messages['filtersaveerror'] = 'Imposible guardar ell filtro. Ha ocurrido un error en el servidor';
 $messages['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
 $messages['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';
 $messages['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?';
 $messages['forbiddenchars'] = 'Caracteres prohibidos en el campo';
 $messages['cannotbeempty'] = 'El campo no puede estar vacío';
+$messages['ruleexist'] = 'El filtro con el nombre especificado ya existe.';
+$messages['setactivateerror'] = 'Imposible activar el conjunto de filtros. Error en el servidor.';
+$messages['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros. Error en el servidor.';
+$messages['setdeleteerror'] = 'Imposible eliminar el conjunto de filtros. Error en el servidor.';
 $messages['setactivated'] = 'Conjunto de filtros activados correctamente';
 $messages['setdeactivated'] = 'Conjunto de filtros desactivados correctamente';
 $messages['setdeleted'] = 'Conjunto de filtros eliminados correctamente';
 $messages['setdeleteconfirm'] = '¿Esta seguro, que quiere eliminar el conjunto de filtros seleccionado?';
+$messages['setcreateerror'] = 'Imposible crear el conjunto de filtros. Error en el servidor.';
 $messages['setcreated'] = 'Conjunto de filtros creados correctamente';
-$messages['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre del conjunto de filtros muy largo';
+$messages['activateerror'] = 'Imposible activar el conjunto de filtros. Error en el servidor.';
+$messages['deactivateerror'] = 'Imposible desactivar el conjunto de filtros. Error en el servidor.';
+$messages['deactivated'] = 'Filtro deshabilitado satisfactoriamente';
+$messages['activated'] = 'Filtro habilitado satisfactoriamente';
+$messages['moved'] = 'Filtro movido satisfactoriamente';
+$messages['moveerror'] = 'Imposible mover el filtro seleccionado. Ha ocurrido un error en el servidor.';
+$messages['nametoolong'] = 'El nombre es demasiado largo.';
+$messages['namereserved'] = 'Nombre reservado.';
+$messages['setexist'] = 'Conjunto ya existe.';
+$messages['nodata'] = 'Al menos una posición debe ser seleccionada!';
+$messages['invaliddateformat'] = 'Fecha o formato de fecha inválido';
+$messages['saveerror'] = 'Imposible guardar la información. Ha ocurrido un error con el servidor.';
+$messages['vacationsaved'] = 'Información de vacaciones guardada satisfactoriamente.';
+$messages['emptyvacationbody'] = '¡Se requiere un cuerpo para el mensaje por vacaciones!';
 ?>
diff --git a/plugins/managesieve/localization/es_ES.inc b/plugins/managesieve/localization/es_ES.inc
index cd8e24dfb..62f357bae 100644
--- a/plugins/managesieve/localization/es_ES.inc
+++ b/plugins/managesieve/localization/es_ES.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'inicial en mayúsculas';
 $labels['varquotewildcard'] = 'entrecomillar caracteres especiales';
 $labels['varlength'] = 'longitud';
 $labels['notify'] = 'Enviar notificación';
-$labels['notifyaddress'] = 'A la dirección de correo:';
-$labels['notifybody'] = 'Cuerpo de la notificación:';
-$labels['notifysubject'] = 'Tema de la notificación:';
-$labels['notifyfrom'] = 'Remitente de la notificación:';
+$labels['notifytarget'] = 'Destino de la notificación:';
+$labels['notifymessage'] = 'Mensaje de notificación (opcional):';
+$labels['notifyoptions'] = 'Opciones de notificación (opcional):';
+$labels['notifyfrom'] = 'Remitente de la notificación (opcional):';
 $labels['notifyimportance'] = 'Importancia:';
 $labels['notifyimportancelow'] = 'baja';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'alta';
+$labels['notifymethodmailto'] = 'Correo electrónico';
+$labels['notifymethodtel'] = 'Teléfono';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Crear Filtro';
 $labels['usedata'] = 'Usar los siguientes datos en el filtro:';
 $labels['nextstep'] = 'Siguiente paso';
@@ -157,6 +160,32 @@ $labels['asciicasemap'] = 'no sensible a mayúsculas (ascii-casemap)';
 $labels['asciinumeric'] = 'numerico (ascii-numeric)';
 $labels['index'] = 'índice:';
 $labels['indexlast'] = 'hacia atrás';
+$labels['vacation'] = 'Vacaciones';
+$labels['vacation.reply'] = 'Mensaje de respuesta';
+$labels['vacation.advanced'] = 'Configuración avanzada';
+$labels['vacation.subject'] = 'Asunto';
+$labels['vacation.body'] = 'Cuerpo';
+$labels['vacation.start'] = 'Comienzo de las vacaciones';
+$labels['vacation.end'] = 'Final de las vacaciones';
+$labels['vacation.status'] = 'Estado';
+$labels['vacation.on'] = 'Activado';
+$labels['vacation.off'] = 'Desactivado';
+$labels['vacation.addresses'] = 'Mis direcciones adicionales';
+$labels['vacation.interval'] = 'Intervalo de respuesta';
+$labels['vacation.after'] = 'Poner regla de vacaciones después de';
+$labels['vacation.saving'] = 'Guardando datos...';
+$labels['vacation.action'] = 'Acción de mensaje entrante';
+$labels['vacation.keep'] = 'Mantener';
+$labels['vacation.discard'] = 'Descartar';
+$labels['vacation.redirect'] = 'Redireccionar a';
+$labels['vacation.copy'] = 'Enviar copia a';
+$labels['arialabelfiltersetactions'] = 'Acciones de un paquete de filtros';
+$labels['arialabelfilteractions'] = 'Acciones de filtro';
+$labels['arialabelfilterform'] = 'Propiedades de filtro';
+$labels['ariasummaryfilterslist'] = 'Lista de filtros';
+$labels['ariasummaryfiltersetslist'] = 'Lista de paquetes de filtros';
+$labels['filterstitle'] = 'Editar filtros de mensajes entrantes';
+$labels['vacationtitle'] = 'Editar la regla fuera-de-la-oficina';
 $messages['filterunknownerror'] = 'Error desconocido en el servidor.';
 $messages['filterconnerror'] = 'No se ha podido conectar con el servidor managesieve.';
 $messages['filterdeleteerror'] = 'No se ha podido borrar el filtro. Ha ocurrido un error en el servidor.';
@@ -189,4 +218,7 @@ $messages['namereserved'] = 'Nombre reservado.';
 $messages['setexist'] = 'El conjunto ya existe.';
 $messages['nodata'] = '¡Al menos una posición debe ser seleccionada!';
 $messages['invaliddateformat'] = 'Fecha o formato de parte de la fecha no válido';
+$messages['saveerror'] = 'No fue posible guardar los datos. Ha ocurrido un error en el servidor.';
+$messages['vacationsaved'] = 'Datos de vacaciones guardados correctamente.';
+$messages['emptyvacationbody'] = '¡Hace falta un texto en el mensaje de vacaciones!';
 ?>
diff --git a/plugins/managesieve/localization/et_EE.inc b/plugins/managesieve/localization/et_EE.inc
index 6f1f73555..3957dcb43 100644
--- a/plugins/managesieve/localization/et_EE.inc
+++ b/plugins/managesieve/localization/et_EE.inc
@@ -106,10 +106,6 @@ $labels['varupperfirst'] = 'esimene märk on suurtäht';
 $labels['varquotewildcard'] = 'tsiteeri erimärke';
 $labels['varlength'] = 'pikkus';
 $labels['notify'] = 'Saada teavitus';
-$labels['notifyaddress'] = 'Saaja e-posti aadress:';
-$labels['notifybody'] = 'Teavituse sisu:';
-$labels['notifysubject'] = 'Teavituse pealkiri:';
-$labels['notifyfrom'] = 'Teavituse saatja:';
 $labels['notifyimportance'] = 'Tähtsus:';
 $labels['notifyimportancelow'] = 'madal';
 $labels['notifyimportancenormal'] = 'tavaline';
diff --git a/plugins/managesieve/localization/eu_ES.inc b/plugins/managesieve/localization/eu_ES.inc
index c16718523..f09b15291 100644
--- a/plugins/managesieve/localization/eu_ES.inc
+++ b/plugins/managesieve/localization/eu_ES.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'lehenengo karakterea maiuskulan';
 $labels['varquotewildcard'] = 'aipatu karaktere bereziak';
 $labels['varlength'] = 'luzera';
 $labels['notify'] = 'Bidali jakinarazpena';
-$labels['notifyaddress'] = 'e-posta helbidera:';
-$labels['notifybody'] = 'Jakinarazpenaren gorputza:';
-$labels['notifysubject'] = 'Jakinarazpenaren subjektua:';
-$labels['notifyfrom'] = 'Jakinarazpenaren bidaltzailea:';
+$labels['notifytarget'] = 'Jakinarazpenaren xedea:';
+$labels['notifymessage'] = 'Jakinarazpenaren mezua (aukerakoa):';
+$labels['notifyoptions'] = 'Jakinarazpenaren aukerak (aukerakoa):';
+$labels['notifyfrom'] = 'Jakinarazpenaren bidaltzailea (aukerakoa):';
 $labels['notifyimportance'] = 'Garrantzia:';
 $labels['notifyimportancelow'] = 'baxua';
 $labels['notifyimportancenormal'] = 'normala';
 $labels['notifyimportancehigh'] = 'altua';
+$labels['notifymethodmailto'] = 'Helbide elektronikoa';
+$labels['notifymethodtel'] = 'Telefonoa';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Sortu iragazkia';
 $labels['usedata'] = 'Erabili datorren data iragazkian:';
 $labels['nextstep'] = 'Hurrengo urratsa';
@@ -157,6 +160,30 @@ $labels['asciicasemap'] = 'minuskulak eta maiuskulak (ascii-casemap)';
 $labels['asciinumeric'] = 'numerikoa  (ascii-numeric)';
 $labels['index'] = 'indexatu:';
 $labels['indexlast'] = 'atzeraka';
+$labels['vacation'] = 'Oporraldia';
+$labels['vacation.reply'] = 'Erantzun mezua';
+$labels['vacation.advanced'] = 'Ezarpen aurreratuak';
+$labels['vacation.subject'] = 'Gaia';
+$labels['vacation.body'] = 'Gorputza';
+$labels['vacation.status'] = 'Egoera';
+$labels['vacation.on'] = 'Piztuta';
+$labels['vacation.off'] = 'Itzalita';
+$labels['vacation.addresses'] = 'Nire helbide osagarriak';
+$labels['vacation.interval'] = 'Erantzun tartea';
+$labels['vacation.after'] = 'Jarri oporren erregela honen ondoren';
+$labels['vacation.saving'] = 'Datuak gordetzen...';
+$labels['vacation.action'] = 'Sarrerako mezuaren ekintza';
+$labels['vacation.keep'] = 'Mantendu';
+$labels['vacation.discard'] = 'Baztertu';
+$labels['vacation.redirect'] = 'Birbideratu hona';
+$labels['vacation.copy'] = 'Bidali kopia hona';
+$labels['arialabelfiltersetactions'] = 'Iragazki-paketearen ekintzak';
+$labels['arialabelfilteractions'] = 'Iragazki-ekintzak';
+$labels['arialabelfilterform'] = 'Iragazkiaren ezaugarriak';
+$labels['ariasummaryfilterslist'] = 'Iragazkien zerrenda';
+$labels['ariasummaryfiltersetslist'] = 'Iragazki-paketeen zerrenda';
+$labels['filterstitle'] = 'Editatu postaren sarrera-iragazkiak';
+$labels['vacationtitle'] = 'Bulegotik-kanpo -erantzun automatiko- araua';
 $messages['filterunknownerror'] = 'Zerbitzari ezezaguna errorea';
 $messages['filterconnerror'] = 'Ezin da konektatu zerbitzariarekin.';
 $messages['filterdeleteerror'] = 'Ezin da ezabatu iragazkia. Errore bat gertatu da zerbitzarian.';
@@ -189,4 +216,6 @@ $messages['namereserved'] = 'Izen erreserbatua.';
 $messages['setexist'] = 'Lehendik badago pakete hori.';
 $messages['nodata'] = 'Gutxienez posizio bat hautatu behar da!';
 $messages['invaliddateformat'] = 'Dataren edo dataren zati baten formatua ez da baliozkoa ';
+$messages['saveerror'] = 'Ezin dira datuak gorde. Errorea gertatu da zerbitzarian.';
+$messages['vacationsaved'] = 'Oporren data ongi gorde da.';
 ?>
diff --git a/plugins/managesieve/localization/fa_AF.inc b/plugins/managesieve/localization/fa_AF.inc
new file mode 100644
index 000000000..87967958e
--- /dev/null
+++ b/plugins/managesieve/localization/fa_AF.inc
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/managesieve/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
+*/
+$labels['filters'] = 'فیلترها';
+$labels['filtername'] = 'نام فیلتر';
+$labels['newfilter'] = 'فیلتر جدید';
+$labels['filteranyof'] = 'تطبیق با هر کدام از رول های زیر';
+$labels['filterany'] = 'تمام پیام ها';
+$labels['filtercontains'] = 'شامل';
+$labels['filteris'] = 'مساوی با';
+$labels['filterunder'] = 'زیر';
+$labels['filterover'] = 'بالای';
+$labels['addrule'] = 'افزودن نقش';
+$labels['delrule'] = 'حذف نقش';
+$labels['messagereply'] = 'پاسخ توسط پیام';
+$labels['messagedelete'] = 'حذف پیام';
+$labels['add'] = 'افزودن';
+$labels['del'] = 'حذف';
+$labels['sender'] = 'فرستنده';
+$labels['recipient'] = 'گیرنده';
+$labels['days'] = 'روز';
+$labels['filtersets'] = 'مجموعه فیلتر';
+$labels['filterdef'] = 'تعریف فیلتر';
+$labels['newfilterset'] = 'مجموعه فیلترهای جدید';
+$labels['active'] = 'فعال';
+$labels['none'] = 'هیچ کدام';
+$labels['flagread'] = 'خواندن';
+$labels['flagdeleted'] = 'حذف شد';
+$labels['flagflagged'] = 'نشانه گذاری شده';
+$labels['flagdraft'] = 'پیش نویس';
+$labels['varlength'] = 'طول';
+$labels['notifyimportancenormal'] = 'عادی';
+$labels['notifymethodmailto'] = 'ایمیل';
+$labels['nextstep'] = 'مرحله بعدی';
+$labels['...'] = '...';
+$labels['currdate'] = 'تاریخ کنونی';
+$labels['datetest'] = 'تاریخ';
+$labels['dateheader'] = 'سرایند:';
+$labels['year'] = 'سال';
+$labels['month'] = 'ماه';
+$labels['day'] = 'روز';
+$labels['second'] = 'ثانیه';
+$labels['address'] = 'آدرس';
+$labels['envelope'] = 'پاکت نامه';
+$labels['modifier'] = 'ویرایش کننده:';
+$labels['text'] = 'متن';
+$labels['contenttype'] = 'نوع محتوا';
+$labels['allparts'] = 'همه';
+$labels['domain'] = 'دامنه';
+$labels['localpart'] = 'جز محلی';
+$labels['user'] = 'کاربر';
+$labels['detail'] = 'جزئیات';
+$labels['comparator'] = 'مقایسه کننده:';
+$labels['default'] = 'پیش فرض';
+$labels['index'] = 'اندیس';
+$labels['vacation'] = 'تعطیلات';
+$labels['vacation.reply'] = 'پیام پاسخ';
+$labels['vacation.advanced'] = 'تنظیمات پیشرفته';
+$labels['vacation.subject'] = 'موضوع';
+$labels['vacation.body'] = 'متن پیام';
+$labels['vacation.status'] = 'وضعیت';
+$labels['vacation.on'] = 'فعال';
+$labels['vacation.off'] = 'غیرفعال';
+$labels['arialabelfilterform'] = 'خصوصیات فیلترها';
+$labels['ariasummaryfilterslist'] = 'لیست فیلترها';
+$messages['filterdeleted'] = 'فیلتر با موفقیت حذف شد.';
+$messages['filtersaved'] = 'فیلتر با موفقیت ذخیره شد.';
+$messages['deactivated'] = 'فیلتر(ها) با موفقیت غیر فعال شدند';
+$messages['nametoolong'] = 'نام بسیار بلند است.';
+$messages['namereserved'] = 'نام  رزرو شده.';
+?>
diff --git a/plugins/managesieve/localization/fa_IR.inc b/plugins/managesieve/localization/fa_IR.inc
index 37cd82548..67e15fbbb 100644
--- a/plugins/managesieve/localization/fa_IR.inc
+++ b/plugins/managesieve/localization/fa_IR.inc
@@ -108,14 +108,13 @@ $labels['varupperfirst'] = 'حرف اول بزرگ';
 $labels['varquotewildcard'] = 'نقل قول کاراکترهای خاص';
 $labels['varlength'] = 'طول';
 $labels['notify'] = 'ارسال تذکر';
-$labels['notifyaddress'] = 'به آدرس پست الکترونیکی:';
-$labels['notifybody'] = 'بدنه تذکر:';
-$labels['notifysubject'] = 'موضوع تذکر:';
-$labels['notifyfrom'] = 'فرستنده تذکر:';
 $labels['notifyimportance'] = 'اهمیت:';
 $labels['notifyimportancelow'] = 'کم';
 $labels['notifyimportancenormal'] = 'معمولی';
 $labels['notifyimportancehigh'] = 'زیاد';
+$labels['notifymethodmailto'] = 'پست الکترونیکی';
+$labels['notifymethodtel'] = 'تلفن';
+$labels['notifymethodsms'] = 'پیامک';
 $labels['filtercreate'] = 'ایجاد صافی';
 $labels['usedata'] = 'استفاده از داده ذیل در صافی:';
 $labels['nextstep'] = 'مرحله بعدی';
@@ -157,6 +156,19 @@ $labels['asciicasemap'] = 'حساس به حروه کوچک و بزرگ (ascii-ca
 $labels['asciinumeric'] = 'عددی (ascii-numeric)';
 $labels['index'] = 'فهرست:';
 $labels['indexlast'] = 'به عقب';
+$labels['vacation'] = 'مسافرت';
+$labels['vacation.reply'] = 'پاسخ به یغام';
+$labels['vacation.advanced'] = 'تنظیمات پیشرفته';
+$labels['vacation.subject'] = 'موضوع';
+$labels['vacation.body'] = 'بدنه';
+$labels['vacation.status'] = 'وضعیت';
+$labels['vacation.on'] = 'روشن';
+$labels['vacation.off'] = 'خاموش';
+$labels['vacation.addresses'] = 'آدرس‌های دیگر من';
+$labels['vacation.interval'] = 'فاصله پاسخ';
+$labels['vacation.after'] = 'قرار دادن قانون مسافرت بعد از';
+$labels['vacation.saving'] = 'ذخیره داده‌ها...';
+$labels['vacation.keep'] = 'نگه داشتن';
 $messages['filterunknownerror'] = 'خطای سرور نامعلوم.';
 $messages['filterconnerror'] = 'ناتوانی در اتصال به سرور.';
 $messages['filterdeleteerror'] = 'ناتوانی در حذف صافی. خطای سرور رخ داد.';
@@ -189,4 +201,6 @@ $messages['namereserved'] = 'نام رزرو شده.';
 $messages['setexist'] = 'مجموعه در حال حاضر موجود است.';
 $messages['nodata'] = 'حداقل باید یک موقعیت باید انتخاب شود.';
 $messages['invaliddateformat'] = 'قالب تاریخ اشتباه';
+$messages['saveerror'] = 'ناتوانی در ذخیره اطلاعات. خطای سرور رخ داد.';
+$messages['vacationsaved'] = 'اطلاعات مسافرت با موفقیت ذخیره شد.';
 ?>
diff --git a/plugins/managesieve/localization/fi_FI.inc b/plugins/managesieve/localization/fi_FI.inc
index afdca3d3e..33d7cd202 100644
--- a/plugins/managesieve/localization/fi_FI.inc
+++ b/plugins/managesieve/localization/fi_FI.inc
@@ -32,13 +32,30 @@ $labels['filteris'] = 'on samanlainen kuin';
 $labels['filterisnot'] = 'ei ole samanlainen kuin';
 $labels['filterexists'] = 'on olemassa';
 $labels['filternotexists'] = 'ei ole olemassa';
+$labels['filtermatches'] = 'vastaa lauseketta';
+$labels['filternotmatches'] = 'ei vastaa lauseketta';
+$labels['filterregex'] = 'vastaa säännöllistä lauseketta';
+$labels['filternotregex'] = 'ei vastaa säännöllistä lauseketta';
+$labels['filterunder'] = 'alle';
+$labels['filterover'] = 'yli';
 $labels['addrule'] = 'Lisää sääntö';
 $labels['delrule'] = 'Poista sääntö';
+$labels['messagemoveto'] = 'Siirrä viesti';
+$labels['messageredirect'] = 'Lähetä viesti edelleen';
+$labels['messagecopyto'] = 'Kopioi viesti';
+$labels['messagesendcopy'] = 'Lähetä kopio viestistä';
+$labels['messagereply'] = 'Vastaa viestillä';
+$labels['messagedelete'] = 'Poista viesti';
+$labels['messagediscard'] = 'Hylkää viestillä';
+$labels['messagekeep'] = 'Säilytä viesti saapuneissa';
+$labels['messagesactions'] = '...suorita seuraavat toiminnot:';
 $labels['add'] = 'Lisää';
 $labels['del'] = 'Poista';
 $labels['sender'] = 'Lähettäjä';
 $labels['recipient'] = 'Vastaanottaja';
 $labels['vacationsubject'] = 'Viestin aihe:';
+$labels['days'] = 'päivää';
+$labels['seconds'] = 'sekuntia';
 $labels['setflags'] = 'Aseta liput viestiin';
 $labels['addflags'] = 'Lisää liput viestiin';
 $labels['removeflags'] = 'Poista liput viestistä';
@@ -50,14 +67,50 @@ $labels['setvariable'] = 'Aseta muuttuja';
 $labels['setvarname'] = 'Muuttujan nimi:';
 $labels['setvarvalue'] = 'Muuttujan arvo:';
 $labels['notifyimportance'] = 'Tärkeysaste:';
+$labels['notifymethodmailto'] = 'Sähköposti';
+$labels['notifymethodtel'] = 'Puhelin';
+$labels['notifymethodsms'] = 'Tekstiviesti';
 $labels['filtercreate'] = 'Luo suodatin';
 $labels['...'] = '...';
+$labels['year'] = 'vuosi';
+$labels['month'] = 'kuukausi';
+$labels['day'] = 'päivä';
+$labels['hour'] = 'tunti';
+$labels['minute'] = 'minuutti';
+$labels['second'] = 'sekunti';
+$labels['time'] = 'aika (hh:mm:ss)';
+$labels['zone'] = 'aikavyöhyke';
 $labels['advancedopts'] = 'Lisävalinnat';
+$labels['address'] = 'osoite';
+$labels['allparts'] = 'kaikki';
+$labels['user'] = 'käyttäjä';
 $labels['default'] = 'oletus';
+$labels['vacation'] = 'Loma';
+$labels['vacation.reply'] = 'Vastausviesti';
+$labels['vacation.advanced'] = 'Lisäasetukset';
+$labels['vacation.subject'] = 'Aihe';
+$labels['vacation.body'] = 'Sisältö';
+$labels['vacation.status'] = 'Tila';
+$labels['vacation.on'] = 'Päällä';
+$labels['vacation.off'] = 'Pois';
+$labels['vacation.saving'] = 'Tallennetaan tietoja...';
+$labels['vacation.action'] = 'Toiminto saapuvalle viestille';
+$labels['vacation.keep'] = 'Säilytä';
+$labels['vacation.discard'] = 'Hylkää';
+$labels['vacation.redirect'] = 'Ohjaa uudelleen osoitteeseen';
+$labels['vacation.copy'] = 'Lähetä kopio osoitteeseen';
 $messages['filterunknownerror'] = 'Tuntematon palvelinvirhe.';
 $messages['filterconnerror'] = 'Yhteys palvelimeen epäonnistui.';
 $messages['filterdeleted'] = 'Suodatin poistettu onnistuneesti.';
+$messages['filtersaved'] = 'Suodatin tallennettu onnistuneesti.';
+$messages['filtersaveerror'] = 'Suodattimen tallennus epäonnistui palvelinvirheen vuoksi.';
+$messages['filterdeleteconfirm'] = 'Haluatko varmasti poistaa valitun suodattimen?';
+$messages['forbiddenchars'] = 'Virheellisiä merkkejä kentässä.';
 $messages['cannotbeempty'] = 'Kenttä ei voi olla tyhjä.';
+$messages['ruleexist'] = 'Suodatin samalla nimellä on jo olemassa.';
 $messages['moved'] = 'Suodatin siirretty onnistuneesti.';
 $messages['nametoolong'] = 'Nimi on liian pitkä.';
+$messages['saveerror'] = 'Tietojen tallennus epäonnistui palvelinvirheen vuoksi.';
+$messages['vacationsaved'] = 'Lomatiedot tallennettu onnistuneesti.';
+$messages['emptyvacationbody'] = 'Lomaviestin sisältö vaaditaan!';
 ?>
diff --git a/plugins/managesieve/localization/fr_FR.inc b/plugins/managesieve/localization/fr_FR.inc
index a06ee178c..6377d12bd 100644
--- a/plugins/managesieve/localization/fr_FR.inc
+++ b/plugins/managesieve/localization/fr_FR.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'premier caractère en majuscule';
 $labels['varquotewildcard'] = 'citer les caractères spéciaux';
 $labels['varlength'] = 'longueur';
 $labels['notify'] = 'Envoyer la notification';
-$labels['notifyaddress'] = 'À l\'adresse courriel :';
-$labels['notifybody'] = 'Corps de la notification :';
-$labels['notifysubject'] = 'Objet de la notification :';
-$labels['notifyfrom'] = 'Expéditeur de la notification :';
+$labels['notifytarget'] = 'Cible de la notification :';
+$labels['notifymessage'] = 'Message de notification (optionnel) :';
+$labels['notifyoptions'] = 'Options de notification (optionnel) :';
+$labels['notifyfrom'] = 'Expéditeur de la notification (optionnel) :';
 $labels['notifyimportance'] = 'Importance :';
 $labels['notifyimportancelow'] = 'faible';
 $labels['notifyimportancenormal'] = 'normale';
 $labels['notifyimportancehigh'] = 'haute';
+$labels['notifymethodmailto'] = 'Courriel';
+$labels['notifymethodtel'] = 'Téléphone';
+$labels['notifymethodsms'] = 'Message texte';
 $labels['filtercreate'] = 'Créer un filtre';
 $labels['usedata'] = 'Utiliser les données suivantes dans le filtre :';
 $labels['nextstep'] = 'Étape suivante';
@@ -162,9 +165,8 @@ $labels['vacation.reply'] = 'Message de réponse';
 $labels['vacation.advanced'] = 'Paramètres avancés';
 $labels['vacation.subject'] = 'Objet';
 $labels['vacation.body'] = 'Corps';
-$labels['vacation.dates'] = 'Période de vacances';
-$labels['vacation.from'] = 'De :';
-$labels['vacation.to'] = 'À :';
+$labels['vacation.start'] = 'Début de vacances';
+$labels['vacation.end'] = 'Fin de vacances';
 $labels['vacation.status'] = 'État';
 $labels['vacation.on'] = 'Arrêt';
 $labels['vacation.off'] = 'Marche';
@@ -172,15 +174,27 @@ $labels['vacation.addresses'] = 'Mes adresses supplémentaires';
 $labels['vacation.interval'] = 'Plage de réponse';
 $labels['vacation.after'] = 'Mettre en place la règle de vacances après';
 $labels['vacation.saving'] = 'Enregistrement des données...';
+$labels['vacation.action'] = 'Action pour message entrant';
+$labels['vacation.keep'] = 'Garder';
+$labels['vacation.discard'] = 'Rejeter';
+$labels['vacation.redirect'] = 'Réacheminer à';
+$labels['vacation.copy'] = 'Envoyer une copie à';
+$labels['arialabelfiltersetactions'] = 'Actions des jeux de filtrage';
+$labels['arialabelfilteractions'] = 'Actions de filtrage';
+$labels['arialabelfilterform'] = 'Propriété du filtrage';
+$labels['ariasummaryfilterslist'] = 'Liste des filtres';
+$labels['ariasummaryfiltersetslist'] = 'Liste des jeux de filtrage';
+$labels['filterstitle'] = 'Modifier les filtres de courriels entrants';
+$labels['vacationtitle'] = 'Modifier la règle d\'absence du bureau';
 $messages['filterunknownerror'] = 'Erreur de serveur inconnue';
 $messages['filterconnerror'] = 'Connexion au serveur impossible.';
 $messages['filterdeleteerror'] = 'Impossible de supprimer le filtre. Une erreur de serveur est survenue.';
 $messages['filterdeleted'] = 'Le filtre a été supprimé avec succès.';
 $messages['filtersaved'] = 'Le filtre a été enregistré avec succès.';
 $messages['filtersaveerror'] = 'Impossible d\'enregistrer le filtre. Une erreur de serveur est survenue.';
-$messages['filterdeleteconfirm'] = 'Voulez-vous vraiment supprimer le filtre sélectionné?';
-$messages['ruledeleteconfirm'] = 'Voulez-vous vraiment supprimer la règle sélectionnée?';
-$messages['actiondeleteconfirm'] = 'Voulez-vous vraiment supprimer l\'action sélectionnée?';
+$messages['filterdeleteconfirm'] = 'Voulez-vous vraiment supprimer le filtre sélectionné ?';
+$messages['ruledeleteconfirm'] = 'Voulez-vous vraiment supprimer la règle sélectionnée ?';
+$messages['actiondeleteconfirm'] = 'Voulez-vous vraiment supprimer l\'action sélectionnée ?';
 $messages['forbiddenchars'] = 'Caractères interdits dans le champ';
 $messages['cannotbeempty'] = 'Le champ ne peut pas être vide';
 $messages['ruleexist'] = 'Un filtre existe déjà avec ce nom.';
@@ -190,7 +204,7 @@ $messages['setdeleteerror'] = 'Impossible de supprimer le jeu de filtres sélect
 $messages['setactivated'] = 'Le jeu de filtres a été activé avec succès.';
 $messages['setdeactivated'] = 'Le jeu de filtres a été désactivé avec succès.';
 $messages['setdeleted'] = 'Le jeu de filtres a été supprimé avec succès.';
-$messages['setdeleteconfirm'] = 'Voulez vous vraiment supprimer le jeu de filtres sélectionné?';
+$messages['setdeleteconfirm'] = 'Voulez vous vraiment supprimer le jeu de filtres sélectionné ?';
 $messages['setcreateerror'] = 'Impossible de créer un jeu de filtres. Une erreur de serveur est survenue.';
 $messages['setcreated'] = 'Le jeu de filtres a été créé avec succès.';
 $messages['activateerror'] = 'Impossible d\'activer le/les filtre(s) sélectionné(s). Une erreur de serveur est survenue.';
@@ -202,8 +216,9 @@ $messages['moveerror'] = 'Impossible de déplacer le filtre sélectionné. Une e
 $messages['nametoolong'] = 'Nom trop long.';
 $messages['namereserved'] = 'Nom réservé.';
 $messages['setexist'] = 'Le jeu existe déjà.';
-$messages['nodata'] = 'Au moins un élément doit être sélectionné!';
+$messages['nodata'] = 'Au moins un élément doit être sélectionné !';
 $messages['invaliddateformat'] = 'Format de date ou d\'une partie de la date invalide';
 $messages['saveerror'] = 'Impossible d\'enregistrer les données. Une erreur du serveur est survenue.';
 $messages['vacationsaved'] = 'Les données de vacances ont été enregistrées avec succès.';
+$messages['emptyvacationbody'] = 'Le corps du message de vacances est nécessaire !';
 ?>
diff --git a/plugins/managesieve/localization/gl_ES.inc b/plugins/managesieve/localization/gl_ES.inc
index 20f66f9f6..cbe45ca28 100644
--- a/plugins/managesieve/localization/gl_ES.inc
+++ b/plugins/managesieve/localization/gl_ES.inc
@@ -108,14 +108,13 @@ $labels['varupperfirst'] = 'primeira letra maiúscula';
 $labels['varquotewildcard'] = 'poñer entre aspas caracteres especiais';
 $labels['varlength'] = 'lonxitude';
 $labels['notify'] = 'Enviar notificación';
-$labels['notifyaddress'] = 'A este enderezo de correo:';
-$labels['notifybody'] = 'Corpo da notificación:';
-$labels['notifysubject'] = 'Asunto da notificación:';
-$labels['notifyfrom'] = 'Remite da notificación:';
 $labels['notifyimportance'] = 'Importancia:';
 $labels['notifyimportancelow'] = 'baixa';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'alta';
+$labels['notifymethodmailto'] = 'Correo electrónico';
+$labels['notifymethodtel'] = 'Teléfono';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Crear filtro';
 $labels['usedata'] = 'Usar os seguintes datos no filtro:';
 $labels['nextstep'] = 'Seguinte paso';
@@ -157,6 +156,21 @@ $labels['asciicasemap'] = 'non sensíbel a maiúsculas/minúsculas (ascii-casema
 $labels['asciinumeric'] = 'numérico (ascii-numerico)';
 $labels['index'] = 'índice:';
 $labels['indexlast'] = 'atrás';
+$labels['vacation.reply'] = 'Respostar á mensaxe';
+$labels['vacation.advanced'] = 'Opcións avanzadas';
+$labels['vacation.subject'] = 'Asunto';
+$labels['vacation.body'] = 'Corpo';
+$labels['vacation.status'] = 'Estado';
+$labels['vacation.on'] = 'Activar';
+$labels['vacation.off'] = 'Desactivar';
+$labels['vacation.saving'] = 'Gardando datos...';
+$labels['vacation.keep'] = 'Manter';
+$labels['vacation.discard'] = 'Descartar';
+$labels['vacation.redirect'] = 'Redirixir a';
+$labels['vacation.copy'] = 'Enviar copia a';
+$labels['arialabelfilteractions'] = 'Accións de filtrado';
+$labels['arialabelfilterform'] = 'Propiedades dos filtros';
+$labels['ariasummaryfilterslist'] = 'Lista de filtros';
 $messages['filterunknownerror'] = 'Erro descoñecido do servidor';
 $messages['filterconnerror'] = 'Imposíbel conectar co servidor.';
 $messages['filterdeleteerror'] = 'Non se pode eliminar filtro. Produciuse un erro de servidor.';
diff --git a/plugins/managesieve/localization/he_IL.inc b/plugins/managesieve/localization/he_IL.inc
index c0cc6e7c2..4e7b5976e 100644
--- a/plugins/managesieve/localization/he_IL.inc
+++ b/plugins/managesieve/localization/he_IL.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'התו הראשון אות גדולה';
 $labels['varquotewildcard'] = 'תו מיוחד יש לשים בין מרכאות';
 $labels['varlength'] = 'אורך';
 $labels['notify'] = 'משלוח התראה';
-$labels['notifyaddress'] = 'אל כתובת דו"אל:';
-$labels['notifybody'] = 'גוף ההתראה:';
-$labels['notifysubject'] = 'נושא ההתראה:';
-$labels['notifyfrom'] = 'שולח ההתראה:';
+$labels['notifytarget'] = 'יעד התראה:';
+$labels['notifymessage'] = 'הודעת התראה (רשות):';
+$labels['notifyoptions'] = 'אפשרויות התראה (רשות):';
+$labels['notifyfrom'] = 'שולח התראה (רשות):';
 $labels['notifyimportance'] = 'חשיובת:';
 $labels['notifyimportancelow'] = 'נמוכה';
 $labels['notifyimportancenormal'] = 'רגילה';
 $labels['notifyimportancehigh'] = 'גבוהה';
+$labels['notifymethodmailto'] = 'דוא״ל';
+$labels['notifymethodtel'] = 'טלפון';
+$labels['notifymethodsms'] = 'מסרון';
 $labels['filtercreate'] = 'יצירת מסנן';
 $labels['usedata'] = 'שימוש במידע שלהלן ליצירת המסנן:';
 $labels['nextstep'] = 'הצעד הבא';
@@ -157,6 +160,32 @@ $labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
 $labels['index'] = 'אינדקס:';
 $labels['indexlast'] = 'בחזרה';
+$labels['vacation'] = 'חופשה';
+$labels['vacation.reply'] = 'הודעת תשובה';
+$labels['vacation.advanced'] = 'הגדרות מתקדמות';
+$labels['vacation.subject'] = 'נושא';
+$labels['vacation.body'] = 'גוף ההודעה';
+$labels['vacation.start'] = 'תאריך התחלה';
+$labels['vacation.end'] = 'תאריך סיום';
+$labels['vacation.status'] = 'מצב';
+$labels['vacation.on'] = 'מופעל';
+$labels['vacation.off'] = 'כבוי';
+$labels['vacation.addresses'] = 'כתובות נוספות שלי';
+$labels['vacation.interval'] = 'מרווח בין תשובות';
+$labels['vacation.after'] = 'העתקת סרגל החופשה אחרי';
+$labels['vacation.saving'] = 'שמירת מידע...';
+$labels['vacation.action'] = 'פעולה על הודעה נכנסת';
+$labels['vacation.keep'] = 'להשאיר';
+$labels['vacation.discard'] = 'להפטר';
+$labels['vacation.redirect'] = 'הפניה אל';
+$labels['vacation.copy'] = 'שליחת העתק אל';
+$labels['arialabelfiltersetactions'] = 'פעולות על קבוצה של חוקי סינון';
+$labels['arialabelfilteractions'] = 'פעולות מסנן';
+$labels['arialabelfilterform'] = 'מאפייני מסנן';
+$labels['ariasummaryfilterslist'] = 'רשימה של מסננים';
+$labels['ariasummaryfiltersetslist'] = 'רשימת קבוצות של חוקי סינון';
+$labels['filterstitle'] = 'ערוך מסנני דואר נכנס';
+$labels['vacationtitle'] = 'ערוך כלל מחוץ-אל-משרדי';
 $messages['filterunknownerror'] = 'שגיאת שרת בלתי מוכרת.';
 $messages['filterconnerror'] = 'לא ניתן להתחבר לשרת.';
 $messages['filterdeleteerror'] = 'לא ניתן למחוק סינון. שגיאת שרת.';
@@ -189,4 +218,7 @@ $messages['namereserved'] = 'השם הזה שמור.';
 $messages['setexist'] = 'הערכה כבר קיימת.';
 $messages['nodata'] = 'חובה לבחור במיקום אחד לפחות!';
 $messages['invaliddateformat'] = 'תאריך לא חוקי אן פורמט לא תקין';
+$messages['saveerror'] = 'לא ניתן לשמור המידע בשל שגיאה של השרת';
+$messages['vacationsaved'] = 'הודעת החופשה נשמרה בהצלחה';
+$messages['emptyvacationbody'] = 'גוף של הודעת חופשה נדרש!';
 ?>
diff --git a/plugins/managesieve/localization/hr_HR.inc b/plugins/managesieve/localization/hr_HR.inc
index ce5259b5f..efcd4da8e 100644
--- a/plugins/managesieve/localization/hr_HR.inc
+++ b/plugins/managesieve/localization/hr_HR.inc
@@ -108,10 +108,6 @@ $labels['varupperfirst'] = 'prvo slovo veliko';
 $labels['varquotewildcard'] = 'Citiraj specijalne znakove';
 $labels['varlength'] = 'duljina';
 $labels['notify'] = 'Pošalji obavijest';
-$labels['notifyaddress'] = 'Na e-mail adresu:';
-$labels['notifybody'] = 'Tekst obavijesti:';
-$labels['notifysubject'] = 'Naslov obavijesti:';
-$labels['notifyfrom'] = 'Pošiljatelj obavijesti:';
 $labels['notifyimportance'] = 'Važnost:';
 $labels['notifyimportancelow'] = 'niska';
 $labels['notifyimportancenormal'] = 'normalna';
@@ -157,6 +153,11 @@ $labels['asciicasemap'] = 'neosjetljivo na veličinu slova (ascii-casemap)';
 $labels['asciinumeric'] = 'numerički (ascii-numeric)';
 $labels['index'] = 'indeks:';
 $labels['indexlast'] = 'unatrag';
+$labels['vacation.advanced'] = 'Napredne postavke';
+$labels['vacation.subject'] = 'Naslov';
+$labels['vacation.body'] = 'Tijelo poruke';
+$labels['vacation.status'] = 'Status';
+$labels['vacation.saving'] = 'Spremanje podataka...';
 $messages['filterunknownerror'] = 'Nepoznata greška na poslužitelju';
 $messages['filterconnerror'] = 'Nemoguće spajanje na poslužitelj (managesieve)';
 $messages['filterdeleteerror'] = 'Nemoguće brisanje filtera. Greška na poslužitelju.';
@@ -189,4 +190,5 @@ $messages['namereserved'] = 'Rezervirano ime.';
 $messages['setexist'] = 'Skup već postoji.';
 $messages['nodata'] = 'Barem jedan pozicija mora biti odabrana!';
 $messages['invaliddateformat'] = 'Neispravan datum ili dio datuma';
+$messages['saveerror'] = 'Nemoguće spremiti podatke. Greška na poslužitelju.';
 ?>
diff --git a/plugins/managesieve/localization/hu_HU.inc b/plugins/managesieve/localization/hu_HU.inc
index af28679ad..eae7650fa 100644
--- a/plugins/managesieve/localization/hu_HU.inc
+++ b/plugins/managesieve/localization/hu_HU.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'első karakter nagybetű';
 $labels['varquotewildcard'] = 'speciális karakterek idézése';
 $labels['varlength'] = 'hossz';
 $labels['notify'] = 'Értesítés küldése';
-$labels['notifyaddress'] = 'Címzett e-mail címe:';
-$labels['notifybody'] = 'Értesítés levéltörzse:';
-$labels['notifysubject'] = 'Értesítés tárgya:';
-$labels['notifyfrom'] = 'Értesítés feladója:';
+$labels['notifytarget'] = 'Értesítés célja:';
+$labels['notifymessage'] = 'Értesítési üzenet (opcionális):';
+$labels['notifyoptions'] = 'Értesítés opcióik (opcionális):';
+$labels['notifyfrom'] = 'Értesítés feladója (opcionális):';
 $labels['notifyimportance'] = 'Fontosság:';
 $labels['notifyimportancelow'] = 'alacsony';
 $labels['notifyimportancenormal'] = 'normál';
 $labels['notifyimportancehigh'] = 'magas';
+$labels['notifymethodmailto'] = 'Email';
+$labels['notifymethodtel'] = 'Telefonszám';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Szűrő létrehozása';
 $labels['usedata'] = 'A következő adatok használata a szűrőben';
 $labels['nextstep'] = 'Következő lépés';
@@ -157,6 +160,32 @@ $labels['asciicasemap'] = 'kis-nagybetüre nem érzékeny (ascii-casemap)';
 $labels['asciinumeric'] = 'számszerü (ascii-numeric)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'visszafelé';
+$labels['vacation'] = 'Vakáció';
+$labels['vacation.reply'] = 'Válasz az üzenetre';
+$labels['vacation.advanced'] = 'Haladó beállítások';
+$labels['vacation.subject'] = 'Tárgy';
+$labels['vacation.body'] = 'Törzs';
+$labels['vacation.start'] = 'Szünidő kezdete';
+$labels['vacation.end'] = 'Szünidő vége';
+$labels['vacation.status'] = 'Állapot';
+$labels['vacation.on'] = 'Be';
+$labels['vacation.off'] = 'Ki';
+$labels['vacation.addresses'] = 'További címeim';
+$labels['vacation.interval'] = 'Válasz intervallum';
+$labels['vacation.after'] = 'Rakd a szabadság szabályt ez után ';
+$labels['vacation.saving'] = 'Adatok mentése...';
+$labels['vacation.action'] = 'Beérkező üzenet akció';
+$labels['vacation.keep'] = 'Megtartás';
+$labels['vacation.discard'] = 'Érvénytelenít';
+$labels['vacation.redirect'] = 'Átírányítás ide';
+$labels['vacation.copy'] = 'Másolat kűldése ide';
+$labels['arialabelfiltersetactions'] = 'Szűrő készlet müveletek';
+$labels['arialabelfilteractions'] = 'Szűrő müveletek';
+$labels['arialabelfilterform'] = 'Szűrő tulajdonságai';
+$labels['ariasummaryfilterslist'] = 'Szűrők listája';
+$labels['ariasummaryfiltersetslist'] = 'Szűrő készletek listája';
+$labels['filterstitle'] = 'Bejövő üzenetek szűrőinek szerkesztése';
+$labels['vacationtitle'] = 'Irodán kiívül szabász szerkesztése';
 $messages['filterunknownerror'] = 'Ismeretlen szerverhiba';
 $messages['filterconnerror'] = 'Nem tudok a szűrőszerverhez kapcsolódni';
 $messages['filterdeleteerror'] = 'A szűrőt nem lehet törölni. Szerverhiba történt';
@@ -189,4 +218,7 @@ $messages['namereserved'] = 'Nem használható (foglalt) név-';
 $messages['setexist'] = 'A készlet már létezik.';
 $messages['nodata'] = 'Legalább egyet ki kell választani.';
 $messages['invaliddateformat'] = 'hibás dátum formátum';
+$messages['saveerror'] = 'Az adat mentése sikertelen. Szerverhiba történt';
+$messages['vacationsaved'] = 'Vakáció adatai sikeresen elmentve.';
+$messages['emptyvacationbody'] = 'A vakácíó üzenet szövegtörzse kötelező!';
 ?>
diff --git a/plugins/managesieve/localization/id_ID.inc b/plugins/managesieve/localization/id_ID.inc
index d4024491f..b445ef65e 100644
--- a/plugins/managesieve/localization/id_ID.inc
+++ b/plugins/managesieve/localization/id_ID.inc
@@ -47,15 +47,20 @@ $labels['messagesendcopy'] = 'Kirim salinan pesan ke';
 $labels['messagereply'] = 'balas dengan pesan';
 $labels['messagedelete'] = 'Hapus pesan';
 $labels['messagediscard'] = 'Buang dengan pesan';
+$labels['messagekeep'] = 'Biarkan pesan tetap didalam kotak surat';
 $labels['messagesrules'] = 'Untuk email masuk:';
 $labels['messagesactions'] = '...lakukan tindakan berikut';
 $labels['add'] = 'Tambah';
 $labels['del'] = 'Hapus';
 $labels['sender'] = 'Pengirim';
 $labels['recipient'] = 'Penerima';
+$labels['vacationaddr'] = 'Alamat email tambahan saya:';
 $labels['vacationdays'] = 'Seberapa sering mengirim pesan (dalam hari):';
+$labels['vacationinterval'] = 'Seberapa sering untuk pengiriman pesan:';
 $labels['vacationreason'] = 'Isi pesan (alasan liburan):';
 $labels['vacationsubject'] = 'Judul pesan:';
+$labels['days'] = 'hari';
+$labels['seconds'] = 'detik';
 $labels['rulestop'] = 'Berhenti mengevaluasi aturan';
 $labels['enable'] = 'Aktifkan/Non-Aktifkan';
 $labels['filterset'] = 'Himpunan filter';
@@ -77,11 +82,13 @@ $labels['countisgreaterthanequal'] = 'penghitungan lebih besa dari atau sama den
 $labels['countislessthan'] = 'penghitungan lebih kecil dari';
 $labels['countislessthanequal'] = 'penghitungan lebih kecil dari atau sama dengan';
 $labels['countequals'] = 'penghitungan sama dengan';
+$labels['countnotequals'] = 'penghitungan tidak sama dengan';
 $labels['valueisgreaterthan'] = 'nilai lebih besar dari';
 $labels['valueisgreaterthanequal'] = 'nilai lebih besar dari atau sama dengan';
 $labels['valueislessthan'] = 'nilai lebih kecil dari';
 $labels['valueislessthanequal'] = 'nilai lebih kecil dari atau sama dengan';
 $labels['valueequals'] = 'nilai sama dengan';
+$labels['valuenotequals'] = 'nilai tidak sadengan';
 $labels['setflags'] = 'Atur tanda pada pesan';
 $labels['addflags'] = 'Berikan tanda pada pesan';
 $labels['removeflags'] = 'Cabut tanda dari pesan';
@@ -101,18 +108,37 @@ $labels['varupperfirst'] = 'karakter pertama huruf besar';
 $labels['varquotewildcard'] = 'kutip karakter khusus';
 $labels['varlength'] = 'panjang';
 $labels['notify'] = 'Kirim pemberitahuan';
-$labels['notifyaddress'] = 'Ke alamat email:';
-$labels['notifybody'] = 'Isi pemberitahuan:';
-$labels['notifysubject'] = 'Judul pemberitahuan';
-$labels['notifyfrom'] = 'Pengirim pemberitahuan.';
+$labels['notifytarget'] = 'Pemberitahuan yang dituju:';
+$labels['notifymessage'] = 'Pemberitahuan pesan (pilihan):';
+$labels['notifyoptions'] = 'Pemberitahuan untuk beberapa pilihan (pilihan):';
+$labels['notifyfrom'] = 'Pemberitahuan ke pengirim (tidak harus):';
 $labels['notifyimportance'] = 'Tingkat kepentingan:';
 $labels['notifyimportancelow'] = 'rendah';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'tinggi';
+$labels['notifymethodmailto'] = 'Surat Elektronik / Email';
+$labels['notifymethodtel'] = 'Telepon';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Buat filter';
 $labels['usedata'] = 'Gunakan data berikut dalam filter:';
 $labels['nextstep'] = 'Langkah Selanjutnya';
 $labels['...'] = '...';
+$labels['currdate'] = 'Tanggal sekarang';
+$labels['datetest'] = 'Tanggal';
+$labels['dateheader'] = 'header / tajuk:';
+$labels['year'] = 'tahun';
+$labels['month'] = 'bulan';
+$labels['day'] = 'hari';
+$labels['date'] = 'tanggal (yyyy-mm-dd)';
+$labels['julian'] = 'tanggal (kalender julian)';
+$labels['hour'] = 'jam';
+$labels['minute'] = 'menit';
+$labels['second'] = 'detik';
+$labels['time'] = 'waktu :(hh:mm:ss)';
+$labels['iso8601'] = 'tanggal (ISO8601)';
+$labels['std11'] = 'tanggal (RFC2822)';
+$labels['zone'] = 'zona-waktu';
+$labels['weekday'] = 'hari kerja (0-6)';
 $labels['advancedopts'] = 'Pilihan lanjutan';
 $labels['body'] = 'Isi';
 $labels['address'] = 'alamat';
@@ -132,26 +158,64 @@ $labels['default'] = 'standar';
 $labels['octet'] = 'ketat (oktet)';
 $labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['index'] = 'indeks:';
+$labels['indexlast'] = 'mundur:';
+$labels['vacation'] = 'Liburan';
+$labels['vacation.reply'] = 'Balas pesan';
+$labels['vacation.advanced'] = 'Pengaturan Lanjutan';
+$labels['vacation.subject'] = 'Judul';
+$labels['vacation.body'] = 'Isi';
+$labels['vacation.status'] = 'Status';
+$labels['vacation.on'] = 'Nyala';
+$labels['vacation.off'] = 'Mati';
+$labels['vacation.addresses'] = 'Alamat email tambahan saya';
+$labels['vacation.interval'] = 'Balas secara interval';
+$labels['vacation.after'] = 'Atur untuk pengaturan cuti setelah';
+$labels['vacation.saving'] = 'Menyimpan data...';
+$labels['vacation.action'] = 'Tindakan untuk pesan masuk';
+$labels['vacation.keep'] = 'Simpan';
+$labels['vacation.discard'] = 'Buang';
+$labels['vacation.redirect'] = 'Alihkan ke';
+$labels['vacation.copy'] = 'Kirim salinan ke';
+$labels['arialabelfiltersetactions'] = 'Tindakan untuk penyaringan';
+$labels['arialabelfilteractions'] = 'Tindakan penyaringan';
+$labels['arialabelfilterform'] = 'Properti untuk penyaringan';
+$labels['ariasummaryfilterslist'] = 'Daftar penyaringan';
+$labels['ariasummaryfiltersetslist'] = 'Daftar penyaringan yang telah di set';
+$labels['filterstitle'] = 'Ubah penyaringan untuk email masuk';
+$labels['vacationtitle'] = 'Ubah aturan untuk sedang-diluar-kantor';
 $messages['filterunknownerror'] = 'Error pada server tak dikenali.';
 $messages['filterconnerror'] = 'Tidak dapat menyambung ke server.';
+$messages['filterdeleteerror'] = 'Tidak dapat menghapus penyaringan. Terjadi kesalahan pada server.';
 $messages['filterdeleted'] = 'Penyaringan berhasil dihapus.';
 $messages['filtersaved'] = 'Penyaringan berhasil disimpan.';
+$messages['filtersaveerror'] = 'Tidak dapat menyimpan penyaringan. Terjadi kesalahan pada server.';
 $messages['filterdeleteconfirm'] = 'Yakin untuk menghapus penyaringan terpilih?';
 $messages['ruledeleteconfirm'] = 'Yakin untuk menghapus aturan terpilih?';
 $messages['actiondeleteconfirm'] = 'Yakin untuk menghapus tindakan terpilih?';
 $messages['forbiddenchars'] = 'Karakter terlarang pada isian.';
 $messages['cannotbeempty'] = 'Isian tidak bisa kosong.';
 $messages['ruleexist'] = 'Penyaringan dengan nama tersebut sudah ada.';
+$messages['setactivateerror'] = 'Tidak dapat mengaktivkan kumpulan penyaringan terpilih. Terjadi kesalahan pada server.';
+$messages['setdeactivateerror'] = 'Tidak bisa mematikan kumpulan penyaringan terpilih. Terjadi kesalahan pada server.';
+$messages['setdeleteerror'] = 'Tidak dapat menghapus kumpulan penyaringan terpilih. Terjadi kesalahan pada server.';
 $messages['setactivated'] = 'Kumpulan penyaringan berhasil dihidupkan.';
 $messages['setdeactivated'] = 'Kumpulan penyaringan berhasil dimatikan.';
 $messages['setdeleted'] = 'Kumpulan penyaringan berhasil dihapus.';
 $messages['setdeleteconfirm'] = 'Yakin ingin menghapus kumpulan penyaringan terpilih?';
+$messages['setcreateerror'] = 'Tidak bisa membuat kumpulan penyaringan. Terjadi kesalahan pada server';
 $messages['setcreated'] = 'Kumpulan penyaringan berhasul dibuat.';
+$messages['activateerror'] = 'Tidak dapat mengaktifkan penyaringan terpilih. Terjadi kesalahan pada server';
+$messages['deactivateerror'] = 'Tidak dapat mematikan penyaringan terpilih. Terjadi kesalahan pada server';
 $messages['deactivated'] = 'Berhasil menghidupkan penyaringan.';
 $messages['activated'] = 'Berhasil mematikan penyaringan.';
 $messages['moved'] = 'Berhasil memindahkan penyaringan.';
+$messages['moveerror'] = 'Tidak bisa memindahkan penyaringan terpilih. Ada kesalahan di server.';
 $messages['nametoolong'] = 'Nama terlalu panjang.';
 $messages['namereserved'] = 'Nama sudah terpesan.';
 $messages['setexist'] = 'Kumpulan sudah ada.';
 $messages['nodata'] = 'Setidaknya satu posisi harus dipilih!';
+$messages['invaliddateformat'] = 'Format tanggal atau bagian dari tanggal salah';
+$messages['saveerror'] = 'Tidak dapat menyimpan data. Terjadi kesalahan pada server.';
+$messages['vacationsaved'] = 'Data untuk cuti berhasil disimpan.';
 ?>
diff --git a/plugins/managesieve/localization/it_IT.inc b/plugins/managesieve/localization/it_IT.inc
index c42a09dba..b97fde843 100644
--- a/plugins/managesieve/localization/it_IT.inc
+++ b/plugins/managesieve/localization/it_IT.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'primo carattere maiuscolo';
 $labels['varquotewildcard'] = 'caratteri speciali di quoting';
 $labels['varlength'] = 'lunghezza';
 $labels['notify'] = 'Invia notifica';
-$labels['notifyaddress'] = 'All\'indirizzo email:';
-$labels['notifybody'] = 'Corpo della notifica:';
-$labels['notifysubject'] = 'Oggetto della notifica:';
-$labels['notifyfrom'] = 'Mittente della notifica:';
+$labels['notifytarget'] = 'Destinatario della notifica';
+$labels['notifymessage'] = 'Messaggio di notifica (opzionale):';
+$labels['notifyoptions'] = 'Opzioni di notifica (opzionale):';
+$labels['notifyfrom'] = 'Mittente della notifica (opzionale):';
 $labels['notifyimportance'] = 'Importanza:';
 $labels['notifyimportancelow'] = 'bassa';
 $labels['notifyimportancenormal'] = 'normale';
 $labels['notifyimportancehigh'] = 'alta';
+$labels['notifymethodmailto'] = 'Email';
+$labels['notifymethodtel'] = 'Telefono';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Crea filtro';
 $labels['usedata'] = 'utilizza i seguenti dati nel filtro';
 $labels['nextstep'] = 'passo successivo';
@@ -162,9 +165,8 @@ $labels['vacation.reply'] = 'Messaggio di risposta';
 $labels['vacation.advanced'] = 'Impostazioni avanzate';
 $labels['vacation.subject'] = 'Oggetto';
 $labels['vacation.body'] = 'Testo';
-$labels['vacation.dates'] = 'Tempo di vacanza';
-$labels['vacation.from'] = 'Da:';
-$labels['vacation.to'] = 'A:';
+$labels['vacation.start'] = 'Inizio vacanza';
+$labels['vacation.end'] = 'Fine vacanza';
 $labels['vacation.status'] = 'Stato';
 $labels['vacation.on'] = 'Attivato';
 $labels['vacation.off'] = 'Disattivato';
@@ -172,6 +174,18 @@ $labels['vacation.addresses'] = 'I miei indirizzi aggiuntivi';
 $labels['vacation.interval'] = 'Intervallo di risposta';
 $labels['vacation.after'] = 'Imposta regola di vacanza dopo';
 $labels['vacation.saving'] = 'Salvataggio...';
+$labels['vacation.action'] = 'Azione messaggio in arrivo';
+$labels['vacation.keep'] = 'Mantieni';
+$labels['vacation.discard'] = 'Elimina';
+$labels['vacation.redirect'] = 'Ridireziona a';
+$labels['vacation.copy'] = 'Invia copia a';
+$labels['arialabelfiltersetactions'] = 'Azione settaggio dei filtri ';
+$labels['arialabelfilteractions'] = 'Azione Filtri';
+$labels['arialabelfilterform'] = 'Proprietà filtri';
+$labels['ariasummaryfilterslist'] = 'Lista dei filtri';
+$labels['ariasummaryfiltersetslist'] = 'Lista settaggio dei filtri';
+$labels['filterstitle'] = 'Modifica filtri dei messaggio in arrivo';
+$labels['vacationtitle'] = 'Modifica le regole del Risponditore automatico';
 $messages['filterunknownerror'] = 'Errore sconosciuto del server';
 $messages['filterconnerror'] = 'Collegamento al server managesieve fallito';
 $messages['filterdeleteerror'] = 'Eliminazione del filtro fallita. Si è verificato un errore nel server.';
@@ -206,4 +220,5 @@ $messages['nodata'] = 'selezionare almeno una posizione';
 $messages['invaliddateformat'] = 'Formato della data non valido';
 $messages['saveerror'] = 'Impossibile salvare i dati. Errore del server.';
 $messages['vacationsaved'] = 'Dati di vacanza salvati correttamente.';
+$messages['emptyvacationbody'] = 'Il testo del messaggio non puo\' essere vuoto!';
 ?>
diff --git a/plugins/managesieve/localization/ja_JP.inc b/plugins/managesieve/localization/ja_JP.inc
index cb9e1b2c7..db04084bf 100644
--- a/plugins/managesieve/localization/ja_JP.inc
+++ b/plugins/managesieve/localization/ja_JP.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = '最初の文字を大文字';
 $labels['varquotewildcard'] = '特殊文字を引用処理';
 $labels['varlength'] = '長さ';
 $labels['notify'] = '通知を送信';
-$labels['notifyaddress'] = '送信先の電子メールアドレス:';
-$labels['notifybody'] = '通知の本文:';
-$labels['notifysubject'] = '通知の件名:';
-$labels['notifyfrom'] = '通知の送信者:';
+$labels['notifytarget'] = '通知の対象:';
+$labels['notifymessage'] = '通知のメッセージ(任意):';
+$labels['notifyoptions'] = '通知のオプション(任意):';
+$labels['notifyfrom'] = '通知の送信者(任意):';
 $labels['notifyimportance'] = '重要度:';
 $labels['notifyimportancelow'] = '低';
 $labels['notifyimportancenormal'] = '通常';
 $labels['notifyimportancehigh'] = '高';
+$labels['notifymethodmailto'] = '電子メール';
+$labels['notifymethodtel'] = '電話';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'フィルターを作成';
 $labels['usedata'] = 'フィルターで次のデータを使用';
 $labels['nextstep'] = '次のステップ';
@@ -157,6 +160,23 @@ $labels['asciicasemap'] = '大文字小文字を区別しない(ascii-casemap)';
 $labels['asciinumeric'] = '数値(ascii-numeric)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'backwards';
+$labels['vacation'] = '休暇';
+$labels['vacation.reply'] = '返信のメッセージ';
+$labels['vacation.advanced'] = '詳細な設定';
+$labels['vacation.subject'] = '件名';
+$labels['vacation.body'] = '本文';
+$labels['vacation.status'] = '状態';
+$labels['vacation.on'] = 'オン';
+$labels['vacation.off'] = 'オフ';
+$labels['vacation.addresses'] = '追加のアドレス';
+$labels['vacation.interval'] = '返信の間隔';
+$labels['vacation.after'] = '後に休暇のルールを記入';
+$labels['vacation.saving'] = 'データを保存中...';
+$labels['arialabelfiltersetactions'] = 'フィルターセットの動作';
+$labels['arialabelfilteractions'] = 'フィルターの動作';
+$labels['arialabelfilterform'] = 'フィルターの特性';
+$labels['ariasummaryfilterslist'] = 'フィルターの一覧';
+$labels['ariasummaryfiltersetslist'] = 'フィルターセットの一覧';
 $messages['filterunknownerror'] = '不明なサーバーのエラーです。';
 $messages['filterconnerror'] = 'サーバに接続できません。';
 $messages['filterdeleteerror'] = 'フィルターを削除できません。サーバーでエラーが発生しました。';
@@ -189,4 +209,6 @@ $messages['namereserved'] = '予約されている名前です。';
 $messages['setexist'] = 'フィルターセットが既に存在します。';
 $messages['nodata'] = '少なくとも1つの場所を選択しなければなりません!';
 $messages['invaliddateformat'] = '無効な日付または日付部分の書式';
+$messages['saveerror'] = 'フィルターの保存できません。サーバーでエラーが発生しました。';
+$messages['vacationsaved'] = '休暇のデータを保存しました。';
 ?>
diff --git a/plugins/managesieve/localization/km_KH.inc b/plugins/managesieve/localization/km_KH.inc
index 0c833543a..9d3de700b 100644
--- a/plugins/managesieve/localization/km_KH.inc
+++ b/plugins/managesieve/localization/km_KH.inc
@@ -75,10 +75,6 @@ $labels['varlower'] = 'អក្សរតូច';
 $labels['varupper'] = 'អក្សរធំ';
 $labels['varlength'] = 'ប្រវែង';
 $labels['notify'] = 'ផ្ញើការជូនដំណឹង';
-$labels['notifyaddress'] = 'ទៅអាសយដ្ឋានអ៊ីមែល៖';
-$labels['notifybody'] = 'តួការជូនដំណឹង៖';
-$labels['notifysubject'] = 'ប្រធានបទការជូនដំណឹង៖';
-$labels['notifyfrom'] = 'អ្នកផ្ញើការជូនដំណឹង៖';
 $labels['notifyimportance'] = 'សំខាន់៖';
 $labels['notifyimportancelow'] = 'ទាប';
 $labels['notifyimportancenormal'] = 'ធម្មតា';
diff --git a/plugins/managesieve/localization/ko_KR.inc b/plugins/managesieve/localization/ko_KR.inc
index 3b4070252..e9497e761 100644
--- a/plugins/managesieve/localization/ko_KR.inc
+++ b/plugins/managesieve/localization/ko_KR.inc
@@ -18,7 +18,7 @@
 $labels['filters'] = '필터';
 $labels['managefilters'] = '수신 메일 필터 관리';
 $labels['filtername'] = '필터명';
-$labels['newfilter'] = '새 필터';
+$labels['newfilter'] = '새로운 필터';
 $labels['filteradd'] = '필터 추가';
 $labels['filterdel'] = '필터 삭제';
 $labels['moveup'] = '위로 이동';
@@ -40,20 +40,20 @@ $labels['filterunder'] = '다음보다 아래임';
 $labels['filterover'] = '다음보다 위임';
 $labels['addrule'] = '규칙 추가';
 $labels['delrule'] = '규칙 삭제';
-$labels['messagemoveto'] = '메시지를 다음 위치로 이동함';
-$labels['messageredirect'] = '메시지를 다음 주소로 전송함';
-$labels['messagecopyto'] = '메시지를 다음 위치로 복사함';
-$labels['messagesendcopy'] = '메시지의 사본을 다음 위치로 보냄';
+$labels['messagemoveto'] = '메시지를 다음 위치로 이동';
+$labels['messageredirect'] = '메시지를 다음 주소로 재전송';
+$labels['messagecopyto'] = '메시지를 다음 위치로 복사';
+$labels['messagesendcopy'] = '메시지 사본을 다음 대상에게 보내기';
 $labels['messagereply'] = '다음 메시지로 회신';
-$labels['messagedelete'] = '메시지를 삭제';
+$labels['messagedelete'] = '메시지 삭제';
 $labels['messagediscard'] = '다음 메시지와 함께 폐기';
 $labels['messagekeep'] = '메시지를 받은 편지함에 보관';
 $labels['messagesrules'] = '해당 받은 메일:';
 $labels['messagesactions'] = '...다음 동작을 실행:';
 $labels['add'] = '추가';
 $labels['del'] = '삭제';
-$labels['sender'] = '발신인';
-$labels['recipient'] = '수신인';
+$labels['sender'] = '발송자';
+$labels['recipient'] = '수신자';
 $labels['vacationaddr'] = '나의 추가적인 이메일 주소:';
 $labels['vacationdays'] = '메시지 발신 주기 (일):';
 $labels['vacationinterval'] = '메시지 발신 주기:';
@@ -67,12 +67,12 @@ $labels['filterset'] = '필터 세트';
 $labels['filtersets'] = '필터 세트';
 $labels['filtersetadd'] = '필터 세트 추가';
 $labels['filtersetdel'] = '현재 필터 세트를 삭제';
-$labels['filtersetact'] = '현재 필터 세트를 활성화';
-$labels['filtersetdeact'] = '현재 필터 세트를 비활성화';
+$labels['filtersetact'] = '현재 필터 세트 활성화';
+$labels['filtersetdeact'] = '현재 필터 세트 비활성화';
 $labels['filterdef'] = '필터 정의';
 $labels['filtersetname'] = '필터 세트명';
 $labels['newfilterset'] = '새 필터 세트';
-$labels['active'] = '활성';
+$labels['active'] = '활성화됨';
 $labels['none'] = '없음';
 $labels['fromset'] = '세트로부터';
 $labels['fromfile'] = '파일로부터';
@@ -89,13 +89,13 @@ $labels['valueislessthan'] = '값이 다음보다 작음';
 $labels['valueislessthanequal'] = '값이 다음보다 작거나 같음';
 $labels['valueequals'] = '값이 다음과 같음';
 $labels['valuenotequals'] = '값이 다음과 일치하지 않음';
-$labels['setflags'] = '메시지에 깃발을 설정';
+$labels['setflags'] = '메시지를 깃발로 표시';
 $labels['addflags'] = '메시지에 깃발을 추가';
 $labels['removeflags'] = '메시지에서 깃발을 제거';
 $labels['flagread'] = '읽음';
 $labels['flagdeleted'] = '삭제됨';
 $labels['flaganswered'] = '응답함';
-$labels['flagflagged'] = '깃발을 추가함';
+$labels['flagflagged'] = '깃발로 표시함';
 $labels['flagdraft'] = '임시 보관함';
 $labels['setvariable'] = '변수 설정';
 $labels['setvarname'] = '변수명:';
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = '첫 문자를 대문자로';
 $labels['varquotewildcard'] = '특수 기호를 인용';
 $labels['varlength'] = '길이';
 $labels['notify'] = '알림 메시지 보내기';
-$labels['notifyaddress'] = '대상 이메일 주소:';
-$labels['notifybody'] = '알림 메시지 본문:';
-$labels['notifysubject'] = '알림 메시지 제목:';
-$labels['notifyfrom'] = '알림 발신인:';
+$labels['notifytarget'] = '알림 대상:';
+$labels['notifymessage'] = '알림 메시지(옵션):';
+$labels['notifyoptions'] = '알림 옵션(옵션):';
+$labels['notifyfrom'] = '알림 발송자(옵션):';
 $labels['notifyimportance'] = '중요도:';
 $labels['notifyimportancelow'] = '낮음';
 $labels['notifyimportancenormal'] = '보통';
 $labels['notifyimportancehigh'] = '높음';
+$labels['notifymethodmailto'] = '이메일';
+$labels['notifymethodtel'] = '전화';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = '필터 생성';
 $labels['usedata'] = '필터에서 다음 데이터를 사용:';
 $labels['nextstep'] = '다음 단계';
@@ -157,36 +160,65 @@ $labels['asciicasemap'] = '대/소문자 구분 (ascii-casemap)';
 $labels['asciinumeric'] = '숫자 (ascii-numeric)';
 $labels['index'] = '색인:';
 $labels['indexlast'] = '역방향';
+$labels['vacation'] = '휴가';
+$labels['vacation.reply'] = '메시지 회신';
+$labels['vacation.advanced'] = '고급 설정';
+$labels['vacation.subject'] = '제목';
+$labels['vacation.body'] = '본문';
+$labels['vacation.start'] = '휴가 시작';
+$labels['vacation.end'] = '휴가 끝';
+$labels['vacation.status'] = '상태';
+$labels['vacation.on'] = '켬';
+$labels['vacation.off'] = '끔';
+$labels['vacation.addresses'] = '내 추가적인 주소';
+$labels['vacation.interval'] = '회신 주기';
+$labels['vacation.after'] = '다음 이후에 휴가 규칙을 위치함';
+$labels['vacation.saving'] = '데이터를 저장하는 중...';
+$labels['vacation.action'] = '수신 메시지 동작';
+$labels['vacation.keep'] = '보관';
+$labels['vacation.discard'] = '폐기';
+$labels['vacation.redirect'] = '재전송';
+$labels['vacation.copy'] = '사본을 다음 대상에게 전송';
+$labels['arialabelfiltersetactions'] = '필터 세트 동작';
+$labels['arialabelfilteractions'] = '필터 동작';
+$labels['arialabelfilterform'] = '필터 속성';
+$labels['ariasummaryfilterslist'] = '필터 목록';
+$labels['ariasummaryfiltersetslist'] = '필터 세트 목록';
+$labels['filterstitle'] = '수신 메일 필터 편집';
+$labels['vacationtitle'] = '자리비움 규칙 편집';
 $messages['filterunknownerror'] = '알수 없는 서버 오류.';
-$messages['filterconnerror'] = '서버에 연결할 수 없음.';
-$messages['filterdeleteerror'] = '필터를 삭제할 수 없음. 서버 오류가 발생하였음.';
+$messages['filterconnerror'] = '서버에 연결할 수 없습니다.';
+$messages['filterdeleteerror'] = '필터를 삭제할 수 없습니다. 서버 오류가 발생했습니다.';
 $messages['filterdeleted'] = '필터가 성공적으로 삭제됨.';
 $messages['filtersaved'] = '필터가 성공적으로 저장됨.';
-$messages['filtersaveerror'] = '필터를 저장할 수 없음. 서버 오류가 발생하였음.';
+$messages['filtersaveerror'] = '필터를 저장할 수 없습니다. 서버 오류가 발생했습니다.';
 $messages['filterdeleteconfirm'] = '정말로 선택한 필터를 삭제하시겠습니까?';
 $messages['ruledeleteconfirm'] = '정말로 선택한 규칙을 삭제하시겠습니까?';
 $messages['actiondeleteconfirm'] = '정말로 선택한 동작을 삭제하시겠습니까?';
-$messages['forbiddenchars'] = '필드에 금지된 문자가 존재함.';
-$messages['cannotbeempty'] = '필드는 비어있을 수 없음.';
-$messages['ruleexist'] = '지정한 이름의 필터가 이미 존재함.';
-$messages['setactivateerror'] = '선택한 필터 세트를 활성화할 수 없음. 서버 오류가 발생하였음.';
-$messages['setdeactivateerror'] = '선택한 필터 세트를 비활성화할 수 없음. 서버 오류가 발생하였음.';
-$messages['setdeleteerror'] = '선택한 필터 세트를 삭제할 수 없음. 서버 오류가 발생하였음.';
+$messages['forbiddenchars'] = '필드에 금지된 문자가 존재합니다.';
+$messages['cannotbeempty'] = '필드는 비어둘 수 없습니다.';
+$messages['ruleexist'] = '지정한 이름의 필터가 이미 존재합니다.';
+$messages['setactivateerror'] = '선택한 필터 세트를 활성화할 수 없습니다. 서버 오류가 발생했습니다.';
+$messages['setdeactivateerror'] = '선택한 필터 세트를 비활성화할 수 없습니다. 서버 오류가 발생했습니다.';
+$messages['setdeleteerror'] = '선택한 필터 세트를 삭제할 수 없습니다. 서버 오류가 발생했습니다.';
 $messages['setactivated'] = '필터 세트가 성공적으로 활성화됨.';
 $messages['setdeactivated'] = '필터 세트가 성공적으로 비활성화됨.';
 $messages['setdeleted'] = '필터 세트가 성공적으로 삭제됨.';
 $messages['setdeleteconfirm'] = '정말로 선택한 필터 세트를 삭제하시겠습니까?';
-$messages['setcreateerror'] = '선택한 필터 세트를 생성할 수 없음. 서버 오류가 발생하였음.';
+$messages['setcreateerror'] = '선택한 필터 세트를 생성할 수 없습니다. 서버 오류가 발생했습니다.';
 $messages['setcreated'] = '필터 세트가 성공적으로 생성됨.';
-$messages['activateerror'] = '선택한 필터를 활성화할 수 없음. 서버 오류가 발생하였음.';
-$messages['deactivateerror'] = '선택한 필터를 비활성화할 수 없음. 서버 오류가 발생하였음.';
+$messages['activateerror'] = '선택한 필터를 활성화할 수 없습니다. 서버 오류가 발생했습니다.';
+$messages['deactivateerror'] = '선택한 필터를 비활성화할 수 없습니다. 서버 오류가 발생했습니다.';
 $messages['deactivated'] = '필터가 성공적으로 비활성화됨.';
 $messages['activated'] = '필터가 성공적으로 활성화됨.';
-$messages['moved'] = '필터가 성공적으로 이동함.';
-$messages['moveerror'] = '선택한 필터를 이동할 수 없음. 서버 오류가 발생하였음.';
-$messages['nametoolong'] = '이름이 너무 김.';
-$messages['namereserved'] = '예약된 이름.';
-$messages['setexist'] = '세트가 이미 존재함.';
+$messages['moved'] = '필터가 성공적으로 이동되었습니다.';
+$messages['moveerror'] = '선택한 필터를 이동할 수 없습니다. 서버 오류가 발생했습니다.';
+$messages['nametoolong'] = '이름이 너무 깁니다.';
+$messages['namereserved'] = '예약된 이름입니다.';
+$messages['setexist'] = '세트가 이미 존재합니다.';
 $messages['nodata'] = '최소 하나의 위치가 선택되어야 합니다!';
 $messages['invaliddateformat'] = '유효하지 않은 날짜 또는 날짜 일부 형식';
+$messages['saveerror'] = '데이터를 저장할 수 없습니다.. 서버 오류가 발생했습니다.';
+$messages['vacationsaved'] = '휴가 데이터가 성공적으로 저장됨.';
+$messages['emptyvacationbody'] = '휴가 메시지의 본문이 필요합니다!';
 ?>
diff --git a/plugins/managesieve/localization/ku.inc b/plugins/managesieve/localization/ku.inc
new file mode 100644
index 000000000..c5171dc12
--- /dev/null
+++ b/plugins/managesieve/localization/ku.inc
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/managesieve/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
+*/
+$labels['filterany'] = 'hemû peyam';
+$labels['filtercontains'] = 'dihewîne';
+$labels['filternotcontains'] = 'nahebîne';
+$labels['filteris'] = 'weke';
+$labels['filterisnot'] = 'ne weke';
+$labels['filterexists'] = 'heye';
+$labels['filternotexists'] = 'tune ye';
+$labels['filterunder'] = 'bin';
+$labels['filterover'] = 'ser';
+$labels['messagemoveto'] = 'Peyamê bibe ';
+$labels['messageredirect'] = 'Peyamê vegerîne';
+$labels['messagereply'] = 'Bi peyamekê bibersivîne';
+$labels['messagedelete'] = 'Peyamê jê bibe';
+$labels['add'] = 'Tev bike';
+$labels['del'] = 'Jê bibe';
+$labels['sender'] = 'Şandyar';
+$labels['vacationaddr'] = 'Navnîşanên e-mailên min ên din:';
+$labels['vacationsubject'] = 'Mijara peyamê:';
+$labels['days'] = 'roj';
+$labels['seconds'] = 'saniye';
+$labels['enable'] = 'Veke/Bigire';
+$labels['active'] = 'çalak';
+$labels['none'] = 'qet';
+$labels['fromfile'] = 'ji dosyeyê';
+$labels['filterdisabled'] = 'Parzing girtî ye';
+$labels['countisgreaterthan'] = 'hejmar mezintir e ji';
+$labels['countisgreaterthanequal'] = 'hejmar weke an jî mezintir e ji';
+$labels['countislessthan'] = 'hejmar kêmtir e ji';
+$labels['countequals'] = 'hejmar weke ';
+$labels['countnotequals'] = 'hejmar ne weke';
+$labels['flagread'] = 'Xwendî';
+$labels['flagdeleted'] = 'Jêbirî';
+$labels['flaganswered'] = 'Nebersivandî';
+$labels['flagflagged'] = 'Bialakirî';
+$labels['varlength'] = 'Dirêjahî';
+$labels['notify'] = 'Agahiyê bişîne';
+$labels['notifyimportance'] = 'Girîng:';
+$labels['notifyimportancelow'] = 'nizm';
+$labels['notifyimportancehigh'] = 'bilind';
+$labels['notifymethodmailto'] = 'Email';
+$labels['notifymethodtel'] = 'Telefon';
+$labels['notifymethodsms'] = 'SMS';
+$labels['filtercreate'] = 'Parzingek çêke';
+$labels['nextstep'] = 'Gava pêşde';
+$labels['...'] = '...';
+$labels['currdate'] = 'Dîroka niha';
+$labels['datetest'] = 'Dîrok';
+$labels['year'] = 'sal';
+$labels['month'] = 'meh';
+$labels['day'] = 'roj';
+$labels['date'] = 'dîrok (ssss-mm--rr)';
+$labels['julian'] = 'dîrok (julian)';
+$labels['hour'] = 'saet';
+$labels['minute'] = 'deqîqe';
+$labels['second'] = 'saniye';
+$labels['time'] = 'dem (ss:dd:ss)';
+$labels['iso8601'] = 'dem (ISO8601)';
+$labels['zone'] = 'qada demê';
+$labels['weekday'] = 'rojên hefteyê (0-6)';
+$labels['address'] = 'navnîşan';
+$labels['text'] = 'nivîs';
+$labels['contenttype'] = 'cûreya naverokê';
+$labels['modtype'] = 'cûre';
+$labels['allparts'] = 'hemû';
+$labels['user'] = 'bikarhêner';
+$labels['detail'] = 'detay';
+$labels['vacation.reply'] = 'Peyamê bibersivîne';
+$labels['vacation.advanced'] = 'Mihengên pêşketî';
+$labels['vacation.subject'] = 'Mijar';
+$labels['vacation.status'] = 'Rewş';
+$labels['vacation.on'] = 'Vekirî';
+$labels['vacation.addresses'] = 'Navnîşanên min ên din';
+?>
diff --git a/plugins/managesieve/localization/lt_LT.inc b/plugins/managesieve/localization/lt_LT.inc
index 510185d14..575e43cbe 100644
--- a/plugins/managesieve/localization/lt_LT.inc
+++ b/plugins/managesieve/localization/lt_LT.inc
@@ -46,6 +46,8 @@ $labels['messagecopyto'] = 'Kopijuoti laišką į';
 $labels['messagesendcopy'] = 'Nusiųsti laiško kopiją';
 $labels['messagereply'] = 'Atsakyti laišku';
 $labels['messagedelete'] = 'Pašalinti laišką';
+$labels['messagediscard'] = 'Panaikinti su laišku';
+$labels['messagekeep'] = 'Palikti laišką gautųjų aplanke';
 $labels['messagesrules'] = 'Gaunamiems laiškams:';
 $labels['messagesactions'] = '…vykdyti šiuos veiksmus:';
 $labels['add'] = 'Pridėti';
@@ -106,14 +108,17 @@ $labels['varupperfirst'] = 'pirmoji raidė didžioji';
 $labels['varquotewildcard'] = 'cituoti specialius simbolius';
 $labels['varlength'] = 'ilgis';
 $labels['notify'] = 'Siųsti priminimą';
-$labels['notifyaddress'] = 'Kam, el. pašto adresas:';
-$labels['notifybody'] = 'Priminimo tekstas';
-$labels['notifysubject'] = 'Priminimo pavadinimas';
-$labels['notifyfrom'] = 'Priminimo siuntėjas';
+$labels['notifytarget'] = 'Priminimo gavėjas:';
+$labels['notifymessage'] = 'Priminimo laiškas (nebūtina):';
+$labels['notifyoptions'] = 'Priminimo nustatymai (nebūtina):';
+$labels['notifyfrom'] = 'Priminimo siuntėjas (nebūtina):';
 $labels['notifyimportance'] = 'Svarbumas';
 $labels['notifyimportancelow'] = 'žemas';
 $labels['notifyimportancenormal'] = 'normalus';
 $labels['notifyimportancehigh'] = 'aukštas';
+$labels['notifymethodmailto'] = 'El. paštas';
+$labels['notifymethodtel'] = 'Telefono numeris';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Kurti filtrą';
 $labels['usedata'] = 'Filtrui naudoti šiuos duomenis:';
 $labels['nextstep'] = 'Kitas žingsnis';
@@ -155,27 +160,62 @@ $labels['asciicasemap'] = 'nepaisantis raidžių registro („ascii-casemap“)'
 $labels['asciinumeric'] = 'skaitinis („ascii-numeric“)';
 $labels['index'] = 'turinys:';
 $labels['indexlast'] = 'atbulai';
+$labels['vacation'] = 'Atostogos';
+$labels['vacation.reply'] = 'Atsakyti laišku';
+$labels['vacation.advanced'] = 'Papildomos nuostatos';
+$labels['vacation.subject'] = 'Tema';
+$labels['vacation.body'] = 'Laiško tekstas';
+$labels['vacation.status'] = 'Būsena';
+$labels['vacation.on'] = 'Įjungta';
+$labels['vacation.off'] = 'Išjungta';
+$labels['vacation.addresses'] = 'Mano papildomi adresai';
+$labels['vacation.interval'] = 'Atsakymo intervalas';
+$labels['vacation.after'] = 'Atostogų taisyklę pastatyti po';
+$labels['vacation.saving'] = 'Išsaugomi duomenys...';
+$labels['vacation.action'] = 'Veiksmas su gaunamais laiškais';
+$labels['vacation.keep'] = 'Palikti';
+$labels['vacation.discard'] = 'Panaikinti';
+$labels['vacation.redirect'] = 'Peradresuoti kam';
+$labels['vacation.copy'] = 'Siųsti kopiją kam';
+$labels['arialabelfiltersetactions'] = 'Filtrų rinkinio veiksmai';
+$labels['arialabelfilteractions'] = 'Filtro veiksmai';
+$labels['arialabelfilterform'] = 'Filtro nustatymai';
+$labels['ariasummaryfilterslist'] = 'Filtrų sąrašas';
+$labels['ariasummaryfiltersetslist'] = 'Filtrų rinkinių sąrašas';
+$labels['filterstitle'] = 'Tvarkyti gaunamų laiškų filtrus';
+$labels['vacationtitle'] = 'Redaguoti ne-biure taisyklę';
 $messages['filterunknownerror'] = 'Nežinoma serverio klaida.';
 $messages['filterconnerror'] = 'Neįmanoma užmegzti ryšio su serveriu.';
+$messages['filterdeleteerror'] = 'Nepavyksta ištrinti filtro. Įvyko serverio klaida.';
 $messages['filterdeleted'] = 'Filtras panaikintas sėkmingai.';
 $messages['filtersaved'] = 'Filtras sėkmingai išsaugotas';
+$messages['filtersaveerror'] = 'Nepavyksta išsaugoti filtro. Įvyko serverio klaida.';
 $messages['filterdeleteconfirm'] = 'Ar jūs esate įsitikinęs, jog norite panaikinti pasirinktus filtrus(-ą)?';
 $messages['ruledeleteconfirm'] = 'Ar jūs įsitikinęs, jog norite panaikinti pasirinktą taisyklę?';
 $messages['actiondeleteconfirm'] = 'Ar jūs įsitikinęs, jog norite panaikinti pasirinktą veiksmą?';
 $messages['forbiddenchars'] = 'Laukelyje yra draudžiamų simbolių.';
 $messages['cannotbeempty'] = 'Laukelis negali būti tuščias';
 $messages['ruleexist'] = 'Filtras tokiu vardu jau yra.';
+$messages['setactivateerror'] = 'Neįmanoma aktyvuoti pasirinkto filtrų rinkinio. Įvyko serverio klaida.';
+$messages['setdeactivateerror'] = 'Neįmanoma išjungti pasirinkto filtrų rinkinio. Įvyko serverio klaida.';
+$messages['setdeleteerror'] = 'Neįmanoma panaikinti pasirinkto filtrų rinkinio. Įvyko serverio klaida.';
 $messages['setactivated'] = 'Filtrų rinkinys sėkmingai aktyvuotas.';
 $messages['setdeactivated'] = 'Filtrų rinkinys sėkmingai deaktyvuotas.';
 $messages['setdeleted'] = 'Filtrų rinkinys sėkmingai panaikintas.';
 $messages['setdeleteconfirm'] = 'Ar jūs esate tikri, jog norite panaikinti pasirinktą filtrų rinkinį?';
+$messages['setcreateerror'] = 'Neįmanoma sukurti filtrų rinkinio. Įvyko serverio klaida.';
 $messages['setcreated'] = 'Filtrų rinkinys sėkmingai sukurtas.';
+$messages['activateerror'] = 'Neįmanoma įjungti pasirinktų filtrų(-o). Įvyko serverio klaida.';
+$messages['deactivateerror'] = 'Neįmanoma išjungti pasirinktų filtrų(-o). Įvyko serverio klaida.';
 $messages['deactivated'] = 'Filtras(-as) sėkmingai išjungti.';
 $messages['activated'] = 'Filtras(-as) sėkmingai įjungti.';
 $messages['moved'] = 'Filtrai perkelti sėkmingai.';
+$messages['moveerror'] = 'Pasirinkto filtro perkelti neįmanoma. Įvyko serverio klaida.';
 $messages['nametoolong'] = 'Vardas per ilgas.';
 $messages['namereserved'] = 'Rezervuotas vardas.';
 $messages['setexist'] = 'Rinkinys jau yra sukurtas.';
 $messages['nodata'] = 'Būtina pasirinkti bent vieną poziciją!';
 $messages['invaliddateformat'] = 'Neteisingas datos ar jos dalies formatas';
+$messages['saveerror'] = 'Nepavyksta išsaugoti duomenų. Įvyko serverio klaida.';
+$messages['vacationsaved'] = 'Sėkmingai išsaugoti atostogų duomenys.';
 ?>
diff --git a/plugins/managesieve/localization/lv_LV.inc b/plugins/managesieve/localization/lv_LV.inc
index 9a2f95d93..33c000e49 100644
--- a/plugins/managesieve/localization/lv_LV.inc
+++ b/plugins/managesieve/localization/lv_LV.inc
@@ -108,10 +108,6 @@ $labels['varupperfirst'] = 'pirmais burts kā lielais burts';
 $labels['varquotewildcard'] = '"citēt" speciālās rakstzīmes';
 $labels['varlength'] = 'garums';
 $labels['notify'] = 'Sūtīt paziņojumus';
-$labels['notifyaddress'] = 'Uz e-pasta adresi:';
-$labels['notifybody'] = 'Paziņojuma teksts:';
-$labels['notifysubject'] = 'Paziņojuma tēma:';
-$labels['notifyfrom'] = 'Paziņojuma sūtītājs:';
 $labels['notifyimportance'] = 'Svarīgums:';
 $labels['notifyimportancelow'] = 'zems';
 $labels['notifyimportancenormal'] = 'parasts';
diff --git a/plugins/managesieve/localization/ml_IN.inc b/plugins/managesieve/localization/ml_IN.inc
index 4dac39417..613695c0b 100644
--- a/plugins/managesieve/localization/ml_IN.inc
+++ b/plugins/managesieve/localization/ml_IN.inc
@@ -47,15 +47,20 @@ $labels['messagesendcopy'] = 'സന്ദേശത്തിന്റെ പക�
 $labels['messagereply'] = 'സന്ദേശം വെച്ച് മറുപടി അയക്കു';
 $labels['messagedelete'] = 'സന്ദേശം മായ്ക്കു';
 $labels['messagediscard'] = 'സന്ദേശത്തോടെ നിരാകരിക്കുക';
+$labels['messagekeep'] = 'സന്ദേശം ഇൻബോക്സിൽ സൂക്ഷിക്കുക';
 $labels['messagesrules'] = 'ആഗമന സന്ദേശങ്ങള്‍ക്ക്:';
 $labels['messagesactions'] = '...ഈ പ്രവര്‍ത്തനങ്ങള്‍ ചെയ്യുക:';
 $labels['add'] = 'ചേര്‍ക്കു';
 $labels['del'] = 'നീക്കം ചെയ്യുക';
 $labels['sender'] = 'അയചയാള്‍';
 $labels['recipient'] = 'സ്വീകര്‍ത്താവ്';
+$labels['vacationaddr'] = 'എന്റെ മറ്റ് ഈമെയിൽ വിലാസങ്ങൾ:';
 $labels['vacationdays'] = 'എത്ര ഭിവസം കൂടുമ്പോള്‍ സന്ദേശം അയക്കണം:';
+$labels['vacationinterval'] = 'എത്ര സമയം കൂടുമ്പോൾ സന്ദേശങ്ങൾ അയയ്ക്കണം:';
 $labels['vacationreason'] = 'സന്ദേശത്തിന്റെ ഉള്ളടക്കം (അവധിയുടെ കാരണം):';
 $labels['vacationsubject'] = 'സന്ദേശത്തിന്റെ വിഷയം:';
+$labels['days'] = 'ദിവസങ്ങൾ';
+$labels['seconds'] = 'സെക്കന്റുകൾ';
 $labels['rulestop'] = 'നിയമങ്ങള്‍ വിലയിരുത്തുന്നത് നിര്‍ത്തുക';
 $labels['enable'] = 'പ്രവര്‍ത്തനസജ്ജം/രഹിതം';
 $labels['filterset'] = 'അരിപ്പകളുടെ കൂട്ടം';
@@ -77,11 +82,13 @@ $labels['countisgreaterthanequal'] = 'എണ്ണം ഇതിനെക്ക�
 $labels['countislessthan'] = 'എണ്ണം ഇതിനെക്കാള്‍ കുറവ്';
 $labels['countislessthanequal'] = 'എണ്ണം ഇതിനെക്കാള്‍ കൂറവ് ഇല്ലെങ്കില്‍ സമം';
 $labels['countequals'] = 'എണ്ണം ഇതിനോട് സമം';
+$labels['countnotequals'] = 'എണ്ണം ഇതിനോട് തുല്യമല്ല';
 $labels['valueisgreaterthan'] = 'മൂല്യം ഇതിനെക്കാള്‍ കുടുതല്‍';
 $labels['valueisgreaterthanequal'] = 'മുല്യം ഇതിനെക്കാള്‍ കൂടുതല്‍ ഇല്ലെങ്കില്‍ സമം';
 $labels['valueislessthan'] = 'മൂല്യം ഇതിനെക്കാള്‍ കുറവ്';
 $labels['valueislessthanequal'] = 'മൂല്യം ഇതിനെക്കാള്‍ കൂറവ് ഇല്ലെങ്കില്‍ തുല്യം';
 $labels['valueequals'] = 'മൂല്യം ഇതിനോട് സമം';
+$labels['valuenotequals'] = 'മൂല്യം ഇതിനോട് തുല്യമല്ല';
 $labels['setflags'] = 'സന്ദേശത്തില്‍ അടയാളമിടുക';
 $labels['addflags'] = 'സന്ദേശത്തില്‍ അടയാളം ചേര്‍ക്കുക';
 $labels['removeflags'] = 'സന്ദേശത്തില്‍ നിന്നും അടയാളം മാറ്റുക';
@@ -90,6 +97,9 @@ $labels['flagdeleted'] = 'നീക്കം ചെയ്തവ';
 $labels['flaganswered'] = 'മറുപടി നല്‍കിയവ';
 $labels['flagflagged'] = 'അടയാളപ്പെടുത്തിയവ';
 $labels['flagdraft'] = 'കരട്';
+$labels['setvariable'] = 'വേരിയബിൾ സ്ഥിരപ്പെടുത്തുക';
+$labels['setvarname'] = 'വേരിയബിളിന്റെ പേര്';
+$labels['setvarvalue'] = 'വേരിയബിളിന്റെ മൂല്യം';
 $labels['filtercreate'] = 'അരിപ്പ ഉണ്ടാക്കുക';
 $labels['usedata'] = 'ഈ വിവരങ്ങള്‍ അരിപ്പയില്‍ ഉപയോഗിക്കുക:';
 $labels['nextstep'] = 'അടുത്ത പടി';
diff --git a/plugins/managesieve/localization/nb_NO.inc b/plugins/managesieve/localization/nb_NO.inc
index f8ec3eded..c9224ae61 100644
--- a/plugins/managesieve/localization/nb_NO.inc
+++ b/plugins/managesieve/localization/nb_NO.inc
@@ -108,10 +108,6 @@ $labels['varupperfirst'] = 'første tegn stor bokstav';
 $labels['varquotewildcard'] = 'sitér spesialtegn';
 $labels['varlength'] = 'lengde';
 $labels['notify'] = 'Send melding';
-$labels['notifyaddress'] = 'Til e-postadresse:';
-$labels['notifybody'] = 'Varseltekst:';
-$labels['notifysubject'] = 'Varselemne:';
-$labels['notifyfrom'] = 'Varselavsender:';
 $labels['notifyimportance'] = 'Viktighet:';
 $labels['notifyimportancelow'] = 'lav';
 $labels['notifyimportancenormal'] = 'normal';
diff --git a/plugins/managesieve/localization/nl_NL.inc b/plugins/managesieve/localization/nl_NL.inc
index be0ab7737..b84b87e94 100644
--- a/plugins/managesieve/localization/nl_NL.inc
+++ b/plugins/managesieve/localization/nl_NL.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'eerste karakter als hoofdletter';
 $labels['varquotewildcard'] = 'speciale karakters quoten';
 $labels['varlength'] = 'lengte';
 $labels['notify'] = 'Stuur melding';
-$labels['notifyaddress'] = 'Naar e-mailadres:';
-$labels['notifybody'] = 'Meldingsbericht:';
-$labels['notifysubject'] = 'Onderwerp van melding:';
-$labels['notifyfrom'] = 'Afzender:';
+$labels['notifytarget'] = 'Meldingsdoel:';
+$labels['notifymessage'] = 'Meldingsbericht (optioneel):';
+$labels['notifyoptions'] = 'Meldingsopties (optioneel):';
+$labels['notifyfrom'] = 'Meldingsafzender (optioneel):';
 $labels['notifyimportance'] = 'Prioriteit:';
 $labels['notifyimportancelow'] = 'laag';
 $labels['notifyimportancenormal'] = 'normaal';
 $labels['notifyimportancehigh'] = 'hoog';
+$labels['notifymethodmailto'] = 'E-mail';
+$labels['notifymethodtel'] = 'Telefoon';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Filter aanmaken';
 $labels['usedata'] = 'Gebruik de volgende gegevens in het filter:';
 $labels['nextstep'] = 'Volgende stap';
@@ -159,18 +162,30 @@ $labels['index'] = 'index:';
 $labels['indexlast'] = 'terugwaarts';
 $labels['vacation'] = 'Vakantie';
 $labels['vacation.reply'] = 'Antwoordbericht';
-$labels['vacation.advanced'] = 'Geavanceerde opties';
+$labels['vacation.advanced'] = 'Geavanceerde instellingen';
 $labels['vacation.subject'] = 'Onderwerp';
 $labels['vacation.body'] = 'Inhoud';
-$labels['vacation.dates'] = 'Lengte van vakantie';
-$labels['vacation.from'] = 'Afzender:';
-$labels['vacation.to'] = 'Aan:';
+$labels['vacation.start'] = 'Begin van vakantie';
+$labels['vacation.end'] = 'Einde van vakantie';
 $labels['vacation.status'] = 'Status';
 $labels['vacation.on'] = 'Aan';
 $labels['vacation.off'] = 'Uit';
 $labels['vacation.addresses'] = 'Mijn extra e-mailadressen';
 $labels['vacation.interval'] = 'Antwoordinterval';
+$labels['vacation.after'] = 'Voeg een vakantieregel toe na';
 $labels['vacation.saving'] = 'Gegevens worden opgeslagen...';
+$labels['vacation.action'] = 'Actie voor inkomend bericht';
+$labels['vacation.keep'] = 'Bewaren';
+$labels['vacation.discard'] = 'Weggooien';
+$labels['vacation.redirect'] = 'Doorsturen naar';
+$labels['vacation.copy'] = 'Kopie sturen naar';
+$labels['arialabelfiltersetactions'] = 'Filtersetacties';
+$labels['arialabelfilteractions'] = 'Filteracties';
+$labels['arialabelfilterform'] = 'Filtereigenschappen';
+$labels['ariasummaryfilterslist'] = 'Filterlijst';
+$labels['ariasummaryfiltersetslist'] = 'Lijst met filtersets';
+$labels['filterstitle'] = 'Bewerk filters voor inkomende berichten';
+$labels['vacationtitle'] = 'Bewerk vakantieregel';
 $messages['filterunknownerror'] = 'Onbekende fout';
 $messages['filterconnerror'] = 'Kan geen verbinding maken met de managesieve server';
 $messages['filterdeleteerror'] = 'Kan filter niet verwijderen. Er trad een serverfout op.';
@@ -203,6 +218,7 @@ $messages['namereserved'] = 'Gereserveerde naam.';
 $messages['setexist'] = 'Filterset bestaat al.';
 $messages['nodata'] = 'Tenminste één positie moet geselecteerd worden!';
 $messages['invaliddateformat'] = 'Ongeldige datum of datumformaat';
-$messages['saveerror'] = 'Het opslaan van de gegevens is mislukt. Er trad een serverfout op.';
-$messages['vacationsaved'] = 'Vakantiegegevens met succes opgeslagen.';
+$messages['saveerror'] = 'Opslaan van de gegevens is mislukt. Er trad een serverfout op.';
+$messages['vacationsaved'] = 'Vakantiegegevens succesvol opgeslagen.';
+$messages['emptyvacationbody'] = 'Inhoud van vakantiebericht is verplicht!';
 ?>
diff --git a/plugins/managesieve/localization/nn_NO.inc b/plugins/managesieve/localization/nn_NO.inc
index 4ef35dbb4..2dc68e6c9 100644
--- a/plugins/managesieve/localization/nn_NO.inc
+++ b/plugins/managesieve/localization/nn_NO.inc
@@ -100,10 +100,6 @@ $labels['varlowerfirst'] = 'med liten forbokstav';
 $labels['varupperfirst'] = 'med stor forbokstav';
 $labels['varlength'] = 'lengde';
 $labels['notify'] = 'Send varsel';
-$labels['notifyaddress'] = 'Til e-postadresse:';
-$labels['notifybody'] = 'Varseltekst:';
-$labels['notifysubject'] = 'Varselemne:';
-$labels['notifyfrom'] = 'Varselavsendar:';
 $labels['notifyimportance'] = 'Betyding:';
 $labels['notifyimportancelow'] = 'låg';
 $labels['notifyimportancenormal'] = 'normal';
diff --git a/plugins/managesieve/localization/pl_PL.inc b/plugins/managesieve/localization/pl_PL.inc
index 880dbad71..06c0a7925 100644
--- a/plugins/managesieve/localization/pl_PL.inc
+++ b/plugins/managesieve/localization/pl_PL.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'pierwsza wielka litera';
 $labels['varquotewildcard'] = 'zamień znaki specjalne';
 $labels['varlength'] = 'długość';
 $labels['notify'] = 'Wyślij powiadomienie';
-$labels['notifyaddress'] = 'Na adres e-mail:';
-$labels['notifybody'] = 'Treść powiadomienia:';
-$labels['notifysubject'] = 'Tytuł powiadomienia:';
-$labels['notifyfrom'] = 'Nadawca powiadomienia:';
+$labels['notifytarget'] = 'Odbiorca powiadomienia:';
+$labels['notifymessage'] = 'Wiadomość powiadomienia (opcjonalne):';
+$labels['notifyoptions'] = 'Opcje powiadomienia (opcjonalne):';
+$labels['notifyfrom'] = 'Nadawca powiadomienia (opcjonalne):';
 $labels['notifyimportance'] = 'Priorytet:';
 $labels['notifyimportancelow'] = 'niski';
 $labels['notifyimportancenormal'] = 'normalny';
 $labels['notifyimportancehigh'] = 'wysoki';
+$labels['notifymethodmailto'] = 'E-Mail';
+$labels['notifymethodtel'] = 'Telefon';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Utwórz filtr';
 $labels['usedata'] = 'Użyj następujących danych do utworzenia filtra:';
 $labels['nextstep'] = 'Następny krok';
@@ -162,9 +165,8 @@ $labels['vacation.reply'] = 'Odpowiedź';
 $labels['vacation.advanced'] = 'Ustawienia zaawansowane';
 $labels['vacation.subject'] = 'Temat';
 $labels['vacation.body'] = 'Treść';
-$labels['vacation.dates'] = 'Czas nieobecności';
-$labels['vacation.from'] = 'Od:';
-$labels['vacation.to'] = 'Do:';
+$labels['vacation.start'] = 'Początek nieobecności';
+$labels['vacation.end'] = 'Koniec nieobecności';
 $labels['vacation.status'] = 'Status';
 $labels['vacation.on'] = 'włączone';
 $labels['vacation.off'] = 'wyłączone';
@@ -172,6 +174,18 @@ $labels['vacation.addresses'] = 'Moje dodatkowe adresy';
 $labels['vacation.interval'] = 'Częstotliwość odpowiedzi';
 $labels['vacation.after'] = 'Umieść regułę odpowiedzi po';
 $labels['vacation.saving'] = 'Zapisywanie danych...';
+$labels['vacation.action'] = 'Akcje wiadomości przychodzących';
+$labels['vacation.keep'] = 'Zachowaj';
+$labels['vacation.discard'] = 'Odrzuć';
+$labels['vacation.redirect'] = 'Przekaż do';
+$labels['vacation.copy'] = 'Wyślij kopię do';
+$labels['arialabelfiltersetactions'] = 'Zbiór filtrów akcji';
+$labels['arialabelfilteractions'] = 'Akcje filtrów';
+$labels['arialabelfilterform'] = 'Ustawienia filtrów';
+$labels['ariasummaryfilterslist'] = 'Spis filtrów';
+$labels['ariasummaryfiltersetslist'] = 'Lista zbiorów filtrów';
+$labels['filterstitle'] = 'Zarządzaj filtrami wiadomości przychodzących';
+$labels['vacationtitle'] = 'Zarządzaj asystentem nieobecności';
 $messages['filterunknownerror'] = 'Nieznany błąd serwera.';
 $messages['filterconnerror'] = 'Nie można nawiązać połączenia z serwerem.';
 $messages['filterdeleteerror'] = 'Nie można usunąć filtra. Błąd serwera.';
@@ -206,4 +220,5 @@ $messages['nodata'] = 'Należy wybrać co najmniej jedną pozycję!';
 $messages['invaliddateformat'] = 'Nieprawidłowy format daty lub fragmentu daty';
 $messages['saveerror'] = 'Nie można zapisać danych. Wystąpił błąd serwera.';
 $messages['vacationsaved'] = 'Dane nieobecności zapisano pomyślnie.';
+$messages['emptyvacationbody'] = 'Treść wiadomości jest wymagana!';
 ?>
diff --git a/plugins/managesieve/localization/pt_BR.inc b/plugins/managesieve/localization/pt_BR.inc
index cffded95f..b0ccaf65a 100644
--- a/plugins/managesieve/localization/pt_BR.inc
+++ b/plugins/managesieve/localization/pt_BR.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'primeiro caractere maiúsculo';
 $labels['varquotewildcard'] = 'caracteres especiais de citação';
 $labels['varlength'] = 'tamanho';
 $labels['notify'] = 'Enviar notificação';
-$labels['notifyaddress'] = 'Para endereço de e-mail:';
-$labels['notifybody'] = 'Corpo da notificação:';
-$labels['notifysubject'] = 'Título da notificação:';
-$labels['notifyfrom'] = 'Remetente da notificação:';
+$labels['notifytarget'] = 'Destino da notificação:';
+$labels['notifymessage'] = 'Mensagem de notificação (opcional):';
+$labels['notifyoptions'] = 'Opções de notificação (opcional):';
+$labels['notifyfrom'] = 'Remetente da notificação (opcional):';
 $labels['notifyimportance'] = 'Importância';
 $labels['notifyimportancelow'] = 'baixa';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'alta';
+$labels['notifymethodmailto'] = 'Email';
+$labels['notifymethodtel'] = 'Telefone';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Criar filtro';
 $labels['usedata'] = 'Usar os seguintes dados no filtro:';
 $labels['nextstep'] = 'Próximo Passo';
@@ -162,9 +165,8 @@ $labels['vacation.reply'] = 'Responder mensagem';
 $labels['vacation.advanced'] = 'Opções avançadas';
 $labels['vacation.subject'] = 'Assunto';
 $labels['vacation.body'] = 'Conteúdo';
-$labels['vacation.dates'] = 'Período de férias';
-$labels['vacation.from'] = 'De:';
-$labels['vacation.to'] = 'Para:';
+$labels['vacation.start'] = 'Início das férias';
+$labels['vacation.end'] = 'Término das férias';
 $labels['vacation.status'] = 'Estado';
 $labels['vacation.on'] = 'Ligado';
 $labels['vacation.off'] = 'Desligado';
@@ -172,6 +174,18 @@ $labels['vacation.addresses'] = 'Meus endereços de e-mail adicionais';
 $labels['vacation.interval'] = 'Intervalo de resposta';
 $labels['vacation.after'] = 'Colocar regra de férias após';
 $labels['vacation.saving'] = 'Salvando dados...';
+$labels['vacation.action'] = 'Ações para mensagens recebidas';
+$labels['vacation.keep'] = 'Manter';
+$labels['vacation.discard'] = 'Descartar';
+$labels['vacation.redirect'] = 'Redirecionar para';
+$labels['vacation.copy'] = 'Enviar cópia para';
+$labels['arialabelfiltersetactions'] = 'Ações do grupo de filtros';
+$labels['arialabelfilteractions'] = 'Ações do filtro';
+$labels['arialabelfilterform'] = 'Propriedades do filtro';
+$labels['ariasummaryfilterslist'] = 'Lista dos filtros';
+$labels['ariasummaryfiltersetslist'] = 'Lista de grupo de filtros';
+$labels['filterstitle'] = 'Editar filtro dos e-mails recebidos';
+$labels['vacationtitle'] = 'Editar regra de ausência';
 $messages['filterunknownerror'] = 'Erro desconhecido de servidor';
 $messages['filterconnerror'] = 'Não foi possível conectar ao servidor managesieve';
 $messages['filterdeleteerror'] = 'Impossível excluir o filtro. Ocorreu um erro no servidor.';
@@ -206,4 +220,5 @@ $messages['nodata'] = 'Pelo menos uma posição precisa ser selecionada!';
 $messages['invaliddateformat'] = 'Data inválida';
 $messages['saveerror'] = 'Impossível salvar dados. Ocorreu um erro no servidor.';
 $messages['vacationsaved'] = 'Dados de férias salvos com sucesso.';
+$messages['emptyvacationbody'] = 'Conteúdo da mensagem de férias necessário!';
 ?>
diff --git a/plugins/managesieve/localization/pt_PT.inc b/plugins/managesieve/localization/pt_PT.inc
index 40f8d8e3b..ec3954200 100644
--- a/plugins/managesieve/localization/pt_PT.inc
+++ b/plugins/managesieve/localization/pt_PT.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'primeira letra em maiúscula';
 $labels['varquotewildcard'] = 'citar caracteres especiais';
 $labels['varlength'] = 'tamanho';
 $labels['notify'] = 'Enviar notificação';
-$labels['notifyaddress'] = 'Endereço de E-mail to:';
-$labels['notifybody'] = 'Corpo de Notificação:';
-$labels['notifysubject'] = 'Assunto Notificação:';
-$labels['notifyfrom'] = 'Remetente Notificação:';
+$labels['notifytarget'] = 'Destino da notificação:';
+$labels['notifymessage'] = 'Mensagem de notificação (opcional):';
+$labels['notifyoptions'] = 'Opções de notificação (opcional):';
+$labels['notifyfrom'] = 'Remetente da notificação (opcional):';
 $labels['notifyimportance'] = 'Importância:';
 $labels['notifyimportancelow'] = 'baixa';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'alta';
+$labels['notifymethodmailto'] = 'Email';
+$labels['notifymethodtel'] = 'Telefone';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Criar filtro';
 $labels['usedata'] = 'Usar os seguintes dados no filtro:';
 $labels['nextstep'] = 'Próximo passo';
@@ -162,9 +165,8 @@ $labels['vacation.reply'] = 'Mensagem de resposta';
 $labels['vacation.advanced'] = 'Definições avançadas';
 $labels['vacation.subject'] = 'Assunto';
 $labels['vacation.body'] = 'Corpo da mensagem';
-$labels['vacation.dates'] = 'Tempo de férias';
-$labels['vacation.from'] = 'De:';
-$labels['vacation.to'] = 'Para:';
+$labels['vacation.start'] = 'Início de férias';
+$labels['vacation.end'] = 'Fim de férias';
 $labels['vacation.status'] = 'Estado';
 $labels['vacation.on'] = 'Ligar';
 $labels['vacation.off'] = 'Desligar';
@@ -172,6 +174,18 @@ $labels['vacation.addresses'] = 'Meus endereços adicionais';
 $labels['vacation.interval'] = 'Intervalo de resposta';
 $labels['vacation.after'] = 'Coloque regra de férias depois';
 $labels['vacation.saving'] = 'A guardar dados...';
+$labels['vacation.action'] = 'Acção para mensagem recebida';
+$labels['vacation.keep'] = 'Manter';
+$labels['vacation.discard'] = 'Rejeitar';
+$labels['vacation.redirect'] = 'Redireccionar para';
+$labels['vacation.copy'] = 'Enviar cópia para';
+$labels['arialabelfiltersetactions'] = 'Acções do conjunto de filtros';
+$labels['arialabelfilteractions'] = 'Acções dos filtros';
+$labels['arialabelfilterform'] = 'Propriedades dos filtro';
+$labels['ariasummaryfilterslist'] = 'Lista de filtros';
+$labels['ariasummaryfiltersetslist'] = 'Lista de conjuntos de filtros';
+$labels['filterstitle'] = 'Editar filtros de mensagens recebidas';
+$labels['vacationtitle'] = 'Editar regra de ausência do escritório';
 $messages['filterunknownerror'] = 'Erro de servidor desconhecido';
 $messages['filterconnerror'] = 'Não é possível ligar ao servidor Sieve';
 $messages['filterdeleteerror'] = 'Não foi possível eliminar o filtro.  Ocorreu um erro no servidor.';
@@ -206,4 +220,5 @@ $messages['nodata'] = 'Deve selecionar pelo menos uma posição.';
 $messages['invaliddateformat'] = 'Data ou formato de data inválido.';
 $messages['saveerror'] = 'Não foi possível guardar os dados. Ocorreu um erro no servidor.';
 $messages['vacationsaved'] = 'Dados de férias guardados com sucesso.';
+$messages['emptyvacationbody'] = 'É necessário o corpo da mensagem de férias!';
 ?>
diff --git a/plugins/managesieve/localization/ro_RO.inc b/plugins/managesieve/localization/ro_RO.inc
index 9bba85e72..017320ee6 100644
--- a/plugins/managesieve/localization/ro_RO.inc
+++ b/plugins/managesieve/localization/ro_RO.inc
@@ -108,10 +108,6 @@ $labels['varupperfirst'] = 'primul caracter cu litre mari';
 $labels['varquotewildcard'] = 'caracterele speciale in citat';
 $labels['varlength'] = 'lungime';
 $labels['notify'] = 'Notificare trimitere';
-$labels['notifyaddress'] = 'La adresa de e-mail';
-$labels['notifybody'] = 'Mesajul de notificare:';
-$labels['notifysubject'] = 'Subiectul notificării:';
-$labels['notifyfrom'] = 'Expeditorul notificării:';
 $labels['notifyimportance'] = 'Importanța:';
 $labels['notifyimportancelow'] = 'mică';
 $labels['notifyimportancenormal'] = 'normală';
@@ -161,10 +157,7 @@ $labels['vacation'] = 'Vacanta';
 $labels['vacation.reply'] = 'Raspunde mesajului';
 $labels['vacation.advanced'] = 'Setari avansate';
 $labels['vacation.subject'] = 'Subiect';
-$labels['vacation.body'] = 'Structura';
-$labels['vacation.dates'] = 'Timp de vacanta';
-$labels['vacation.from'] = 'De la:';
-$labels['vacation.to'] = 'Catre:';
+$labels['vacation.body'] = 'Corp';
 $labels['vacation.status'] = 'Statut';
 $labels['vacation.on'] = 'Pe';
 $labels['vacation.off'] = 'De pe';
diff --git a/plugins/managesieve/localization/ru_RU.inc b/plugins/managesieve/localization/ru_RU.inc
index 08a0041f8..6714c4c9d 100644
--- a/plugins/managesieve/localization/ru_RU.inc
+++ b/plugins/managesieve/localization/ru_RU.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'первый символ в верхнем реги
 $labels['varquotewildcard'] = 'символ кавычек';
 $labels['varlength'] = 'длина';
 $labels['notify'] = 'Отправить уведомление';
-$labels['notifyaddress'] = 'На адрес электронной почты:';
-$labels['notifybody'] = 'Текст уведомления:';
-$labels['notifysubject'] = 'Тема уведомления:';
-$labels['notifyfrom'] = 'Отправитель уведомления:';
+$labels['notifytarget'] = 'Объект уведомления:';
+$labels['notifymessage'] = 'Сообщение уведомления (не обязательно):';
+$labels['notifyoptions'] = 'Параметры уведомления (не обязательно):';
+$labels['notifyfrom'] = 'Отправитель уведомления (не обязательно):';
 $labels['notifyimportance'] = 'Важность:';
 $labels['notifyimportancelow'] = 'низкая';
 $labels['notifyimportancenormal'] = 'нормальная';
 $labels['notifyimportancehigh'] = 'высокая';
+$labels['notifymethodmailto'] = 'Email';
+$labels['notifymethodtel'] = 'Телефон';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Создать фильтр';
 $labels['usedata'] = 'Использовать следующие данные в фильтре:';
 $labels['nextstep'] = 'Далее';
@@ -157,6 +160,32 @@ $labels['asciicasemap'] = 'Регистронезависимый (ascii-casemap
 $labels['asciinumeric'] = 'Числовой (ascii-numeric)';
 $labels['index'] = 'индекс:';
 $labels['indexlast'] = 'наоборот';
+$labels['vacation'] = 'Отпуск';
+$labels['vacation.reply'] = 'Ответное сообщение';
+$labels['vacation.advanced'] = 'Дополнительные настройки';
+$labels['vacation.subject'] = 'Тема';
+$labels['vacation.body'] = 'Тело письма';
+$labels['vacation.start'] = 'Начало отпуска';
+$labels['vacation.end'] = 'Конец отпуска';
+$labels['vacation.status'] = 'Состояние';
+$labels['vacation.on'] = 'Вкл.';
+$labels['vacation.off'] = 'Выкл.';
+$labels['vacation.addresses'] = 'Мои дополнительные адреса';
+$labels['vacation.interval'] = 'Интервал ответа';
+$labels['vacation.after'] = 'Поместить правило отпуска после';
+$labels['vacation.saving'] = 'Сохранение данных...';
+$labels['vacation.action'] = 'Действия с входящим сообщением';
+$labels['vacation.keep'] = 'Оставить';
+$labels['vacation.discard'] = 'Отменить';
+$labels['vacation.redirect'] = 'Перенаправить на';
+$labels['vacation.copy'] = 'Отправить копию на';
+$labels['arialabelfiltersetactions'] = 'Действия набора фильтров';
+$labels['arialabelfilteractions'] = 'Действия фильтра';
+$labels['arialabelfilterform'] = 'Свойства фильтра';
+$labels['ariasummaryfilterslist'] = 'Список фильтров';
+$labels['ariasummaryfiltersetslist'] = 'Список набора фильтров';
+$labels['filterstitle'] = 'Редактировать фильтры для входящей почты';
+$labels['vacationtitle'] = 'Изменить правило "Не в офисе"';
 $messages['filterunknownerror'] = 'Неизвестная ошибка сервера.';
 $messages['filterconnerror'] = 'Невозможно подключиться к серверу.';
 $messages['filterdeleteerror'] = 'Невозможно удалить фильтр. Ошибка сервера.';
@@ -189,4 +218,7 @@ $messages['namereserved'] = 'Зарезервированное имя.';
 $messages['setexist'] = 'Набор уже существует.';
 $messages['nodata'] = 'Нужно выбрать хотя бы одну позицию!';
 $messages['invaliddateformat'] = 'Неверная дата или формат части даты';
+$messages['saveerror'] = 'Невозможно сохранить данные. Ошибка сервера.';
+$messages['vacationsaved'] = 'Данные об отпуске успешно сохранены.';
+$messages['emptyvacationbody'] = 'Сообщение о причине отсутствия не может быть пустым!';
 ?>
diff --git a/plugins/managesieve/localization/sk_SK.inc b/plugins/managesieve/localization/sk_SK.inc
index ba9f4f552..4cad13f55 100644
--- a/plugins/managesieve/localization/sk_SK.inc
+++ b/plugins/managesieve/localization/sk_SK.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'prvé písmeno veľké';
 $labels['varquotewildcard'] = 'k špeciálnym znakom pridať úvodzovky';
 $labels['varlength'] = 'dĺžka';
 $labels['notify'] = 'Odoslať oznámenie';
-$labels['notifyaddress'] = 'Na e-mailovú adresu:';
-$labels['notifybody'] = 'Telo oznámenia:';
-$labels['notifysubject'] = 'Predmet oznámenia:';
-$labels['notifyfrom'] = 'Odosielateľ oznámenia:';
+$labels['notifytarget'] = 'Cieľ notifikácie:';
+$labels['notifymessage'] = 'Notifikačná správa (voliteľne):';
+$labels['notifyoptions'] = 'Nastavenia notifikácie (voliteľné):';
+$labels['notifyfrom'] = 'Odosielateľ notifikácie (voliteľne):';
 $labels['notifyimportance'] = 'Priorita:';
 $labels['notifyimportancelow'] = 'nízka';
 $labels['notifyimportancenormal'] = 'normálna';
 $labels['notifyimportancehigh'] = 'vysoká';
+$labels['notifymethodmailto'] = 'E-mail';
+$labels['notifymethodtel'] = 'Telefón';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Vytvoriť filter';
 $labels['usedata'] = 'Použiť tieto údaje vo filtri:';
 $labels['nextstep'] = 'Ďalší krok';
@@ -162,9 +165,8 @@ $labels['vacation.reply'] = 'Odpoveď na správu';
 $labels['vacation.advanced'] = 'Pokročilé nastavenia';
 $labels['vacation.subject'] = 'Predmet';
 $labels['vacation.body'] = 'Telo';
-$labels['vacation.dates'] = 'Čas dovolenky';
-$labels['vacation.from'] = 'Od:';
-$labels['vacation.to'] = 'Komu:';
+$labels['vacation.start'] = 'Začiatok dovolenky';
+$labels['vacation.end'] = 'Koniec dovolenky';
 $labels['vacation.status'] = 'Stav';
 $labels['vacation.on'] = 'Zap.';
 $labels['vacation.off'] = 'Vyp.';
@@ -172,6 +174,18 @@ $labels['vacation.addresses'] = 'Moje ďalšie adresy';
 $labels['vacation.interval'] = 'Interval odpovedania';
 $labels['vacation.after'] = 'Nastaviť pravidlo pre dovolenku po';
 $labels['vacation.saving'] = 'Ukladanie údajov...';
+$labels['vacation.action'] = 'Akcia pre prichádzajúcu správu';
+$labels['vacation.keep'] = 'Zachovať';
+$labels['vacation.discard'] = 'Vyhodiť do koša';
+$labels['vacation.redirect'] = 'Presmerovať na';
+$labels['vacation.copy'] = 'Poslať kópiu na';
+$labels['arialabelfiltersetactions'] = 'Akcie zo súpravy filtrov';
+$labels['arialabelfilteractions'] = 'Akcie filtra';
+$labels['arialabelfilterform'] = 'Nastavenia filtra';
+$labels['ariasummaryfilterslist'] = 'Zoznam filtrov';
+$labels['ariasummaryfiltersetslist'] = 'Zoznam súprav s filtrami';
+$labels['filterstitle'] = 'Upraviť filtre prichádzajúcich e-mailov';
+$labels['vacationtitle'] = 'Upraviť pravidlo pre čas mimo kancelárie';
 $messages['filterunknownerror'] = 'Neznáma chyba servera.';
 $messages['filterconnerror'] = 'Nepodarilo sa pripojiť k serveru.';
 $messages['filterdeleteerror'] = 'Nemožno vymazať filter. Nastala chyba servera.';
@@ -206,4 +220,5 @@ $messages['nodata'] = 'Aspoň jedna pozícia musí byť zvolená!';
 $messages['invaliddateformat'] = 'Neplatný formát dátumu alebo časti dátumu';
 $messages['saveerror'] = 'Údaje nemožno uložiť. Nastala chyba servera.';
 $messages['vacationsaved'] = 'Údaje o dovolenke boli úspešne uložené.';
+$messages['emptyvacationbody'] = 'Musíte zadať telo správy, zobrazovanej v čase neprítomnosti!';
 ?>
diff --git a/plugins/managesieve/localization/sl_SI.inc b/plugins/managesieve/localization/sl_SI.inc
index 8c37b9c76..f0e5159c3 100644
--- a/plugins/managesieve/localization/sl_SI.inc
+++ b/plugins/managesieve/localization/sl_SI.inc
@@ -108,10 +108,6 @@ $labels['varupperfirst'] = 'prvi znak velika začetnica';
 $labels['varquotewildcard'] = 'citiraj posebne znake';
 $labels['varlength'] = 'dolžina';
 $labels['notify'] = 'Poštlji obvestilo';
-$labels['notifyaddress'] = 'Na elektronski naslov:';
-$labels['notifybody'] = 'Telo obvestila:';
-$labels['notifysubject'] = 'Zadeva obvestila:';
-$labels['notifyfrom'] = 'Pošiljatelj obvestila:';
 $labels['notifyimportance'] = 'Pomembnost:';
 $labels['notifyimportancelow'] = 'nizko';
 $labels['notifyimportancenormal'] = 'običajno';
diff --git a/plugins/managesieve/localization/sv_SE.inc b/plugins/managesieve/localization/sv_SE.inc
index f0d3da778..ede13cb61 100644
--- a/plugins/managesieve/localization/sv_SE.inc
+++ b/plugins/managesieve/localization/sv_SE.inc
@@ -19,7 +19,7 @@ $labels['filters'] = 'Filter';
 $labels['managefilters'] = 'Administrera filter';
 $labels['filtername'] = 'Filternamn';
 $labels['newfilter'] = 'Nytt filter';
-$labels['filteradd'] = 'Lägg till filter';
+$labels['filteradd'] = 'Nytt filter';
 $labels['filterdel'] = 'Ta bort filter';
 $labels['moveup'] = 'Flytta upp filter';
 $labels['movedown'] = 'Flytta ner filter';
@@ -65,7 +65,7 @@ $labels['rulestop'] = 'Avsluta filtrering';
 $labels['enable'] = 'Aktivera/deaktivera';
 $labels['filterset'] = 'Filtergrupp';
 $labels['filtersets'] = 'Filtergrupper';
-$labels['filtersetadd'] = 'Lägg till filtergrupp';
+$labels['filtersetadd'] = 'Ny filtergrupp';
 $labels['filtersetdel'] = 'Ta bort filtergrupp';
 $labels['filtersetact'] = 'Aktivera filtergrupp';
 $labels['filtersetdeact'] = 'Deaktivera filtergrupp';
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'Första tecken versalt';
 $labels['varquotewildcard'] = 'Koda specialtecken';
 $labels['varlength'] = 'Längd';
 $labels['notify'] = 'Skicka avisering';
-$labels['notifyaddress'] = 'Mottagaradress:';
-$labels['notifybody'] = 'Aviseringsmeddelande:';
-$labels['notifysubject'] = 'Aviseringsämne:';
-$labels['notifyfrom'] = 'Aviseringsavsändare:';
+$labels['notifytarget'] = 'Aviseringsmål:';
+$labels['notifymessage'] = 'Aviseringsmeddelande (valfritt):';
+$labels['notifyoptions'] = 'Aviseringstillval (valfritt):';
+$labels['notifyfrom'] = 'Aviseringsavsändare (valfri):';
 $labels['notifyimportance'] = 'Prioritet:';
 $labels['notifyimportancelow'] = 'Låg';
 $labels['notifyimportancenormal'] = 'Normal';
 $labels['notifyimportancehigh'] = 'Hög';
+$labels['notifymethodmailto'] = 'E-post';
+$labels['notifymethodtel'] = 'Telefon';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Skapa filter';
 $labels['usedata'] = 'Använd följande information i filtret:';
 $labels['nextstep'] = 'Nästa steg';
@@ -162,9 +165,8 @@ $labels['vacation.reply'] = 'Besvara meddelande';
 $labels['vacation.advanced'] = 'Avancerade inställningar';
 $labels['vacation.subject'] = 'Ämne';
 $labels['vacation.body'] = 'Innehåll';
-$labels['vacation.dates'] = 'Frånvarotid';
-$labels['vacation.from'] = 'Avsändare:';
-$labels['vacation.to'] = 'Mottagare:';
+$labels['vacation.start'] = 'Frånvaron börjar';
+$labels['vacation.end'] = 'Frånvaron slutar';
 $labels['vacation.status'] = 'Status';
 $labels['vacation.on'] = 'På';
 $labels['vacation.off'] = 'Av';
@@ -172,6 +174,18 @@ $labels['vacation.addresses'] = 'Ytterligare mottagaradresser';
 $labels['vacation.interval'] = 'Svarsintervall';
 $labels['vacation.after'] = 'Placera frånvaroregel efter';
 $labels['vacation.saving'] = 'Sparar data...';
+$labels['vacation.action'] = 'Hantering av inkommande meddelanden';
+$labels['vacation.keep'] = 'Behåll';
+$labels['vacation.discard'] = 'Förkasta';
+$labels['vacation.redirect'] = 'Ändra mottagare till';
+$labels['vacation.copy'] = 'Skicka kopia till';
+$labels['arialabelfiltersetactions'] = 'Hantera filtergrupper';
+$labels['arialabelfilteractions'] = 'Hantera filter';
+$labels['arialabelfilterform'] = 'Filteregenskaper';
+$labels['ariasummaryfilterslist'] = 'Lista med filter';
+$labels['ariasummaryfiltersetslist'] = 'Lista med filtergrupper';
+$labels['filterstitle'] = 'Ändra filter för inkommande meddelanden';
+$labels['vacationtitle'] = 'Ändra regel för frånvaromeddelande';
 $messages['filterunknownerror'] = 'Okänt serverfel';
 $messages['filterconnerror'] = 'Anslutning till serverns filtertjänst misslyckades';
 $messages['filterdeleteerror'] = 'Filtret kunde inte tas bort på grund av serverfel';
@@ -206,4 +220,5 @@ $messages['nodata'] = 'Minst en position måste väljas!';
 $messages['invaliddateformat'] = 'Ogiltigt datum eller del av datumformat';
 $messages['saveerror'] = 'Datan kunde inte sparas på grund av serverfel.';
 $messages['vacationsaved'] = 'Frånvarodatan har sparats.';
+$messages['emptyvacationbody'] = 'Text för frånvaromeddelande saknas!';
 ?>
diff --git a/plugins/managesieve/localization/tr_TR.inc b/plugins/managesieve/localization/tr_TR.inc
index c4b4f82db..c61838690 100644
--- a/plugins/managesieve/localization/tr_TR.inc
+++ b/plugins/managesieve/localization/tr_TR.inc
@@ -98,7 +98,7 @@ $labels['flaganswered'] = 'Cevaplanmış';
 $labels['flagflagged'] = 'İşaretli';
 $labels['flagdraft'] = 'Taslak';
 $labels['setvariable'] = 'Değişken tanımla';
-$labels['setvarname'] = 'Değişken adı';
+$labels['setvarname'] = 'Değişken adı:';
 $labels['setvarvalue'] = 'Değişken değeri:';
 $labels['setvarmodifiers'] = 'Değiştiriciler:';
 $labels['varlower'] = 'küçük harf';
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'İlk karakter büyük harf';
 $labels['varquotewildcard'] = 'özel karakterleri tırnak içine al';
 $labels['varlength'] = 'uzunluk';
 $labels['notify'] = 'Bildirim gönder';
-$labels['notifyaddress'] = 'Alıcı e-posta adresi';
-$labels['notifybody'] = 'Bildirim gövdesi:';
-$labels['notifysubject'] = 'Bildirim konusu:';
-$labels['notifyfrom'] = 'Bildirim göndericisi:';
-$labels['notifyimportance'] = 'Önem derecesi';
+$labels['notifytarget'] = 'Bildirim hedefi:';
+$labels['notifymessage'] = 'Bildirim mesajı (tercihe bağlı):';
+$labels['notifyoptions'] = 'Bildirim tercihleri (tercihe bağlı):';
+$labels['notifyfrom'] = 'Bildirim göndericisi (tercihe bağlı):';
+$labels['notifyimportance'] = 'Önem derecesi:';
 $labels['notifyimportancelow'] = 'düşük';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'yüksek';
+$labels['notifymethodmailto'] = 'E-posta';
+$labels['notifymethodtel'] = 'Telefon';
+$labels['notifymethodsms'] = 'SMS';
 $labels['filtercreate'] = 'Süzgeç oluştur';
 $labels['usedata'] = 'Aşağıdaki verileri süzgeçte kullan';
 $labels['nextstep'] = 'Sonraki adım';
@@ -162,16 +165,27 @@ $labels['vacation.reply'] = 'Cevap mesajı';
 $labels['vacation.advanced'] = 'Gelişmiş seçenekler';
 $labels['vacation.subject'] = 'Konu';
 $labels['vacation.body'] = 'Gövde';
-$labels['vacation.dates'] = 'Tatil zamanı';
-$labels['vacation.from'] = 'Gönderen:';
-$labels['vacation.to'] = 'Kime:';
+$labels['vacation.start'] = 'Tatil başlangıcı';
+$labels['vacation.end'] = 'Tatil bitişi';
 $labels['vacation.status'] = 'Durum';
-$labels['vacation.on'] = 'Aktif';
+$labels['vacation.on'] = 'Etkin';
 $labels['vacation.off'] = 'Devre dışı';
 $labels['vacation.addresses'] = 'Ek adresler';
 $labels['vacation.interval'] = 'Cevap aralığı';
 $labels['vacation.after'] = 'Şundan sonra tatil kuralı koy';
-$labels['vacation.saving'] = 'Veriyi kaydediyor';
+$labels['vacation.saving'] = 'Veri kaydediliyor...';
+$labels['vacation.action'] = 'Gelen mesaj aksiyonu';
+$labels['vacation.keep'] = 'Koru';
+$labels['vacation.discard'] = 'Yoksay';
+$labels['vacation.redirect'] = 'Şuraya yönlendir';
+$labels['vacation.copy'] = 'Şuraya kopya gönder';
+$labels['arialabelfiltersetactions'] = 'Filtre seti aksiyonları';
+$labels['arialabelfilteractions'] = 'Filtre aksiyonları';
+$labels['arialabelfilterform'] = 'Filtre özellikleri';
+$labels['ariasummaryfilterslist'] = 'Filtre listesi';
+$labels['ariasummaryfiltersetslist'] = 'Filtre seti listesi';
+$labels['filterstitle'] = 'Gelen e-posta filtrelerini düzenle';
+$labels['vacationtitle'] = 'Ofis dışında kuralını düzenle';
 $messages['filterunknownerror'] = 'Bilinmeyen sunucu hatası.';
 $messages['filterconnerror'] = 'Sunucuya bağlanamıyor.';
 $messages['filterdeleteerror'] = 'Filtre silinemedi. Sunucuda hata oluştu.';
@@ -206,4 +220,5 @@ $messages['nodata'] = 'En az bir pozisyon seçilmelidir.';
 $messages['invaliddateformat'] = 'geçersiz tarih veya tarih biçimi';
 $messages['saveerror'] = 'Veri kaydedilemedi. Sunucuda hata oluştu.';
 $messages['vacationsaved'] = 'Tatil verisi başarıyla kaydedildi.';
+$messages['emptyvacationbody'] = 'Tatil mesajı metni gerekmektedir.';
 ?>
diff --git a/plugins/managesieve/localization/uk_UA.inc b/plugins/managesieve/localization/uk_UA.inc
index d77b592f9..fce7867a6 100644
--- a/plugins/managesieve/localization/uk_UA.inc
+++ b/plugins/managesieve/localization/uk_UA.inc
@@ -93,10 +93,6 @@ $labels['varlowerfirst'] = 'перший символ в нижньому рег
 $labels['varupperfirst'] = 'перший символ в верхньому регістрі';
 $labels['varlength'] = 'довжина';
 $labels['notify'] = 'Надсилати сповіщення';
-$labels['notifyaddress'] = 'На електронну адресу:';
-$labels['notifybody'] = 'Тіло сповіщення:';
-$labels['notifysubject'] = 'Тема сповіщення:';
-$labels['notifyfrom'] = 'Відправник сповіщення:';
 $labels['filtercreate'] = 'Створити фільтр';
 $labels['nextstep'] = 'Наступний крок';
 $labels['...'] = '...';
diff --git a/plugins/managesieve/localization/vi_VN.inc b/plugins/managesieve/localization/vi_VN.inc
index 4960c2a47..d22ff7e91 100644
--- a/plugins/managesieve/localization/vi_VN.inc
+++ b/plugins/managesieve/localization/vi_VN.inc
@@ -108,14 +108,17 @@ $labels['varupperfirst'] = 'chữ cái đầu viết hoa';
 $labels['varquotewildcard'] = 'trích dẫn ký tự đặc biệt';
 $labels['varlength'] = 'độ dài';
 $labels['notify'] = 'Gửi thông báo';
-$labels['notifyaddress'] = 'Gửi đến địa chỉ email:';
-$labels['notifybody'] = 'Nội dung thông báo:';
-$labels['notifysubject'] = 'Tiêu đề thông báo:';
-$labels['notifyfrom'] = 'Người gửi thông báo:';
+$labels['notifytarget'] = 'Mục tiêu thông báo:';
+$labels['notifymessage'] = 'Nội dung thông báo (tuỳ chọn):';
+$labels['notifyoptions'] = 'Lựa chọn thông báo (tuỳ chọn):';
+$labels['notifyfrom'] = 'Người gửi thông báo (tuỳ chọn):';
 $labels['notifyimportance'] = 'Mức độ quan trọng:';
 $labels['notifyimportancelow'] = 'thấp';
 $labels['notifyimportancenormal'] = 'vừa phải';
 $labels['notifyimportancehigh'] = 'cao';
+$labels['notifymethodmailto'] = 'Thư điện tử';
+$labels['notifymethodtel'] = 'Điện thoại';
+$labels['notifymethodsms'] = 'Tin nhắn';
 $labels['filtercreate'] = 'Tạo bộ lọc';
 $labels['usedata'] = 'Dùng dữ liệu trong bộ lọc sau:';
 $labels['nextstep'] = 'Bước tiếp theo';
@@ -157,6 +160,18 @@ $labels['asciicasemap'] = 'Không phân biệt chữ hoa chữ thường';
 $labels['asciinumeric'] = 'Bảng mã ASCII';
 $labels['index'] = 'chỉ mục:';
 $labels['indexlast'] = 'ngược';
+$labels['vacation'] = 'Thiết lập tự động trả lời trong kỳ nghỉ';
+$labels['vacation.reply'] = 'Trả lời thư';
+$labels['vacation.advanced'] = 'Tùy chọn tính năng cao hơn';
+$labels['vacation.subject'] = 'Tiêu đề';
+$labels['vacation.body'] = 'Nội dung thư';
+$labels['vacation.status'] = 'Trạng thái';
+$labels['vacation.on'] = 'Bật';
+$labels['vacation.off'] = 'Tắt';
+$labels['vacation.addresses'] = 'Các địa chỉ bổ sung của tôi';
+$labels['vacation.interval'] = 'Khoảng thời gian trả lời';
+$labels['vacation.after'] = 'Đặt quy định kỳ nghỉ sau';
+$labels['vacation.saving'] = 'Lưu lại dữ liệu...';
 $messages['filterunknownerror'] = 'Không tìm được lỗi máy chủ';
 $messages['filterconnerror'] = 'Không kết nối được với máy chủ.';
 $messages['filterdeleteerror'] = 'Không thể xóa bộ lọc. Xuất hiện lỗi ở máy chủ';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'Tên đã được bảo vệ';
 $messages['setexist'] = 'Thiết lập đã tồn tại';
 $messages['nodata'] = 'Ít nhất một vị trí phải được chọn';
 $messages['invaliddateformat'] = 'Lỗi không đúng cú pháp ngày hoặc nhập ngày sai';
+$messages['saveerror'] = 'Không thể lưu trữ dữ liệu. Xuất hiện lỗi ở máy chủ.';
+$messages['vacationsaved'] = 'Thiết lập kỳ nghỉ đã được lưu lại thành công.';
 ?>
diff --git a/plugins/managesieve/localization/zh_CN.inc b/plugins/managesieve/localization/zh_CN.inc
index e62c3f974..a39b3126f 100644
--- a/plugins/managesieve/localization/zh_CN.inc
+++ b/plugins/managesieve/localization/zh_CN.inc
@@ -104,10 +104,6 @@ $labels['varupperfirst'] = '首字母大写';
 $labels['varquotewildcard'] = '引用特殊字符';
 $labels['varlength'] = '长度';
 $labels['notify'] = '发送通知';
-$labels['notifyaddress'] = '收件地址：';
-$labels['notifybody'] = '通知正文：';
-$labels['notifysubject'] = '通知主题';
-$labels['notifyfrom'] = '通知的发送人：';
 $labels['notifyimportance'] = '优先级：';
 $labels['notifyimportancelow'] = '低';
 $labels['notifyimportancenormal'] = '中';
diff --git a/plugins/managesieve/localization/zh_TW.inc b/plugins/managesieve/localization/zh_TW.inc
index 72eb3393b..b21310cea 100644
--- a/plugins/managesieve/localization/zh_TW.inc
+++ b/plugins/managesieve/localization/zh_TW.inc
@@ -102,10 +102,6 @@ $labels['varupperfirst'] = '第一個字高於';
 $labels['varquotewildcard'] = '跳脫字元';
 $labels['varlength'] = '長度';
 $labels['notify'] = '寄送通知';
-$labels['notifyaddress'] = '寄到電子郵件位址:';
-$labels['notifybody'] = '通知內容:';
-$labels['notifysubject'] = '通知主旨:';
-$labels['notifyfrom'] = '通知寄件者:';
 $labels['notifyimportance'] = '重要性:';
 $labels['notifyimportancelow'] = '低';
 $labels['notifyimportancenormal'] = '一般';
diff --git a/plugins/markasjunk/localization/ku.inc b/plugins/markasjunk/localization/ast.inc
index 0bb30fa59..b55fa363a 100644
--- a/plugins/markasjunk/localization/ku.inc
+++ b/plugins/markasjunk/localization/ast.inc
@@ -15,6 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-$labels['buttontitle'] = 'nawnişani bka ba şkaw';
-$labels['reportedasjunk'] = 'ba gşti raport kra';
+$labels['buttontext'] = 'Puxarra';
+$labels['buttontitle'] = 'Conseñar como puxarra';
+$labels['reportedasjunk'] = 'Reportáu con ésitu como Puxarra';
 ?>
 \ No newline at end of file
diff --git a/plugins/markasjunk/localization/fa_AF.inc b/plugins/markasjunk/localization/fa_AF.inc
new file mode 100644
index 000000000..04eaec61c
--- /dev/null
+++ b/plugins/markasjunk/localization/fa_AF.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/markasjunk/localization/<lang>.inc                            |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
+*/
+$labels['buttontext'] = 'هرزنامه';
+$labels['buttontitle'] = 'نشانه گذاری به عنوان هرزنامه';
+$labels['reportedasjunk'] = 'با موفقبت به عنوان هرزنامه گزارش شد';
+?>
+\ No newline at end of file
diff --git a/plugins/markasjunk/localization/ko_KR.inc b/plugins/markasjunk/localization/ko_KR.inc
index 209f530a1..485af3187 100644
--- a/plugins/markasjunk/localization/ko_KR.inc
+++ b/plugins/markasjunk/localization/ko_KR.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-$labels['buttontext'] = '정크메일';
-$labels['buttontitle'] = '정크메일로 표시';
-$labels['reportedasjunk'] = '성공적으로, 정크메일이라 보고 됨';
+$labels['buttontext'] = '스팸';
+$labels['buttontitle'] = '스팸으로 표시';
+$labels['reportedasjunk'] = '스팸으로 성공적으로 보고함';
 ?>
 \ No newline at end of file
diff --git a/plugins/markasjunk/localization/ml_IN.inc b/plugins/markasjunk/localization/ml_IN.inc
index aaa736b98..d08a04363 100644
--- a/plugins/markasjunk/localization/ml_IN.inc
+++ b/plugins/markasjunk/localization/ml_IN.inc
@@ -15,6 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-$labels['buttontitle'] = 'സ്പാം ആയി അടയാളപ്പെടുത്തുക';
-$labels['reportedasjunk'] = 'സ്പാം ആയി അടയാളപ്പെടുത്തി';
+$labels['buttontext'] = 'ചവർ';
+$labels['buttontitle'] = 'ചവർ ആയി അടയാളപ്പെടുത്തുക';
+$labels['reportedasjunk'] = 'ചവർ ആയി അടയാളപ്പെടുത്തി';
 ?>
 \ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ast.inc b/plugins/new_user_dialog/localization/ast.inc
index 0ec826dee..11868bcbb 100644
--- a/plugins/new_user_dialog/localization/ast.inc
+++ b/plugins/new_user_dialog/localization/ast.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-$labels['identitydialogtitle'] = 'Por favor, completa los tos datos personales';
-$labels['identitydialoghint'] = 'Esti diálogu namái va apaecer la primer vegada que te coneutes al corréu.';
+$labels['identitydialogtitle'] = 'Por favor, completa la to identidá de remitente';
+$labels['identitydialoghint'] = 'Esta caxa namái apaecerá una vegada nel primer aniciu de sesión.';
 ?>
 \ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/br.inc b/plugins/new_user_dialog/localization/br.inc
new file mode 100644
index 000000000..9654452e7
--- /dev/null
+++ b/plugins/new_user_dialog/localization/br.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
+*/
+$labels['identitydialogtitle'] = 'Bizskrivit hoc\'h anv kaser mar plij';
+$labels['identitydialoghint'] = 'Diskouezet eo ar boest e-pad ar c\'hentañ kennask.';
+?>
+\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ko_KR.inc b/plugins/new_user_dialog/localization/ko_KR.inc
index 51b98f03c..6e27e7c62 100644
--- a/plugins/new_user_dialog/localization/ko_KR.inc
+++ b/plugins/new_user_dialog/localization/ko_KR.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-$labels['identitydialogtitle'] = '발신인의 신원을 완성하시기 바랍니다.';
+$labels['identitydialogtitle'] = '발송자의 신원을 완성해주세요.';
 $labels['identitydialoghint'] = '이 상자는 최초로 로그인할 때만 나타납니다.';
 ?>
 \ No newline at end of file
diff --git a/plugins/newmail_notifier/localization/ast.inc b/plugins/newmail_notifier/localization/ast.inc
index 3c5c192e0..5121d2821 100644
--- a/plugins/newmail_notifier/localization/ast.inc
+++ b/plugins/newmail_notifier/localization/ast.inc
@@ -15,14 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-$labels['basic'] = 'Amosar notificaciones del navegador cuando aporte un mensaxe nuevu';
-$labels['desktop'] = 'Amosar notificaciones del escritoriu cuando aporte un mensaxe nuevu';
-$labels['sound'] = 'Reproducir soníu cuando aporte un mensaxe nuevu';
+$labels['basic'] = 'Amosar notificaciones del restolador nun mensaxe nuevu';
+$labels['desktop'] = 'Amosar notificaciones d\'escritoriu nun mensaxe nuevu';
+$labels['sound'] = 'Reproducir el soníu nun mensaxe nuevu';
 $labels['test'] = 'Prueba';
 $labels['title'] = '¡Mensaxe nuevu!';
 $labels['body'] = 'Recibisti un mensaxe nuevu';
-$labels['testbody'] = 'Esta ye una notificación de pruebes';
-$labels['desktopdisabled'] = 'Les notificaciones d\'escritoriu tán deshabilitaes nel to navegador.';
-$labels['desktopunsupported'] = 'El to navegador nun sofita notificaciones d\'escritoriu.';
+$labels['testbody'] = 'Esta ye una notificación de prueba';
+$labels['desktopdisabled'] = 'Les notificaciones d\'escritoriu tán deshabilitaes nel to restolador.';
+$labels['desktopunsupported'] = 'El to restolador nun sofita notificaciones d\'escritoriu.';
 $labels['desktoptimeout'] = 'Zarrar notificación d\'escritoriu';
 ?>
diff --git a/plugins/newmail_notifier/localization/br.inc b/plugins/newmail_notifier/localization/br.inc
index 60db9a529..319a67729 100644
--- a/plugins/newmail_notifier/localization/br.inc
+++ b/plugins/newmail_notifier/localization/br.inc
@@ -15,10 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
+$labels['basic'] = 'Diskouez kemennoù ar merdeer evit kemennadennoù nevez';
+$labels['desktop'] = 'Diskouez kemennoù ar burev evit kemennadennoù nevez';
 $labels['sound'] = 'Seniñ ar son pa kemennadenn nevez';
 $labels['test'] = 'Taol-arnod';
 $labels['title'] = 'Kemennadenn nevez !';
 $labels['body'] = 'Resevet ho p\'eus ur postel nevez';
 $labels['testbody'] = 'An dra se a zo un taol arnod kemenn';
+$labels['desktopdisabled'] = 'Diweredekaet eo kemennoù ar burev en ho merdeer.';
+$labels['desktopunsupported'] = 'N\'eo ket skoret kemennoù ar burev gant ho merdeer.';
 $labels['desktoptimeout'] = 'Serr burev kemen';
 ?>
diff --git a/plugins/newmail_notifier/localization/es_AR.inc b/plugins/newmail_notifier/localization/es_AR.inc
index 682d79ef4..a095c01d8 100644
--- a/plugins/newmail_notifier/localization/es_AR.inc
+++ b/plugins/newmail_notifier/localization/es_AR.inc
@@ -24,4 +24,5 @@ $labels['body'] = 'Has recibido correo nuevo';
 $labels['testbody'] = 'Esta es una notificación de prueba';
 $labels['desktopdisabled'] = 'Las notificaciones en escritorio están deshabilitadas en tu navegador';
 $labels['desktopunsupported'] = 'Tu navegador no soporta notificaciones en escritorio';
+$labels['desktoptimeout'] = 'Cerrar notificación de escritorio';
 ?>
diff --git a/plugins/newmail_notifier/localization/et_EE.inc b/plugins/newmail_notifier/localization/et_EE.inc
index 22bdde908..6f6f1b0c7 100644
--- a/plugins/newmail_notifier/localization/et_EE.inc
+++ b/plugins/newmail_notifier/localization/et_EE.inc
@@ -24,4 +24,5 @@ $labels['body'] = 'Saabus uus kiri.';
 $labels['testbody'] = 'See on teavituse proov.';
 $labels['desktopdisabled'] = 'Töölaua märguanded on su veebilehitsejas keelatud.';
 $labels['desktopunsupported'] = 'Sinu veebilehitseja ei toeta töölaua märguandeid.';
+$labels['desktoptimeout'] = 'Sulge töölaua teavitus';
 ?>
diff --git a/plugins/newmail_notifier/localization/hu_HU.inc b/plugins/newmail_notifier/localization/hu_HU.inc
index 59464f27c..6477de9b9 100644
--- a/plugins/newmail_notifier/localization/hu_HU.inc
+++ b/plugins/newmail_notifier/localization/hu_HU.inc
@@ -16,13 +16,13 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 $labels['basic'] = 'Értesítés megjelenítése böngészőben amikor új üzenet érkezik';
-$labels['desktop'] = 'Asztali értesítés megjelenítése új üzenet érkezésekor';
+$labels['desktop'] = 'Értesítés megjelenítése az asztalon amikor új üzenet érkezik';
 $labels['sound'] = 'Hang lejátszása új üzenet érkezésekor';
-$labels['test'] = 'Hang lejátszása';
-$labels['title'] = 'Ú email!';
-$labels['body'] = 'Új üzeneted érkezett.';
-$labels['testbody'] = 'Ez egy teszt értesítés.';
-$labels['desktopdisabled'] = 'Az asztali értesítés ki van kapcsolva a böngésződben.';
-$labels['desktopunsupported'] = 'A böngésződ nem támogatja az asztali értesítéseket.';
-$labels['desktoptimeout'] = 'Az asztali értesítés bezárása';
+$labels['test'] = 'Próba';
+$labels['title'] = 'Új üzenet!';
+$labels['body'] = 'Új üzenet érkezett.';
+$labels['testbody'] = 'Ez egy értesítési próba.';
+$labels['desktopdisabled'] = 'A böngészőben tiltva van az asztali értesítések megjelenítése.';
+$labels['desktopunsupported'] = 'A böngésző nem támogatja az asztali értesítések megjelenítését.';
+$labels['desktoptimeout'] = 'Az értesítés bezárása';
 ?>
diff --git a/plugins/newmail_notifier/localization/id_ID.inc b/plugins/newmail_notifier/localization/id_ID.inc
index 1f32afa7c..34c71e3e6 100644
--- a/plugins/newmail_notifier/localization/id_ID.inc
+++ b/plugins/newmail_notifier/localization/id_ID.inc
@@ -24,4 +24,5 @@ $labels['body'] = 'Anda telah menerima sebuah pesan baru.';
 $labels['testbody'] = 'Ini adalah percobaan pemberitahuan.';
 $labels['desktopdisabled'] = 'Pemberitahuan di desktop dimatikan pada peramban Anda.';
 $labels['desktopunsupported'] = 'Peramban Anda tidak mendukung pemberitahuan pada desktop';
+$labels['desktoptimeout'] = 'Tutup pemberitahuan pada desktop';
 ?>
diff --git a/plugins/newmail_notifier/localization/ko_KR.inc b/plugins/newmail_notifier/localization/ko_KR.inc
index 9c3a2b16a..ce9e5a46a 100644
--- a/plugins/newmail_notifier/localization/ko_KR.inc
+++ b/plugins/newmail_notifier/localization/ko_KR.inc
@@ -15,14 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-$labels['basic'] = '새로운 메시지가 도착 시에 브라우저의 알림에 표시';
-$labels['desktop'] = '새로운 메시지가 도착 시에 데스크탑의 알림에 표시';
-$labels['sound'] = '새로운 메시지가 도착 시에 소리 재생';
+$labels['basic'] = '새로운 메시지가 도착하면 브라우저 알림 표시';
+$labels['desktop'] = '새로운 메시지가 도착하면 바탕화면 알림 표시';
+$labels['sound'] = '새로운 메시지가 도착하면 소리 재생';
 $labels['test'] = '테스트';
-$labels['title'] = '새로운 메일 도착!';
-$labels['body'] = '새로운 메시지를 수신하였습니다.';
-$labels['testbody'] = '이 것은 시험용 알림입니다.';
-$labels['desktopdisabled'] = '당신의 브라우져에서는 데스크탑의 알림이 불가능하도록 되어있습니다.';
-$labels['desktopunsupported'] = '당신의 브라우져에서는 데스크탑의 알림을 지원하지 않습니다.';
-$labels['desktoptimeout'] = '데스크탑 알림 닫기';
+$labels['title'] = '새로운 이메일 도착!';
+$labels['body'] = '새로운 메시지를 받았습니다.';
+$labels['testbody'] = '이것은 테스트 알림입니다.';
+$labels['desktopdisabled'] = ' 브라우저에서 바탕화면 알림이 비활성화되었습니다.';
+$labels['desktopunsupported'] = '브라우저가 바탕화면 알림을 지원하지 않습니다.';
+$labels['desktoptimeout'] = '바탕화면 알림 닫기';
 ?>
diff --git a/plugins/newmail_notifier/localization/ku.inc b/plugins/newmail_notifier/localization/ku.inc
new file mode 100644
index 000000000..cf8d69261
--- /dev/null
+++ b/plugins/newmail_notifier/localization/ku.inc
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
+*/
+$labels['basic'] = 'Agahdariyên gerokê li ser peyama nû bide nîşan';
+$labels['desktop'] = 'Agahdariyên sermasê li ser peyama nû bide nîşan';
+$labels['sound'] = 'Deng li ser peyameke nû veke';
+$labels['test'] = 'Test';
+$labels['title'] = 'Emaila Nû!';
+$labels['body'] = 'Peyameke te ya nû heye.';
+$labels['testbody'] = 'Ev agahdariyeke testê ye.';
+$labels['desktopdisabled'] = 'Agahdariyên sermasê di geroka te de girtî ne. ';
+$labels['desktopunsupported'] = 'Geroka te bi agahdariyên sermasê re ne ahengdar e.';
+$labels['desktoptimeout'] = 'Ahahadariya sermasê bigire';
+?>
diff --git a/plugins/newmail_notifier/localization/ku_IQ.inc b/plugins/newmail_notifier/localization/ku_IQ.inc
new file mode 100644
index 000000000..93235de03
--- /dev/null
+++ b/plugins/newmail_notifier/localization/ku_IQ.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
+*/
+$labels['test'] = 'تاقیکردنەوە';
+?>
diff --git a/plugins/newmail_notifier/localization/ml_IN.inc b/plugins/newmail_notifier/localization/ml_IN.inc
index 44ec26e69..c4986d3ad 100644
--- a/plugins/newmail_notifier/localization/ml_IN.inc
+++ b/plugins/newmail_notifier/localization/ml_IN.inc
@@ -24,4 +24,5 @@ $labels['body'] = 'താങ്കള്‍ക്ക് ഒരു പുതി�
 $labels['testbody'] = 'ഇത് ഒരു പരീക്ഷണ അറിയിപ്പാണ്.';
 $labels['desktopdisabled'] = 'താങ്കളുടെ ബ്രൌസറില്‍ ഡെസ്ക്ക്ടോപ്പ് നോട്ടിഫിക്കേഷന്‍ പ്രവര്‍ത്തനരഹിതമാണ്.';
 $labels['desktopunsupported'] = 'താങ്കളുടെ ബ്രൌസ്സര്‍ ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകള്‍ പിന്‍തുണയ്ക്കുന്നില്ല.';
+$labels['desktoptimeout'] = 'ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകൾ അടയ്ക്കുക';
 ?>
diff --git a/plugins/newmail_notifier/localization/tr_TR.inc b/plugins/newmail_notifier/localization/tr_TR.inc
index 8c4e0c158..e59c05597 100644
--- a/plugins/newmail_notifier/localization/tr_TR.inc
+++ b/plugins/newmail_notifier/localization/tr_TR.inc
@@ -17,12 +17,12 @@
 */
 $labels['basic'] = 'Yeni mesajlarda web tarayıcı bildirimlerini göster';
 $labels['desktop'] = 'Yeni mesajlarda masa üstü bildirimlerini göster';
-$labels['sound'] = 'Yeni mesajlarda muzik çal';
+$labels['sound'] = 'Yeni mesajlarda müzik çal';
 $labels['test'] = 'Deneme';
 $labels['title'] = 'Yeni E-posta!';
 $labels['body'] = 'Yeni bir mesaj aldınız';
 $labels['testbody'] = 'Bu bir test bildirimidir.';
-$labels['desktopdisabled'] = 'Web tarayıcınızda masa üstü bildirimi iptal edildi';
-$labels['desktopunsupported'] = 'Web tarayıcınız masa üstü bildidrimleri desteklemiyor';
+$labels['desktopdisabled'] = 'Web tarayıcınızda masaüstü bildirimi iptal edildi';
+$labels['desktopunsupported'] = 'Web tarayıcınız masaüstü bildirimleri desteklemiyor';
 $labels['desktoptimeout'] = 'Masaüstü bildirimini kapat';
 ?>
diff --git a/plugins/password/localization/ar.inc b/plugins/password/localization/ar.inc
index 521127a8f..db7c424cd 100644
--- a/plugins/password/localization/ar.inc
+++ b/plugins/password/localization/ar.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'تغيير كلمة المرور';
 $labels['curpasswd']  = 'كلمة المرور الحالية:';
 $labels['newpasswd']  = 'كلمة المرور الجديدة:';
 $labels['confpasswd']  = 'تأكيد كلمة المرور الجديدة:';
diff --git a/plugins/password/localization/ar_SA.inc b/plugins/password/localization/ar_SA.inc
index d9fd11fbf..d91b52333 100644
--- a/plugins/password/localization/ar_SA.inc
+++ b/plugins/password/localization/ar_SA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'تغيير كلمة المرور';
 $labels['curpasswd']  = 'كلمة المرور الحالية';
 $labels['newpasswd']  = 'كلمة المرور الجديدة';
 $labels['confpasswd']  = 'تأكيد كلمة المرور الجديدة';
diff --git a/plugins/password/localization/ast.inc b/plugins/password/localization/ast.inc
index 99b283ec5..aae336854 100644
--- a/plugins/password/localization/ast.inc
+++ b/plugins/password/localization/ast.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Camudar contraseña';
 $labels['curpasswd']  = 'Contraseña actual:';
 $labels['newpasswd']  = 'Contraseña nueva:';
 $labels['confpasswd']  = 'Confirmar contraseña:';
@@ -28,5 +27,6 @@ $messages['connecterror'] = 'Nun pudo guardase la contraseña nueva. Fallu de co
 $messages['internalerror'] = 'Nun pudo guardase la contraseña nueva. ';
 $messages['passwordshort'] = 'La contraseña tien de tener polo menos $length caráuteres.';
 $messages['passwordweak'] = 'La contraseña tien de tener polo menos un númberu y un signu de puntuación.';
-$messages['passwordforbidden'] = 'La contraseña que s\'introduxo contién caráuteres non permitíos.';
+$messages['passwordforbidden'] = 'La contraseña contien caráuteres prohibíos.';
+$messages['firstloginchange'] = 'Esti ye\'l to primer aniciu sesión. Por favor, camuda la to contraseña.';
 ?>
diff --git a/plugins/password/localization/az_AZ.inc b/plugins/password/localization/az_AZ.inc
index 18fa758f4..01bb7a91e 100644
--- a/plugins/password/localization/az_AZ.inc
+++ b/plugins/password/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Şifrəni dəyiş';
 $labels['curpasswd']  = 'Hal-hazırki şifrə:';
 $labels['newpasswd']  = 'Yeni şifrə:';
 $labels['confpasswd']  = 'Yeni şifrə: (təkrar)';
diff --git a/plugins/password/localization/be_BE.inc b/plugins/password/localization/be_BE.inc
index 457e67e9e..4ac446134 100644
--- a/plugins/password/localization/be_BE.inc
+++ b/plugins/password/localization/be_BE.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Не ўдалося захаваць новы па
 $messages['passwordshort'] = 'Пароль мусіць быць мінімум $length знакаў.';
 $messages['passwordweak'] = 'Пароль мусіць утрымліваць мінімум адну лічбу і адзін знак пунктуацыі.';
 $messages['passwordforbidden'] = 'Пароль утрымлівае забароненыя знакі.';
+$messages['firstloginchange'] = 'Гэта ваш першы ўваход. Трэба змяніць пароль.';
 ?>
diff --git a/plugins/password/localization/bg_BG.inc b/plugins/password/localization/bg_BG.inc
index c1c8b9b7a..d543b5548 100644
--- a/plugins/password/localization/bg_BG.inc
+++ b/plugins/password/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Промяна на парола';
 $labels['curpasswd']  = 'Текуща парола:';
 $labels['newpasswd']  = 'Нова парола:';
 $labels['confpasswd']  = 'Повторно нова парола:';
diff --git a/plugins/password/localization/br.inc b/plugins/password/localization/br.inc
index a43b0b715..4e0486277 100644
--- a/plugins/password/localization/br.inc
+++ b/plugins/password/localization/br.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'N\'haller ket enrollañ ar ger-tremen nevez.';
 $messages['passwordshort'] = 'Ret eo d\'ar ger-tremen bezañ hiroc\'h eget $length arouezenn.';
 $messages['passwordweak'] = 'En ho ker-tremen e tle bezañ ur sifr hag un arouezenn boentaouiñ da nebeutañ';
 $messages['passwordforbidden'] = 'Arouezennoù difennet zo er ger-tremen.';
+$messages['firstloginchange'] = 'Emaoc\'h o kennaskañ evit ar wezh kentañ. Kemmañ ho ger-tremen mar plij.';
 ?>
diff --git a/plugins/password/localization/bs_BA.inc b/plugins/password/localization/bs_BA.inc
index f030fef87..6ca96aa1b 100644
--- a/plugins/password/localization/bs_BA.inc
+++ b/plugins/password/localization/bs_BA.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Nije moguće sačuvati novu šifru.';
 $messages['passwordshort'] = 'Šifra mora sadržavati barem $length znakova.';
 $messages['passwordweak'] = 'Šifra mora imati barem jedan broj i jedan interpunkcijski znak.';
 $messages['passwordforbidden'] = 'Šifra sadrži nedozvoljene znakove.';
+$messages['firstloginchange'] = 'Ovo je vaša prva prijava. Molimo vas da promijenite vašu šifru.';
 ?>
diff --git a/plugins/password/localization/ca_ES.inc b/plugins/password/localization/ca_ES.inc
index 8e367155f..d74a4dc50 100644
--- a/plugins/password/localization/ca_ES.inc
+++ b/plugins/password/localization/ca_ES.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'No s\'ha pogut desar la nova contrasenya.';
 $messages['passwordshort'] = 'La nova contrasenya ha de tenir com a mínim $length caràcters.';
 $messages['passwordweak'] = 'La nova contrasenya ha d\'incloure com a mínim un nombre i un caràcter de puntuació.';
 $messages['passwordforbidden'] = 'La contrasenya conté caràcters no permesos.';
+$messages['firstloginchange'] = 'Aquest és el vostre primer accés. Si us plau, canvieu-vos la contrasenya.';
 ?>
diff --git a/plugins/password/localization/cs_CZ.inc b/plugins/password/localization/cs_CZ.inc
index 46076b0a0..45870a35c 100644
--- a/plugins/password/localization/cs_CZ.inc
+++ b/plugins/password/localization/cs_CZ.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Heslo se nepodařilo uložit.';
 $messages['passwordshort'] = 'Heslo musí mít alespoň $length znaků.';
 $messages['passwordweak'] = 'Heslo musí obsahovat alespoň jedno číslo a jedno interpuknční znaménko.';
 $messages['passwordforbidden'] = 'Heslo obsahuje nepovolené znaky.';
+$messages['firstloginchange'] = 'Vaše první přihlášení, změňte si prosím heslo.';
 ?>
diff --git a/plugins/password/localization/cy_GB.inc b/plugins/password/localization/cy_GB.inc
index 16fc65447..5cd335fc4 100644
--- a/plugins/password/localization/cy_GB.inc
+++ b/plugins/password/localization/cy_GB.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Newid Cyfrinair';
+$labels['changepasswd']  = 'Newid cyfrinair';
 $labels['curpasswd']  = 'Cyfrinair Presennol:';
 $labels['newpasswd']  = 'Cyfrinair Newydd:';
 $labels['confpasswd']  = 'Cadarnhau Cyfrinair Newydd:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Methwyd cadw\'r cyfrinair newydd.';
 $messages['passwordshort'] = 'Rhaid i\'r cyfrinair fod o leia $length llythyren o hyd.';
 $messages['passwordweak'] = 'Rhaid i\'r cyfrinair gynnwys o leia un rhif a un cymeriad atalnodi.';
 $messages['passwordforbidden'] = 'Mae\'r cyfrinair yn cynnwys llythrennau wedi gwahardd.';
+$messages['firstloginchange'] = 'Dyma eich mewngofnodiad cynta. Newidiwch eich cyfrinair.';
 ?>
diff --git a/plugins/password/localization/da_DK.inc b/plugins/password/localization/da_DK.inc
index 76e161db4..d88381e29 100644
--- a/plugins/password/localization/da_DK.inc
+++ b/plugins/password/localization/da_DK.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Skift adgangskode';
+$labels['changepasswd']  = 'Ændre adgangskode ';
 $labels['curpasswd']  = 'Nuværende adgangskode:';
 $labels['newpasswd']  = 'Ny adgangskode:';
 $labels['confpasswd']  = 'Bekræft ny adgangskode:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Kunne ikke gemme den nye adgangskode.';
 $messages['passwordshort'] = 'Adgangskoden skal være mindst $length tegn lang.';
 $messages['passwordweak'] = 'Adgangskoden skal indeholde mindst et tal og et tegnsætningstegn (-.,)';
 $messages['passwordforbidden'] = 'Adgangskoden indeholder forbudte tegn.';
+$messages['firstloginchange'] = 'Dette er første gang du logger ind, ændre venligst din adgangskode';
 ?>
diff --git a/plugins/password/localization/de_CH.inc b/plugins/password/localization/de_CH.inc
index a446e1b52..68945be34 100644
--- a/plugins/password/localization/de_CH.inc
+++ b/plugins/password/localization/de_CH.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Neues Passwort nicht gespeichert';
 $messages['passwordshort'] = 'Passwort muss mindestens $length Zeichen lang sein.';
 $messages['passwordweak'] = 'Passwort muss mindestens eine Zahl und ein Sonderzeichen enthalten.';
 $messages['passwordforbidden'] = 'Passwort enthält unzulässige Zeichen.';
+$messages['firstloginchange'] = 'Dies ist Ihre erste Anmeldung. Bitte ändern Sie Ihr Passwort.';
 ?>
diff --git a/plugins/password/localization/de_DE.inc b/plugins/password/localization/de_DE.inc
index fab78fce9..d27e305cd 100644
--- a/plugins/password/localization/de_DE.inc
+++ b/plugins/password/localization/de_DE.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Kennwort ändern';
+$labels['changepasswd']  = 'Passwort ändern';
 $labels['curpasswd']  = 'Aktuelles Kennwort:';
 $labels['newpasswd']  = 'Neues Kennwort:';
 $labels['confpasswd']  = 'Neues Kennwort bestätigen:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Neues Passwort nicht gespeichert';
 $messages['passwordshort'] = 'Passwort muss mindestens $length Zeichen lang sein.';
 $messages['passwordweak'] = 'Passwort muss mindestens eine Zahl und ein Sonderzeichen enthalten.';
 $messages['passwordforbidden'] = 'Passwort enthält unzulässige Zeichen.';
+$messages['firstloginchange'] = 'Dies ist Ihr erster Login. Bitte ändern Sie Ihr Passwort.';
 ?>
diff --git a/plugins/password/localization/el_GR.inc b/plugins/password/localization/el_GR.inc
index b1c72ab69..f3baa916d 100644
--- a/plugins/password/localization/el_GR.inc
+++ b/plugins/password/localization/el_GR.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Αλλαγη κωδικου προσβασης';
+$labels['changepasswd']  = 'Αλλαγή συνθηματικού';
 $labels['curpasswd']  = 'Τρεχων κωδικος προσβασης:';
 $labels['newpasswd']  = 'Νεος κωδικος προσβασης:';
 $labels['confpasswd']  = 'Επιβεβαιωση κωδικου προσβασης:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Δεν μπορεσε να αποθηκεύθει
 $messages['passwordshort'] = 'Ο κωδικός πρόσβασης πρέπει να είναι τουλάχιστον $μήκος χαρακτήρων.';
 $messages['passwordweak'] = 'Ο κωδικός πρόσβασης πρέπει να περιλαμβάνει τουλάχιστον έναν αριθμό και ένα σημείο στίξης. ';
 $messages['passwordforbidden'] = 'Ο κωδικός πρόσβασης περιέχει μη επιτρεπτούς χαρακτήρες. ';
+$messages['firstloginchange'] = 'Αυτή είναι η πρώτη σας είσοδος. Παρακαλώ αλλάξτε το συνθηματικό σας.';
 ?>
diff --git a/plugins/password/localization/en_CA.inc b/plugins/password/localization/en_CA.inc
index 6206b5923..e67ee7bfe 100644
--- a/plugins/password/localization/en_CA.inc
+++ b/plugins/password/localization/en_CA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Change Password';
 $labels['curpasswd']  = 'Current Password:';
 $labels['newpasswd']  = 'New Password:';
 $labels['confpasswd']  = 'Confirm New Password:';
diff --git a/plugins/password/localization/en_GB.inc b/plugins/password/localization/en_GB.inc
index 1f1b4e286..d5387cb91 100644
--- a/plugins/password/localization/en_GB.inc
+++ b/plugins/password/localization/en_GB.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Change Password';
+$labels['changepasswd']  = 'Change password';
 $labels['curpasswd']  = 'Current Password:';
 $labels['newpasswd']  = 'New Password:';
 $labels['confpasswd']  = 'Confirm New Password:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'New password could not be saved.';
 $messages['passwordshort'] = 'Password must be at least $length characters long.';
 $messages['passwordweak'] = 'Password must include at least one number and one symbol.';
 $messages['passwordforbidden'] = 'Password contains forbidden characters.';
+$messages['firstloginchange'] = 'This is your first login. Please change your password.';
 ?>
diff --git a/plugins/password/localization/eo.inc b/plugins/password/localization/eo.inc
index d985c18e6..214a68dac 100644
--- a/plugins/password/localization/eo.inc
+++ b/plugins/password/localization/eo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Ŝanĝi pasvorton';
 $labels['curpasswd']  = 'Nuna pasvorto:';
 $labels['newpasswd']  = 'Nova pasvorto:';
 $labels['confpasswd']  = 'Konfirmi novan pasvorton:';
diff --git a/plugins/password/localization/es_419.inc b/plugins/password/localization/es_419.inc
index 3d99b561c..4c2a2cd38 100644
--- a/plugins/password/localization/es_419.inc
+++ b/plugins/password/localization/es_419.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'No se puedo guardar la nueva contraseña.';
 $messages['passwordshort'] = 'La contraseña debe tener al menos $length carácteres.';
 $messages['passwordweak'] = 'La contraseña debe incluir por lo menos un número y un signo de puntuación.';
 $messages['passwordforbidden'] = 'La contraseña contiene carácteres ilegales.';
+$messages['firstloginchange'] = 'Esta es la primera vez que ingresas. Por favor cambia tu contraseña.';
 ?>
diff --git a/plugins/password/localization/es_AR.inc b/plugins/password/localization/es_AR.inc
index 47589cfc7..ea043625f 100644
--- a/plugins/password/localization/es_AR.inc
+++ b/plugins/password/localization/es_AR.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Cambiar Contraseña';
+$labels['changepasswd']  = 'Cambiar contraseña';
 $labels['curpasswd']  = 'Contraseña Actual:';
 $labels['newpasswd']  = 'Contraseña Nueva:';
 $labels['confpasswd']  = 'Confirmar Contraseña:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'No se pudo guardar la contraseña nueva.';
 $messages['passwordshort'] = 'Tu contraseña debe tener una longitud mínima de $length.';
 $messages['passwordweak'] = 'Tu nueva contraseña debe incluir al menos un número y un signo de puntuación.';
 $messages['passwordforbidden'] = 'La contraseña contiene caracteres inválidos.';
+$messages['firstloginchange'] = 'Este es tu primer inicio de sesión. Por favor, cambia tu contraseña.';
 ?>
diff --git a/plugins/password/localization/es_ES.inc b/plugins/password/localization/es_ES.inc
index 80ee2e9a1..cededcd8b 100644
--- a/plugins/password/localization/es_ES.inc
+++ b/plugins/password/localization/es_ES.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Cambiar contraseña';
+$labels['changepasswd']  = 'Cambiar la contraseña';
 $labels['curpasswd']  = 'Contraseña actual:';
 $labels['newpasswd']  = 'Contraseña nueva:';
 $labels['confpasswd']  = 'Confirmar contraseña:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'No se pudo guardar la contraseña nueva.';
 $messages['passwordshort'] = 'La contraseña debe tener por lo menos $length caracteres.';
 $messages['passwordweak'] = 'La contraseña debe incluir al menos un número y un signo de puntuación.';
 $messages['passwordforbidden'] = 'La contraseña introducida contiene caracteres no permitidos.';
+$messages['firstloginchange'] = 'Este es su primer inicio de sesión. Por favor, cambie su contraseña.';
 ?>
diff --git a/plugins/password/localization/et_EE.inc b/plugins/password/localization/et_EE.inc
index e1c524dcf..6c270f8a1 100644
--- a/plugins/password/localization/et_EE.inc
+++ b/plugins/password/localization/et_EE.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Uue parooli andmebaasi salvestamine nurjus.';
 $messages['passwordshort'] = 'Parool peab olema vähemalt $length märki pikk.';
 $messages['passwordweak'] = 'Parool peab sisaldama vähemalt üht numbrit ja märki.';
 $messages['passwordforbidden'] = 'Parool sisaldab keelatud märki.';
+$messages['firstloginchange'] = 'See on sinu esimene sisselogimine, palun muuda oma parooli.';
 ?>
diff --git a/plugins/password/localization/eu_ES.inc b/plugins/password/localization/eu_ES.inc
index b814d2983..7f93d0110 100644
--- a/plugins/password/localization/eu_ES.inc
+++ b/plugins/password/localization/eu_ES.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Ezin izan da pasahitz berria gorde.';
 $messages['passwordshort'] = 'Gutxienez $length karakteretakoa izan behar du pasahitzak.';
 $messages['passwordweak'] = 'Gutxienez zenbaki bat eta puntuazio karaktere bat izan behar du pasahitzak.';
 $messages['passwordforbidden'] = 'Galarazitako karaktereak daude pasahitzean.';
+$messages['firstloginchange'] = 'Zure lehenengo sarrera da. Pasahitza aldatu mesedez.';
 ?>
diff --git a/plugins/password/localization/fa_AF.inc b/plugins/password/localization/fa_AF.inc
index 5bf7c3a8f..3df6a3057 100644
--- a/plugins/password/localization/fa_AF.inc
+++ b/plugins/password/localization/fa_AF.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'تغییر رمز عبور';
 $labels['curpasswd']  = 'رمز عبور کنونی';
 $labels['newpasswd']  = 'رمز عبور جدید';
 $labels['confpasswd']  = 'تایید رمز عبور جدید';
diff --git a/plugins/password/localization/fi_FI.inc b/plugins/password/localization/fi_FI.inc
index 3b6735bec..5cf0db192 100644
--- a/plugins/password/localization/fi_FI.inc
+++ b/plugins/password/localization/fi_FI.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Uuden salasanan tallennus epäonnistui.';
 $messages['passwordshort'] = 'Salasanassa täytyy olla vähintään $length merkkiä.';
 $messages['passwordweak'] = 'Salasanan täytyy sisältää vähintään yksi numero ja yksi välimerkki.';
 $messages['passwordforbidden'] = 'Salasana sisältää virheellisiä merkkejä.';
+$messages['firstloginchange'] = 'Tämä on ensimmäinen kirjautumiskertasi. Vaihda salasanasi.';
 ?>
diff --git a/plugins/password/localization/fo_FO.inc b/plugins/password/localization/fo_FO.inc
index 7c9ba55bc..875f79b69 100644
--- a/plugins/password/localization/fo_FO.inc
+++ b/plugins/password/localization/fo_FO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Broyt loyniorð';
 $labels['curpasswd']  = 'Nú verandi loyniorð:';
 $labels['newpasswd']  = 'Nýtt loyniorð:';
 $labels['confpasswd']  = 'Endurtak nýggja loyniorð:';
diff --git a/plugins/password/localization/fr_FR.inc b/plugins/password/localization/fr_FR.inc
index 799fd48d7..03c914e11 100644
--- a/plugins/password/localization/fr_FR.inc
+++ b/plugins/password/localization/fr_FR.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Impossible d\'enregistrer le nouveau mot de passe.
 $messages['passwordshort'] = 'Le mot de passe doit comporter au moins $length caractères.';
 $messages['passwordweak'] = 'Le mot de passe doit comporter au moins un chiffre et un signe de ponctuation.';
 $messages['passwordforbidden'] = 'Le mot de passe contient des caractères interdits.';
+$messages['firstloginchange'] = 'Ceci est votre première connexion. Veuillez changer votre mot de passe.';
 ?>
diff --git a/plugins/password/localization/gl_ES.inc b/plugins/password/localization/gl_ES.inc
index 1415366a3..b0f5e39b2 100644
--- a/plugins/password/localization/gl_ES.inc
+++ b/plugins/password/localization/gl_ES.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Non foi posíbel gardar o contrasinal novo.';
 $messages['passwordshort'] = 'O contrasinal debe ter polo menos $length caracteres.';
 $messages['passwordweak'] = 'O contrasinal debe incluir polo menos un número e un signo de puntuación.';
 $messages['passwordforbidden'] = 'O contrasinal contén caracteres non permitidos.';
+$messages['firstloginchange'] = 'É a primeira vez que se conecta. Por favor, troque o seu contrasinal.';
 ?>
diff --git a/plugins/password/localization/he_IL.inc b/plugins/password/localization/he_IL.inc
index ce05ea59c..c60acd7c1 100644
--- a/plugins/password/localization/he_IL.inc
+++ b/plugins/password/localization/he_IL.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'שינוי סיסמה';
+$labels['changepasswd']  = 'שנה סיסמה';
 $labels['curpasswd']  = 'סיסמה נוכחית:';
 $labels['newpasswd']  = 'סיסמה חדשה:';
 $labels['confpasswd']  = 'אימות הסיסמה החדשה:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'לא ניתן לשמור על הסיסמה החד�
 $messages['passwordshort'] = 'הסיסמה צריכה להיות לפחות בעלת $length תווים';
 $messages['passwordweak'] = 'הסיסמה חייבת לכלול לפחות סיפרה אחת ולפחות סימן פיסוק אחד.';
 $messages['passwordforbidden'] = 'הסיסמה מכילה תווים אסורים.';
+$messages['firstloginchange'] = 'זוהי כניסתך הראשונה. אנא שנה את סיסמתך.';
 ?>
diff --git a/plugins/password/localization/hr_HR.inc b/plugins/password/localization/hr_HR.inc
index 44b62b2af..9815bf504 100644
--- a/plugins/password/localization/hr_HR.inc
+++ b/plugins/password/localization/hr_HR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Promijeni zaporku';
 $labels['curpasswd']  = 'Važeća zaporka:';
 $labels['newpasswd']  = 'Nova zaporka:';
 $labels['confpasswd']  = 'Potvrda nove zaporke:';
diff --git a/plugins/password/localization/hu_HU.inc b/plugins/password/localization/hu_HU.inc
index e9167b0c9..46fd82a42 100644
--- a/plugins/password/localization/hu_HU.inc
+++ b/plugins/password/localization/hu_HU.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Hiba történt a kérés feldolgozása során.';
 $messages['passwordshort'] = 'A jelszónak legalább $length karakter hosszunak kell lennie.';
 $messages['passwordweak'] = 'A jelszónak mindenképpen kell tartalmaznia egy számot és egy írásjelet.';
 $messages['passwordforbidden'] = 'A jelszó tiltott karaktert is tartalmaz.';
+$messages['firstloginchange'] = 'Ez az első belépésed. Változtass jelszót.';
 ?>
diff --git a/plugins/password/localization/hy_AM.inc b/plugins/password/localization/hy_AM.inc
index ebca6cd85..824f38642 100644
--- a/plugins/password/localization/hy_AM.inc
+++ b/plugins/password/localization/hy_AM.inc
@@ -15,9 +15,9 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Գաղտնաբառի փոփոխում';
-$labels['curpasswd']  = 'Առկա գաղտնաբառը`';
-$labels['newpasswd']  = 'Նոր գաղտնաբառը`';
+$labels['changepasswd']  = 'Փոխել գաղտնաբառը';
+$labels['curpasswd']  = 'Ներկա գաղտնաբառ`';
+$labels['newpasswd']  = 'Նոր գաղտնաբառ`';
 $labels['confpasswd']  = 'Կրկնեք նոր գաղտնաբառը`';
 $messages['nopassword'] = 'Ներմուցեք նոր գաղտնաբառը։';
 $messages['nocurpassword'] = 'Ներմուցեք առկա գաղտնաբառը։';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Նոր գաղտնաբառի պահպանումը �
 $messages['passwordshort'] = 'Գաղտնաբառերը պետք է լինեն առնվազն $length նիշ երկարությամբ։';
 $messages['passwordweak'] = 'Գաղտնաբառերը պետք է պարունակեն առնվազն մեկ թիվ և մեկ կետադրական նիշ։';
 $messages['passwordforbidden'] = 'Գաղտնաբառը պարունակում է արգելված նիշ։';
+$messages['firstloginchange'] = 'Սա ձեր առաջին մուտքն է։ Խնդրում ենք փոխել գաղտնաբառը։';
 ?>
diff --git a/plugins/password/localization/id_ID.inc b/plugins/password/localization/id_ID.inc
index b7b0cde8c..3a42abdf3 100644
--- a/plugins/password/localization/id_ID.inc
+++ b/plugins/password/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Ubah Sandi';
 $labels['curpasswd']  = 'Sandi saat ini:';
 $labels['newpasswd']  = 'Sandi Baru:';
 $labels['confpasswd']  = 'Konfirmasi Sandi Baru:';
diff --git a/plugins/password/localization/it_IT.inc b/plugins/password/localization/it_IT.inc
index ddb83ca82..d9bdb4fd5 100644
--- a/plugins/password/localization/it_IT.inc
+++ b/plugins/password/localization/it_IT.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Impossibile salvare la nuova password.';
 $messages['passwordshort'] = 'La password deve essere lunga almeno $length caratteri.';
 $messages['passwordweak'] = 'La password deve includere almeno una cifra decimale e un simbolo di punteggiatura.';
 $messages['passwordforbidden'] = 'La password contiene caratteri proibiti.';
+$messages['firstloginchange'] = 'Questo è il tuo primo accesso. Si prega di cambiare la propria password.';
 ?>
diff --git a/plugins/password/localization/ja_JP.inc b/plugins/password/localization/ja_JP.inc
index cc5a1173d..7c97215c3 100644
--- a/plugins/password/localization/ja_JP.inc
+++ b/plugins/password/localization/ja_JP.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = '新しいパスワードを保存できません�
 $messages['passwordshort'] = 'パスワードは少なくとも $length 文字の長さが必要です。';
 $messages['passwordweak'] = 'パスワードは少なくとも数字の 1 文字と記号の 1 文字を含んでいなければなりません。';
 $messages['passwordforbidden'] = 'パスワードに禁止された文字が含まれています。';
+$messages['firstloginchange'] = 'これは初めてのログインです。パスワードを変更してください。';
 ?>
diff --git a/plugins/password/localization/km_KH.inc b/plugins/password/localization/km_KH.inc
index f223dc653..5e92faf41 100644
--- a/plugins/password/localization/km_KH.inc
+++ b/plugins/password/localization/km_KH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'ប្ដូរពាក្យសម្ងាត់';
 $labels['curpasswd']  = 'ពាក្យសម្ងាត់បច្ចុប្បន្ន៖';
 $labels['newpasswd']  = 'ពាក្យសម្ងាត់ថ្មី៖';
 $labels['confpasswd']  = 'បញ្ជាក់ពាក្យសម្ងាត់ថ្មី៖';
diff --git a/plugins/password/localization/ko_KR.inc b/plugins/password/localization/ko_KR.inc
index 21e2dbbf8..1d6374295 100644
--- a/plugins/password/localization/ko_KR.inc
+++ b/plugins/password/localization/ko_KR.inc
@@ -17,16 +17,17 @@
 */
 $labels['changepasswd']  = '암호 변경';
 $labels['curpasswd']  = '현재 암호:';
-$labels['newpasswd']  = '새 암호:';
-$labels['confpasswd']  = '새로운 비밀번호 확인 :';
-$messages['nopassword'] = '새 암호를 입력하시오.';
-$messages['nocurpassword'] = '현재 사용중인 암호를 입력하세요.';
-$messages['passwordincorrect'] = '현재 사용중인 암호가 올바르지 않습니다.';
-$messages['passwordinconsistency'] = '암호가 일치하지 않습니다. 다시 시도하기 바랍니다.';
-$messages['crypterror'] = '새로운 암호를 저장할 수 없습니다. 암호화 실패.';
-$messages['connecterror'] = '새로운 암호를 저장할 수 없습니다. 연결 오류.';
+$labels['newpasswd']  = '새로운 암호:';
+$labels['confpasswd']  = '새로운 암호 확인:';
+$messages['nopassword'] = '새로운 암호를 입력하세요.';
+$messages['nocurpassword'] = '현재 사용 중인 암호를 입력하세요.';
+$messages['passwordincorrect'] = '현재 사용 중인 암호가 올바르지 않습니다.';
+$messages['passwordinconsistency'] = '암호가 일치하지 않습니다. 다시 시도해주세요.';
+$messages['crypterror'] = '새로운 암호를 저장할 수 없습니다. 암호화 기능이 누락되었습니다.';
+$messages['connecterror'] = '새로운 암호를 저장할 수 없습니다. 연결 오류입니다.';
 $messages['internalerror'] = '새로운 암호를 저장할 수 없습니다.';
-$messages['passwordshort'] = '암호는 적어도 $length 글자 이상이어야 합니다.';
-$messages['passwordweak'] = '암호는 적어도 숫자 하나와 특수 문자 하나를 포함하여야 합니다.';
-$messages['passwordforbidden'] = '암호가 허락되지 않은 문자들을 포함하고 있습니다.';
+$messages['passwordshort'] = '암호는 문자가 $length개 이상이어야 합니다.';
+$messages['passwordweak'] = '암호는 숫자 및 특수문자를 각각 한 개 이상 포함해야 합니다.';
+$messages['passwordforbidden'] = '암호가 금지된 문자을 포함하고 있습니다.';
+$messages['firstloginchange'] = '처음 로그인하셨습니다. 암호를 변경해주세요.';
 ?>
diff --git a/plugins/password/localization/ku.inc b/plugins/password/localization/ku.inc
index 544626846..574539b21 100644
--- a/plugins/password/localization/ku.inc
+++ b/plugins/password/localization/ku.inc
@@ -15,5 +15,19 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'گۆڕینی ووشەی نهێنی';
+$labels['changepasswd']  = 'Şîfreyê biguherîne';
+$labels['curpasswd']  = 'Şîfreya niha:';
+$labels['newpasswd']  = 'Şîfreya nû:';
+$labels['confpasswd']  = 'Şîfreya nû bipejirîne:';
+$messages['nopassword'] = 'Şîfreya nû binivîse.';
+$messages['nocurpassword'] = 'Şîfreya niha binivîse.';
+$messages['passwordincorrect'] = 'Şîfreya niha xelet e.';
+$messages['passwordinconsistency'] = 'Şîfre hevdu nagirin, dîsa biceribîne.';
+$messages['crypterror'] = 'Şîfreya nû nehat tomarkirin. Fonksiyona şîfrekirinê hat jibîrkirin.';
+$messages['connecterror'] = 'Şîfreya nû nehat tomarkirin. Çewtiya girêdanê.';
+$messages['internalerror'] = 'Şîfre nehat tomarkirin.';
+$messages['passwordshort'] = 'Divê şîfre ji $length karakteran kêmtir nebe.';
+$messages['passwordweak'] = 'Divê di şîfreyê de herî kêm hejmarek û karakterekî xalbendiyê hebe.';
+$messages['passwordforbidden'] = 'Şîfre karakterên qedexe dihewîne.';
+$messages['firstloginchange'] = 'Ev têketina te ya yekemîn e. Ji kerema xwe şîfreya xwe biguherîne.';
 ?>
diff --git a/plugins/password/localization/ku_IQ.inc b/plugins/password/localization/ku_IQ.inc
new file mode 100644
index 000000000..67ec86de1
--- /dev/null
+++ b/plugins/password/localization/ku_IQ.inc
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/password/localization/<lang>.inc                              |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
+*/
+$labels['changepasswd']  = 'گۆڕینی تێپەڕەوشە';
+$labels['curpasswd']  = 'تێپەڕەوشەی ئێستا:';
+$labels['newpasswd']  = 'تێپەڕەوشەی نوێ:';
+$labels['confpasswd']  = 'پشتڕاستکردنەوەی تێپەڕەوشەی نوێ:';
+$messages['nopassword'] = 'تکایە تێپەڕەوشەی نوێ بنووسە.';
+$messages['nocurpassword'] = 'تکایە تێپەڕەوشەی ئێستا بنووسە.';
+$messages['passwordincorrect'] = 'تێپەڕەوشەی ئێستا نادروستە.';
+$messages['passwordinconsistency'] = 'تێپەڕەوشەکان هاویەک نین، تکایە دووبارە هەوڵبدەوە.';
+$messages['connecterror'] = 'نەتوانرا تێپەڕەوشەی نوێ پاشەکەوت بکرێت. هەڵەی پەیوەندیکردن.';
+$messages['internalerror'] = 'نەتوانرا تێپەڕەوشەی نوێ پاشەکەوت بکرێت.';
+$messages['passwordforbidden'] = 'تێپەڕەوشە نووسەی ڕێپێنەدراوی تێدایە.';
+$messages['firstloginchange'] = 'ئەمە یەکەم چوونەژوورەوەتە. تکایە تێپەڕەوشەکەت بگۆڕە.';
+?>
diff --git a/plugins/password/localization/lb_LU.inc b/plugins/password/localization/lb_LU.inc
index 08026f242..2093b82ab 100644
--- a/plugins/password/localization/lb_LU.inc
+++ b/plugins/password/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Passwuert änneren';
 $labels['curpasswd']  = 'Aktuellt Passwuert:';
 $labels['newpasswd']  = 'Neit Passwuert:';
 $labels['confpasswd']  = 'Neit Passwuert bestätegen:';
diff --git a/plugins/password/localization/lt_LT.inc b/plugins/password/localization/lt_LT.inc
index 4425d63e0..3351c305e 100644
--- a/plugins/password/localization/lt_LT.inc
+++ b/plugins/password/localization/lt_LT.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Slaptažodžio keitimas';
+$labels['changepasswd']  = 'Keisti slaptažodį';
 $labels['curpasswd']  = 'Dabartinis slaptažodis:';
 $labels['newpasswd']  = 'Naujasis slaptažodis:';
 $labels['confpasswd']  = 'Pakartokite naująjį slaptažodį:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Nepavyko įrašyti naujojo slaptažodžio.';
 $messages['passwordshort'] = 'Slaptažodis turi būti sudarytas bent iš $length simbolių.';
 $messages['passwordweak'] = 'Slaptažodyje turi būti bent vienas skaitmuo ir vienas skyrybos ženklas.';
 $messages['passwordforbidden'] = 'Slaptažodyje rasta neleistinų simbolių.';
+$messages['firstloginchange'] = 'Tai yra pirmasis jūsų prisijungimas. Prašau, pasikeiskite savo slaptažodį.';
 ?>
diff --git a/plugins/password/localization/lv_LV.inc b/plugins/password/localization/lv_LV.inc
index c45bc8314..9e0e0e740 100644
--- a/plugins/password/localization/lv_LV.inc
+++ b/plugins/password/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Nomainīt paroli';
 $labels['curpasswd']  = 'Pašreizējā parole:';
 $labels['newpasswd']  = 'Jaunā parole:';
 $labels['confpasswd']  = 'Apstiprināt jauno paroli:';
diff --git a/plugins/password/localization/ml_IN.inc b/plugins/password/localization/ml_IN.inc
new file mode 100644
index 000000000..6b8ac9e32
--- /dev/null
+++ b/plugins/password/localization/ml_IN.inc
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/password/localization/<lang>.inc                              |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
+*/
+$labels['changepasswd']  = 'രഹസ്യവാക്ക് മാറ്റുക';
+$labels['curpasswd']  = 'ഇപ്പോഴത്തെ രഹസ്യവാക്ക്';
+$labels['newpasswd']  = 'പുതിയ രഹസ്യവാക്ക്';
+$labels['confpasswd']  = 'പുതിയ രഹസ്യവാക്ക് സ്ഥിരീകരിക്കുക';
+$messages['nopassword'] = 'ദയവായി പുതിയ രഹസ്യവാക്ക് നൽകുക';
+$messages['nocurpassword'] = 'ദയവായി ഇപ്പോഴത്തെ രഹസ്യവാക്ക് നൽകുക';
+$messages['passwordincorrect'] = 'ഇപ്പോഴത്തെ രഹസ്യവാക്ക് തെറ്റാണ്.';
+$messages['passwordinconsistency'] = 'രഹസ്യവാക്കുകൾ ചേരുന്നില്ല, ദയവായി വീണ്ടും ശ്രമിക്കുക';
+$messages['crypterror'] = 'പുതിയ രഹസ്യവാക്ക് സൂക്ഷിക്കാൻ സാധിച്ചില്ല. എൻക്രിപ്ഷൻ ഫങ്ങ്ഷൻ ലഭ്യമല്ല.';
+$messages['connecterror'] = 'പുതിയ രഹസ്യവാക്ക് സൂക്ഷിക്കാൻ സാധിച്ചില്ല. ബന്ധം സ്ഥാപിക്കുന്നതിൽ പിഴവ്.';
+$messages['internalerror'] = 'പുതിയ രഹസ്യവാക്ക് സൂക്ഷിക്കാൻ സാധിച്ചില്ല.';
+$messages['passwordshort'] = 'രഹസ്യവാക്കിനു് കുറഞ്ഞത് $length അക്ഷരങ്ങൾ നീളം വേണം';
+$messages['passwordweak'] = 'രഹസ്യവാക്കിൽ കുറഞ്ഞത് ഒരു സംഖ്യയും, ഒരു പ്രത്യേക അക്ഷരവും വേണം';
+$messages['passwordforbidden'] = 'രഹസ്യവാക്കിൽ അനുവദനീയമല്ലാത്ത അക്ഷരങ്ങൾ ഉണ്ട്';
+$messages['firstloginchange'] = 'ഇത് താങ്കളുടെ ആദ്യത്തെ പ്രവേശനമാണ്. ദയവായി താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക.';
+?>
diff --git a/plugins/password/localization/nb_NO.inc b/plugins/password/localization/nb_NO.inc
index 9901303d2..5d69740f0 100644
--- a/plugins/password/localization/nb_NO.inc
+++ b/plugins/password/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Bytt passord';
 $labels['curpasswd']  = 'Nåværende passord:';
 $labels['newpasswd']  = 'Nytt passord:';
 $labels['confpasswd']  = 'Bekreft nytt passord';
diff --git a/plugins/password/localization/nl_NL.inc b/plugins/password/localization/nl_NL.inc
index 1b5f0b15b..41ca116cc 100644
--- a/plugins/password/localization/nl_NL.inc
+++ b/plugins/password/localization/nl_NL.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Wachtwoord wijzigen';
+$labels['changepasswd']  = 'Wijzig wachtwoord';
 $labels['curpasswd']  = 'Huidig wachtwoord:';
 $labels['newpasswd']  = 'Nieuw wachtwoord:';
 $labels['confpasswd']  = 'Bevestig nieuw wachtwoord:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Uw nieuwe wachtwoord kan niet worden opgeslagen.';
 $messages['passwordshort'] = 'Het wachtwoord moet minimaal $length tekens lang zijn.';
 $messages['passwordweak'] = 'Het wachtwoord moet minimaal één cijfer en één leesteken bevatten.';
 $messages['passwordforbidden'] = 'Het wachtwoord bevat tekens die niet toegestaan zijn.';
+$messages['firstloginchange'] = 'Dit is uw eerste aanmelding. Verander uw wachtwoord alstublieft.';
 ?>
diff --git a/plugins/password/localization/nn_NO.inc b/plugins/password/localization/nn_NO.inc
index 89d0ad1c1..9a8fd78aa 100644
--- a/plugins/password/localization/nn_NO.inc
+++ b/plugins/password/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Bytt passord';
 $labels['curpasswd']  = 'Noverande passord:';
 $labels['newpasswd']  = 'Nytt passord:';
 $labels['confpasswd']  = 'Bekreft nytt passord';
diff --git a/plugins/password/localization/pl_PL.inc b/plugins/password/localization/pl_PL.inc
index b3ce3726f..00a7aa7e3 100644
--- a/plugins/password/localization/pl_PL.inc
+++ b/plugins/password/localization/pl_PL.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Nie udało się zapisać nowego hasła.';
 $messages['passwordshort'] = 'Hasło musi posiadać co najmniej $length znaków.';
 $messages['passwordweak'] = 'Hasło musi zawierać co najmniej jedną cyfrę i znak interpunkcyjny.';
 $messages['passwordforbidden'] = 'Hasło zawiera niedozwolone znaki.';
+$messages['firstloginchange'] = 'To jest twoje pierwsze logowanie. Proszę zmień hasło.';
 ?>
diff --git a/plugins/password/localization/pt_BR.inc b/plugins/password/localization/pt_BR.inc
index ac714764f..1eeccb0b2 100644
--- a/plugins/password/localization/pt_BR.inc
+++ b/plugins/password/localization/pt_BR.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Alterar senha';
+$labels['changepasswd']  = 'Alterar a senha';
 $labels['curpasswd']  = 'Senha atual:';
 $labels['newpasswd']  = 'Nova senha:';
 $labels['confpasswd']  = 'Confirmar nova senha:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Não foi possível gravar a nova senha.';
 $messages['passwordshort'] = 'A senha precisa ter ao menos $length caracteres.';
 $messages['passwordweak'] = 'A senha precisa conter ao menos um número e um caractere de pontuação.';
 $messages['passwordforbidden'] = 'A senha contém caracteres proibidos.';
+$messages['firstloginchange'] = 'Este é o seu primeiro acesso. Por favor altere sua senha.';
 ?>
diff --git a/plugins/password/localization/pt_PT.inc b/plugins/password/localization/pt_PT.inc
index fc5b28899..6317ede9c 100644
--- a/plugins/password/localization/pt_PT.inc
+++ b/plugins/password/localization/pt_PT.inc
@@ -15,18 +15,19 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Alterar password';
-$labels['curpasswd']  = 'Password atual:';
-$labels['newpasswd']  = 'Nova password:';
-$labels['confpasswd']  = 'Confirmar password:';
-$messages['nopassword'] = 'Introduza a nova password.';
-$messages['nocurpassword'] = 'Introduza a password actual.';
-$messages['passwordincorrect'] = 'Password actual errada.';
-$messages['passwordinconsistency'] = 'Password\'s não combinam, tente novamente..';
-$messages['crypterror'] = 'Não foi possível gravar a nova password. Função de criptografica inexistente.';
-$messages['connecterror'] = 'Não foi possível gravar a nova password. Erro de ligação.';
-$messages['internalerror'] = 'Não foi possível gravar a nova password.';
+$labels['changepasswd']  = 'Alterar palavra-passe';
+$labels['curpasswd']  = 'Palavra-passe actual:';
+$labels['newpasswd']  = 'Nova palavra-passe:';
+$labels['confpasswd']  = 'Confirmar palavra-passe:';
+$messages['nopassword'] = 'Introduza a nova palavra-passe.';
+$messages['nocurpassword'] = 'Introduza a palavra-passe actual.';
+$messages['passwordincorrect'] = 'Palavra-passe actual incorrecta.';
+$messages['passwordinconsistency'] = 'As palavras-passe não combinam, tente novamente.';
+$messages['crypterror'] = 'Não foi possível gravar a nova palavra-passe. Função de criptografia inexistente.';
+$messages['connecterror'] = 'Não foi possível gravar a nova palavra-passe. Erro de ligação.';
+$messages['internalerror'] = 'Não foi possível gravar a nova palavra-passe.';
 $messages['passwordshort'] = 'A palavra-passe deve ter pelo menos $length caracteres';
 $messages['passwordweak'] = 'A palavra-passe deve incluir pelo menos um numero e um sinal de pontuação.';
 $messages['passwordforbidden'] = 'A palavra-passe contém caracteres não suportados.';
+$messages['firstloginchange'] = 'Este é o seu primeiro acesso. Por favor, altere a sua palavra-passe.';
 ?>
diff --git a/plugins/password/localization/ro_RO.inc b/plugins/password/localization/ro_RO.inc
index 004254382..74fd80765 100644
--- a/plugins/password/localization/ro_RO.inc
+++ b/plugins/password/localization/ro_RO.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Schimbați parola';
+$labels['changepasswd']  = 'Schimbă parola';
 $labels['curpasswd']  = 'Parola curentă:';
 $labels['newpasswd']  = 'Parola nouă:';
 $labels['confpasswd']  = 'Confirmare parola nouă:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Nu am reușit să salvez noua parolă.';
 $messages['passwordshort'] = 'Parola trebuie să aibă minim $length caractere.';
 $messages['passwordweak'] = 'Parola trebuie să conțina cel puțin un număr si un semn de punctuație.';
 $messages['passwordforbidden'] = 'Parola conține caractere nepermise.';
+$messages['firstloginchange'] = 'Aceasta este prima autentificare. Te rugăm să schimbi parola.';
 ?>
diff --git a/plugins/password/localization/ru_RU.inc b/plugins/password/localization/ru_RU.inc
index 85b7bf2c4..d7c03477a 100644
--- a/plugins/password/localization/ru_RU.inc
+++ b/plugins/password/localization/ru_RU.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Не могу сохранить новый пар
 $messages['passwordshort'] = 'Длина пароля должна быть как минимум $length символов.';
 $messages['passwordweak'] = 'Пароль должен включать в себя как минимум одну цифру и один знак пунктуации.';
 $messages['passwordforbidden'] = 'Пароль содержит недопустимые символы.';
+$messages['firstloginchange'] = 'Вы выполнили вход впервые. Измените ваш пароль.';
 ?>
diff --git a/plugins/password/localization/sk_SK.inc b/plugins/password/localization/sk_SK.inc
index 51339bb7b..4cf8cb91f 100644
--- a/plugins/password/localization/sk_SK.inc
+++ b/plugins/password/localization/sk_SK.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Nové heslo nemožno uložiť.';
 $messages['passwordshort'] = 'Heslo musí mať najmenej $length znakov.';
 $messages['passwordweak'] = 'Heslo musí obsahovať aspoň jedno číslo a jedno interpunkčné znamienko.';
 $messages['passwordforbidden'] = 'Heslo obsahuje nepovolené znaky.';
+$messages['firstloginchange'] = 'Prihlásili ste sa po prvýkrát. Prosím zmeňte si prístupové heslo.';
 ?>
diff --git a/plugins/password/localization/sl_SI.inc b/plugins/password/localization/sl_SI.inc
index 99af3c9f5..ec9010c77 100644
--- a/plugins/password/localization/sl_SI.inc
+++ b/plugins/password/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Spremeni geslo';
 $labels['curpasswd']  = 'Obstoječe geslo:';
 $labels['newpasswd']  = 'Novo geslo:';
 $labels['confpasswd']  = 'Potrdi novo geslo:';
diff --git a/plugins/password/localization/sr_CS.inc b/plugins/password/localization/sr_CS.inc
index 0900b3112..77e2d1251 100644
--- a/plugins/password/localization/sr_CS.inc
+++ b/plugins/password/localization/sr_CS.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Промијени лозинку';
 $labels['curpasswd']  = 'Тренутна лозинка:';
 $labels['newpasswd']  = 'Нова лозинка:';
 $labels['confpasswd']  = 'Поновите лозинку:';
diff --git a/plugins/password/localization/sv_SE.inc b/plugins/password/localization/sv_SE.inc
index 0aee9da81..26ee37d06 100644
--- a/plugins/password/localization/sv_SE.inc
+++ b/plugins/password/localization/sv_SE.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Lösenordet kunde inte ändras.';
 $messages['passwordshort'] = 'Lösenordet måste vara minst $length tecken långt.';
 $messages['passwordweak'] = 'Lösenordet måste innehålla minst en siffra och ett specialtecken.';
 $messages['passwordforbidden'] = 'Lösenordet innehåller otillåtna tecken.';
+$messages['firstloginchange'] = 'Du loggar in för första gången. Vänligen ändra ditt lösenord.';
 ?>
diff --git a/plugins/password/localization/ti.inc b/plugins/password/localization/ti.inc
index 9453318f0..fd334a957 100644
--- a/plugins/password/localization/ti.inc
+++ b/plugins/password/localization/ti.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'መሕለፊ ቃል ይለወጥ';
 $labels['curpasswd']  = 'ህልው መሕለፊ ቃል:';
 $labels['newpasswd']  = 'ሓዱሽ መሕለፊ ቃል:';
 $labels['confpasswd']  = 'መረጋገፂ ሓዱሽ መሕለፊ ቃል :';
diff --git a/plugins/password/localization/tr_TR.inc b/plugins/password/localization/tr_TR.inc
index 75ee30f6d..37c25c608 100644
--- a/plugins/password/localization/tr_TR.inc
+++ b/plugins/password/localization/tr_TR.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Parolayı Değiştir';
+$labels['changepasswd']  = 'Parolayı değiştir';
 $labels['curpasswd']  = 'Şimdiki Parola:';
 $labels['newpasswd']  = 'Yeni Parola:';
 $labels['confpasswd']  = 'Yeni Parolayı Onaylayın:';
@@ -29,4 +29,5 @@ $messages['internalerror'] = 'Yeni parola kaydedilemedi.';
 $messages['passwordshort'] = 'Parola en az $length karakterden oluşmalı.';
 $messages['passwordweak'] = 'Parola en az bir sayı ve bir noktalama işareti içermeli.';
 $messages['passwordforbidden'] = 'Parola uygunsuz karakter(ler) içeriyor.';
+$messages['firstloginchange'] = 'Bu ilk girişiniz. Lütfen parolanızı değiştirin.';
 ?>
diff --git a/plugins/password/localization/uk_UA.inc b/plugins/password/localization/uk_UA.inc
index 0d102e528..d9e96d15e 100644
--- a/plugins/password/localization/uk_UA.inc
+++ b/plugins/password/localization/uk_UA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Змінити пароль';
 $labels['curpasswd']  = 'Поточний пароль:';
 $labels['newpasswd']  = 'Новий пароль:';
 $labels['confpasswd']  = 'Підтвердіть новий пароль:';
diff --git a/plugins/password/localization/vi_VN.inc b/plugins/password/localization/vi_VN.inc
index 3e5745f4d..8dcf706d8 100644
--- a/plugins/password/localization/vi_VN.inc
+++ b/plugins/password/localization/vi_VN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = 'Thay đổi mật khẩu';
 $labels['curpasswd']  = 'Mật khẩu hiện tại';
 $labels['newpasswd']  = 'Mật khẩu mới:';
 $labels['confpasswd']  = 'Xác nhận mật khẩu mới';
diff --git a/plugins/password/localization/zh_CN.inc b/plugins/password/localization/zh_CN.inc
index 02db6e83e..681e5c7e2 100644
--- a/plugins/password/localization/zh_CN.inc
+++ b/plugins/password/localization/zh_CN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-$labels['changepasswd']  = '修改密码';
 $labels['curpasswd']  = '当前密码：';
 $labels['newpasswd']  = '新密码：';
 $labels['confpasswd']  = '确认新密码：';
diff --git a/plugins/password/localization/zh_TW.inc b/plugins/password/localization/zh_TW.inc
index e5e2414f2..22d88f042 100644
--- a/plugins/password/localization/zh_TW.inc
+++ b/plugins/password/localization/zh_TW.inc
@@ -29,4 +29,5 @@ $messages['internalerror'] = '無法更新密碼';
 $messages['passwordshort'] = '您的密碼至少需 $length 個字元長';
 $messages['passwordweak'] = '您的新密碼至少需含有一個數字與一個標點符號';
 $messages['passwordforbidden'] = '您的密碼含有禁用字元';
+$messages['firstloginchange'] = '這是你第一次登入。請更改你的密碼。';
 ?>
diff --git a/plugins/subscriptions_option/localization/ast.inc b/plugins/subscriptions_option/localization/ast.inc
new file mode 100644
index 000000000..47a8e142c
--- /dev/null
+++ b/plugins/subscriptions_option/localization/ast.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
+*/
+$labels['useimapsubscriptions']  = 'Usar soscripciones IMAP';
+?>
diff --git a/plugins/subscriptions_option/localization/ku.inc b/plugins/subscriptions_option/localization/ku.inc
new file mode 100644
index 000000000..99bf68f37
--- /dev/null
+++ b/plugins/subscriptions_option/localization/ku.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
+*/
+$labels['useimapsubscriptions']  = 'Abonetiyên IMAPê bi kar bîne';
+?>
diff --git a/plugins/subscriptions_option/localization/ml_IN.inc b/plugins/subscriptions_option/localization/ml_IN.inc
new file mode 100644
index 000000000..84f518a85
--- /dev/null
+++ b/plugins/subscriptions_option/localization/ml_IN.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
+*/
+$labels['useimapsubscriptions']  = 'IMAP വരിസംഖ്യകൾ ഉപയോഗിക്കുക';
+?>
diff --git a/plugins/userinfo/localization/ast.inc b/plugins/userinfo/localization/ast.inc
index 179c5ba29..e70d0a6d7 100644
--- a/plugins/userinfo/localization/ast.inc
+++ b/plugins/userinfo/localization/ast.inc
@@ -17,6 +17,6 @@
 */
 $labels['userinfo'] = 'Información d\'usuariu';
 $labels['created'] = 'Creáu';
-$labels['lastlogin'] = 'Cabera conexón';
-$labels['defaultidentity'] = 'Identidá predeterminada';
+$labels['lastlogin'] = 'Aniciu de sesión caberu';
+$labels['defaultidentity'] = 'Identidá por defeutu';
 ?>
 \ No newline at end of file
diff --git a/plugins/userinfo/localization/ko_KR.inc b/plugins/userinfo/localization/ko_KR.inc
index 5a95d2e77..98d4fc2e3 100644
--- a/plugins/userinfo/localization/ko_KR.inc
+++ b/plugins/userinfo/localization/ko_KR.inc
@@ -16,7 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 $labels['userinfo'] = '사용자 정보';
-$labels['created'] = '생성됨';
+$labels['created'] = '생성함';
 $labels['lastlogin'] = '마지막 로그인';
-$labels['defaultidentity'] = '기본 신분증';
+$labels['defaultidentity'] = '기본 신원';
 ?>
 \ No newline at end of file
diff --git a/plugins/userinfo/localization/ku_IQ.inc b/plugins/userinfo/localization/ku_IQ.inc
new file mode 100644
index 000000000..889e720a9
--- /dev/null
+++ b/plugins/userinfo/localization/ku_IQ.inc
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/userinfo/localization/<lang>.inc                              |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
+*/
+$labels['userinfo'] = 'زانیاری بەکارهێنەر';
+$labels['created'] = 'دروستکرا';
+$labels['lastlogin'] = 'دوایین چوونەژوورەوە';
+$labels['defaultidentity'] = 'ناسنامەی بنەڕەتی';
+?>
+\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ast.inc b/plugins/vcard_attachments/localization/ast.inc
new file mode 100644
index 000000000..899e8a2d0
--- /dev/null
+++ b/plugins/vcard_attachments/localization/ast.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
+*/
+$labels['addvcardmsg'] = 'Amestar vCard a la llibreta de direiciones';
+$labels['vcardsavefailed'] = 'Nun pue guardase la vCard';
+?>
+\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/br.inc b/plugins/vcard_attachments/localization/br.inc
new file mode 100644
index 000000000..d11a63f34
--- /dev/null
+++ b/plugins/vcard_attachments/localization/br.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
+*/
+$labels['addvcardmsg'] = 'Ouzhpennañ ar vCard d\'ar c\'harned chomlec\'hioù';
+$labels['vcardsavefailed'] = 'N\'haller ket enrollañ ar vCard';
+?>
+\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ko_KR.inc b/plugins/vcard_attachments/localization/ko_KR.inc
index b9b6906d2..fbbb73921 100644
--- a/plugins/vcard_attachments/localization/ko_KR.inc
+++ b/plugins/vcard_attachments/localization/ko_KR.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-$labels['addvcardmsg'] = '주소록에 vCard를 추가';
-$labels['vcardsavefailed'] = 'vCard 저장이 불가능함';
+$labels['addvcardmsg'] = '주소록에 vCard 추가';
+$labels['vcardsavefailed'] = 'vCard를 저장할 수 없음';
 ?>
 \ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ku.inc b/plugins/vcard_attachments/localization/ku.inc
new file mode 100644
index 000000000..a2cd9769b
--- /dev/null
+++ b/plugins/vcard_attachments/localization/ku.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
+*/
+$labels['addvcardmsg'] = 'vCardê tevî deftera navnîşanan bike';
+$labels['vcardsavefailed'] = 'Tomarkirina vCard betal bike';
+?>
+\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ar.inc b/plugins/zipdownload/localization/ar.inc
index c5857c96c..ac8585000 100644
--- a/plugins/zipdownload/localization/ar.inc
+++ b/plugins/zipdownload/localization/ar.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'تنزيل كل المرفقات';
-$labels['downloadfolder'] = 'تنزيل المجلد';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ar_SA.inc b/plugins/zipdownload/localization/ar_SA.inc
index dd5f5f349..e8652a182 100644
--- a/plugins/zipdownload/localization/ar_SA.inc
+++ b/plugins/zipdownload/localization/ar_SA.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'تحميل جميع المرفقات';
-$labels['downloadfolder'] = 'تحميل المجلد';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ast.inc b/plugins/zipdownload/localization/ast.inc
new file mode 100644
index 000000000..74bb0ff52
--- /dev/null
+++ b/plugins/zipdownload/localization/ast.inc
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
+$labels['downloadall'] = 'Descargar tolos axuntos';
+$labels['download'] = 'Descargar...';
+$labels['downloadmbox'] = 'Formatu Mbox (.zip)';
+$labels['downloadmaildir'] = 'Formatu Maildir (.zip)';
+$labels['downloademl'] = 'Fonte (.eml)';
diff --git a/plugins/zipdownload/localization/az_AZ.inc b/plugins/zipdownload/localization/az_AZ.inc
index af785b48d..cc93b8aa8 100644
--- a/plugins/zipdownload/localization/az_AZ.inc
+++ b/plugins/zipdownload/localization/az_AZ.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Bütün qoşmaları endir';
-$labels['downloadfolder'] = 'Qovluğu endir';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/be_BE.inc b/plugins/zipdownload/localization/be_BE.inc
index 7c6fb3876..80d2bdbc2 100644
--- a/plugins/zipdownload/localization/be_BE.inc
+++ b/plugins/zipdownload/localization/be_BE.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Спампаваць усе далучэнні';
-$labels['downloadfolder'] = 'Спампаваць папку';
-?>
-\ No newline at end of file
+$labels['download'] = 'Сцягнуць...';
+$labels['downloadmbox'] = 'Фармат mbox (.zip)';
+$labels['downloadmaildir'] = 'Фармат maildir (.zip)';
+$labels['downloademl'] = 'Выточны файл (.eml)';
diff --git a/plugins/zipdownload/localization/bg_BG.inc b/plugins/zipdownload/localization/bg_BG.inc
index 69f91f6f2..36bf5389c 100644
--- a/plugins/zipdownload/localization/bg_BG.inc
+++ b/plugins/zipdownload/localization/bg_BG.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Изтегляне на всички прикачени файлове';
-$labels['downloadfolder'] = 'Изтегляне на папка';
-?>
-\ No newline at end of file
+$labels['download'] = 'Изтегляне...';
+$labels['downloadmbox'] = 'Mbox формат (.zip)';
+$labels['downloadmaildir'] = 'Maildir формат (.zip)';
+$labels['downloademl'] = 'Outlook формат (.eml)';
diff --git a/plugins/zipdownload/localization/br.inc b/plugins/zipdownload/localization/br.inc
index 0d7da382b..031200280 100644
--- a/plugins/zipdownload/localization/br.inc
+++ b/plugins/zipdownload/localization/br.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Pellgargañ an holl stagadennoù';
-$labels['downloadfolder'] = 'Pellgargañ an teuliad';
-?>
-\ No newline at end of file
+$labels['download'] = 'Pellgargañ…';
+$labels['downloadmbox'] = 'Mentrezh Mbox (.zip)';
+$labels['downloadmaildir'] = 'Mentrezh Maildir (.zip)';
+$labels['downloademl'] = 'Tarzh (.eml)';
diff --git a/plugins/zipdownload/localization/bs_BA.inc b/plugins/zipdownload/localization/bs_BA.inc
index ea72831af..d6389f995 100644
--- a/plugins/zipdownload/localization/bs_BA.inc
+++ b/plugins/zipdownload/localization/bs_BA.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Preuzmi sve priloge';
-$labels['downloadfolder'] = 'Preuzmi folder';
-?>
-\ No newline at end of file
+$labels['download'] = 'Preuzmi...';
+$labels['downloadmbox'] = 'Mbox format (.zip)';
+$labels['downloadmaildir'] = 'Maildir format (.zip)';
+$labels['downloademl'] = 'Izvorno (.eml)';
diff --git a/plugins/zipdownload/localization/ca_ES.inc b/plugins/zipdownload/localization/ca_ES.inc
index bf5640ec6..c8dd680ef 100644
--- a/plugins/zipdownload/localization/ca_ES.inc
+++ b/plugins/zipdownload/localization/ca_ES.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Descarrega tots els adjunts';
-$labels['downloadfolder'] = 'Descarrega la carpeta';
-?>
-\ No newline at end of file
+$labels['download'] = 'Descarrega...';
+$labels['downloadmbox'] = 'Format mbox (.zip)';
+$labels['downloadmaildir'] = 'Format maildir (.zip)';
+$labels['downloademl'] = 'Codi font (.eml)';
diff --git a/plugins/zipdownload/localization/cs_CZ.inc b/plugins/zipdownload/localization/cs_CZ.inc
index d96b1f570..9c4d45fd3 100644
--- a/plugins/zipdownload/localization/cs_CZ.inc
+++ b/plugins/zipdownload/localization/cs_CZ.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Stáhnout všechny přílohy';
-$labels['downloadfolder'] = 'Stáhnout složku';
-?>
-\ No newline at end of file
+$labels['download'] = 'Stáhnout...';
+$labels['downloadmbox'] = 'Formát mbox (.zip)';
+$labels['downloadmaildir'] = 'Formát maildir (.zip)';
+$labels['downloademl'] = 'Zdroj (.eml)';
diff --git a/plugins/zipdownload/localization/cy_GB.inc b/plugins/zipdownload/localization/cy_GB.inc
index 3c9fc7580..d0a60f0d6 100644
--- a/plugins/zipdownload/localization/cy_GB.inc
+++ b/plugins/zipdownload/localization/cy_GB.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Llwytho lawr holl atodiadau';
-$labels['downloadfolder'] = 'Ffolder llwytho lawr';
-?>
-\ No newline at end of file
+$labels['download'] = 'Llwytho lawr...';
+$labels['downloadmbox'] = 'Fformat mbox (.zip)';
+$labels['downloadmaildir'] = 'Fformat maildir (.zip)';
+$labels['downloademl'] = 'Ffynhonnell (.eml)';
diff --git a/plugins/zipdownload/localization/da_DK.inc b/plugins/zipdownload/localization/da_DK.inc
index 9e29018d5..7cf98144c 100644
--- a/plugins/zipdownload/localization/da_DK.inc
+++ b/plugins/zipdownload/localization/da_DK.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Download alle som .zip-fil';
-$labels['downloadfolder'] = 'Download folder som .zip-fil';
-?>
-\ No newline at end of file
+$labels['download'] = 'Download...';
+$labels['downloadmbox'] = 'Mbox format (.zip)';
+$labels['downloadmaildir'] = 'Maildir format (.zip)';
+$labels['downloademl'] = 'Kilde (.eml)';
diff --git a/plugins/zipdownload/localization/de_CH.inc b/plugins/zipdownload/localization/de_CH.inc
index 978c221b0..f1a180e8b 100644
--- a/plugins/zipdownload/localization/de_CH.inc
+++ b/plugins/zipdownload/localization/de_CH.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Alle Anhänge herunterladen';
-$labels['downloadfolder'] = 'Ordner herunterladen';
-?>
-\ No newline at end of file
+$labels['download'] = 'Download...';
+$labels['downloadmbox'] = 'Mbox Format (.zip)';
+$labels['downloadmaildir'] = 'Maildir Format (.zip)';
+$labels['downloademl'] = 'Source (.eml)';
diff --git a/plugins/zipdownload/localization/de_DE.inc b/plugins/zipdownload/localization/de_DE.inc
index 978c221b0..d3dadc025 100644
--- a/plugins/zipdownload/localization/de_DE.inc
+++ b/plugins/zipdownload/localization/de_DE.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Alle Anhänge herunterladen';
-$labels['downloadfolder'] = 'Ordner herunterladen';
-?>
-\ No newline at end of file
+$labels['download'] = 'Herunterladen...';
+$labels['downloadmbox'] = 'Mbox-Format (.zip)';
+$labels['downloadmaildir'] = 'Maildir-Format (.zip)';
+$labels['downloademl'] = 'Quelltext (.eml)';
diff --git a/plugins/zipdownload/localization/el_GR.inc b/plugins/zipdownload/localization/el_GR.inc
index e1ee35eb4..db9a5b1eb 100644
--- a/plugins/zipdownload/localization/el_GR.inc
+++ b/plugins/zipdownload/localization/el_GR.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Λήψη όλων των συνημμένων';
-$labels['downloadfolder'] = 'Λήψη φακέλου';
-?>
-\ No newline at end of file
+$labels['download'] = 'Λήψη...';
+$labels['downloadmbox'] = 'Μορφή mbox (.zip)';
+$labels['downloadmaildir'] = 'Μορφή maildir (.zip)';
+$labels['downloademl'] = 'Πηγή (.eml)';
diff --git a/plugins/zipdownload/localization/en_CA.inc b/plugins/zipdownload/localization/en_CA.inc
index 48a8d9bcb..c3400d971 100644
--- a/plugins/zipdownload/localization/en_CA.inc
+++ b/plugins/zipdownload/localization/en_CA.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Download all attachments';
-$labels['downloadfolder'] = 'Download folder';
-?>
-\ No newline at end of file
+$labels['download'] = 'Download...';
+$labels['downloadmbox'] = 'Mbox format (.zip)';
+$labels['downloadmaildir'] = 'Maildir format (.zip)';
+$labels['downloademl'] = 'Source (.eml)';
diff --git a/plugins/zipdownload/localization/en_GB.inc b/plugins/zipdownload/localization/en_GB.inc
index 48a8d9bcb..c3400d971 100644
--- a/plugins/zipdownload/localization/en_GB.inc
+++ b/plugins/zipdownload/localization/en_GB.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Download all attachments';
-$labels['downloadfolder'] = 'Download folder';
-?>
-\ No newline at end of file
+$labels['download'] = 'Download...';
+$labels['downloadmbox'] = 'Mbox format (.zip)';
+$labels['downloadmaildir'] = 'Maildir format (.zip)';
+$labels['downloademl'] = 'Source (.eml)';
diff --git a/plugins/zipdownload/localization/eo.inc b/plugins/zipdownload/localization/eo.inc
index bc6ef9d69..729052489 100644
--- a/plugins/zipdownload/localization/eo.inc
+++ b/plugins/zipdownload/localization/eo.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Elŝuti ĉiujn kunsendaĵojn';
-$labels['downloadfolder'] = 'Elŝuti dosierujon';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/es_419.inc b/plugins/zipdownload/localization/es_419.inc
index a25e34266..095926cb0 100644
--- a/plugins/zipdownload/localization/es_419.inc
+++ b/plugins/zipdownload/localization/es_419.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Descargar todos los archivos adjuntos';
-$labels['downloadfolder'] = 'Descargar carpeta';
-?>
-\ No newline at end of file
+$labels['download'] = 'Descargando...';
+$labels['downloadmbox'] = 'Formato mbox (.zip)';
+$labels['downloadmaildir'] = 'Formato maildir (.zip)';
+$labels['downloademl'] = 'Fuente (.eml)';
diff --git a/plugins/zipdownload/localization/es_AR.inc b/plugins/zipdownload/localization/es_AR.inc
index 9f20f5561..5a4d24ad5 100644
--- a/plugins/zipdownload/localization/es_AR.inc
+++ b/plugins/zipdownload/localization/es_AR.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Descargar Todo';
-$labels['downloadfolder'] = 'Descargar carpeta';
-?>
-\ No newline at end of file
+$labels['download'] = 'Descargar...';
+$labels['downloadmbox'] = 'Formato Mbox (.zip)';
+$labels['downloadmaildir'] = 'Formato Maildir (.zip)';
+$labels['downloademl'] = 'Original (.eml)';
diff --git a/plugins/zipdownload/localization/es_ES.inc b/plugins/zipdownload/localization/es_ES.inc
index 22db2cda9..1c95b7f3e 100644
--- a/plugins/zipdownload/localization/es_ES.inc
+++ b/plugins/zipdownload/localization/es_ES.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Descargar todos los adjuntos';
-$labels['downloadfolder'] = 'Descargar carpeta';
-?>
-\ No newline at end of file
+$labels['download'] = 'Descargar...';
+$labels['downloadmbox'] = 'Formato mbox (.zip)';
+$labels['downloadmaildir'] = 'Formato maildir (.zip)';
+$labels['downloademl'] = 'Fuente (.eml)';
diff --git a/plugins/zipdownload/localization/et_EE.inc b/plugins/zipdownload/localization/et_EE.inc
index 969658bc2..a28653fa3 100644
--- a/plugins/zipdownload/localization/et_EE.inc
+++ b/plugins/zipdownload/localization/et_EE.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Laadi alla kõik manused';
-$labels['downloadfolder'] = 'Allalaadimiste kaust';
-?>
-\ No newline at end of file
+$labels['download'] = 'lae arvutisse';
+$labels['downloadmbox'] = 'Mbox vorming (.zip)';
+$labels['downloadmaildir'] = 'Maildir vorming (.zip)';
+$labels['downloademl'] = 'Lähtetekst (.eml)';
diff --git a/plugins/zipdownload/localization/eu_ES.inc b/plugins/zipdownload/localization/eu_ES.inc
index 0be09c8b2..3d923f11d 100644
--- a/plugins/zipdownload/localization/eu_ES.inc
+++ b/plugins/zipdownload/localization/eu_ES.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Deskargatu eranskin guztiak';
-$labels['downloadfolder'] = 'Deskargatu karpeta';
-?>
-\ No newline at end of file
+$labels['download'] = 'Deskargatu...';
+$labels['downloadmbox'] = 'Mbox formatua (.zip)';
+$labels['downloadmaildir'] = 'Maildir formatua (.zip)';
+$labels['downloademl'] = 'Iturburua (.eml)';
diff --git a/plugins/zipdownload/localization/fa_AF.inc b/plugins/zipdownload/localization/fa_AF.inc
index 57bb55ea4..89e898fc9 100644
--- a/plugins/zipdownload/localization/fa_AF.inc
+++ b/plugins/zipdownload/localization/fa_AF.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'بارگزاری همه ضمیمه ها';
-$labels['downloadfolder'] = 'بارگزاری  پوشه';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/fa_IR.inc b/plugins/zipdownload/localization/fa_IR.inc
index 46007a0fb..04caaf82a 100644
--- a/plugins/zipdownload/localization/fa_IR.inc
+++ b/plugins/zipdownload/localization/fa_IR.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,5 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'بارگیری همه پیوست‌ها';
-$labels['downloadfolder'] = 'بارگیری پوشه';
-?>
-\ No newline at end of file
+$labels['download'] = 'بارگیری';
+$labels['downloademl'] = 'منبع (.eml)';
diff --git a/plugins/zipdownload/localization/fi_FI.inc b/plugins/zipdownload/localization/fi_FI.inc
index 7e2c3137d..fed2d9cf3 100644
--- a/plugins/zipdownload/localization/fi_FI.inc
+++ b/plugins/zipdownload/localization/fi_FI.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Lataa kaikki liitteet';
-$labels['downloadfolder'] = 'Lataa kansio';
-?>
-\ No newline at end of file
+$labels['download'] = 'Lataa...';
+$labels['downloadmbox'] = 'Mbox-muoto (.zip)';
+$labels['downloadmaildir'] = 'Maildir-muoto (.zip)';
+$labels['downloademl'] = 'Lähde (.eml)';
diff --git a/plugins/zipdownload/localization/fo_FO.inc b/plugins/zipdownload/localization/fo_FO.inc
index c49d20b68..5feb35aeb 100644
--- a/plugins/zipdownload/localization/fo_FO.inc
+++ b/plugins/zipdownload/localization/fo_FO.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Heinta allar viðheftingar';
-$labels['downloadfolder'] = 'Heinta mappu';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/fr_FR.inc b/plugins/zipdownload/localization/fr_FR.inc
index d921cd0a1..6dd839ae6 100644
--- a/plugins/zipdownload/localization/fr_FR.inc
+++ b/plugins/zipdownload/localization/fr_FR.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Télécharger tous les fichiers joints';
-$labels['downloadfolder'] = 'Dossier de téléchargement';
-?>
-\ No newline at end of file
+$labels['download'] = 'Télécharger...';
+$labels['downloadmbox'] = 'Format mbox (.zip)';
+$labels['downloadmaildir'] = 'Format maildir (.zip)';
+$labels['downloademl'] = 'Source (.eml)';
diff --git a/plugins/zipdownload/localization/gl_ES.inc b/plugins/zipdownload/localization/gl_ES.inc
index 91fc14651..04912f4fb 100644
--- a/plugins/zipdownload/localization/gl_ES.inc
+++ b/plugins/zipdownload/localization/gl_ES.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Descargar todos os adxuntos';
-$labels['downloadfolder'] = 'Descargar o cartafol';
-?>
-\ No newline at end of file
+$labels['download'] = 'Descargar';
+$labels['downloadmbox'] = 'En formato mbox (.zip)';
+$labels['downloadmaildir'] = 'En formato maildir (.zip)';
+$labels['downloademl'] = 'Código fonte (.eml)';
diff --git a/plugins/zipdownload/localization/he_IL.inc b/plugins/zipdownload/localization/he_IL.inc
index 0df6191fa..50521fc6c 100644
--- a/plugins/zipdownload/localization/he_IL.inc
+++ b/plugins/zipdownload/localization/he_IL.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'להוריד את כל הצרופות';
-$labels['downloadfolder'] = 'תיקיית צרופות';
-?>
-\ No newline at end of file
+$labels['download'] = 'מוריד כעת...';
+$labels['downloadmbox'] = 'פורמט Mbox  &rlm;(zip.)';
+$labels['downloadmaildir'] = 'פורמט Maildir  &rlm;(zip.)';
+$labels['downloademl'] = 'מקור (eml.)';
diff --git a/plugins/zipdownload/localization/hr_HR.inc b/plugins/zipdownload/localization/hr_HR.inc
index 38d9cd0c4..6b21f010d 100644
--- a/plugins/zipdownload/localization/hr_HR.inc
+++ b/plugins/zipdownload/localization/hr_HR.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Preuzmi sve privitke';
-$labels['downloadfolder'] = 'Preuzmi (kao) mapu';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/hu_HU.inc b/plugins/zipdownload/localization/hu_HU.inc
index 85179e5a6..557d14ceb 100644
--- a/plugins/zipdownload/localization/hu_HU.inc
+++ b/plugins/zipdownload/localization/hu_HU.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Összes csatolmány letöltése';
-$labels['downloadfolder'] = 'Könyvtár letöltése';
-?>
-\ No newline at end of file
+$labels['download'] = 'Letöltés...';
+$labels['downloadmbox'] = 'Mbox formátum (.zip)';
+$labels['downloadmaildir'] = 'Maildir formátum (.zip)';
+$labels['downloademl'] = 'Forrás (.eml)';
diff --git a/plugins/zipdownload/localization/hy_AM.inc b/plugins/zipdownload/localization/hy_AM.inc
index 10b21f6e2..0f24512de 100644
--- a/plugins/zipdownload/localization/hy_AM.inc
+++ b/plugins/zipdownload/localization/hy_AM.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Ներբեռնել բոլո կցված նիշքերը';
-$labels['downloadfolder'] = 'Ներբեռնել պանակը';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/id_ID.inc b/plugins/zipdownload/localization/id_ID.inc
index 2ff3c87df..ca1abc85e 100644
--- a/plugins/zipdownload/localization/id_ID.inc
+++ b/plugins/zipdownload/localization/id_ID.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Unduh semua lampiran';
-$labels['downloadfolder'] = 'Folder download';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/it_IT.inc b/plugins/zipdownload/localization/it_IT.inc
index 882e354d9..96cd8898d 100644
--- a/plugins/zipdownload/localization/it_IT.inc
+++ b/plugins/zipdownload/localization/it_IT.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Scarica tutti gli allegati';
-$labels['downloadfolder'] = 'Scarica cartella';
-?>
-\ No newline at end of file
+$labels['download'] = 'Scaricare...';
+$labels['downloadmbox'] = 'Formato mbox (.zip)';
+$labels['downloadmaildir'] = 'Formato maildir (.zip)';
+$labels['downloademl'] = 'Sorgente (.eml)';
diff --git a/plugins/zipdownload/localization/ja_JP.inc b/plugins/zipdownload/localization/ja_JP.inc
index a0388808d..71a8143a4 100644
--- a/plugins/zipdownload/localization/ja_JP.inc
+++ b/plugins/zipdownload/localization/ja_JP.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'すべての添付ファイルをダウンロード';
-$labels['downloadfolder'] = 'ダウンロード先のフォルダー';
-?>
-\ No newline at end of file
+$labels['download'] = 'ダウンロード...';
+$labels['downloadmbox'] = 'mbox形式(.zip)';
+$labels['downloadmaildir'] = 'Maildir形式(.zip)';
+$labels['downloademl'] = 'ソース(.eml)';
diff --git a/plugins/zipdownload/localization/km_KH.inc b/plugins/zipdownload/localization/km_KH.inc
index 0ada98dfc..9bf572198 100644
--- a/plugins/zipdownload/localization/km_KH.inc
+++ b/plugins/zipdownload/localization/km_KH.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'ទាញយកឯកសារភ្ជាប់ទាំងអស់';
-$labels['downloadfolder'] = 'ទាញយកថតឯកសារ';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ko_KR.inc b/plugins/zipdownload/localization/ko_KR.inc
index cae831353..2cc610ae7 100644
--- a/plugins/zipdownload/localization/ko_KR.inc
+++ b/plugins/zipdownload/localization/ko_KR.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = '모든 첨부파일을 다운로드';
-$labels['downloadfolder'] = '다운로드 폴더';
-?>
-\ No newline at end of file
+$labels['download'] = '다운로드...';
+$labels['downloadmbox'] = 'Mbox 형식(.zip)';
+$labels['downloadmaildir'] = 'Maildir 형식(.zip)';
+$labels['downloademl'] = '소스(.eml)';
diff --git a/plugins/zipdownload/localization/ku.inc b/plugins/zipdownload/localization/ku.inc
new file mode 100644
index 000000000..af8165da3
--- /dev/null
+++ b/plugins/zipdownload/localization/ku.inc
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
+$labels['downloadall'] = 'Hemû pêvekan daxîne';
+$labels['download'] = 'Daxîne...';
+$labels['downloadmbox'] = 'Mbox format (.zip)';
+$labels['downloadmaildir'] = 'Maildir format (.zip)';
+$labels['downloademl'] = 'Çavkanî (.eml)';
diff --git a/plugins/zipdownload/localization/ku_IQ.inc b/plugins/zipdownload/localization/ku_IQ.inc
new file mode 100644
index 000000000..0374e01a8
--- /dev/null
+++ b/plugins/zipdownload/localization/ku_IQ.inc
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
+$labels['downloadall'] = 'داگرتنی هەموو هاوپێچەکان';
+$labels['download'] = 'داگرتن...';
+$labels['downloadmbox'] = 'Mbox format (.zip)';
+$labels['downloadmaildir'] = 'Maildir format (.zip)';
+$labels['downloademl'] = 'Source (.eml)';
diff --git a/plugins/zipdownload/localization/lb_LU.inc b/plugins/zipdownload/localization/lb_LU.inc
index 434b064dd..70e60595c 100644
--- a/plugins/zipdownload/localization/lb_LU.inc
+++ b/plugins/zipdownload/localization/lb_LU.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'All d\'Unhäng eroflueden';
-$labels['downloadfolder'] = 'Dossier eroflueden';
-?>
-\ No newline at end of file
+$labels['download'] = 'Eroflueden...';
+$labels['downloadmbox'] = 'Mbox-Format (.zip)';
+$labels['downloadmaildir'] = 'Maildir-Format (.zip)';
+$labels['downloademl'] = 'Source (.eml)';
diff --git a/plugins/zipdownload/localization/lt_LT.inc b/plugins/zipdownload/localization/lt_LT.inc
index 9b4a13310..85ecb9b09 100644
--- a/plugins/zipdownload/localization/lt_LT.inc
+++ b/plugins/zipdownload/localization/lt_LT.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Atsisiųsti visus priedus';
-$labels['downloadfolder'] = 'Atsisiųsti aplanką';
-?>
-\ No newline at end of file
+$labels['download'] = 'Parsisiųsti...';
+$labels['downloadmbox'] = 'Mbox formatas (.zip)';
+$labels['downloadmaildir'] = 'Maildir formatas (.zip)';
+$labels['downloademl'] = 'Kodas (.eml)';
diff --git a/plugins/zipdownload/localization/lv_LV.inc b/plugins/zipdownload/localization/lv_LV.inc
index b23417abc..9dcf4cd81 100644
--- a/plugins/zipdownload/localization/lv_LV.inc
+++ b/plugins/zipdownload/localization/lv_LV.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Lejupielādēt visus pielikumus';
-$labels['downloadfolder'] = 'Lejupielādēt mapi';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ml_IN.inc b/plugins/zipdownload/localization/ml_IN.inc
new file mode 100644
index 000000000..3dcaffa1f
--- /dev/null
+++ b/plugins/zipdownload/localization/ml_IN.inc
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
+$labels['downloadall'] = 'എല്ലാ അറ്റാച്ച്മെന്റുകളും ഡൗൺലോഡ് ചെയ്യുക';
+$labels['download'] = 'ഡൗൺലോഡ്...';
+$labels['downloadmbox'] = 'എംബോക്സ് രീതി (.zip)';
+$labels['downloadmaildir'] = 'മെയിൽഡിർ രീതി (.zip)';
+$labels['downloademl'] = 'സ്രോതസ്സ് (.eml)';
diff --git a/plugins/zipdownload/localization/nb_NO.inc b/plugins/zipdownload/localization/nb_NO.inc
index a0b076bf4..196a723be 100644
--- a/plugins/zipdownload/localization/nb_NO.inc
+++ b/plugins/zipdownload/localization/nb_NO.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Last ned alle vedlegg';
-$labels['downloadfolder'] = 'Nedlastningsmappe';
-?>
-\ No newline at end of file
+$labels['download'] = 'Nedlaste...';
+$labels['downloadmbox'] = 'Mbox format (.zip)';
+$labels['downloadmaildir'] = 'Maildir format (.zip)';
+$labels['downloademl'] = 'Kildekode (.eml)';
diff --git a/plugins/zipdownload/localization/nl_NL.inc b/plugins/zipdownload/localization/nl_NL.inc
index 43aa442f3..ef8276970 100644
--- a/plugins/zipdownload/localization/nl_NL.inc
+++ b/plugins/zipdownload/localization/nl_NL.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Alle bijlagen downloaden';
-$labels['downloadfolder'] = 'Map downloaden';
-?>
-\ No newline at end of file
+$labels['download'] = 'Download...';
+$labels['downloadmbox'] = 'Mbox-formaat (.zip)';
+$labels['downloadmaildir'] = 'Maildir-formaat (.zip)';
+$labels['downloademl'] = 'Bron (.eml)';
diff --git a/plugins/zipdownload/localization/nn_NO.inc b/plugins/zipdownload/localization/nn_NO.inc
index a0b076bf4..2440a2ea9 100644
--- a/plugins/zipdownload/localization/nn_NO.inc
+++ b/plugins/zipdownload/localization/nn_NO.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Last ned alle vedlegg';
-$labels['downloadfolder'] = 'Nedlastningsmappe';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/pl_PL.inc b/plugins/zipdownload/localization/pl_PL.inc
index 7cf192e1d..eefbd7485 100644
--- a/plugins/zipdownload/localization/pl_PL.inc
+++ b/plugins/zipdownload/localization/pl_PL.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Pobierz wszystkie jako ZIP';
-$labels['downloadfolder'] = 'Pobierz folder';
-?>
-\ No newline at end of file
+$labels['download'] = 'Pobierz...';
+$labels['downloadmbox'] = 'Format mbox (.zip)';
+$labels['downloadmaildir'] = 'Format maildir (.zip)';
+$labels['downloademl'] = 'Źródło wiadomości (.eml)';
diff --git a/plugins/zipdownload/localization/pt_BR.inc b/plugins/zipdownload/localization/pt_BR.inc
index 86dee11f2..daac3ae2d 100644
--- a/plugins/zipdownload/localization/pt_BR.inc
+++ b/plugins/zipdownload/localization/pt_BR.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Baixar todos os anexos';
-$labels['downloadfolder'] = 'Pasta de baixar arquivos';
-?>
-\ No newline at end of file
+$labels['download'] = 'Baixar...';
+$labels['downloadmbox'] = 'Formato mbox (.zip)';
+$labels['downloadmaildir'] = 'Formato maildir (.zip)';
+$labels['downloademl'] = 'Original (.eml)';
diff --git a/plugins/zipdownload/localization/pt_PT.inc b/plugins/zipdownload/localization/pt_PT.inc
index 4b7441927..4574bc4bd 100644
--- a/plugins/zipdownload/localization/pt_PT.inc
+++ b/plugins/zipdownload/localization/pt_PT.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Guardar todos os anexos';
-$labels['downloadfolder'] = 'Guardar pasta';
-?>
-\ No newline at end of file
+$labels['download'] = 'Descarregar...';
+$labels['downloadmbox'] = 'Formato Mbox (.zip)';
+$labels['downloadmaildir'] = 'Formato Maildir (.zip)';
+$labels['downloademl'] = 'Original (.eml)';
diff --git a/plugins/zipdownload/localization/ro_RO.inc b/plugins/zipdownload/localization/ro_RO.inc
index a676799d5..5c872d033 100644
--- a/plugins/zipdownload/localization/ro_RO.inc
+++ b/plugins/zipdownload/localization/ro_RO.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Descarcă toate atașamentele';
-$labels['downloadfolder'] = 'Descarcă dosar';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ru_RU.inc b/plugins/zipdownload/localization/ru_RU.inc
index b6286a177..93725e355 100644
--- a/plugins/zipdownload/localization/ru_RU.inc
+++ b/plugins/zipdownload/localization/ru_RU.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Загрузить все вложения';
-$labels['downloadfolder'] = 'Загрузить папку';
-?>
-\ No newline at end of file
+$labels['download'] = 'Загрузка...';
+$labels['downloadmbox'] = 'Формат Mbox (.zip)';
+$labels['downloadmaildir'] = 'Формат Maildir (.zip)';
+$labels['downloademl'] = 'Исходный формат (.eml)';
diff --git a/plugins/zipdownload/localization/sk_SK.inc b/plugins/zipdownload/localization/sk_SK.inc
index 4c918528f..a7ab21c2d 100644
--- a/plugins/zipdownload/localization/sk_SK.inc
+++ b/plugins/zipdownload/localization/sk_SK.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Stiahnuť všetky prílohy';
-$labels['downloadfolder'] = 'Priečinok pre stiahnuté súbory';
-?>
-\ No newline at end of file
+$labels['download'] = 'Stiahnuť...';
+$labels['downloadmbox'] = 'Formát Mbox (.zip)';
+$labels['downloadmaildir'] = 'Formát Maildir (.zip)';
+$labels['downloademl'] = 'Zdroj (.eml)';
diff --git a/plugins/zipdownload/localization/sl_SI.inc b/plugins/zipdownload/localization/sl_SI.inc
index 07caeacbc..4fa4ca3ea 100644
--- a/plugins/zipdownload/localization/sl_SI.inc
+++ b/plugins/zipdownload/localization/sl_SI.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Prenesi vse priponke';
-$labels['downloadfolder'] = 'Prenesi mapo';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sr_CS.inc b/plugins/zipdownload/localization/sr_CS.inc
index 55d64b91f..0fc8edda4 100644
--- a/plugins/zipdownload/localization/sr_CS.inc
+++ b/plugins/zipdownload/localization/sr_CS.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Преузми све прилоге';
-$labels['downloadfolder'] = 'Фасцикла за преузимање';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sv_SE.inc b/plugins/zipdownload/localization/sv_SE.inc
index d9c4f5da6..4a3d5ded3 100644
--- a/plugins/zipdownload/localization/sv_SE.inc
+++ b/plugins/zipdownload/localization/sv_SE.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -15,6 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-$labels['downloadall'] = 'Hämta alla bifogade filer';
-$labels['downloadfolder'] = 'Hämta katalog';
-?>
-\ No newline at end of file
+$labels['downloadall'] = 'Ladda ner alla bifogade filer';
+$labels['download'] = 'Hämta...';
+$labels['downloadmbox'] = 'Format Mbox (.zip)';
+$labels['downloadmaildir'] = 'Format Maildir (.zip)';
+$labels['downloademl'] = 'Källkod (.eml)';
diff --git a/plugins/zipdownload/localization/tr_TR.inc b/plugins/zipdownload/localization/tr_TR.inc
index a4dbec57b..21a44eb7d 100644
--- a/plugins/zipdownload/localization/tr_TR.inc
+++ b/plugins/zipdownload/localization/tr_TR.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Tüm ek dosyaları indir';
-$labels['downloadfolder'] = 'klasörü indir';
-?>
-\ No newline at end of file
+$labels['download'] = 'İndir...';
+$labels['downloadmbox'] = 'Mbox biçimi(.zip)';
+$labels['downloadmaildir'] = 'Maildir biçimi (.zip)';
+$labels['downloademl'] = 'Kaynak (.eml)';
diff --git a/plugins/zipdownload/localization/uk_UA.inc b/plugins/zipdownload/localization/uk_UA.inc
index 6232e9a2c..e7f6646c1 100644
--- a/plugins/zipdownload/localization/uk_UA.inc
+++ b/plugins/zipdownload/localization/uk_UA.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Завантажити всі вкладення';
-$labels['downloadfolder'] = 'Завантажити теку';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/vi_VN.inc b/plugins/zipdownload/localization/vi_VN.inc
index 7e33bc75a..d63146636 100644
--- a/plugins/zipdownload/localization/vi_VN.inc
+++ b/plugins/zipdownload/localization/vi_VN.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -15,6 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-$labels['downloadall'] = 'Tải tất cả đính kèm về';
-$labels['downloadfolder'] = 'Tải thư mục về';
-?>
-\ No newline at end of file
+$labels['downloadall'] = 'Tải tất cả tệp tin đính kèm';
+$labels['download'] = 'Tải xuống...';
+$labels['downloadmbox'] = 'Định dạng mbox (.zip)';
+$labels['downloadmaildir'] = 'Định dạng Maildir (.zip)';
+$labels['downloademl'] = 'Mã nguồn (.eml)';
diff --git a/plugins/zipdownload/localization/zh_CN.inc b/plugins/zipdownload/localization/zh_CN.inc
index dfa8db34a..5e0fd4ea6 100644
--- a/plugins/zipdownload/localization/zh_CN.inc
+++ b/plugins/zipdownload/localization/zh_CN.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = '下载全部附件';
-$labels['downloadfolder'] = '下载文件夹';
-?>
-\ No newline at end of file
diff --git a/plugins/zipdownload/localization/zh_TW.inc b/plugins/zipdownload/localization/zh_TW.inc
index 44107c634..4fb9efec1 100644
--- a/plugins/zipdownload/localization/zh_TW.inc
+++ b/plugins/zipdownload/localization/zh_TW.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = '下載所有附件';
-$labels['downloadfolder'] = '下載資料夾';
-?>
-\ No newline at end of file
+$labels['download'] = '下載...';
+$labels['downloadmbox'] = 'Mbox 格式 (.zip)';
+$labels['downloadmaildir'] = 'Maildir 格式 (.zip)';
+$labels['downloademl'] = '原始格式 (.eml)';
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index a518fb012..6feba64a6 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -22,6 +22,7 @@ $messages['sessionerror'] = 'انتهت صلاحية الجلسة الحالية
 $messages['storageerror'] = 'فشل الاتصال بخادم IMAP';
 $messages['servererror'] = 'خطأ في الخادم!';
 $messages['servererrormsg'] = 'خطأ خادم: $msg';
+$messages['connerror'] = 'خطأ في الاتصال (فشل في الوصول الى الخادم)!';
 $messages['dberror'] = 'خطأ في قاعدة البيانات!';
 $messages['requesttimedout'] = 'انتهت مهلة الطلب ';
 $messages['errorreadonly'] = 'تعذر تنفيذ العملية. المجلد للقراءة فقط.';
@@ -135,7 +136,6 @@ $messages['importmessagesuccess'] = 'تم استرداد $nr رسالة بنجا
 $messages['importmessageerror'] = 'فشل في الاستيراد! الملف الذي تحاول رفعة ليس رسالة او صندوق بريد صالح. ';
 $messages['opnotpermitted'] = 'العملية ممنوعة!';
 $messages['nofromaddress'] = 'عنوان البريد الالكتروني غير محدد فيالهويّة المنتقاة';
-$messages['editorwarning'] = 'يتسبب الانتقال إلى محرر النص البسيط بضياع جميع التنسيق. هل تريد الاستمرار؟';
 $messages['httpreceivedencrypterror'] = 'حدث خطأ جسيم في التهيئة. رجاءً اتصال بمدير الخادم حالاً. <b>لا يمكن إرسال بريدك.</b>';
 $messages['smtpconnerror'] = 'خطأ SMTP ($code): تعذر الاتصال بالخادم';
 $messages['smtpautherror'] = 'خطأ SMTP ($code): تعذر التحقق من هويتك';
diff --git a/program/localization/ast/labels.inc b/program/localization/ast/labels.inc
index 25d09451c..0aef08d3f 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -17,14 +17,14 @@
 */
 $labels['welcome']   = 'Bienllegáu a $product';
 $labels['username']  = 'Usuariu';
-$labels['password']  = 'Clave';
+$labels['password']  = 'Contraseña';
 $labels['server']    = 'Sirvidor';
-$labels['login']     = 'Entrar';
-$labels['logout']   = 'Zarrar';
+$labels['login']     = 'Aniciar sesión';
+$labels['logout']   = 'Zarrar sesión';
 $labels['mail']     = 'Corréu';
 $labels['settings'] = 'Axustes';
 $labels['addressbook'] = 'Llibreta de direiciones';
-$labels['inbox']  = 'Entrantes';
+$labels['inbox']  = 'Bandexa d\'entrada';
 $labels['drafts'] = 'Borradores';
 $labels['sent']   = 'Unviaos';
 $labels['trash']  = 'Papelera';
@@ -43,20 +43,21 @@ $labels['size']    = 'Tamañu';
 $labels['priority'] = 'Prioridá';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Lleer estáu';
-$labels['listoptions'] = 'Llista d\'oopciones...';
-$labels['mailboxlist'] = 'Bandexes';
-$labels['messagesfromto'] = 'Mensaxes del $from a $to de $count';
+$labels['listoptions'] = 'Llista d\'opciones...';
+$labels['mailboxlist'] = 'Carpetes';
+$labels['messagesfromto'] = 'Mensaxes $from a $to de $count';
 $labels['threadsfromto'] = 'Filos $from a $to de $count';
 $labels['messagenrof'] = 'Mensaxe $nr de $count';
 $labels['fromtoshort'] = '$from – $to de $count';
 $labels['copy']     = 'Copia';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'mover a...';
+$labels['copyto']   = 'Copiar a...';
 $labels['download'] = 'Descargar';
 $labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Amosar';
 $labels['showanyway'] = 'Amosar de toes formes';
-$labels['filename'] = 'Nome del Ficheru';
+$labels['filename'] = 'Nome del ficheru';
 $labels['filesize'] = 'Tamañu del ficheru';
 $labels['addtoaddressbook'] = 'Amestar a la llibreta de direiciones';
 $labels['sun'] = 'Dom';
@@ -99,47 +100,54 @@ $labels['longnov']	= 'Payares';
 $labels['longdec']	= 'Avientu';
 $labels['today'] = 'Güei';
 $labels['refresh']          = 'Refrescar';
-$labels['checkmail']        = 'Buscar mensaxes nuevos';
-$labels['compose']          = 'Escribir un mensaxe';
-$labels['writenewmessage']  = 'Facer un mensaxe nuevu';
+$labels['checkmail']        = 'Comprobar mensaxes nuevos';
+$labels['compose']          = 'Redactar';
+$labels['writenewmessage']  = 'Redactar un mensaxe nuevu';
 $labels['reply']            = 'Responder';
-$labels['replytomessage']   = 'Contestar al mensaxe';
-$labels['replytoallmessage'] = 'Contestar a toos';
+$labels['replytomessage']   = 'Responder al remitente';
+$labels['replytoallmessage'] = 'Responder a la llista o al remitente y tolos destinatarios';
 $labels['replyall']         = 'Responder a toos';
 $labels['replylist']        = 'Responder a la llista';
 $labels['forward']          = 'Reunviar';
 $labels['forwardinline']    = 'Reunviar direutamente';
 $labels['forwardattachment'] = 'Reunviar como axuntu';
-$labels['forwardmessage']   = 'Reunviar mensaxe';
+$labels['forwardmessage']   = 'Reunviar el mensaxe';
 $labels['deletemessage']    = 'Desaniciar mensaxe';
 $labels['movemessagetotrash'] = 'Mover mensaxe a la papelera';
 $labels['printmessage']     = 'Imprentar esti mensaxe';
 $labels['previousmessage']  = 'Amosar el mensaxe anterior';
 $labels['firstmessage']     = 'Amosar primer mensaxe';
-$labels['nextmessage']      = 'Amosar el mensaxe siguiente';
-$labels['lastmessage']      = 'Amosar l\'últimu mensaxe';
+$labels['nextmessage']      = 'Amosar mensaxe siguiente';
+$labels['lastmessage']      = 'Amosar mensaxe caberu';
 $labels['backtolist']       = 'Tornar a la llista de mensaxes';
-$labels['viewsource']       = 'Amosar el códigu';
-$labels['mark']             = 'Marcar';
-$labels['markmessages']     = 'Marcar mensaxes';
+$labels['viewsource']       = 'Amosar fonte';
+$labels['mark']             = 'Conseñar';
+$labels['markmessages']     = 'Conseñar mensaxes';
 $labels['markread']         = 'Como lleíu';
 $labels['markunread']       = 'Como non lleíu';
 $labels['markflagged']      = 'Como etiquetáu';
 $labels['markunflagged']    = 'Como non etiquetáu';
 $labels['moreactions']      = 'Más aiciones...';
 $labels['more']             = 'Más';
-$labels['back']             = 'Volver';
+$labels['back']             = 'Tornar';
 $labels['options']          = 'Opciones';
-$labels['select'] = 'Escoyer';
+$labels['first'] = 'Primeru';
+$labels['last'] = 'Caberu';
+$labels['previous'] = 'Postreru';
+$labels['next'] = 'Siguiente';
+$labels['select'] = 'Esbillar';
 $labels['all'] = 'Toos';
 $labels['none'] = 'Dengún';
 $labels['currpage'] = 'Páxina actual';
+$labels['isread'] = 'Lleer';
 $labels['unread'] = 'Ensin lleer';
 $labels['flagged'] = 'Etiquetaos';
 $labels['unanswered'] = 'Ensin contestar';
 $labels['withattachment'] = 'Con axuntu';
 $labels['deleted'] = 'Desaniciáu';
 $labels['undeleted'] = 'Non desaniciáu';
+$labels['replied'] = 'Respondíu';
+$labels['forwarded'] = 'Reunviáu';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtru';
 $labels['list'] = 'Llista';
@@ -151,8 +159,8 @@ $labels['threaded'] = 'Encadenaos';
 $labels['autoexpand_threads'] = 'Espander filos de mensaxes';
 $labels['do_expand'] = 'tolos filos';
 $labels['expand_only_unread'] = 'namái con mensaxes non lleíos';
-$labels['fromto'] = 'Remitente/Destinatariu';
-$labels['flag'] = 'Etiqueta';
+$labels['fromto'] = 'De/a';
+$labels['flag'] = 'Bandera';
 $labels['attachment'] = 'Axuntu';
 $labels['nonesort'] = 'Dengún';
 $labels['sentdate'] = 'Data d\'unviu';
@@ -163,22 +171,29 @@ $labels['listcolumns'] = 'Llistar columnes';
 $labels['listsorting'] = 'Columna de llistáu';
 $labels['listorder'] = 'Orde de llistáu';
 $labels['listmode'] = 'Mou de vista de llista';
-$labels['folderactions'] = 'Aiciones de bandexa...';
+$labels['folderactions'] = 'Aiciones de carpeta...';
 $labels['compact'] = 'Compautar';
 $labels['empty'] = 'Vaciar';
 $labels['importmessages'] = 'Importar mensaxes';
-$labels['quota'] = 'Espaciu en discu';
+$labels['quota'] = 'Usu de discu';
 $labels['unknown']  = 'desconocíu';
-$labels['unlimited']  = 'ensin llímite';
+$labels['unlimited']  = 'ensin llende';
+$labels['quotatotal'] = 'Llímite';
+$labels['quotaused'] = 'Usáu';
+$labels['quotastorage'] = 'Espaciu en discu';
 $labels['quicksearch']  = 'Gueta rápida';
-$labels['resetsearch']  = 'Anovar la gueta';
+$labels['resetsearch']  = 'Reaniciar la gueta';
 $labels['searchmod']  = 'Guetar modificadores';
-$labels['msgtext']  = 'Mensaxe';
+$labels['msgtext']  = 'Mensaxe enteru';
 $labels['body']  = 'Cuerpu';
-$labels['type'] = 'Tipu';
+$labels['type'] = 'Triba';
 $labels['namex'] = 'Nome';
+$labels['searchscope'] = 'Algame';
+$labels['currentfolder'] = 'Carpeta actual';
+$labels['subfolders'] = 'Esta y les subcarpetes';
+$labels['allfolders'] = 'Toles carpetes';
 $labels['openinextwin'] = 'Abrir nuna ventana nueva';
-$labels['emlsave'] = 'Baxar (.eml)';
+$labels['emlsave'] = 'Descargar (.eml)';
 $labels['changeformattext'] = 'Amosar en formatu de testu planu';
 $labels['changeformathtml'] = 'Amosar en formatu HTML';
 $labels['editasnew']      = 'Editar como nuevu';
@@ -187,23 +202,38 @@ $labels['sendmessage']    = 'Unviar el mensaxe yá';
 $labels['savemessage']    = 'Guardar como borrador';
 $labels['addattachment']  = 'Axuntar un ficheru';
 $labels['charset']        = 'Codificación';
-$labels['editortype']     = 'Tipu d\'editor';
-$labels['returnreceipt']  = 'Avisu de recibu';
-$labels['dsn']            = 'Entrega de notificaciones d\'estáu';
+$labels['editortype']     = 'Triba d\'editor';
+$labels['returnreceipt']  = 'Devolver avisu de recibu';
+$labels['dsn']            = 'Notificación d\'estáu d\'entrega';
 $labels['mailreplyintro'] = 'El $date, $sender escribió:';
 $labels['originalmessage'] = 'Mensaxe orixinal';
+$labels['selectimage']    = 'Esbillar imaxe';
+$labels['addimage']       = 'Amestar imaxe';
+$labels['selectmedia']    = 'Esbillar película';
+$labels['addmedia']       = 'Amestar película';
 $labels['editidents']    = 'Editar identidaes';
 $labels['spellcheck']    = 'Correutor ortográficu';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Siguir cola edición';
 $labels['revertto']      = 'Revertir a';
+$labels['restore'] = 'Restaurar';
+$labels['restoremessage'] = '¿Restaurar mensaxe?';
+$labels['responses'] = 'Rempuestes';
+$labels['insertresponse'] = 'Inxertar una rempuesta';
+$labels['manageresponses'] = 'Alministrar rempuestes';
+$labels['savenewresponse'] = 'Crear resmpuesta nueva';
+$labels['addresponse'] = 'Amestar rempuesta';
+$labels['editresponse'] = 'Editar rempuesta';
+$labels['editresponses'] = 'Editar rempuestes';
 $labels['responsename'] = 'Nome';
+$labels['responsetext'] = 'Testu de la rempuesta';
 $labels['attach'] = 'Axuntar';
 $labels['attachments'] = 'Axuntos';
 $labels['upload'] = 'Xubir';
 $labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close']  = 'Zarrar';
 $labels['messageoptions']  = 'Opciones de mensaxe...';
+$labels['togglecomposeoptions'] = 'Camudar opciones de composición';
 $labels['low']     = 'Baxu';
 $labels['lowest']  = 'Mui baxu';
 $labels['normal']  = 'Normal';
@@ -211,13 +241,13 @@ $labels['high']    = 'Altu';
 $labels['highest'] = 'Mui altu';
 $labels['nosubject']  = '(ensin asuntu)';
 $labels['showimages'] = 'Amosar imáxenes';
-$labels['alwaysshow'] = 'Amosar siempre les imáxenes de $sender';
+$labels['alwaysshow'] = 'Amosar siempres les imáxenes de $sender';
 $labels['isdraft']    = 'Esti mensaxe ye un borrador.';
 $labels['andnmore']   = '$nr más...';
 $labels['togglemoreheaders'] = 'Amosar más testeres del mensaxe';
 $labels['togglefullheaders'] = 'Amosar o anubrir testeres de mensaxes';
 $labels['htmltoggle'] = 'HTML';
-$labels['plaintoggle'] = 'Testu';
+$labels['plaintoggle'] = 'Testu planu';
 $labels['savesentmessagein'] = 'Guardar mensaxe unviáu en';
 $labels['dontsave'] = 'nun guardar';
 $labels['maxuploadsize'] = 'El tamañu másimu pa un ficheru ye $size';
@@ -225,10 +255,10 @@ $labels['addcc'] = 'Amestar Cc';
 $labels['addbcc'] = 'Amestar Cct';
 $labels['addreplyto'] = 'Amestar Rempuesta pa';
 $labels['addfollowupto'] = 'Amestar Siguir a';
-$labels['mdnrequest'] = 'El qu\'unvia esti mensaxe quier que lu avises cuando lleas el corréu. ¿Quies avisalu?';
-$labels['receiptread'] = 'Avisu de llectura';
-$labels['yourmessage'] = 'Esto ye un avisu de llectura del to mensaxe';
-$labels['receiptnote'] = 'Nota: Esti avisu namás quier dicir que\'l to mensaxe amosóse nel equipu del receutor. Nun hai forma de garantizate que lu lleera o que atalantara\'l conteníu del to mensaxe.';
+$labels['mdnrequest'] = 'El remitente d\'esti mensaxe entrugó pa ser notificáu cuando lleas esti mensaxe. ¿Deseyes notificá-ylo al remitente?';
+$labels['receiptread'] = 'Devolver avisu de recibu (lleíu)';
+$labels['yourmessage'] = 'Esto ye una devolución del avisu de recibu pal to mensaxe';
+$labels['receiptnote'] = 'Nota: Esti avisu de recibu namái reconoz que\'l mensaxe amosóse nel ordenador del destinatariu. Nun hai garantía de que\'l destinatariu lleera o entendiera\'l conteníu del mensaxe.';
 $labels['name']         = 'Nome completu';
 $labels['firstname']    = 'Nome';
 $labels['surname']      = 'Apellíu';
@@ -238,7 +268,7 @@ $labels['namesuffix']   = 'Sufixu';
 $labels['nickname']     = 'Nomatu';
 $labels['jobtitle']     = 'Tratamientu';
 $labels['department']   = 'Departamentu';
-$labels['gender']       = 'Sexu';
+$labels['gender']       = 'Xéneru';
 $labels['maidenname']   = 'Apellíu de soltera';
 $labels['email']        = 'Corréu';
 $labels['phone']        = 'Teléfonu';
@@ -249,19 +279,19 @@ $labels['zipcode']      = 'Códigu postal';
 $labels['region']       = 'Estáu/Provincia';
 $labels['country']      = 'País';
 $labels['birthday']     = 'Cumpleaños';
-$labels['anniversary']  = 'Santu';
+$labels['anniversary']  = 'Aniversariu';
 $labels['website']      = 'Páxina web';
 $labels['instantmessenger'] = 'Mensaxería nel intre';
 $labels['notes'] = 'Notes';
 $labels['male']   = 'home';
 $labels['female'] = 'muyer';
-$labels['manager'] = 'Direutor';
+$labels['manager'] = 'Alministrador';
 $labels['assistant'] = 'Auxiliar';
-$labels['spouse'] = 'Cónyugue';
+$labels['spouse'] = 'Casáu con';
 $labels['allfields'] = 'Tolos campos';
 $labels['search'] = 'Guetar';
 $labels['advsearch'] = 'Gueta avanzada';
-$labels['advanced'] = 'Avanzaes';
+$labels['advanced'] = 'Avanzáu';
 $labels['other'] = 'Otru';
 $labels['typehome']   = 'Casa';
 $labels['typework']   = 'Trabayu';
@@ -271,18 +301,20 @@ $labels['typemain']  = 'Principal';
 $labels['typehomefax']  = 'Fax de casa';
 $labels['typeworkfax']  = 'Fax del trabayu';
 $labels['typecar']  = 'Coche';
-$labels['typepager']  = 'Busca';
+$labels['typepager']  = 'Buscapersones';
 $labels['typevideo']  = 'Videu';
 $labels['typeassistant']  = 'Auxiliar';
-$labels['typehomepage']  = 'Aniciu';
+$labels['typehomepage']  = 'Páxina d\'aniciu';
 $labels['typeblog'] = 'Blogue';
 $labels['typeprofile'] = 'Perfil';
 $labels['addfield'] = 'Amestar campu...';
-$labels['addcontact'] = 'Amestar contautu nuevu';
+$labels['addcontact'] = 'Amestar contautu';
 $labels['editcontact'] = 'Editar contautu';
 $labels['contacts'] = 'Contautos';
 $labels['contactproperties'] = 'Propiedaes del contautu';
+$labels['contactnameandorg'] = 'Nome y organización';
 $labels['personalinfo'] = 'Información personal';
+$labels['contactphoto'] = 'Semeya de contautu';
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Encaboxar';
 $labels['save']   = 'Guardar';
@@ -290,24 +322,25 @@ $labels['delete'] = 'Desaniciar';
 $labels['rename'] = 'Renomar';
 $labels['addphoto'] = 'Amestar';
 $labels['replacephoto'] = 'Trocar';
-$labels['uploadphoto'] = 'Xubir xemeya';
-$labels['newcontact']     = 'Facer un contautu nuevu';
-$labels['deletecontact']  = 'Desaniciar los contautos marcaos';
-$labels['composeto']      = 'Unviar mensaxe a';
+$labels['uploadphoto'] = 'Xubir semeya';
+$labels['newcontact']     = 'Crear contautu nuevu';
+$labels['deletecontact']  = 'Desaniciar los contautos esbillaos';
+$labels['composeto']      = 'Redactar mensaxe a';
 $labels['contactsfromto'] = 'Contautos $from a $to de $count';
 $labels['print']          = 'Imprentar';
 $labels['export']         = 'Esportar';
 $labels['exportall']      = 'Esportar too';
-$labels['exportsel']      = 'Esportar lo seleicionao';
+$labels['exportsel']      = 'Esportar lo esbillao';
 $labels['exportvcards']   = 'Esportar contautos en formatu vCard';
-$labels['newcontactgroup'] = 'Crear un grupu nuevu de contautos';
+$labels['newcontactgroup']       = 'Crear grupu nuevu';
 $labels['grouprename']    = 'Renomar grupu';
 $labels['groupdelete']    = 'Desaniciar grupu';
-$labels['groupremoveselected'] = 'Desaniciar los contautos seleicionaos del grupu';
-$labels['previouspage']   = 'Amosar páxina previa';
+$labels['groupremoveselected'] = 'Desaniciar los contautos esbillaos del grupu';
+$labels['uponelevel']     = 'Xunir un nivel';
+$labels['previouspage']   = 'Amosar páxina postrera';
 $labels['firstpage']      = 'Amosar primer páxina';
-$labels['nextpage']       = 'Amosar siguiente páxina';
-$labels['lastpage']       = 'Amosar última páxina';
+$labels['nextpage']       = 'Amosar páxina siguiente';
+$labels['lastpage']       = 'Amosar páxina cabera';
 $labels['group'] = 'Grupu';
 $labels['groups'] = 'Grupos';
 $labels['listgroup'] = 'Llistar miembros del grupu';
@@ -322,7 +355,7 @@ $labels['importreplace'] = 'Trocar el llibru de direiciones enteru';
 $labels['importgroups'] = 'Importar asignaciones de grupu';
 $labels['importgroupsall'] = 'Toos (crear grupos si ye necesario)';
 $labels['importgroupsexisting'] = 'Namái pa los grupos esistentes';
-$labels['importdesc'] = 'Pues xubir contautos dende una llibreta de direiciones esistente.<br/>Anguaño permitimos la importación dende los formatos de datos <a href="http://es.wikipedia.org/wiki/VCard">vCard</a> o CSV (separtaos per comes).';
+$labels['importdesc'] = 'Pues xubir los contautos dende una llibreta de direiciones esistente.<br/>Anguaño permitimos la importación de direiciones dende los formatos de datos <a href="http://es.wikipedia.org/wiki/VCard">vCard</a> o CSV (separtaos per comes).';
 $labels['done'] = 'Fecho';
 $labels['settingsfor'] = 'Axustes pa';
 $labels['about'] = 'Tocante a';
@@ -330,10 +363,10 @@ $labels['preferences'] = 'Preferencies';
 $labels['userpreferences'] = 'Preferencies d\'usuariu';
 $labels['editpreferences'] = 'Editar preferencies d\'usuariu';
 $labels['identities'] = 'Identidaes';
-$labels['manageidentities'] = 'Remanar identidaes pa esta cuenta';
-$labels['newidentity'] = 'Identidá nueva';
-$labels['newitem'] = 'Nuevu';
-$labels['edititem'] = 'Editar';
+$labels['manageidentities'] = 'Almisnitrar identidaes';
+$labels['newidentity'] = 'Crear identidá nueva';
+$labels['addidentity'] = 'Amestar identidça';
+$labels['edititem'] = 'Editar identidá';
 $labels['preferhtml'] = 'Amosar HTML';
 $labels['defaultcharset'] = 'Xuegu de caráuteres predetermináu';
 $labels['htmlmessage'] = 'Mensaxe HTML';
@@ -341,82 +374,83 @@ $labels['messagepart'] = 'Parte';
 $labels['digitalsig'] = 'Robla dixital';
 $labels['dateformat'] = 'Formatu de data';
 $labels['timeformat'] = 'Formatu d\'hora';
-$labels['prettydate'] = 'Fecha prestosa';
-$labels['setdefault']  = 'Escoyer opción preferida';
-$labels['autodetect']  = 'Escoyer automáticamente';
+$labels['prettydate'] = 'Dates prestoses';
+$labels['setdefault']  = 'Reafitar';
+$labels['autodetect']  = 'Auto';
 $labels['language']  = 'Llingua';
 $labels['timezone']  = 'Estaya horaria';
 $labels['pagesize']  = 'Fileres per páxina';
 $labels['signature'] = 'Robla';
 $labels['dstactive']  = 'Cambéu horariu';
 $labels['showinextwin'] = 'Abrir mensaxe nuna ventana nueva';
-$labels['composeextwin'] = 'Escribir nuna ventana nueva';
-$labels['htmleditor'] = 'Facer el mensaxe en HTML';
-$labels['htmlonreply'] = 'namái en rempuesta a un mensaxe HTML';
+$labels['composeextwin'] = 'Redactar nuna ventana nueva';
+$labels['htmleditor'] = 'Redactar el mensaxe en HTML';
+$labels['htmlonreply'] = 'en rempuesta a mensaxe HTML';
 $labels['htmlonreplyandforward'] = 'en reunviu o rempuesta al mensaxe HTML';
 $labels['htmlsignature'] = 'Robla HTML';
-$labels['showemail'] = 'Amosar direición de corréu-e al visualizar el nome';
-$labels['previewpane'] = 'Entever';
-$labels['skin'] = 'Estilu';
+$labels['showemail'] = 'Amosar direición de corréu-e al amosar el nome';
+$labels['previewpane'] = 'Amosar panel de previsualización';
+$labels['skin'] = 'Tema de la interfaz';
 $labels['logoutclear'] = 'Vaciar la papelera al zarrar la sesión';
 $labels['logoutcompact'] = 'Compautar la bandexa d\'entrada al zarrar la sesión';
 $labels['uisettings'] = 'Interfaz d\'usuariu';
-$labels['serversettings'] = 'Configuración del sirvidor';
+$labels['serversettings'] = 'Axustes del sirvidor';
 $labels['mailboxview'] = 'Vista del buzón';
-$labels['mdnrequests'] = 'Avisos d\'unvios';
-$labels['askuser'] = 'entrugame';
-$labels['autosend'] = 'unviar de secute';
-$labels['autosendknown'] = 'unviar acuse de recibu a los mios contautos, col restu entrugame';
-$labels['autosendknownignore'] = 'unviar acuse de recibu a los mios contautos, non a los demás';
+$labels['mdnrequests'] = 'En petición de devolución del recibíu';
+$labels['askuser'] = 'entrúgame';
+$labels['autosend'] = 'unviar recibu';
+$labels['autosendknown'] = 'unviar recibu a los mios contautos, d\'otramiente entrúgame';
+$labels['autosendknownignore'] = 'unviar recibu a los mios contautos, d\'otramiente inorar';
 $labels['ignore'] = 'inorar';
-$labels['readwhendeleted'] = 'Marcar el mensaxe como lleíu al desanicialu';
-$labels['flagfordeletion'] = 'Marcar el mensaxe pa desaniciase en cuenta de desanicialu dafechu';
+$labels['readwhendeleted'] = 'Conseñar el mensaxe como lleíu al desanicialu';
+$labels['flagfordeletion'] = 'Conseñar el mensaxe pal desaniu en cuantes de desanicialu';
 $labels['skipdeleted'] = 'Nun amosar los mensaxes desaniciaos';
-$labels['deletealways'] = 'Si falla el treslladar los mensaxes a la Papelera, desanicialos';
-$labels['deletejunk'] = 'Desaniciar direutamente el correú de Puxarra';
-$labels['showremoteimages'] = 'Amosar imáxenes remotes';
-$labels['fromknownsenders'] = 'de contautos conocíos';
-$labels['always'] = 'siempre';
-$labels['showinlineimages'] = 'Amosar imáxenes axuntes embaxo\'l mensaxe';
-$labels['autosavedraft']  = 'Guardar borrador de secute';
+$labels['deletealways'] = 'Si falla\'l treslláu de los mensaxes a la Papelera, desanicialos';
+$labels['deletejunk'] = 'Desaniciar direutamente el correú en Puxarra';
+$labels['showremoteimages'] = 'Amosar imáxenes en llinia remotes';
+$labels['fromknownsenders'] = 'de remitentes conocíos';
+$labels['always'] = 'siempres';
+$labels['showinlineimages'] = 'Amosar les imáxenes axuntaes embaxo\'l mensaxe';
+$labels['autosavedraft']  = 'Guardar borrador automáticamente';
 $labels['everynminutes']  = 'cada $n minutu/os';
-$labels['refreshinterval']  = 'Anovar (comprobar mensaxes nuevos, etc.)';
+$labels['refreshinterval']  = 'Refrescar (comprobación de mensaxes nuevos, etc.)';
 $labels['never']  = 'nunca';
-$labels['immediately']  = 'darréu';
+$labels['immediately']  = 'de secute';
 $labels['messagesdisplaying'] = 'Vista de mensaxes';
-$labels['messagescomposition'] = 'Edición de mensaxes';
+$labels['messagescomposition'] = 'Redaición de mensaxes';
 $labels['mimeparamfolding'] = 'Nomes d\'axuntos';
-$labels['2231folding'] = 'Too RFC 2231 (Thunderbird)';
+$labels['2231folding'] = 'RFC 2231 completu (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Too RFC 2047 (otros)';
+$labels['2047folding'] = 'RFC 2047 completu (otros)';
 $labels['force7bit'] = 'Usar codificación MIME pa caráuteres de 8 bits';
 $labels['advancedoptions'] = 'Opciones avanzaes';
-$labels['focusonnewmessage'] = 'Poner el focu nos mensaxes nuevos';
-$labels['checkallfolders'] = 'Guetar mensaxes nuevos en toles bandexes';
-$labels['displaynext'] = 'Depués de mover/desaniciar amosar el mensaxe que sigue darréu';
-$labels['defaultfont'] = 'Tipu de lletra predeterminada del mensaxe HTML';
+$labels['toggleadvancedoptions'] = 'Camudar opciones avanzaes';
+$labels['focusonnewmessage'] = 'Enfocar la ventana de restolación en mensaxes nuevos';
+$labels['checkallfolders'] = 'Comprobar en toles carpetes mensaxes nuevos';
+$labels['displaynext'] = 'Depués de mover/desaniciar amosar el mensaxe siguiente';
+$labels['defaultfont'] = 'Triba de fonte por defeutu del mensaxe HTML';
 $labels['mainoptions'] = 'Opciones principales';
-$labels['browseroptions'] = 'Opciones del navegador';
+$labels['browseroptions'] = 'Opciones del restolador';
 $labels['section'] = 'Seición';
 $labels['maintenance'] = 'Caltenimientu';
-$labels['newmessage'] = 'Mensax nuevu';
+$labels['newmessage'] = 'Mensaxe nuevu';
 $labels['signatureoptions'] = 'Opciones de robla';
-$labels['whenreplying'] = 'Al responder';
+$labels['whenreplying'] = 'Cuando se respuenda';
 $labels['replyempty'] = 'nun citar el mensaxe orixinal';
-$labels['replytopposting'] = 'empezar un mensaxe nuevu encima del orixinal';
-$labels['replybottomposting'] = 'empezar un mensaxe nuevu debaxo del orixinal';
-$labels['replyremovesignature'] = 'Desaniciar la robla orixinal del mensaxe al responder';
+$labels['replytopposting'] = 'aniciar un mensaxe nuevu enriba l\'orixinal';
+$labels['replybottomposting'] = 'aniciar un mensaxe nuevu embaxo l\'orixinal';
+$labels['replyremovesignature'] = 'Desaniciar la robla orixinal del mensaxe cuando se respuenda';
 $labels['autoaddsignature'] = 'Amestar robla automáticamente';
 $labels['newmessageonly'] = 'namái mensaxe nuevu';
 $labels['replyandforwardonly'] = 'namái rempuestes y reunvios';
 $labels['insertsignature'] = 'Inxertar robla';
-$labels['previewpanemarkread']  = 'Marcar mensaxe previsualizáu como lleíu';
+$labels['previewpanemarkread']  = 'Conseñar mensaxes previsualizaos como lleíos';
 $labels['afternseconds']  = 'dempués de $n segundos';
-$labels['reqmdn'] = 'Solicitar siempre un acuse de recibu';
-$labels['reqdsn'] = 'Solicitar siempre la entrega de notificaciones d\'estáu';
-$labels['replysamefolder'] = 'Allugar les rempuestes na bandexa del mensaxe que se respuende';
-$labels['defaultabook'] = 'Llibreta de direiciones predeterminada';
-$labels['autocompletesingle'] = 'Omitir direiciones de corréu alternatives n\'autocompletáu';
+$labels['reqmdn'] = 'Solicitar siempres un recibu';
+$labels['reqdsn'] = 'Solicitar siempres la notificación d\'estáu d\'entrega';
+$labels['replysamefolder'] = 'Allugar les rempuestes na carpeta del mensaxe que tea respondiéndose';
+$labels['defaultabook'] = 'Llibreta de direiciones por defeutu';
+$labels['autocompletesingle'] = 'Saltar direiciones de corréu alternatives nel autocompletáu';
 $labels['listnamedisplay'] = 'Llistar contautos como';
 $labels['spellcheckbeforesend'] = 'Comprobar ortografía enantes d\'unviar un mensaxe';
 $labels['spellcheckoptions'] = 'Opciones d\'ortografía';
@@ -424,42 +458,44 @@ $labels['spellcheckignoresyms'] = 'Inorar pallabres con símbolos';
 $labels['spellcheckignorenums'] = 'Inorar pallabres con númberos';
 $labels['spellcheckignorecaps'] = 'Inorar pallabres con too mayúscules';
 $labels['addtodict'] = 'Amestar al diccionariu';
-$labels['mailtoprotohandler'] = 'Rexistrar controlador de protocolu pa enllaces \'mailto:\'';
-$labels['standardwindows'] = 'Xestionar ventanes emerxentes como ventanes estándar';
+$labels['mailtoprotohandler'] = 'Rexistrar xestor de protocolu pa enllaces \'mailto:\'';
+$labels['standardwindows'] = 'Remanar ventanos emerxentes como ventanes estándar';
 $labels['forwardmode'] = 'Reunviu de mensaxes';
 $labels['inline'] = 'en llinia';
 $labels['asattachment'] = 'como axuntu';
+$labels['replyallmode'] = 'Aición por defeutu del botón [Responder too]';
 $labels['replyalldefault'] = 'responder a toos';
-$labels['folder']  = 'Bandexa';
-$labels['folders']  = 'Bandexes';
-$labels['foldername']  = 'Nome de bandexa';
-$labels['subscribed']  = 'Soscrita';
+$labels['replyalllist'] = 'responder namái a la llista de Corréu (si s\'alcuentra)';
+$labels['folder'] = 'Carpeta';
+$labels['folders'] = 'Carpetes';
+$labels['foldername'] = 'Nome de carpeta';
+$labels['subscribed'] = 'Soscrita';
 $labels['messagecount'] = 'Mensaxes';
-$labels['create']  = 'Facer';
-$labels['createfolder']  = 'Facer una bandexa nueva';
-$labels['managefolders']  = 'Alministrar bandexes';
-$labels['specialfolders'] = 'Bandexes especiales';
+$labels['create'] = 'Crear';
+$labels['createfolder'] = 'Crear una carpeta nueva';
+$labels['managefolders'] = 'Alministrar carpetes';
+$labels['specialfolders'] = 'Carpetes especiales';
 $labels['properties'] = 'Propiedaes';
-$labels['folderproperties'] = 'Propiedaes de la bandexa';
-$labels['parentfolder'] = 'Bandexa contenedora';
+$labels['folderproperties'] = 'Propiedaes de la carpeta';
+$labels['parentfolder'] = 'Carpeta pá';
 $labels['location'] = 'Llocalización';
 $labels['info'] = 'Información';
-$labels['getfoldersize'] = 'Clic pa saber el tamañu de la bandexa';
-$labels['changesubscription'] = 'Clic pa camudar soscripción';
-$labels['foldertype'] = 'Tipu de bandexa';
-$labels['personalfolder']  = 'Bandexa privada';
-$labels['otherfolder']  = 'Bandexa d\'otru usuariu';
-$labels['sharedfolder']  = 'Bandexa pública';
-$labels['sortby'] = 'Ordenar por';
+$labels['getfoldersize'] = 'Primi pa saber el tamañu de la carpeta';
+$labels['changesubscription'] = 'Primi pa camudar la soscripción';
+$labels['foldertype'] = 'Triba de carpeta';
+$labels['personalfolder'] = 'Carpeta privada';
+$labels['otherfolder'] = 'Carpeta d\'otru usuariu';
+$labels['sharedfolder'] = 'Carpeta pública';
+$labels['sortby'] = 'Ordenar per';
 $labels['sortasc']  = 'Orde ascendente';
 $labels['sortdesc'] = 'Orde descendente';
 $labels['undo'] = 'Desfacer';
 $labels['installedplugins'] = 'Complementos instalaos';
 $labels['plugin'] = 'Complementu';
 $labels['version'] = 'Versión';
-$labels['source'] = 'Orixe';
+$labels['source'] = 'Fonte';
 $labels['license'] = 'Llicencia';
-$labels['support'] = 'Obtener soporte';
+$labels['support'] = 'Consiguir sofitu';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -478,8 +514,46 @@ $labels['turkish'] = 'Turcu';
 $labels['nordic'] = 'Nórdicu';
 $labels['thai'] = 'Tailandés';
 $labels['celtic'] = 'Celta';
-$labels['vietnamese'] = 'Vietnamín';
+$labels['vietnamese'] = 'Vietnamita';
 $labels['japanese'] = 'Xaponés';
 $labels['korean'] = 'Coreanu';
 $labels['chinese'] = 'Chinu';
+$labels['arialabeltopnav'] = 'Control de ventana';
+$labels['arialabeltasknav'] = 'Xeres d\'aplicación';
+$labels['arialabeltoolbar'] = 'Barra de ferramientes d\'aplicación';
+$labels['arialabelactivetask'] = 'Xera activa';
+$labels['arialabelmessagessearchfilter'] = 'Flitru de llistáy de correos';
+$labels['arialabelmailsearchform'] = 'Formulariu de gueta de mensaxe de corréu';
+$labels['arialabelcontactsearchform'] = 'Formulariu de gueta de contautos';
+$labels['arialabelmailquicksearchbox'] = 'Entrada de gueta de correos';
+$labels['arialabelquicksearchbox'] = 'Entrada de gueta';
+$labels['arialabelfolderlist'] = 'Esbilla de carpeta de corréu';
+$labels['arialabelmessagelist'] = 'Llistáu de mensaxes de corréu';
+$labels['arialabelmailpreviewframe'] = 'Vista previa de mensaxe';
+$labels['arialabelmailboxmenu'] = 'Menú d\'aiciones de carpeta';
+$labels['arialabellistselectmenu'] = 'Menú d\'esbilla de llista';
+$labels['arialabelthreadselectmenu'] = 'Menú de llistáu de filos';
+$labels['arialabelmailimportdialog'] = 'Diálogu d\'impotación de mensaxe';
+$labels['arialabelmessagenav'] = 'Restolación de mensaxe';
+$labels['arialabelmessagebody'] = 'Cuerpu de mensaxe';
+$labels['arialabelmessageactions'] = 'Aiciones de mensaxe';
+$labels['arialabelcontactquicksearch'] = 'Formulariu de gueta de contautos';
+$labels['arialabelcontactsearchbox'] = 'Entrada de gueta de contautu';
+$labels['arialabelmessageheaders'] = 'Testeres de mensaxe';
+$labels['arialabelforwardingoptions'] = 'Opciones de reunviu';
+$labels['arialabelreplyalloptions'] = 'Opciones de responder a toos';
+$labels['arialabelmoremessageactions'] = 'Aiciones de más mensaxes';
+$labels['arialabelmarkmessagesas'] = 'Conseñar los mensaxes esbillaos como...';
+$labels['arialabelcomposeoptions'] = 'Opciones de redaición';
+$labels['arialabelresponsesmenu'] = 'Menú de rempuestes conservaes';
+$labels['arialabelattachmentuploadform'] = 'Formulariu de xuba d\'axuntu';
+$labels['arialabelattachmentpreview'] = 'Vista previa d\'axuntu';
+$labels['ariasummarycomposecontacts'] = 'Llista de contutos y grupos pa esbillar como destinatarios';
+$labels['arialabelcontactexportoptions'] = 'Opciones d\'esportación de contautu';
+$labels['arialabelabookgroupoptions'] = 'Opciones de llibru de direiciones/grupu';
+$labels['arialabelpreferencesform'] = 'Formulariu de preferencies';
+$labels['arialabelidentityeditfrom'] = 'Formulariu d\'edición d\'identidá';
+$labels['arialabelresonseeditfrom'] = 'Formulariu d\'edición de rempuesta';
+$labels['helplistnavigation'] = 'Restolación de tecláu de llista';
+$labels['helplistkeyboardnavcontacts'] = "Enter: Abrir el contautu esbilláu/enfocáu.";
 ?>
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index 6abf990ae..25bad1942 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -17,12 +17,14 @@
 */
 $messages['errortitle']  = '¡Hebo un fallu!';
 $messages['loginfailed']  = 'Contraseña o nome d\'usuariu incorreutu.';
-$messages['cookiesdisabled'] = 'El to navegador nun aceuta "cookies';
+$messages['cookiesdisabled'] = 'El to restolador nun aceuta cookies.';
 $messages['sessionerror'] = 'La to sesión nun val o caducó.';
 $messages['storageerror'] = 'Fallu de conexón col sirvidor IMAP';
 $messages['servererror'] = '¡Fallu del sirvidor!';
 $messages['servererrormsg'] = 'Fallu de sirvidor: $msg';
+$messages['connerror'] = '¡Fallu de conexón (Fallu al algamar el sirvidor)!';
 $messages['dberror'] = '¡Fallu na base de datos!';
+$messages['windowopenerror'] = '¡Bloquióse\'l ventanu emerxente!';
 $messages['requesttimedout'] = 'Caducó\'l tiempu de rempuesta.';
 $messages['errorreadonly'] = 'Imposible facer la operación. La bandexa ye de namái-llectura.';
 $messages['errornoperm'] = 'Imposible facer la operación. Denegóse\'l permisu.';
@@ -31,7 +33,9 @@ $messages['erroroverquotadelete'] = 'Nun queda espaciu nel discu. Usa Shift+Supr
 $messages['invalidrequest'] = 'Fallu de la solicitú. Nun se guardaron datos.';
 $messages['invalidhost'] = 'Nome de sirvidor inválidu.';
 $messages['nomessagesfound'] = 'Nun s\'atoparon mensaxes na bandexa';
-$messages['loggedout'] = 'Zarraste la sesión. ¡Talluéu!';
+$messages['loggedout'] = 'Zarrasti la sesión. Ta llueu!';
+$messages['mailboxempty'] = 'La bandexa de corréu ta balera';
+$messages['nomessages'] = 'Nun hai mensaxes';
 $messages['refreshing'] = 'Anovando...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Xubiendo ficheru';
@@ -43,6 +47,8 @@ $messages['messagesent'] = 'Unvióse\'l mensaxe.';
 $messages['savingmessage'] = 'Guardar mensaxe...';
 $messages['messagesaved'] = 'El mensaxe guardóse en borradores';
 $messages['successfullysaved'] = 'Guardóse correchamente';
+$messages['savingresponse'] = 'Guardando mensaxe de rempuesta...';
+$messages['deleteresponseconfirm'] = '¿De xuru quies desaniciar esti testu de rempuesta?';
 $messages['addedsuccessfully'] = 'El contautu amestóse correchamente a la llibreta de direiciones';
 $messages['contactexists'] = 'Yá hai un contautu con esa direición de corréu-e.';
 $messages['contactnameexists'] = 'Yá esiste un contautu col mesmu nome.';
@@ -53,6 +59,8 @@ $messages['contactnotfound'] = 'Nun s\'atopa\'l contautu solicitáu.';
 $messages['contactsearchonly'] = 'Introduz dalgún criteriu pa guetar contautos';
 $messages['sendingfailed'] = 'Falló l\'unviu del mensaxe';
 $messages['senttooquickly'] = 'Por favor espera $sec segundu/os enantes d\'unviar esti mensaxe.';
+$messages['errorsavingsent'] = 'Hebo un fallu al guardar el mensaxe unviáu.';
+$messages['errorsaving'] = 'Hebo un fallu al guardar.';
 $messages['errormoving'] = 'Nun pudo movese el/los mensaxe(s).';
 $messages['errorcopying'] = 'Nun pudo copiase el/los mensaxe(s).';
 $messages['errordeleting'] = 'Nun pudo desaniciase el/los mensaxe(s)';
@@ -77,6 +85,7 @@ $messages['norecipientwarning'] = 'Por favor, introduz polo menos un destinatari
 $messages['nosubjectwarning']  = 'El campo "Asuntu" ta vacíu. ¿Quies rellenalu agora?';
 $messages['nobodywarning'] = '¿Quies unviar esti mensaxe ensin testu?';
 $messages['notsentwarning'] = 'Nun s\'unvió\'l mensaxe. ¿Quies desanicialu?';
+$messages['restoresavedcomposedata'] = 'Alcontróse un mensaxe redactáu anterior ensin unviar.n\nAsuntu: $subject\nGuardáu: $date\n\n¿Quies restaurar esti mensaxe?';
 $messages['noldapserver'] = 'Por favor, escueyi un sirvidor LDAP pa buscar.';
 $messages['nosearchname'] = 'Por favor, introduz un nome o una direición de corréu-e.';
 $messages['notuploadedwarning'] = 'Entá nun se xubieron tolos axuntos. Por favor, espera o encaboxa la xuba.';
@@ -85,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Atopáronse $nr contautos.';
 $messages['searchnomatch'] = 'Nun s\'atopó dengún resultáu';
 $messages['searching'] = 'A la gueta...';
 $messages['checking'] = 'Comprobando...';
+$messages['stillsearching'] = 'Guetando entá...';
 $messages['nospellerrors'] = 'Nun s\'atoparon errores ortográficos';
 $messages['folderdeleted'] = 'Desanicióse la bandexa correchamente';
 $messages['foldersubscribed'] = 'Soscritu a bandexa correchamente.';
@@ -128,7 +138,7 @@ $messages['importmessagesuccess'] = '$nr mensaxes importaos con éxitu';
 $messages['importmessageerror'] = '¡Falló la importación! El ficheru xubíu nun ye un ficheru válidu de mensaxe o buzón de corréu';
 $messages['opnotpermitted'] = '¡Nun tienes permisu pa facelo!';
 $messages['nofromaddress'] = 'El contautu seleicionáu nun tien direición de corréu-e.';
-$messages['editorwarning'] = 'Si pases a editor en mou testu vas perder tol estilu aplicáu al mensaxe. ¿Tas seguru de que quies facelo?';
+$messages['editorwarning'] = 'Cambear la triba d\'editor pue causar perda del formatu del testu. ¿Deseyes continuar?';
 $messages['httpreceivedencrypterror'] = 'Hai un fallu grave de configuración. Contauta col alministrador de secute. <b>Nun pue unviase\'l mensaxe</b>';
 $messages['smtpconnerror'] = 'Fallu SMTP ($code): Fallu de conexón col sirvidor';
 $messages['smtpautherror'] = 'Fallu SMTP ($code): Fallu d\'autorización';
@@ -139,6 +149,7 @@ $messages['smtperror'] = 'Fallu SMTP: $msg';
 $messages['emailformaterror'] = 'Direición de corréu incorreuta: $email';
 $messages['toomanyrecipients'] = 'Hai munchos destinatarios. Amenorga\'l númberu de destinatarios a $max.';
 $messages['maxgroupmembersreached'] = 'El númberu de miembros del grupu perpasa\'l máximu de $max.';
+$messages['internalerror'] = 'Hebo un fallu internu. Por favor, vuelvi intentalo.';
 $messages['contactdelerror'] = 'Nun pudo desaniciase el/los contautu(os).';
 $messages['contactdeleted'] = 'Contautu(os) desaniciáu(os) correchamente.';
 $messages['contactrestoreerror'] = 'Nun pudieron restaurase los contautos desaniciaos.';
diff --git a/program/localization/az_AZ/messages.inc b/program/localization/az_AZ/messages.inc
index 28e5f57d2..a65ff447e 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -135,7 +135,6 @@ $messages['importmessagesuccess'] = '$nr məktublar uğurla idxal edildi';
 $messages['importmessageerror'] = 'İdxal alınmadı! Yüklənilmiş fayl düzgün məktub və ya poçt faylı deyil';
 $messages['opnotpermitted'] = 'Əməliyyat qadağandır!';
 $messages['nofromaddress'] = 'Seçilmiş kimlikdə e-poçt ünvanları yoxdur';
-$messages['editorwarning'] = 'Adi mətn redaktoruna keçid, bütün mətn formatlarının itkisinə gətirəcək. Davam edilsin?';
 $messages['httpreceivedencrypterror'] = 'Serverdə qaçıımaz xəta baş verib. Təcili öz inzibatçınız ilə əlaqə qurun. <b>Sizin məktub göndərilməyə bilər.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): Serverlə bağlantı alınmadı';
 $messages['smtpautherror'] = 'SMTP Error ($code): İdentifikasiya xətası';
diff --git a/program/localization/be_BE/labels.inc b/program/localization/be_BE/labels.inc
index c08b9c866..bf3edb326 100644
--- a/program/localization/be_BE/labels.inc
+++ b/program/localization/be_BE/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Больш дзеянняў...';
 $labels['more']             = 'Больш';
 $labels['back']             = 'Назад';
 $labels['options']          = 'Параметры';
+$labels['first'] = 'Першая';
+$labels['last'] = 'Апошняя';
+$labels['previous'] = 'Папярэдняя';
+$labels['next'] = 'Наступная';
 $labels['select'] = 'Выбраць';
 $labels['all'] = 'Усе';
 $labels['none'] = 'Жаднага';
 $labels['currpage'] = 'Бягучая старонка';
+$labels['isread'] = 'Прачытаныя';
 $labels['unread'] = 'Непрачытаныя';
 $labels['flagged'] = 'З флагам';
+$labels['unflagged'] = 'Без флага';
 $labels['unanswered'] = 'Неадказаныя';
 $labels['withattachment'] = 'З далучэннямі';
 $labels['deleted'] = 'Выдаленыя';
 $labels['undeleted'] = 'Нявыдаленыя';
+$labels['replied'] = 'Адказаныя';
+$labels['forwarded'] = 'Перасланыя';
 $labels['invert'] = 'Інвертаваць';
 $labels['filter'] = 'Фільтр';
 $labels['list'] = 'Спіс';
@@ -178,6 +186,10 @@ $labels['msgtext']  = 'Усё паведамленне';
 $labels['body']  = 'Цела';
 $labels['type'] = 'Тып';
 $labels['namex'] = 'Імя';
+$labels['searchscope'] = 'Абсяг';
+$labels['currentfolder'] = 'Бягучая папка';
+$labels['subfolders'] = 'Гэтая і падпапкі';
+$labels['allfolders'] = 'Усе папкі';
 $labels['openinextwin'] = 'Адкрыць у новым акне';
 $labels['emlsave'] = 'Сцягнуць (.eml)';
 $labels['changeformattext'] = 'Паказаць як просты тэкст';
@@ -193,6 +205,10 @@ $labels['returnreceipt']  = 'Пацверджанне атрымання';
 $labels['dsn']            = 'Апавяшчэнне пра дастаўку';
 $labels['mailreplyintro'] = '$sender пісаў $date:';
 $labels['originalmessage'] = 'Арыгінальнае паведамленне';
+$labels['selectimage']    = 'Абраць відарыс';
+$labels['addimage']       = 'Дадаць відарыс';
+$labels['selectmedia']    = 'Абраць фільмік';
+$labels['addmedia']       = 'Дадаць фільмік';
 $labels['editidents']    = 'Рэдагаваць тоеснасці';
 $labels['spellcheck']    = 'Правапіс';
 $labels['checkspelling'] = 'Праверыць правапіс';
@@ -203,9 +219,10 @@ $labels['restoremessage'] = 'Аднавіць паведамленне?';
 $labels['responses'] = 'Адказы';
 $labels['insertresponse'] = 'Уставіць адказ';
 $labels['manageresponses'] = 'Кіраваць адказамі';
-$labels['savenewresponse'] = 'Захаваць новы адказ';
-$labels['editresponses'] = 'Рэдагаваць адказы';
+$labels['savenewresponse'] = 'Стварыць новы адказ';
+$labels['addresponse'] = 'Дадаць адказ';
 $labels['editresponse'] = 'Рэдагаваць адказ';
+$labels['editresponses'] = 'Рэдагаваць адказы';
 $labels['responsename'] = 'Назва';
 $labels['responsetext'] = 'Тэкст адказу';
 $labels['attach'] = 'Далучыць';
@@ -214,6 +231,7 @@ $labels['upload'] = 'Апублікаваць';
 $labels['uploadprogress'] = '$percent ($current з $total)';
 $labels['close']  = 'Закрыць';
 $labels['messageoptions']  = 'Параметры паведамлення...';
+$labels['togglecomposeoptions'] = 'Пераключыць параметры складання';
 $labels['low']     = 'Нізкі';
 $labels['lowest']  = 'Найнізшы';
 $labels['normal']  = 'Звычайны';
@@ -288,11 +306,13 @@ $labels['typehomepage']  = 'Дамашняя старонка';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профіль';
 $labels['addfield'] = 'Дадаць поле...';
-$labels['addcontact'] = 'Дадаць новы кантакт';
+$labels['addcontact'] = 'Дадаць кантакт';
 $labels['editcontact'] = 'Рэдагаваць кантакт';
 $labels['contacts'] = 'Кантакты';
 $labels['contactproperties'] = 'Уласцівасці кантакта';
+$labels['contactnameandorg'] = 'Імя і арганізацыя';
 $labels['personalinfo'] = 'Асабістыя звесткі';
+$labels['contactphoto'] = 'Асабістае фота';
 $labels['edit']   = 'Рэдагаваць';
 $labels['cancel'] = 'Скасаваць';
 $labels['save']   = 'Захаваць';
@@ -301,7 +321,7 @@ $labels['rename'] = 'Пераназваць';
 $labels['addphoto'] = 'Дадаць';
 $labels['replacephoto'] = 'Замяніць';
 $labels['uploadphoto'] = 'Апублікаваць фота';
-$labels['newcontact']     = 'Стварыць новую картку кантакта';
+$labels['newcontact']     = 'Стварыць новы кантакт';
 $labels['deletecontact']  = 'Выдаліць абраных кантактаў';
 $labels['composeto']      = 'Скласці ліст да';
 $labels['contactsfromto'] = 'Кантакты $from—$to з $count';
@@ -310,10 +330,11 @@ $labels['export']         = 'Экспарт';
 $labels['exportall']      = 'Экспартаваць усё';
 $labels['exportsel']      = 'Экспартаваць абранае';
 $labels['exportvcards']   = 'Экспартаваць кантакты ў фармаце vCard';
-$labels['newcontactgroup'] = 'Стварыць новую групу кантактаў';
+$labels['newcontactgroup']       = 'Стварыць новую групу';
 $labels['grouprename']    = 'Пераназваць групу';
 $labels['groupdelete']    = 'Выдаліць групу';
 $labels['groupremoveselected'] = 'Выдаліць абраных кантакаў з групы';
+$labels['uponelevel']     = 'На адзін узровень уверх';
 $labels['previouspage']   = 'Папярэдняя старонка';
 $labels['firstpage']      = 'Першая старонка';
 $labels['nextpage']       = 'Наступная старонка';
@@ -340,10 +361,6 @@ $labels['preferences'] = 'Параметры';
 $labels['userpreferences'] = 'Параметры карыстальніка';
 $labels['editpreferences'] = 'Рэдагаваць параметры карыстальніка';
 $labels['identities'] = 'Тоеснасці';
-$labels['manageidentities'] = 'Парадкаваць тоеснасці для гэтага ўліковага запісу';
-$labels['newidentity'] = 'Новая тоеснасць';
-$labels['newitem'] = 'Новы элемент';
-$labels['edititem'] = 'Рэдагаваць элемент';
 $labels['preferhtml'] = 'Паказаць HTML';
 $labels['defaultcharset'] = 'Стандартная кадзіроўка';
 $labels['htmlmessage'] = 'Паведамленне ў HTML';
@@ -442,14 +459,14 @@ $labels['asattachment'] = 'як далучэнне';
 $labels['replyallmode'] = 'Стандартнае дзеянне кнопкі [Адказаць усім]';
 $labels['replyalldefault'] = 'адказаць усім';
 $labels['replyalllist'] = 'адказаць толькі ў спіс рассылкі (калі знойдзены)';
-$labels['folder']  = 'Папка';
-$labels['folders']  = 'Папкі';
-$labels['foldername']  = 'Назва папкі';
-$labels['subscribed']  = 'Падпісаная';
+$labels['folder'] = 'Папка';
+$labels['folders'] = 'Папкі';
+$labels['foldername'] = 'Назва папкі';
+$labels['subscribed'] = 'Падпісаная';
 $labels['messagecount'] = 'Паведамленні';
-$labels['create']  = 'Стварыць';
-$labels['createfolder']  = 'Стварыць новую папку';
-$labels['managefolders']  = 'Парадкаваць папкі';
+$labels['create'] = 'Стварыць';
+$labels['createfolder'] = 'Стварыць новую папку';
+$labels['managefolders'] = 'Парадкаваць папкі';
 $labels['specialfolders'] = 'Адмысловыя папкі';
 $labels['properties'] = 'Уласцівасці';
 $labels['folderproperties'] = 'Уласцівасці папкі';
@@ -459,9 +476,9 @@ $labels['info'] = 'Звесткі';
 $labels['getfoldersize'] = 'Пстрыкніце, каб даведацца памер папкі';
 $labels['changesubscription'] = 'Пстрыкніце, каб змяніць падпіску';
 $labels['foldertype'] = 'Тып папкі';
-$labels['personalfolder']  = 'Асабістая папка';
-$labels['otherfolder']  = 'Папка іншага карыстальніка';
-$labels['sharedfolder']  = 'Публічная папка';
+$labels['personalfolder'] = 'Асабістая папка';
+$labels['otherfolder'] = 'Папка іншага карыстальніка';
+$labels['sharedfolder'] = 'Публічная папка';
 $labels['sortby'] = 'Сартаваць паводле';
 $labels['sortasc']  = 'Сартаваць на ўзрастанне';
 $labels['sortdesc'] = 'Сартаваць на змяншчэнне';
diff --git a/program/localization/be_BE/messages.inc b/program/localization/be_BE/messages.inc
index 5d17249d6..cb51b0b40 100644
--- a/program/localization/be_BE/messages.inc
+++ b/program/localization/be_BE/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Ваша сесія невалідная альбо
 $messages['storageerror'] = 'Не ўдалося злучыцца з серверам-сховішчам.';
 $messages['servererror'] = 'Памылка сервера!';
 $messages['servererrormsg'] = 'Памылка сервера: $msg';
+$messages['connerror'] = 'Памылка злучэння (не ўдалося даступіцца да сервера)!';
 $messages['dberror'] = 'Памылка базы даных!';
+$messages['windowopenerror'] = 'Усплыўное акно было заблакавана!';
 $messages['requesttimedout'] = 'Час запросу выйшаў';
 $messages['errorreadonly'] = 'Не ўдалося выканаць аперацыю. Папка даступна толькі для чытання.';
 $messages['errornoperm'] = 'Не ўдалося выканаць аперацыю. Адмоўлена ў доступе.';
@@ -36,8 +38,8 @@ $messages['mailboxempty'] = 'У паштовай скрынцы пуста';
 $messages['nomessages'] = 'Няма паведамленняў';
 $messages['refreshing'] = 'Абнаўляецца...';
 $messages['loading'] = 'Загружаецца...';
-$messages['uploading'] = 'Файл зацягваецца...';
-$messages['uploadingmany'] = 'Файлы зацягваюцца...';
+$messages['uploading'] = 'Файл загружаецца...';
+$messages['uploadingmany'] = 'Файлы загружаюцца...';
 $messages['loadingdata'] = 'Загружаюцца даныя...';
 $messages['checkingmail'] = 'Праверка новых паведамленняў...';
 $messages['sendingmessage'] = 'Паведамленне адпраўляецца...';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Знойдзена $nr кантакта�
 $messages['searchnomatch'] = 'Пошук не даў выніку.';
 $messages['searching'] = 'Ідзе пошук...';
 $messages['checking'] = 'Ідзе праверка...';
+$messages['stillsearching'] = 'Усё яшчэ ідзе пошук...';
 $messages['nospellerrors'] = 'Памылак правапісання не выяўлена.';
 $messages['folderdeleted'] = 'Папка выдалена.';
 $messages['foldersubscribed'] = 'Папка падпісана.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = '$nr паведамленняў імпарт
 $messages['importmessageerror'] = 'Не ўдалося імпартаваць! Загружаны файл не ёсць слушным паведамленнем альбо файлам паштовай скрынкі';
 $messages['opnotpermitted'] = 'Аперацыя не дазволеная!';
 $messages['nofromaddress'] = 'У абранай тоеснасці не стае адрасу эл. пошты.';
-$messages['editorwarning'] = 'Змена рэдактара прывядзе да страты фарматавання. Працягнуць?';
+$messages['editorwarning'] = 'Змена тыпу рэдактара можа прывесці да страты фарматавання. Працягнуць?';
 $messages['httpreceivedencrypterror'] = 'Важная памылка ў канфігурацыі. Неадкладна скантактуйцеся з адміністратарам. <b>Паведамленне не можа быць адпраўлена.</b>';
 $messages['smtpconnerror'] = 'Памылка SMTP ($code): Не ўдалося злучыцца з серверам.';
 $messages['smtpautherror'] = 'Памылка SMTP ($code): Аўтэтыфікацыя не ўдалася.';
@@ -173,5 +176,5 @@ $messages['mispellingsfound'] = 'У паведамленні выяўлены п
 $messages['parentnotwritable'] = 'Не ўдалося стварыць/перамясціць папку ў абраным месцы. Няма доступу.';
 $messages['messagetoobig'] = 'Гэтая часць паведамлення завялікая, каб яе апрацаваць.';
 $messages['attachmentvalidationerror'] = 'УВАГА! Гэтае далучэнне ёсць падазроным, бо тып ягоны не супадае з заяўленым тыпам у паведамленні. Калі вы не давяраеце гэтаму адпраўніку, не адчыняйце яго ў браўзеры, таму што яно можа ўтрымліваць шкоднае змесціва.<br/><br/><em>Чаканы: $expected; знойдзены: $detected<em>';
-$messages['noscriptwarning'] = 'Увага: Служба вымагае Javascript’у! Каб карыстацца ёй, трэба ўключыць Javascript у настаўленнях браўзера.';
+$messages['noscriptwarning'] = 'Увага: Служба вымагае Javascript’у! Каб карыстацца ёй, трэба ўключыць Javascript у перавагах браўзера.';
 ?>
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index e7f2f3712..cb6c19578 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Допълнителни действия...';
 $labels['more']             = 'Още';
 $labels['back']             = 'Назад';
 $labels['options']          = 'Опции';
+$labels['first'] = 'Първо';
+$labels['last'] = 'Последно';
+$labels['previous'] = 'Предишно';
+$labels['next'] = 'Сладващо';
 $labels['select'] = 'Избери';
 $labels['all'] = 'Всички';
 $labels['none'] = 'Остави без избор';
 $labels['currpage'] = 'Всички на страницата';
+$labels['isread'] = 'Прочетено';
 $labels['unread'] = 'Само нови';
 $labels['flagged'] = 'Само отбелязани';
+$labels['unflagged'] = 'Без флаг';
 $labels['unanswered'] = 'Само без отговор';
 $labels['withattachment'] = 'С прикачен файл';
 $labels['deleted'] = 'Всички изтрити';
 $labels['undeleted'] = 'Които не са изтрити';
+$labels['replied'] = 'Отговорено';
+$labels['forwarded'] = 'Препратено';
 $labels['invert'] = 'Които не са избрани';
 $labels['filter'] = 'Филтър';
 $labels['list'] = 'Списък';
@@ -178,6 +186,10 @@ $labels['msgtext']  = 'Цялото писмо';
 $labels['body']  = 'Основен текст';
 $labels['type'] = 'Тип';
 $labels['namex'] = 'Име';
+$labels['searchscope'] = 'Обхват';
+$labels['currentfolder'] = 'Текуща папка';
+$labels['subfolders'] = 'Тази и подпапките';
+$labels['allfolders'] = 'Всички папки';
 $labels['openinextwin'] = 'Отвори в нов прозорец';
 $labels['emlsave'] = 'Изтегли като .eml';
 $labels['changeformattext'] = 'Покажи в текстов формат';
@@ -193,6 +205,10 @@ $labels['returnreceipt']  = 'Обратна разписка';
 $labels['dsn']            = 'Нотификация при доставка';
 $labels['mailreplyintro'] = 'На $date, $sender написа:';
 $labels['originalmessage'] = 'Оригинално писмо';
+$labels['selectimage']    = 'Избери изображение';
+$labels['addimage']       = 'Добави изображение';
+$labels['selectmedia']    = 'Избери клип';
+$labels['addmedia']       = 'Добави клип';
 $labels['editidents']    = 'Промени самоличности';
 $labels['spellcheck']    = 'Правопис';
 $labels['checkspelling'] = 'Проверка на правописа';
@@ -203,9 +219,8 @@ $labels['restoremessage'] = 'Възстановяване на съобщени�
 $labels['responses'] = 'Отговори';
 $labels['insertresponse'] = 'Вмъкване на отговори';
 $labels['manageresponses'] = 'Настройка на отговори';
-$labels['savenewresponse'] = 'Запис на нов отговор';
-$labels['editresponses'] = 'Редакция на отговори';
 $labels['editresponse'] = 'Редакция на отговор';
+$labels['editresponses'] = 'Редакция на отговори';
 $labels['responsename'] = 'Име';
 $labels['responsetext'] = 'Текст на отговор';
 $labels['attach'] = 'Прикачи';
@@ -214,6 +229,7 @@ $labels['upload'] = 'Качи';
 $labels['uploadprogress'] = '$percent ($current от $total)';
 $labels['close']  = 'Затвори';
 $labels['messageoptions']  = 'Настройки на писма...';
+$labels['togglecomposeoptions'] = 'Превключване опции за създаване';
 $labels['low']     = 'Нисък';
 $labels['lowest']  = 'Най-нисък';
 $labels['normal']  = 'Нормален';
@@ -288,11 +304,13 @@ $labels['typehomepage']  = 'Личен';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профил';
 $labels['addfield'] = 'Друго поле...';
-$labels['addcontact'] = 'Добави нов контакт';
+$labels['addcontact'] = 'Добави контакт';
 $labels['editcontact'] = 'Редактирай контакт';
 $labels['contacts'] = 'Контакти';
 $labels['contactproperties'] = 'Данни на контакт';
+$labels['contactnameandorg'] = 'Име и организация';
 $labels['personalinfo'] = 'Лична информация';
+$labels['contactphoto'] = 'Снимка на контакт';
 $labels['edit']   = 'Редактирай';
 $labels['cancel'] = 'Отказ';
 $labels['save']   = 'Запис';
@@ -301,7 +319,7 @@ $labels['rename'] = 'Преименувай';
 $labels['addphoto'] = 'Добави';
 $labels['replacephoto'] = 'Замени';
 $labels['uploadphoto'] = 'Качване на снимка';
-$labels['newcontact']     = 'Нов контакт';
+$labels['newcontact']     = 'Създаване нов контакт';
 $labels['deletecontact']  = 'Изтрий избраните контакти';
 $labels['composeto']      = 'Напиши писмо до';
 $labels['contactsfromto'] = 'Контакти $from до $to от $count';
@@ -310,10 +328,10 @@ $labels['export']         = 'Експорт';
 $labels['exportall']      = 'Експортиране на всичко';
 $labels['exportsel']      = 'Експортиране на избраното';
 $labels['exportvcards']   = 'Експорт във vCard формат';
-$labels['newcontactgroup'] = 'Нова група контракти';
 $labels['grouprename']    = 'Преименувай групата';
 $labels['groupdelete']    = 'Изтрий групата';
 $labels['groupremoveselected'] = 'Премахни избраните контакти от групата';
+$labels['uponelevel']     = 'Нагоре едно ниво';
 $labels['previouspage']   = 'Предишна страница';
 $labels['firstpage']      = 'Първа страница';
 $labels['nextpage']       = 'Следваща страница';
@@ -340,10 +358,8 @@ $labels['preferences'] = 'Настройки';
 $labels['userpreferences'] = 'Потребителски настройки';
 $labels['editpreferences'] = 'Редактирай потребителските настройки';
 $labels['identities'] = 'Самоличности';
-$labels['manageidentities'] = 'Настройка на самоличности за този акаунт';
-$labels['newidentity'] = 'Нова самоличност';
-$labels['newitem'] = 'Нова самоличност';
-$labels['edititem'] = 'Редактирай самоличност';
+$labels['manageidentities'] = 'Управление самоличности';
+$labels['newidentity'] = 'Създай нова самоличност';
 $labels['preferhtml'] = 'Покажи първо HTML версия';
 $labels['defaultcharset'] = 'Кодова таблица по подразбиране';
 $labels['htmlmessage'] = 'HTML писмо';
@@ -401,6 +417,7 @@ $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Според RFC 2047 (други)';
 $labels['force7bit'] = 'Използване на MIME кодиране за 8-битови символи';
 $labels['advancedoptions'] = 'Разширени настройки';
+$labels['toggleadvancedoptions'] = 'Превключване на разширени опции';
 $labels['focusonnewmessage'] = 'Премигване на прозореца при ново писмо';
 $labels['checkallfolders'] = 'Проверка за нови писма във всички папки ';
 $labels['displaynext'] = 'След изтриване/преместване на писмо покажи следващото в списъка';
@@ -442,14 +459,14 @@ $labels['asattachment'] = 'като прикачен файл';
 $labels['replyallmode'] = 'Действие по подразбиране на бутон [Отговор на всички]';
 $labels['replyalldefault'] = 'отговори на всички';
 $labels['replyalllist'] = 'отговори на списъка само (ако има)';
-$labels['folder']  = 'Папка';
-$labels['folders']  = 'Папки';
-$labels['foldername']  = 'Име на папката';
-$labels['subscribed']  = 'Абониран';
+$labels['folder'] = 'Папка';
+$labels['folders'] = 'Папки';
+$labels['foldername'] = 'Име на папката';
+$labels['subscribed'] = 'Абониран';
 $labels['messagecount'] = 'Писма';
-$labels['create']  = 'Създай';
-$labels['createfolder']  = 'Нова папка';
-$labels['managefolders']  = 'Управление на папките';
+$labels['create'] = 'Създай';
+$labels['createfolder'] = 'Нова папка';
+$labels['managefolders'] = 'Управление на папките';
 $labels['specialfolders'] = 'Служебни папки';
 $labels['properties'] = 'Данни';
 $labels['folderproperties'] = 'Свойства на папката';
@@ -459,9 +476,9 @@ $labels['info'] = 'Информация';
 $labels['getfoldersize'] = 'Щракни за размер на папката';
 $labels['changesubscription'] = 'Щракни за промяна на абонамент';
 $labels['foldertype'] = 'Вид на папката';
-$labels['personalfolder']  = 'Лична папка';
-$labels['otherfolder']  = 'Папка на друг потребител';
-$labels['sharedfolder']  = 'Публична папка';
+$labels['personalfolder'] = 'Лична папка';
+$labels['otherfolder'] = 'Папка на друг потребител';
+$labels['sharedfolder'] = 'Публична папка';
 $labels['sortby'] = 'Сортирай по';
 $labels['sortasc']  = 'Сортирай нарастващо';
 $labels['sortdesc'] = 'Сортирай намаляващо';
@@ -494,4 +511,26 @@ $labels['vietnamese'] = 'Виетнамски';
 $labels['japanese'] = 'Японски';
 $labels['korean'] = 'Корейски';
 $labels['chinese'] = 'Китайски';
+$labels['arialabeltopnav'] = 'Контрол на прозорците';
+$labels['arialabeltasknav'] = 'Задачи на приложението';
+$labels['arialabeltoolbar'] = 'Ленти с инструменти';
+$labels['arialabelmessagessearchfilter'] = 'Филтър на списък с писма';
+$labels['arialabelmailsearchform'] = 'Форма за търсене на писма';
+$labels['arialabelcontactsearchform'] = 'Форма за търсене на контакти';
+$labels['arialabelmailquicksearchbox'] = 'Поле за търсене на писма';
+$labels['arialabelquicksearchbox'] = 'Поле за търсене';
+$labels['arialabelfolderlist'] = 'Избор на папка с писма';
+$labels['arialabelmessagelist'] = 'Списък с писма';
+$labels['arialabelmailpreviewframe'] = 'Преглед на писмо';
+$labels['arialabelmailboxmenu'] = 'Меню с действия върху папка';
+$labels['arialabellistselectmenu'] = 'Меню за избор в списък';
+$labels['arialabelthreadselectmenu'] = 'Меню за списък с кореспонденции';
+$labels['arialabelmessagelistoptions'] = 'Опции за преглед и сортиране на списък с писма';
+$labels['arialabelmailimportdialog'] = 'Диалог за импорт на писма';
+$labels['arialabelmessagenav'] = 'Навигация на писма';
+$labels['arialabelmessagebody'] = 'Текст на писмо';
+$labels['arialabelmessageactions'] = 'Действия за писмо';
+$labels['arialabelcontactquicksearch'] = 'Форма за търсене на контакти';
+$labels['arialabelcontactsearchbox'] = 'Поле за търсене на контакт';
+$labels['arialabelmessageheaders'] = 'Заглавни блокове на писмо';
 ?>
diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index df9620b30..9d0726901 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Невалидна или изтекла сесия
 $messages['storageerror'] = 'Неуспешно свързване към сървър с данни.';
 $messages['servererror'] = 'Сървърна грешка!';
 $messages['servererrormsg'] = 'Сървърна грешка: $msg';
+$messages['connerror'] = 'Неуспешно свързване (Сървърът не е намерен)';
 $messages['dberror'] = 'Грешка в база данни!';
+$messages['windowopenerror'] = 'Изскачащият прозорец беше блокиран!';
 $messages['requesttimedout'] = 'Изтекло време за изпълнение на заявката';
 $messages['errorreadonly'] = 'Невъзможно изпълнение на операцията. Папката е с права само за четене.';
 $messages['errornoperm'] = 'Невъзможно изпълнение на операцията. Отказани права за достъп.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr контакта намерени.';
 $messages['searchnomatch'] = 'Няма съвпадения от търсенето.';
 $messages['searching'] = 'Търсене...';
 $messages['checking'] = 'Проверка...';
+$messages['stillsearching'] = 'Търсенето продължава...';
 $messages['nospellerrors'] = 'Не са открити правописни грешки.';
 $messages['folderdeleted'] = 'Папката е изтрита успешно.';
 $messages['foldersubscribed'] = 'Абонирането за папката е успешно.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Успешно импортирани $nr �
 $messages['importmessageerror'] = 'Неуспешен импорт! Каченият файл не е валиден файл на писма или пощенска кутия';
 $messages['opnotpermitted'] = 'Непозволена операция!';
 $messages['nofromaddress'] = 'Липсва e-mail адрес за избраната самоличност.';
-$messages['editorwarning'] = 'Превключването на редактора в текстов режим ще доведе до загуба на форматирането на текста. Сигурни ли сте, че желаете да продължите?';
+$messages['editorwarning'] = 'Превключване на типа на редактора може да доведе до загуба на форматиране на текста. Желаете ли да продължите?';
 $messages['httpreceivedencrypterror'] = 'Фатална конфигурационна грешка. Моля свържете се с Вашия администратор. <b>Писмото не може да бъде изпратено.</b>';
 $messages['smtpconnerror'] = 'SMTP грешка ($code): Няма връзка със сървъра.';
 $messages['smtpautherror'] = 'SMTP грешка ($code): Грешни потребител/парола.';
diff --git a/program/localization/bn_BD/messages.inc b/program/localization/bn_BD/messages.inc
index d8fd08b4f..abf8317a5 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -80,5 +80,4 @@ $messages['importwait'] = 'আমদানি করা হচ্ছে। এ�
 $messages['importconfirm'] = '<b>ঠিকমতো $inserted ঠিকানা আমদানি করা গেছে, $skipped ঠিকানা আগের থেকেই ছিলো বলে তাদের টা যা ছিলো তাই রাখা হয়েছে</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = 'এই কাজটা করার অনুমতি নাই আপনার';
 $messages['nofromaddress'] = 'বেছে নেওয়া যে পরিচিতিটা, তাতে ই-মেইল নেই';
-$messages['editorwarning'] = 'যদি আপনি শুধু লেখার স্টাইলে যান তাহলে বর্তমানের কোনো বিন্যাস হারিয়ে যাবে';
 ?>
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index c239fe718..c95612b6d 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -29,6 +29,7 @@ $labels['drafts'] = 'Brouilhedoù';
 $labels['sent']   = 'Kaset';
 $labels['trash']  = 'Pod-lastez';
 $labels['junk']   = 'Stroboù';
+$labels['show_real_foldernames'] = 'Diskouez anvioù gwir teuliadoù arbennik';
 $labels['subject'] = 'Sujed';
 $labels['from']    = 'Eus';
 $labels['sender']  = 'Kaser';
@@ -51,7 +52,9 @@ $labels['fromtoshort'] = '$from - $to war $count';
 $labels['copy']     = 'Eilañ';
 $labels['move']     = 'Dilec\'hiañ';
 $labels['moveto']   = 'Dilec\'hiañ da...';
+$labels['copyto']   = 'Eilañ da…';
 $labels['download'] = 'Pellgargañ';
+$labels['open']     = 'Digeriñ';
 $labels['showattachment'] = 'Diskouez';
 $labels['showanyway'] = 'Diskouez anezhañ memestra';
 $labels['filename'] = 'Anv ar restr';
@@ -105,6 +108,8 @@ $labels['replytomessage']   = 'Respont d\'ar kaser';
 $labels['replytoallmessage'] = 'Respont d\'an holl';
 $labels['replyall']         = 'Respont d\'an holl';
 $labels['replylist']        = 'Respont d\'ar roll';
+$labels['forward']          = 'Treuzkas';
+$labels['forwardinline']    = 'Treuzkas er gemennadenn';
 $labels['forwardattachment'] = 'Treuskas evel pezh stag';
 $labels['forwardmessage']   = 'Treuzkas ar c\'hemennad';
 $labels['deletemessage']    = 'Dilec\'hiañ ar c\'hemennad er pod-lastez';
@@ -118,18 +123,52 @@ $labels['backtolist']       = 'Distreiñ el listenn kemennadoù';
 $labels['viewsource']       = 'Gwelout an tarzh';
 $labels['mark']             = 'merkañ';
 $labels['markmessages']     = 'Merkañ ar c\'hemennad';
+$labels['markread']         = 'E-giz lennet';
+$labels['markunread']       = 'E-giz anlennet';
 $labels['markflagged']      = 'spilhennet';
 $labels['markunflagged']    = 'n\'eo ket bet spilhennet';
 $labels['moreactions']      = 'muioc\'h a dibab';
 $labels['more']             = 'muioc\'h';
 $labels['back']             = 'distro';
 $labels['options']          = 'Dibarzhioù';
+$labels['first'] = 'Kentañ';
+$labels['last'] = 'Diwezhañ';
+$labels['previous'] = 'Kent';
+$labels['next'] = 'War-Lerc\'h';
 $labels['select'] = 'Diuzañ';
 $labels['all'] = 'An holl';
 $labels['none'] = 'Ebet';
 $labels['currpage'] = 'Pajenn';
+$labels['isread'] = 'Lennet';
 $labels['unread'] = 'Na lennet';
+$labels['flagged'] = 'Merket';
+$labels['unflagged'] = 'N\'eo ket merket';
+$labels['unanswered'] = 'Respontet ebet';
+$labels['withattachment'] = 'Gant restroù staget';
+$labels['deleted'] = 'Dilammet';
+$labels['undeleted'] = 'N\'eo ket bet dilammet';
+$labels['replied'] = 'Respontet';
+$labels['forwarded'] = 'Treuzkaset';
+$labels['invert'] = 'Tuginañ';
+$labels['filter'] = 'Sil';
+$labels['list'] = 'Listennañ';
+$labels['threads'] = 'Neudennadoù';
+$labels['expand-all'] = 'Diskouez an holl';
+$labels['expand-unread'] = 'Diskouez ar re anlennet';
+$labels['collapse-all'] = 'Serriñ an holl';
+$labels['threaded'] = 'Dre neudennadoù';
+$labels['autoexpand_threads'] = 'Diskouez an neudennadoù ar gemennadenn';
+$labels['do_expand'] = 'an holl steudadoù';
+$labels['expand_only_unread'] = 'Gant kemennadennoù anlennet nemetken';
+$labels['fromto'] = 'Eus/ Da';
+$labels['flag'] = 'Merket';
+$labels['attachment'] = 'Restroù staget';
 $labels['nonesort'] = 'Ebet';
+$labels['sentdate'] = 'Deiz kas';
+$labels['arrival'] = 'Deiz erruet';
+$labels['asc'] = 'War-grec\'h';
+$labels['desc'] = 'war ziskenn';
+$labels['listcolumns'] = 'Listenn bannoù';
 $labels['compact'] = 'Stummaat';
 $labels['empty'] = 'Skarzhañ';
 $labels['quota'] = 'Implijadur pladenn';
@@ -137,6 +176,10 @@ $labels['unknown']  = 'Dianav';
 $labels['unlimited']  = 'didermen';
 $labels['quicksearch']  = 'Klask prim';
 $labels['resetsearch']  = 'Aderaouekaat ar glask';
+$labels['type'] = 'Doare';
+$labels['namex'] = 'Anv';
+$labels['allfolders'] = 'Holl teuliadoù';
+$labels['send']           = 'Kas';
 $labels['sendmessage']    = 'Kas ar c\'hemennad diouzhtu';
 $labels['savemessage']    = 'Gwarediñ ar brouilhed-se';
 $labels['addattachment']  = 'Stagañ ur restr';
@@ -146,9 +189,12 @@ $labels['returnreceipt']  = 'Testeni degemer';
 $labels['checkspelling'] = 'Gwiriañ ar reizhskrivadur';
 $labels['resumeediting'] = 'Distreiñ en aozer';
 $labels['revertto']      = 'Distreiñ en/r';
+$labels['editresponse'] = 'Kemmañ ar respont';
+$labels['responsename'] = 'Anv';
 $labels['attachments'] = 'Restroù staget';
 $labels['upload'] = 'Stagañ';
 $labels['close']  = 'Serriñ';
+$labels['messageoptions']  = 'Dibarzhioù ar gemennadenn';
 $labels['low']     = 'Izel';
 $labels['lowest']  = 'An izelañ';
 $labels['normal']  = 'Reizh';
@@ -156,13 +202,39 @@ $labels['high']    = 'Uhel';
 $labels['highest'] = 'An uhelañ';
 $labels['nosubject']  = '(n\'eus ket sujed)';
 $labels['showimages'] = 'Diskouez ar skeudennoù';
+$labels['andnmore']   = '$nr muioc\'h...';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'testenn kriz';
 $labels['name']         = 'Anv da ziskouez';
 $labels['firstname']    = 'Raganv';
 $labels['surname']      = 'Anv';
+$labels['nickname']     = 'Lesanv';
+$labels['gender']       = 'Rev';
 $labels['email']        = 'Postel elektronek';
-$labels['addcontact'] = 'Ouzhpennañ an darempred diuzet en hor c\'harned chomlec\'hioù';
+$labels['phone']        = 'Pellgomz';
+$labels['address']      = 'Chomlec\'h';
+$labels['street']       = 'Straed';
+$labels['locality']     = 'Kêr';
+$labels['zipcode']      = 'Kod Post';
+$labels['region']       = 'Stad/Proviñs';
+$labels['country']      = 'Bro';
+$labels['birthday']     = 'Deiz ha bloaz';
+$labels['anniversary']  = 'Deiz ha bloaz';
+$labels['website']      = 'Lec\'hienn';
+$labels['male']   = 'paotr';
+$labels['female'] = 'plac\'h';
+$labels['search'] = 'Klask';
+$labels['advanced'] = 'Araokaet';
+$labels['other'] = 'All';
+$labels['typehome']   = 'Degemer';
+$labels['typework']   = 'Labour';
+$labels['typeother']  = 'All';
+$labels['typemobile']  = 'Hezoug';
+$labels['typemain']  = 'Pennañ';
+$labels['typehomepage']  = 'Pajenn degemer';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profil';
+$labels['addfield'] = 'Ouzhpennañ ur vaezienn...';
 $labels['editcontact'] = 'Cheñch an darempred';
 $labels['contacts'] = 'darempred';
 $labels['edit']   = 'Cheñch';
@@ -170,17 +242,20 @@ $labels['cancel'] = 'Nullañ';
 $labels['save']   = 'Gwarediñ';
 $labels['delete'] = 'Dilemel';
 $labels['rename'] = 'chench anv';
+$labels['addphoto'] = 'Ouzhpennañ';
 $labels['replacephoto'] = 'chench';
-$labels['newcontact']     = 'Krouiñ un darempred nevez';
 $labels['deletecontact']  = 'Dilemel an darempredoù diuzet';
 $labels['composeto']      = 'Skrivañ ur c\'hemennad ouzh';
 $labels['contactsfromto'] = 'Darempredoù eus $from ouzh $to war $count';
 $labels['print']          = 'Moulañ';
 $labels['export']         = 'Ezporzhiañ';
+$labels['grouprename']    = 'Adeñvel ar strollad';
+$labels['groupdelete']    = 'Dilemel ar strollad';
 $labels['previouspage']   = 'Diskouez pajenn a-raok';
 $labels['firstpage']      = 'Gwelout ar bajenn gentañ';
 $labels['nextpage']       = 'Diskouez pajenn da heul';
 $labels['lastpage']       = 'Gwelout ar bajenn diwezhañ';
+$labels['group'] = 'Strollad';
 $labels['groups'] = 'Strolladoù';
 $labels['personaladrbook'] = 'Chomlec\'h personel';
 $labels['searchsave'] = 'enrollane an enklask';
@@ -195,14 +270,11 @@ $labels['preferences'] = 'Dibarzhioù';
 $labels['userpreferences'] = 'Dibarzhioù implijer';
 $labels['editpreferences'] = 'Cheñch dibarzhioù implijer';
 $labels['identities'] = 'Identelezhioù';
-$labels['manageidentities'] = 'Merañ an identelezhioù evit ar c\'hont-se';
-$labels['newidentity'] = 'Identelezh nevez';
-$labels['newitem'] = 'Elfenn nevez';
-$labels['edititem'] = 'Cheñch an elfenn';
 $labels['preferhtml'] = 'Diskouez en HTML';
 $labels['htmlmessage'] = 'Kemennad en HTML';
 $labels['prettydate'] = 'Diskouez berr deizioù';
 $labels['setdefault']  = 'Arventennoù dre ziouer';
+$labels['autodetect']  = 'Emgefre';
 $labels['language']  = 'Yezh';
 $labels['timezone']  = 'Gwerzhid-eur';
 $labels['pagesize']  = 'Niver a linenn dre bajenn';
@@ -211,17 +283,33 @@ $labels['dstactive']  = 'Eur an hañv';
 $labels['htmleditor'] = 'Sevel ur c\'hemennad er furmad HTML';
 $labels['htmlsignature'] = 'Sinadur HTML';
 $labels['previewpane'] = 'Diskouez panel alberz';
+$labels['skin'] = 'Neuze an etrefas';
+$labels['askuser'] = 'goulenn ganin';
+$labels['autosend'] = 'Kas un testeni degemer';
+$labels['always'] = 'atav';
 $labels['autosavedraft']  = 'Gwarediñ emgefre brouilhedoù';
 $labels['everynminutes']  = 'Bep $n munutoù';
 $labels['never']  = 'ebet';
-$labels['folder']  = 'Renkell';
-$labels['folders']  = 'Teuliadoù';
-$labels['foldername']  = 'Anv ar renkell';
-$labels['subscribed']  = 'Koumananer';
-$labels['create']  = 'Krouiñ';
-$labels['createfolder']  = 'Krouiñ ur renkell nevez';
-$labels['managefolders']  = 'Aozañ ar renkelloù';
+$labels['advancedoptions'] = 'Dibarzhioù araokaet';
+$labels['newmessage'] = 'Kemennadenn nevez';
+$labels['signatureoptions'] = 'Dibarzhioù sinadur';
+$labels['insertsignature'] = 'Ouzhpennañ ar sinadur';
+$labels['replyalldefault'] = 'respont d\'an holl';
+$labels['folder'] = 'Renkell';
+$labels['folders'] = 'Teuliadoù';
+$labels['foldername'] = 'Anv ar renkell';
+$labels['subscribed'] = 'Koumananer';
+$labels['messagecount'] = 'Kemennadennoù';
+$labels['create'] = 'Krouiñ';
+$labels['createfolder'] = 'Krouiñ ur renkell nevez';
+$labels['managefolders'] = 'Aozañ ar renkelloù';
+$labels['properties'] = 'Perzhioù';
+$labels['info'] = 'Titouroù';
 $labels['sortby'] = 'Rummañ dre';
 $labels['sortasc']  = 'Rumm diagentad';
 $labels['sortdesc'] = 'Rumm diskennad';
+$labels['license'] = 'Aotre-implijout';
+$labels['celtic'] = 'Keltieg';
+$labels['japanese'] = 'Japaneg';
+$labels['chinese'] = 'Sinaeg';
 ?>
diff --git a/program/localization/br/messages.inc b/program/localization/br/messages.inc
index bd266d0d4..14e6c8d0a 100644
--- a/program/localization/br/messages.inc
+++ b/program/localization/br/messages.inc
@@ -16,16 +16,19 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 $messages['errortitle']  = 'Degouezhet ez eus bet ur fazi !';
-$messages['loginfailed']  = 'C\'hwitadenn war kennaskañ';
-$messages['cookiesdisabled'] = 'N\'eus ket c\'hoant toupinoù Hor merder';
+$messages['loginfailed']  = 'Kennaskañ c\'hwitet';
+$messages['cookiesdisabled'] = 'Nac\'h a ra ho merdeer an toupinoù';
 $messages['sessionerror'] = 'Didalvoudek pe echuet eo hoc\'h estez.';
 $messages['storageerror'] = 'C\'hwitadenn war kennaskañ ouzh an dafariad mirout';
 $messages['servererror'] = 'Fazi dafariad !';
 $messages['servererrormsg'] = 'Fazi dafariad : $msg';
 $messages['dberror'] = 'Fazi stlennvon !';
-$messages['nomessagesfound'] = 'Kemennadoù ebet er voest lizhiri';
+$messages['nomessagesfound'] = 'Kemennad ebet er voest lizhiri';
 $messages['loggedout'] = 'Digevreet hoc\'h eus mat. Kenavo !';
+$messages['refreshing'] = 'O freskaat...';
 $messages['loading'] = 'O kargañ...';
+$messages['uploading'] = 'O kargañ ar restr...';
+$messages['uploadingmany'] = 'O kargañ ar restroù...';
 $messages['loadingdata'] = 'O kargañ roadennoù...';
 $messages['checkingmail'] = 'O Gwiriañ kemennadoù nevez...';
 $messages['sendingmessage'] = 'O kas ar c\'hemennad...';
@@ -69,4 +72,6 @@ $messages['fileuploaderror'] = 'Fazi o treuzkas ar restr';
 $messages['filesizeerror'] = 'Re vras eo ar restr treuzkaset $size';
 $messages['sourceisreadonly'] = 'Lenn hepken eo an tarzh chomlec\'h se';
 $messages['errorsavingcontact'] = 'Ne c\'haller ket gwarediñ chomlec\'h darempred';
+$messages['movingcontact'] = 'O fiñval an darempred(où)';
+$messages['contactdelerror'] = 'N\'eus ket bet gellet dilemel an darempred(où)';
 ?>
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index c79cf4ecc..7179ec006 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Više akcija...';
 $labels['more']             = 'Više';
 $labels['back']             = 'Nazad';
 $labels['options']          = 'Opcije';
+$labels['first'] = 'Prva';
+$labels['last'] = 'Zadnja';
+$labels['previous'] = 'Prethodno';
+$labels['next'] = 'Sljedeće';
 $labels['select'] = 'Odaberi';
 $labels['all'] = 'Sve';
 $labels['none'] = 'Ništa';
 $labels['currpage'] = 'Trenutna stranica';
+$labels['isread'] = 'Pročitano';
 $labels['unread'] = 'Nepročitano';
 $labels['flagged'] = 'Važno';
+$labels['unflagged'] = 'Nije označeno';
 $labels['unanswered'] = 'Neodgovoreno';
 $labels['withattachment'] = 'Sa prilogom';
 $labels['deleted'] = 'Obrisano';
 $labels['undeleted'] = 'Nije obrisano';
+$labels['replied'] = 'Odgovoreno';
+$labels['forwarded'] = 'Proslijeđeno';
 $labels['invert'] = 'Izokreni';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lista';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Uvezi poruke';
 $labels['quota'] = 'Zauzeće diska';
 $labels['unknown']  = 'nepoznato';
 $labels['unlimited']  = 'neograničeno';
+$labels['quotatype'] = 'Vrsta kvote';
+$labels['quotatotal'] = 'Limit';
+$labels['quotaused'] = 'Iskorišteno';
+$labels['quotastorage'] = 'Prostor na disku';
+$labels['quotamessage'] = 'Broj poruka';
 $labels['quicksearch']  = 'Brza pretraga';
 $labels['resetsearch']  = 'Resetuj pretragu';
 $labels['searchmod']  = 'Modifikacija pretrage';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Cijela poruka';
 $labels['body']  = 'Tijelo';
 $labels['type'] = 'Vrsta';
 $labels['namex'] = 'Ime';
+$labels['searchscope'] = 'Opseg';
+$labels['currentfolder'] = 'Trenutni folder';
+$labels['subfolders'] = 'Ovo i podfolderi';
+$labels['allfolders'] = 'Svi folder';
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Preuzmi (.eml)';
 $labels['changeformattext'] = 'Prikaži kao obični tekst';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Potvrda o prispijeću poruke';
 $labels['dsn']            = 'Obavještenje o statusu dostave';
 $labels['mailreplyintro'] = '$date, $sender je napisao/la:';
 $labels['originalmessage'] = 'Originalna poruka';
+$labels['selectimage']    = 'Odaberi sliku';
+$labels['addimage']       = 'Dodaj sliku';
+$labels['selectmedia']    = 'Odaberi film';
+$labels['addmedia']       = 'Dodaj film';
 $labels['editidents']    = 'Uredi identitete';
 $labels['spellcheck']    = 'Pravopis';
 $labels['checkspelling'] = 'Provjera pravopisa';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'Vratiti poruku?';
 $labels['responses'] = 'Odgovori';
 $labels['insertresponse'] = 'Umetni odgovor';
 $labels['manageresponses'] = 'Upravljaj odgovorima';
-$labels['savenewresponse'] = 'Snimi novi odgovor';
-$labels['editresponses'] = 'Uredi odgovore';
+$labels['savenewresponse'] = 'Kreiraj novi odgovor';
+$labels['addresponse'] = 'Dodaj odgovor';
 $labels['editresponse'] = 'Uredi odgovor';
+$labels['editresponses'] = 'Uredi odgovore';
 $labels['responsename'] = 'Ime';
 $labels['responsetext'] = 'Tekst odgovora';
 $labels['attach'] = 'Priloži';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Dodaj';
 $labels['uploadprogress'] = '$percent ($current od $total)';
 $labels['close']  = 'Zatvori';
 $labels['messageoptions']  = 'Opcije poruke...';
+$labels['togglecomposeoptions'] = '(De)aktivacija opcija pisanja';
 $labels['low']     = 'Nizak';
 $labels['lowest']  = 'Najniži';
 $labels['normal']  = 'Normalan';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Pomoćnik';
 $labels['spouse'] = 'Supružnik';
 $labels['allfields'] = 'Sva polja';
 $labels['search'] = 'Pretraga';
+$labels['searchresult'] = 'Rezultati pretrage';
 $labels['advsearch'] = 'Napredna pretraga';
 $labels['advanced'] = 'Napredno';
 $labels['other'] = 'Ostalo';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Početna stranica';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Dodaj polje...';
-$labels['addcontact'] = 'Dodaj novi kontakt';
+$labels['addcontact'] = 'Dodaj kontakt';
 $labels['editcontact'] = 'Uredi kontakt';
 $labels['contacts'] = 'Kontakti';
 $labels['contactproperties'] = 'Svojstva kontakta';
+$labels['contactnameandorg'] = 'Ime i organizacija';
 $labels['personalinfo'] = 'Lični podaci';
+$labels['contactphoto'] = 'Kontakt fotografija';
 $labels['edit']   = 'Uredi';
 $labels['cancel'] = 'Otkaži';
 $labels['save']   = 'Sačuvaj';
@@ -301,7 +327,7 @@ $labels['rename'] = 'Preimenuj';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Zamijeni';
 $labels['uploadphoto'] = 'Dodaj fotografiju';
-$labels['newcontact']     = 'Dodaj novi kontakt';
+$labels['newcontact']     = 'Kreiraj novi kontakt';
 $labels['deletecontact']  = 'Obriši odabrane kontakte';
 $labels['composeto']      = 'Napiši email za';
 $labels['contactsfromto'] = 'Kontakti od $from do $to od ukupno $count';
@@ -310,10 +336,12 @@ $labels['export']         = 'Izvoz';
 $labels['exportall']      = 'Izvezi sve';
 $labels['exportsel']      = 'Izvezi označeno';
 $labels['exportvcards']   = 'Izvezi kontakte u vCard formatu';
-$labels['newcontactgroup'] = 'Kreiraj novu grupu kontakata';
+$labels['newcontactgroup']       = 'Kreiraj novu grupu';
+$labels['addgroup']       = 'Dodaj grupu';
 $labels['grouprename']    = 'Preimenuj grupu';
 $labels['groupdelete']    = 'Obriši grupu';
 $labels['groupremoveselected'] = 'Ukloni odabrane kontakte iz grupe';
+$labels['uponelevel']     = 'Nazad jedan nivo';
 $labels['previouspage']   = 'Prikaži prethodnu stranicu';
 $labels['firstpage']      = 'Prikaži prvu stranicu';
 $labels['nextpage']       = 'Prikaži sljedeću stranicu';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Podešavanja';
 $labels['userpreferences'] = 'Korisničke opcije';
 $labels['editpreferences'] = 'Uredi korisničke opcije';
 $labels['identities'] = 'Identiteti';
-$labels['manageidentities'] = 'Podesi identitete za ovaj račun';
-$labels['newidentity'] = 'Dodaj identitet';
-$labels['newitem'] = 'Nova stavka';
-$labels['edititem'] = 'Uredi stavku';
+$labels['manageidentities'] = 'Upravljanje identitetima';
+$labels['newidentity'] = 'Kreiraj novi identitet';
+$labels['addidentity'] = 'Dodaj identitet';
+$labels['edititem'] = 'Uredi identitet';
 $labels['preferhtml'] = 'Prikaži HTML';
 $labels['defaultcharset'] = 'Glavni skup znakova';
 $labels['htmlmessage'] = 'HTML poruke';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'Puni RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Puni RFC 2047 (ostalo)';
 $labels['force7bit'] = 'Koristi MIME kodiranje za 8-bitne znakove';
+$labels['savelocalstorage'] = "Sačuvaj u lokalno skladište browsera (privremeno)";
 $labels['advancedoptions'] = 'Napredne opcije';
+$labels['toggleadvancedoptions'] = '(De)aktivacija naprednih opcija';
 $labels['focusonnewmessage'] = 'Fokusiraj prozor preglednika na novu poruku';
 $labels['checkallfolders'] = 'Provjeri ima li novih poruka u svim folderima';
 $labels['displaynext'] = 'Aakon brisanja/premještanja poruke, prikaži slijedeću poruku';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'kao prilog';
 $labels['replyallmode'] = 'Zadana radnja za [Odgovori svima] dugme';
 $labels['replyalldefault'] = 'odgovori svima';
 $labels['replyalllist'] = 'odgovori samo listi mailova (ukoliko je pronađena)';
-$labels['folder']  = 'Folder';
-$labels['folders']  = 'Folderi';
-$labels['foldername']  = 'Naziv foldera';
-$labels['subscribed']  = 'Pretplaćen';
+$labels['folder'] = 'Folder';
+$labels['folders'] = 'Folderi';
+$labels['foldername'] = 'Naziv foldera';
+$labels['subscribed'] = 'Pretplaćen';
 $labels['messagecount'] = 'Poruke';
-$labels['create']  = 'Kreiraj';
-$labels['createfolder']  = 'Kreiraj novi folder';
-$labels['managefolders']  = 'Upravljanje folderima';
+$labels['create'] = 'Kreiraj';
+$labels['createfolder'] = 'Kreiraj novi folder';
+$labels['managefolders'] = 'Upravljanje folderima';
 $labels['specialfolders'] = 'Specijalni folder';
 $labels['properties'] = 'Svojstva';
 $labels['folderproperties'] = 'Svojstva foldera';
@@ -459,9 +489,13 @@ $labels['info'] = 'Informacije';
 $labels['getfoldersize'] = 'Kliknite da biste dobili informaciju o veličini foldera';
 $labels['changesubscription'] = 'Kliknite da promijenite pretplatu';
 $labels['foldertype'] = 'Vrsta foldera';
-$labels['personalfolder']  = 'Privatni folder';
-$labels['otherfolder']  = 'Folder drugog korisnika';
-$labels['sharedfolder']  = 'Javni folder';
+$labels['personalfolder'] = 'Privatni folder';
+$labels['otherfolder'] = 'Folder drugog korisnika';
+$labels['sharedfolder'] = 'Javni folder';
+$labels['findfolders'] = 'Pronađi foldere';
+$labels['namespace.personal'] = 'Lično';
+$labels['namespace.other'] = 'Ostali korisnici';
+$labels['namespace.shared'] = 'Dijeljeno';
 $labels['sortby'] = 'Sortiraj po';
 $labels['sortasc']  = 'Sortiraj uzlazno';
 $labels['sortdesc'] = 'Sortiraj silazno';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'vijetnamski';
 $labels['japanese'] = 'japanski';
 $labels['korean'] = 'korejski';
 $labels['chinese'] = 'kineski';
+$labels['arialabeltopnav'] = 'Kontrola prozora';
+$labels['arialabeltasknav'] = 'Zadaci aplikacije';
+$labels['arialabeltoolbar'] = 'Alatna traka aplikacije';
+$labels['arialabelactivetask'] = 'Aktivni zadatak';
+$labels['arialabelmessagessearchfilter'] = 'Filter listinga emaila';
+$labels['arialabelmailsearchform'] = 'Obrazac za pretragu email poruka';
+$labels['arialabelcontactsearchform'] = 'Obrazac za pretragu kontakata';
+$labels['arialabelmailquicksearchbox'] = 'Unos za email pretragu';
+$labels['arialabelquicksearchbox'] = 'Unos za pretragu';
+$labels['arialabelfoldersearchfilter'] = 'Fitr listi foldera';
+$labels['arialabelfoldersearchform'] = 'Obrazac za pretragu foldera';
+$labels['arialabelfolderlist'] = 'Odabir email foldera';
+$labels['arialabelmessagelist'] = 'Listing email poruka';
+$labels['arialabelmailpreviewframe'] = 'Pregled poruke';
+$labels['arialabelmailboxmenu'] = 'Meni sa akcijama za foldere';
+$labels['arialabellistselectmenu'] = 'Meni za odabir listinga';
+$labels['arialabelthreadselectmenu'] = 'Meni za listing tema';
+$labels['arialabelmessagelistoptions'] = 'Prikaz listi poruka i opcije sortiranja';
+$labels['arialabelmailimportdialog'] = 'Dijalog za uvoz poruke';
+$labels['arialabelmessagenav'] = 'Navigacija za poruku';
+$labels['arialabelmessagebody'] = 'Tijelo poruke';
+$labels['arialabelmessageactions'] = 'Akcije poruke';
+$labels['arialabelcontactquicksearch'] = 'Obrazac za pretragu kontakata';
+$labels['arialabelcontactsearchbox'] = 'Unos za pretragu kontakata';
+$labels['arialabelmessageheaders'] = 'Zaglavlja poruke';
+$labels['arialabelforwardingoptions'] = 'Opcije prosljeđivanja';
+$labels['arialabelreplyalloptions'] = 'Opcije odgovora svima';
+$labels['arialabelmoremessageactions'] = 'Više akcija za poruke';
+$labels['arialabelmarkmessagesas'] = 'Označi odabrane poruke kao...';
+$labels['arialabelcomposeoptions'] = 'Opcije pisanja';
+$labels['arialabelresponsesmenu'] = 'Meni za odbačene odgovore';
+$labels['arialabelattachmentuploadform'] = 'Obrazac za dodavanje priloga';
+$labels['arialabelattachmentpreview'] = 'Pregled priloga';
+$labels['ariasummarycomposecontacts'] = 'Lista kontakata i grupi za primaoce';
+$labels['arialabelcontactexportoptions'] = 'Opcije izvoza kontakata';
+$labels['arialabelabookgroupoptions'] = 'Opcije adresara/grupe';
+$labels['arialabelpreferencesform'] = 'Obrazac podešavanja';
+$labels['arialabelidentityeditfrom'] = 'Obrazac za uređivanje identiteta';
+$labels['arialabelresonseeditfrom'] = 'Obrazac za uređivanje odgovora';
+$labels['arialabelsearchterms'] = 'Pojam za pretragu';
+$labels['helplistnavigation'] = 'Lista navigacije pomoću tastature';
+$labels['helplistkeyboardnavigation'] = "Strelice gore/dole: Pomjeri fokusirani red/selekciju.
+Razmak: Odaberi fokusirani red.
+Shift + gore/dole: Odaberi dodatni red iznad/ispod.
+Ctrl + razmak: Dodaj fokusirani red u selekciju/ukloni iz selekcije.";
+$labels['helplistkeyboardnavmessages'] = "Strelice desno/lijevo: proširi/zatvori temu temu emaila (samo u modu za teme).
+Enter: Otvori odabranu/fokusiranu poruku.
+Delete: Premjesti odabranu poruku u Smeće.";
+$labels['helplistkeyboardnavcontacts'] = "Enter: Otvora odabrani/fokusirani kontakt.";
 ?>
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index 42f2517b2..0e75669b1 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Vaša sesija je neispravna ili je istekla.';
 $messages['storageerror'] = 'Neuspješna konekcija na IMAP server';
 $messages['servererror'] = 'Serverska greška!';
 $messages['servererrormsg'] = 'Serverska greška: $msg';
+$messages['connerror'] = 'Greška u povezivanju (Nije moguće kontaktirati server)!';
 $messages['dberror'] = 'Greška u bazi podataka!';
+$messages['windowopenerror'] = 'Popup prozor je blokiran!';
 $messages['requesttimedout'] = 'Zahtjev je istekao';
 $messages['errorreadonly'] = 'Nije moguće izvršiti operaciju. Folder je samo za čitanje.';
 $messages['errornoperm'] = 'Nije moguće izvršiti operaciju. Pristup je odbijen.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr kontakata je pronađeno.';
 $messages['searchnomatch'] = 'Traženi pojam nije pronađen ni u jednoj poruci.';
 $messages['searching'] = 'Pretražujem...';
 $messages['checking'] = 'Provjeravam...';
+$messages['stillsearching'] = 'I dalje pretražujem...';
 $messages['nospellerrors'] = 'Pravopisne greške nisu pronađene.';
 $messages['folderdeleted'] = 'Folder je uspješno obrisan.';
 $messages['foldersubscribed'] = 'Uspješno ste pretplaćeni na folder.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Uspješno uvezeno $nr poruka';
 $messages['importmessageerror'] = 'Uvoz nije uspio! Dodana datoteke nije ispravna datoteka sa porukama';
 $messages['opnotpermitted'] = 'Operacija nije dozvoljena!';
 $messages['nofromaddress'] = 'U odabrani identitet nije upisana email adresa.';
-$messages['editorwarning'] = 'Prebacivanje u obični tekstualni uređivač će prouzrokovati gubljenje formatiranja teksta. Želite li nastaviti?';
+$messages['editorwarning'] = 'Promjenom uređivača biste mogli izgubiti formatiranje teksta. Želite li nastaviti?';
 $messages['httpreceivedencrypterror'] = 'Dogodila se fatalna konfiguracijska greška. Odmah kontaktirajte administratora. <b>Vaša poruka se ne poslati.</b>';
 $messages['smtpconnerror'] = 'SMTP greška ($code): Veza sa serverom nije uspostavljena.';
 $messages['smtpautherror'] = 'SMTP greška ($code): Autentifikacija nije uspjela.';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 15d879bc1..8f3cf554c 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Més accions...';
 $labels['more']             = 'Més';
 $labels['back']             = 'Torna';
 $labels['options']          = 'Opcions';
+$labels['first'] = 'Primer';
+$labels['last'] = 'Darrer';
+$labels['previous'] = 'Anterior';
+$labels['next'] = 'Següent';
 $labels['select'] = 'Selecciona';
 $labels['all'] = 'Tots';
 $labels['none'] = 'Cap';
 $labels['currpage'] = 'Pàgina actual';
+$labels['isread'] = 'Llegeix';
 $labels['unread'] = 'No llegit';
 $labels['flagged'] = 'Marcat';
+$labels['unflagged'] = 'No marcat';
 $labels['unanswered'] = 'No respost';
 $labels['withattachment'] = 'Amb fitxer adjunt';
 $labels['deleted'] = 'Suprimit';
 $labels['undeleted'] = 'No s\'ha suprimit';
+$labels['replied'] = 'Respost';
+$labels['forwarded'] = 'Reenviat';
 $labels['invert'] = 'Inverteix';
 $labels['filter'] = 'Filtre';
 $labels['list'] = 'Llista';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Importa missatges';
 $labels['quota'] = 'Ús del disc';
 $labels['unknown']  = 'desconegut';
 $labels['unlimited']  = 'il·limitat';
+$labels['quotatype'] = 'Tipus de quota';
+$labels['quotatotal'] = 'Límit';
+$labels['quotaused'] = 'Utilitzat';
+$labels['quotastorage'] = 'Espai de disc';
+$labels['quotamessage'] = 'Comptador de missatges';
 $labels['quicksearch']  = 'Cerca ràpida';
 $labels['resetsearch']  = 'Neteja cerca';
 $labels['searchmod']  = 'Cerca modificadors';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Missatge sencer';
 $labels['body']  = 'Cos';
 $labels['type'] = 'Tipus';
 $labels['namex'] = 'Nom';
+$labels['searchscope'] = 'Abast';
+$labels['currentfolder'] = 'Carpeta actual';
+$labels['subfolders'] = 'Aquesta i les seves subcarpetes';
+$labels['allfolders'] = 'Totes les carpetes';
 $labels['openinextwin'] = 'Obre a una nova finestra';
 $labels['emlsave'] = 'Descarrega (.eml)';
 $labels['changeformattext'] = 'Mostra en format de text net';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Confirmació de recepció';
 $labels['dsn']            = 'Notificació d\'estat de lliurament';
 $labels['mailreplyintro'] = 'A $date, $sender escrigué:';
 $labels['originalmessage'] = 'Missatge Original';
+$labels['selectimage']    = 'Selecciona una imatge';
+$labels['addimage']       = 'Afegeix una imatge';
+$labels['selectmedia']    = 'Selecciona pel·lícula';
+$labels['addmedia']       = 'Afegeix pel·lícula';
 $labels['editidents']    = 'Edita identitats';
 $labels['spellcheck']    = 'Ortografia';
 $labels['checkspelling'] = 'Comprova l\'ortografia';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'Recupera el missatge?';
 $labels['responses'] = 'Respostes';
 $labels['insertresponse'] = 'Introduïu una resposta';
 $labels['manageresponses'] = 'Gestiona respostes';
-$labels['savenewresponse'] = 'Desa una nova resposta';
-$labels['editresponses'] = 'Edita respostes';
+$labels['savenewresponse'] = 'Crea una nova resposta';
+$labels['addresponse'] = 'Afegeix una resposta';
 $labels['editresponse'] = 'Edita la resposta';
+$labels['editresponses'] = 'Edita respostes';
 $labels['responsename'] = 'Nom';
 $labels['responsetext'] = 'Text de resposta';
 $labels['attach'] = 'Adjunta';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Afegeix';
 $labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close']  = 'Tanca';
 $labels['messageoptions']  = 'Opcions de missatge...';
+$labels['togglecomposeoptions'] = 'Commuta les opcions de composició';
 $labels['low']     = 'Baixa';
 $labels['lowest']  = 'La més baixa';
 $labels['normal']  = 'Normal';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Assistent';
 $labels['spouse'] = 'Cònjuge';
 $labels['allfields'] = 'Tots els camps';
 $labels['search'] = 'Cerca';
+$labels['searchresult'] = 'Resultat de la cerca';
 $labels['advsearch'] = 'Cerca Avançada';
 $labels['advanced'] = 'Paràmetres avançats';
 $labels['other'] = 'Un altre';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Pàgina web personal';
 $labels['typeblog'] = 'Bloc';
 $labels['typeprofile'] = 'Perfil';
 $labels['addfield'] = 'Afegeix camp...';
-$labels['addcontact'] = 'Afegeix un nou contacte';
+$labels['addcontact'] = 'Afegeix un contacte';
 $labels['editcontact'] = 'Edita el contacte';
 $labels['contacts'] = 'Contactes';
 $labels['contactproperties'] = 'Propietats del contacte';
+$labels['contactnameandorg'] = 'Nom i Organització';
 $labels['personalinfo'] = 'Informació personal';
+$labels['contactphoto'] = 'Foto de contacte';
 $labels['edit']   = 'Edita';
 $labels['cancel'] = 'Cancel·la';
 $labels['save']   = 'Desa';
@@ -310,10 +336,12 @@ $labels['export']         = 'Exporta';
 $labels['exportall']      = 'Exporta\'ls tots';
 $labels['exportsel']      = 'Exporta els seleccionats';
 $labels['exportvcards']   = 'Exporta contactes en format vCard';
-$labels['newcontactgroup'] = 'Crea un nou grup de contactes';
+$labels['newcontactgroup']       = 'Crea un grup nou';
+$labels['addgroup']       = 'Afegeix un grup';
 $labels['grouprename']    = 'Reanomena el grup';
 $labels['groupdelete']    = 'Suprimeix el grup';
 $labels['groupremoveselected'] = 'Suprimeix els contactes seleccionats del grup';
+$labels['uponelevel']     = 'Un nivell amunt';
 $labels['previouspage']   = 'Mostra la pàgina anterior';
 $labels['firstpage']      = 'Mostra la primera pàgina';
 $labels['nextpage']       = 'Mostra la pàgina següent';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Preferències';
 $labels['userpreferences'] = 'Preferències de l\'usuari';
 $labels['editpreferences'] = 'Edita les preferències de l\'usuari';
 $labels['identities'] = 'Identitats';
-$labels['manageidentities'] = 'Gestiona les identitats per a aquest compte';
-$labels['newidentity'] = 'Nova identitat';
-$labels['newitem'] = 'Nou element';
-$labels['edititem'] = 'Edita l\'element';
+$labels['manageidentities'] = 'Gestiona les identitats';
+$labels['newidentity'] = 'Crea una nova identitat';
+$labels['addidentity'] = 'Afegeix una identitat';
+$labels['edititem'] = 'Edita la identitat';
 $labels['preferhtml'] = 'Mostra HTML';
 $labels['defaultcharset'] = 'Joc de caràcters per defecte';
 $labels['htmlmessage'] = 'Missatge HTML';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'Compleix RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Compleix RFC 2047 (un altre)';
 $labels['force7bit'] = 'Fes servir la codificació MIME per a caràcters de 8-bits';
+$labels['savelocalstorage'] = "Desa-ho (temporalment) a l'espai local del navegador";
 $labels['advancedoptions'] = 'Opcions avançades';
+$labels['toggleadvancedoptions'] = 'Commuta les opcions avançades';
 $labels['focusonnewmessage'] = 'Activa la finestra del navegador quan hi hagi un nou missatge';
 $labels['checkallfolders'] = 'Comprova totes les carpetes per missatges nous';
 $labels['displaynext'] = 'Mostra el missatge següent després de suprimir-ne o moure\'n un';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'com un adjunt';
 $labels['replyallmode'] = 'Acció per defecte del botó [Respon a tots]';
 $labels['replyalldefault'] = 'respon a tots';
 $labels['replyalllist'] = 'respon només a la llista de missatges (si n\'hi ha cap)';
-$labels['folder']  = 'Carpeta';
-$labels['folders']  = 'Carpetes';
-$labels['foldername']  = 'Nom de la carpeta';
-$labels['subscribed']  = 'Subscrit';
+$labels['folder'] = 'Carpeta';
+$labels['folders'] = 'Carpetes';
+$labels['foldername'] = 'Nom de la carpeta';
+$labels['subscribed'] = 'Subscrit';
 $labels['messagecount'] = 'Missatges';
-$labels['create']  = 'Crea';
-$labels['createfolder']  = 'Crea una carpeta nova';
-$labels['managefolders']  = 'Gestiona carpetes';
+$labels['create'] = 'Crea';
+$labels['createfolder'] = 'Crea una carpeta nova';
+$labels['managefolders'] = 'Gestiona carpetes';
 $labels['specialfolders'] = 'Carpetes especials';
 $labels['properties'] = 'Propietats';
 $labels['folderproperties'] = 'Propietats de la carpeta';
@@ -459,9 +489,13 @@ $labels['info'] = 'Informació';
 $labels['getfoldersize'] = 'Feu clic per veure la mida de la carpeta';
 $labels['changesubscription'] = 'Feu clic per canviar la subscripció';
 $labels['foldertype'] = 'Tipus de Carpeta';
-$labels['personalfolder']  = 'Carpeta privada';
-$labels['otherfolder']  = 'Carpeta d\'un altre usuari';
-$labels['sharedfolder']  = 'Carpeta pública';
+$labels['personalfolder'] = 'Carpeta privada';
+$labels['otherfolder'] = 'Carpeta d\'un altre usuari';
+$labels['sharedfolder'] = 'Carpeta pública';
+$labels['findfolders'] = 'Cerca carpetes';
+$labels['namespace.personal'] = 'Personal';
+$labels['namespace.other'] = 'Altres usuaris';
+$labels['namespace.shared'] = 'Compartit';
 $labels['sortby'] = 'Ordena per';
 $labels['sortasc']  = 'Ordena ascendentment';
 $labels['sortdesc'] = 'Ordena descendentment';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamita';
 $labels['japanese'] = 'Japonès';
 $labels['korean'] = 'Coreà';
 $labels['chinese'] = 'Xinès';
+$labels['arialabeltopnav'] = 'Finestra de control';
+$labels['arialabeltasknav'] = 'Aplicació de tasques';
+$labels['arialabeltoolbar'] = 'Aplicació de barra d\'eines';
+$labels['arialabelactivetask'] = 'Tasca activa';
+$labels['arialabelmessagessearchfilter'] = 'Filtre de llistat de correus electrònics';
+$labels['arialabelmailsearchform'] = 'Formulari de cerca de correus electrònics';
+$labels['arialabelcontactsearchform'] = 'Formulari de cerca de contactes';
+$labels['arialabelmailquicksearchbox'] = 'Entrada per la cerca de correus electrònics';
+$labels['arialabelquicksearchbox'] = 'Entrada de cerca';
+$labels['arialabelfoldersearchfilter'] = 'Filtre de llistat de carpetes';
+$labels['arialabelfoldersearchform'] = 'Formulari de cerca de carpetes';
+$labels['arialabelfolderlist'] = 'Selecció de carpeta de correu electrònic';
+$labels['arialabelmessagelist'] = 'Llistat de missatges de correu electrònic';
+$labels['arialabelmailpreviewframe'] = 'Previsualitza el missatge';
+$labels['arialabelmailboxmenu'] = 'Menú d\'accions de carpeta';
+$labels['arialabellistselectmenu'] = 'Menú de seleccions de la llista';
+$labels['arialabelthreadselectmenu'] = 'Menú de llistat de fils';
+$labels['arialabelmessagelistoptions'] = 'Opcions de visualització de llista de missatges i ordenació';
+$labels['arialabelmailimportdialog'] = 'Diàleg per importar missatges';
+$labels['arialabelmessagenav'] = 'Missatge de navegació';
+$labels['arialabelmessagebody'] = 'Cos del missatge';
+$labels['arialabelmessageactions'] = 'Accions del missatge';
+$labels['arialabelcontactquicksearch'] = 'Formulari per la cerca de contactes';
+$labels['arialabelcontactsearchbox'] = 'Entrada per la cerca de contactes';
+$labels['arialabelmessageheaders'] = 'Capçaleres del missatge';
+$labels['arialabelforwardingoptions'] = 'Opcions de re-enviament';
+$labels['arialabelreplyalloptions'] = 'Opcions per respondre a tots';
+$labels['arialabelmoremessageactions'] = 'Més accions de missatge';
+$labels['arialabelmarkmessagesas'] = 'Marca els missatges seleccionats com a...';
+$labels['arialabelcomposeoptions'] = 'Opcions de composició';
+$labels['arialabelresponsesmenu'] = 'Menú de respostes \'enllaunades\' o establertes';
+$labels['arialabelattachmentuploadform'] = 'Formulari per pujar adjunts';
+$labels['arialabelattachmentpreview'] = 'Previsualitza l\'ajunt';
+$labels['ariasummarycomposecontacts'] = 'Llista de contactes i grups per seleccionar com a destinataris';
+$labels['arialabelcontactexportoptions'] = 'Opcions per exportar contactes';
+$labels['arialabelabookgroupoptions'] = 'Opcions de llibreta d\'adreces/grup';
+$labels['arialabelpreferencesform'] = 'Formulari de preferències';
+$labels['arialabelidentityeditfrom'] = 'Formulari d\'edició d\'identitats';
+$labels['arialabelresonseeditfrom'] = 'Formulari d\'edició de respostes';
+$labels['arialabelsearchterms'] = 'Cerca termes';
+$labels['helplistnavigation'] = 'Llista la navegació per teclat';
+$labels['helplistkeyboardnavigation'] = "Fletxes amunt/avall: Mou la fila seleccionada/activa.
+Espai: Selecciona la fila activa.
+Majús + amunt/avall: Selecciona una fila addicional de sobre/sota.
+Ctrl + Espai: Afegeix la fila activa a la selecció/Suprimeix de la selecció.";
+$labels['helplistkeyboardnavmessages'] = "Fletxes dreta/esquerra: expandeix/contrau fils del missatge (només en mode fils).
+Retorn: Obre el missatge seleccionat/actiu.
+Suprimeix: Mou els missatges seleccionats a la Paperera.";
+$labels['helplistkeyboardnavcontacts'] = "Retorn: Obre el contacte seleccionat/actiu";
 ?>
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index c71677b44..f1a068842 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'La vostra sessió no existeix o ha expirat.';
 $messages['storageerror'] = 'Error de connexió amb el servidor IMAP.';
 $messages['servererror'] = 'Error del Servidor!';
 $messages['servererrormsg'] = 'Error del Servidor: $msg';
+$messages['connerror'] = 'Error de connexió (no s\'ha pogut establir la connexió amb el servidor)!';
 $messages['dberror'] = 'Error a la Base de Dades!';
+$messages['windowopenerror'] = 'La finestra emergent ha estat bloquejada!';
 $messages['requesttimedout'] = 'S\'ha esgotat el temps de la sol·licitud';
 $messages['errorreadonly'] = 'No s\'ha pogut de realitzar l\'operació. La carpeta és de només lectura.';
 $messages['errornoperm'] = 'No s\'ha pogut realitzar l\'operació. Permís denegat.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr contactes trobats.';
 $messages['searchnomatch'] = 'No s\'ha trobat cap coincidència.';
 $messages['searching'] = 'S\'està cercant...';
 $messages['checking'] = 'S\'està comprovant...';
+$messages['stillsearching'] = 'Encara s\'està cercant...';
 $messages['nospellerrors'] = 'No s\'han trobat errors d\'ortografia.';
 $messages['folderdeleted'] = 'Carpeta suprimida correctament.';
 $messages['foldersubscribed'] = 'Carpeta subscrita correctament.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = '<b>S\'han importat $nr missatges correctame
 $messages['importmessageerror'] = 'La importació ha fallat. El fitxer que heu pujat no és un fitxer de missatges vàlid o no és un fitxer de bústia.';
 $messages['opnotpermitted'] = 'Operació no permesa!';
 $messages['nofromaddress'] = 'Falta l\'adreça de correu a la identitat seleccionada.';
-$messages['editorwarning'] = 'Si canvieu a l\'editor de text net perdreu tot el format del text. Voleu continuar?';
+$messages['editorwarning'] = 'Si canvieu el tipus d\'editor pot ser que perdreu tot el format del text. Voleu continuar?';
 $messages['httpreceivedencrypterror'] = 'Hi ha hagut un error fatal de configuració. Contacteu amb el vostre administrador immediatament. <b>El vostre missatge no pot ser enviat.</b>';
 $messages['smtpconnerror'] = 'Error SMTP ($code): La connexió al servidor ha fallat.';
 $messages['smtpautherror'] = 'Error SMTP ($code): La identificació ha fallat.';
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index 37f5280e8..3d491e427 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Vaše přihlášení je neplatné nebo vypršelo';
 $messages['storageerror'] = 'Připojení na IMAP server selhalo';
 $messages['servererror'] = 'Chyba serveru!';
 $messages['servererrormsg'] = 'Chyba serveru: $msg';
+$messages['connerror'] = 'Chyba připojení (Selhalo připojeni k serveru)!';
 $messages['dberror'] = 'Chyba databáze!';
+$messages['windowopenerror'] = 'Vyskakovací okno bylo zablokováno!';
 $messages['requesttimedout'] = 'Došlo k vypršení požadavku';
 $messages['errorreadonly'] = 'Příkaz nelze provést, složka je určena jen ke čtení.';
 $messages['errornoperm'] = 'Příkaz nelze provést, nemáte oprávnění.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Nalezeno $nr kontaktů';
 $messages['searchnomatch'] = 'Nenalezena žádná zpráva';
 $messages['searching'] = 'Vyhledávám...';
 $messages['checking'] = 'Kontroluji...';
+$messages['stillsearching'] = 'Stále vyhledávám...';
 $messages['nospellerrors'] = 'Nebyly nalezeny žádné chyby';
 $messages['folderdeleted'] = 'Složka byla úspěšně vymazána';
 $messages['foldersubscribed'] = 'Složka byla úspěšně připojena';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Úspěšně naimportováno $nr zpráv';
 $messages['importmessageerror'] = 'Import se nezdařil! Nahraný soubor není platnou zprávou nebo souborem mailboxu';
 $messages['opnotpermitted'] = 'Operace není povolena!';
 $messages['nofromaddress'] = 'Chybějící e-mailová adresa v označeném profilu';
-$messages['editorwarning'] = 'Přepnutím do režimu prostého textu ztratíte veškeré formátování. Chcete pokračovat?';
+$messages['editorwarning'] = 'Přepnutím režimu editoru ztratíte veškeré formátování. Chcete pokračovat?';
 $messages['httpreceivedencrypterror'] = 'Vyskytla se vážná chyba v konfiguraci. Kontaktujte neprodleně administátora. Vaše zpráva nemohla být odeslána.';
 $messages['smtpconnerror'] = 'Chyba SMTP ($code): Připojení k serveru selhalo';
 $messages['smtpautherror'] = 'Chyba SMTP ($code): Chyba přihlášení';
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index 770df3bff..2ef6ce5b4 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Mwy o weithredoedd...';
 $labels['more']             = 'Mwy';
 $labels['back']             = 'Yn ôl';
 $labels['options']          = 'Dewisiadau';
+$labels['first'] = 'Cyntaf';
+$labels['last'] = 'Olaf';
+$labels['previous'] = 'Blaenorol';
+$labels['next'] = 'Nesaf';
 $labels['select'] = 'Dewis';
 $labels['all'] = 'Popeth';
 $labels['none'] = 'Dim';
 $labels['currpage'] = 'Tudalen gyfredol';
+$labels['isread'] = 'Darllenwyd';
 $labels['unread'] = 'Heb eu darllen';
 $labels['flagged'] = 'Nodwyd';
+$labels['unflagged'] = 'Heb eu Fflagio';
 $labels['unanswered'] = 'Heb ei ateb';
 $labels['withattachment'] = 'Gyda atodiad';
 $labels['deleted'] = 'Dilewyd';
 $labels['undeleted'] = 'Heb ei ddileu';
+$labels['replied'] = 'Ymatebwyd';
+$labels['forwarded'] = 'Anfonwyd ymlaen';
 $labels['invert'] = 'Gwrth-droi';
 $labels['filter'] = 'Hidlo';
 $labels['list'] = 'Rhestr';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Mewnforio negeseuon';
 $labels['quota'] = 'Defnydd';
 $labels['unknown']  = 'anhysbys';
 $labels['unlimited']  = 'diderfyn';
+$labels['quotatype'] = 'Math Cwota';
+$labels['quotatotal'] = 'Cyfyngiad';
+$labels['quotaused'] = 'Defnyddiwyd';
+$labels['quotastorage'] = 'Gofod disg';
+$labels['quotamessage'] = 'Nifer negeseuon';
 $labels['quicksearch']  = 'Chwiliad cyflym';
 $labels['resetsearch']  = 'Ail-osod chwiliad';
 $labels['searchmod']  = 'Addasyddion chwilio';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Y neges yn llawn';
 $labels['body']  = 'Corff';
 $labels['type'] = 'Math';
 $labels['namex'] = 'Enw';
+$labels['searchscope'] = 'Amrediad';
+$labels['currentfolder'] = 'Ffolder cyfredol';
+$labels['subfolders'] = 'Hwn a is-ffolderi';
+$labels['allfolders'] = 'Pob ffolder';
 $labels['openinextwin'] = 'Agor mewn ffenest newydd';
 $labels['emlsave'] = 'Llwytho lawr (.eml)';
 $labels['changeformattext'] = 'Dangos mewn fformat testun plaen';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Cadarnhau derbyn';
 $labels['dsn']            = 'Hysbysiad statws danfon';
 $labels['mailreplyintro'] = 'Ar $date, ysgrifennodd $sender:';
 $labels['originalmessage'] = 'Neges Wreiddiol';
+$labels['selectimage']    = 'Dewiswch lun';
+$labels['addimage']       = 'Ychwanegwch lun';
+$labels['selectmedia']    = 'Dewiswch fideo';
+$labels['addmedia']       = 'Ychwanegwch fideo';
 $labels['editidents']    = 'Golygu personoliaethau';
 $labels['spellcheck']    = 'Sillafu';
 $labels['checkspelling'] = 'Gwirio sillafu';
@@ -204,8 +225,9 @@ $labels['responses'] = 'Ymatebion';
 $labels['insertresponse'] = 'Mewnosod ymateb';
 $labels['manageresponses'] = 'Rheoli ymatebion';
 $labels['savenewresponse'] = 'Cadw ymateb newydd';
-$labels['editresponses'] = 'Golygu ymatebion';
+$labels['addresponse'] = 'Ychwanegu ymateb';
 $labels['editresponse'] = 'Golygu ymateb';
+$labels['editresponses'] = 'Golygu ymatebion';
 $labels['responsename'] = 'Enw';
 $labels['responsetext'] = 'Testun Ymateb';
 $labels['attach'] = 'Atodi';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Llwytho fyny';
 $labels['uploadprogress'] = '$percent ($current o $total)';
 $labels['close']  = 'Cau';
 $labels['messageoptions']  = 'Dewisiadau neges...';
+$labels['togglecomposeoptions'] = 'Newid dewisiadau ysgrifennu';
 $labels['low']     = 'Isel';
 $labels['lowest']  = 'Isaf';
 $labels['normal']  = 'Cyffredin';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Cynorthwyydd';
 $labels['spouse'] = 'Cymar';
 $labels['allfields'] = 'Pob maes';
 $labels['search'] = 'Chwilio';
+$labels['searchresult'] = 'Canlyniadau chwilio';
 $labels['advsearch'] = 'Chwilio Uwch';
 $labels['advanced'] = 'Uwch';
 $labels['other'] = 'Arall';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Gwefan';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Proffil';
 $labels['addfield'] = 'Ychwanegu maes...';
-$labels['addcontact'] = 'Ychwanegu cyswllt newydd';
+$labels['addcontact'] = 'Ychwanegu cyswllt';
 $labels['editcontact'] = 'Golygu cyswllt';
 $labels['contacts'] = 'Cysylltiadau';
 $labels['contactproperties'] = 'Nodweddion cyswllt';
+$labels['contactnameandorg'] = 'Enw a Corff';
 $labels['personalinfo'] = 'Gwybodaeth bersonol';
+$labels['contactphoto'] = 'Llun cyswllt';
 $labels['edit']   = 'Golygu';
 $labels['cancel'] = 'Canslo';
 $labels['save']   = 'Cadw';
@@ -301,7 +327,7 @@ $labels['rename'] = 'Ail-enwi';
 $labels['addphoto'] = 'Ychwanegu';
 $labels['replacephoto'] = 'Amnewid';
 $labels['uploadphoto'] = 'Llwytho fyny llun';
-$labels['newcontact']     = 'Creu cerdyn cyswllt newydd';
+$labels['newcontact']     = 'Creu cyswllt newydd';
 $labels['deletecontact']  = 'Dileu y cysylltiadau a ddewiswyd';
 $labels['composeto']      = 'Ysgrifennu neges at';
 $labels['contactsfromto'] = 'Cysylltiadau $from i $to o $count';
@@ -310,10 +336,12 @@ $labels['export']         = 'Allforio';
 $labels['exportall']      = 'Allforio popeth';
 $labels['exportsel']      = 'Allforio dewiswyd';
 $labels['exportvcards']   = 'Allforio cysylltiadau mewn fformat vCard';
-$labels['newcontactgroup'] = 'Creu grŵp cysylltiadau newydd';
+$labels['newcontactgroup']       = 'Creu grŵp newydd';
+$labels['addgroup']       = 'Ychwanegu grŵp';
 $labels['grouprename']    = 'Ail-enwi grŵp';
 $labels['groupdelete']    = 'Dileu grŵp';
 $labels['groupremoveselected'] = 'Dileu y cysylltiadau dewiswyd o\'r grŵp';
+$labels['uponelevel']     = 'Fyny un lefel';
 $labels['previouspage']   = 'Dangos y set flaenorol';
 $labels['firstpage']      = 'Dangos y set gyntaf';
 $labels['nextpage']       = 'Dangos y set nesaf';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Dewisiadau';
 $labels['userpreferences'] = 'Dewisiadau\'r defnyddiwr';
 $labels['editpreferences'] = 'Golygu dewisiadau\'r defnyddiwr';
 $labels['identities'] = 'Personoliaethau';
-$labels['manageidentities'] = 'Rheoli personoliaethau ar gyfer y cyfri hwn';
-$labels['newidentity'] = 'Personoliaeth newydd';
-$labels['newitem'] = 'Eitem newydd';
-$labels['edititem'] = 'Golygu eitem';
+$labels['manageidentities'] = 'Rheoli personoliaethau';
+$labels['newidentity'] = 'Creu personoliaeth newydd';
+$labels['addidentity'] = 'Ychwanegu personoliaeth';
+$labels['edititem'] = 'Golygu personoliaeth';
 $labels['preferhtml'] = 'Dangos HTML';
 $labels['defaultcharset'] = 'Set Nodau Diofyn';
 $labels['htmlmessage'] = 'Neges HTML';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'RFC 2231 llawn (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 llawn (arall)';
 $labels['force7bit'] = 'Defnyddio amgodi MIME ar gyfer llythrennau 8-did';
+$labels['savelocalstorage'] = "Cadw yn storfa leol y porwr (dros dro)";
 $labels['advancedoptions'] = 'Dewisiadau uwch';
+$labels['toggleadvancedoptions'] = 'Newid dewisiadau uwch';
 $labels['focusonnewmessage'] = 'Ffocysu\'r porwr ar y neges newydd';
 $labels['checkallfolders'] = 'Chwilio pob ffolder am negeseuon newydd';
 $labels['displaynext'] = 'Ar ôl dileu/symud neges dangos y neges nesaf';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'fel atodiad';
 $labels['replyallmode'] = 'Gweithred diofyn botwm [Ymateb i bawb]';
 $labels['replyalldefault'] = 'ymateb i bawb';
 $labels['replyalllist'] = 'ymateb i\'r rhestr trafod yn unig (os canfuwyd)';
-$labels['folder']  = 'Ffolder';
-$labels['folders']  = 'Ffolderi';
-$labels['foldername']  = 'Enw ffolder';
-$labels['subscribed']  = 'Tanysgrifwyd';
+$labels['folder'] = 'Ffolder';
+$labels['folders'] = 'Ffolderi';
+$labels['foldername'] = 'Enw ffolder';
+$labels['subscribed'] = 'Tanysgrifwyd';
 $labels['messagecount'] = 'Negeseuon';
-$labels['create']  = 'Creu';
-$labels['createfolder']  = 'Creu ffolder newydd';
-$labels['managefolders']  = 'Rheoli ffolderi';
+$labels['create'] = 'Creu';
+$labels['createfolder'] = 'Creu ffolder newydd';
+$labels['managefolders'] = 'Rheoli ffolderi';
 $labels['specialfolders'] = 'Ffolderi arbennig';
 $labels['properties'] = 'Nodweddion';
 $labels['folderproperties'] = 'Ffolder nodweddion';
@@ -459,9 +489,13 @@ $labels['info'] = 'Gwybodaeth';
 $labels['getfoldersize'] = 'Cliciwch i gael maint ffolder';
 $labels['changesubscription'] = 'Cliciwch i newid y tanysgrifiad';
 $labels['foldertype'] = 'Math Ffolder';
-$labels['personalfolder']  = 'Ffolder Preifat';
-$labels['otherfolder']  = 'Ffolder Defnyddiwr Arall';
-$labels['sharedfolder']  = 'Ffolder Cyhoeddus';
+$labels['personalfolder'] = 'Ffolder Preifat';
+$labels['otherfolder'] = 'Ffolder Defnyddiwr Arall';
+$labels['sharedfolder'] = 'Ffolder Cyhoeddus';
+$labels['findfolders'] = 'Canfod ffolderi';
+$labels['namespace.personal'] = 'Persono';
+$labels['namespace.other'] = 'Defnyddwyr arall';
+$labels['namespace.shared'] = 'Rhannwyd';
 $labels['sortby'] = 'Trefnu yn ôl';
 $labels['sortasc']  = 'Trefn esgynnol';
 $labels['sortdesc'] = 'Trefn ddisgynnol';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Fietnamaidd';
 $labels['japanese'] = 'Japaneaidd';
 $labels['korean'] = 'Corëeg';
 $labels['chinese'] = 'Tsieineaidd';
+$labels['arialabeltopnav'] = 'Rheolaeth ffenest';
+$labels['arialabeltasknav'] = 'Tasgiau rhaglen';
+$labels['arialabeltoolbar'] = 'Bar offer y rhaglen';
+$labels['arialabelactivetask'] = 'Tasg gweithredol';
+$labels['arialabelmessagessearchfilter'] = 'Hidlydd rhestr ebost';
+$labels['arialabelmailsearchform'] = 'Ffurflen chwilio neges ebost';
+$labels['arialabelcontactsearchform'] = 'Ffurflen chwilio cysylltiadau';
+$labels['arialabelmailquicksearchbox'] = 'Mewnbwn chwilio ebost';
+$labels['arialabelquicksearchbox'] = 'Mewnbwn chwilio';
+$labels['arialabelfoldersearchfilter'] = 'Hidlydd rhestr ffolderi';
+$labels['arialabelfoldersearchform'] = 'Ffurflen chwilio ffolderi';
+$labels['arialabelfolderlist'] = 'Dewis ffolderi ebost';
+$labels['arialabelmessagelist'] = 'Rhestr Negeseuon Ebost';
+$labels['arialabelmailpreviewframe'] = 'Rhagolwg neges';
+$labels['arialabelmailboxmenu'] = 'Bwydlen gweithrediadau ffolder';
+$labels['arialabellistselectmenu'] = 'Bwydlen dewis rhestr';
+$labels['arialabelthreadselectmenu'] = 'Bwydlen rhestr edefynnau';
+$labels['arialabelmessagelistoptions'] = 'Dewisiadau dangos a trefnu rhestr negeseuon';
+$labels['arialabelmailimportdialog'] = 'Deialog mewnforio negeseuon';
+$labels['arialabelmessagenav'] = 'Llywio neges';
+$labels['arialabelmessagebody'] = 'Corff Neges';
+$labels['arialabelmessageactions'] = 'Gweithrediadau neges';
+$labels['arialabelcontactquicksearch'] = 'Ffurflen chwilio cysylltiadau';
+$labels['arialabelcontactsearchbox'] = 'Mewnbwn chwilio cyswllt';
+$labels['arialabelmessageheaders'] = 'Pennynau neges';
+$labels['arialabelforwardingoptions'] = 'Dewisiadau anfon ymlaen';
+$labels['arialabelreplyalloptions'] = 'Dewisiadau ymateb i bawb';
+$labels['arialabelmoremessageactions'] = 'Mwy o weithrediadau neges';
+$labels['arialabelmarkmessagesas'] = 'Nodi y negeseuon dewiswyd fel...';
+$labels['arialabelcomposeoptions'] = 'Dewisiadau ysgrifennu';
+$labels['arialabelresponsesmenu'] = 'Bwydlen ymatebion parod';
+$labels['arialabelattachmentuploadform'] = 'Ffurflen uwchlwytho atodiad';
+$labels['arialabelattachmentpreview'] = 'Rhagolwg atodiad';
+$labels['ariasummarycomposecontacts'] = 'Rhestr o gysylltiadau a grwpiau i ddewis fel derbynwyr';
+$labels['arialabelcontactexportoptions'] = 'Dewisiadau allforio cysylltiadau';
+$labels['arialabelabookgroupoptions'] = 'Dewisiadau grŵp/llyfr cyfeiriadau';
+$labels['arialabelpreferencesform'] = 'Ffurflen dewisiadau';
+$labels['arialabelidentityeditfrom'] = 'Ffurflen golygu personoliaeth';
+$labels['arialabelresonseeditfrom'] = 'Ffurflen golygu ymateb';
+$labels['arialabelsearchterms'] = 'Chwilio termau';
+$labels['helplistnavigation'] = 'Rhestru llywio bysellfwrdd';
+$labels['helplistkeyboardnavigation'] = "Saeth fyny/lawr: Symud dewis/ffocws dan sylw.
+Bwlch: Dewis rhes dan sylw.
+Shift + fyny/lawr; Dewis rhes ychwanegol uwchben/islaw.
+Ctrl + Bwlch: Ychwanegu rhes dan sylw i'r dewis/dileu o'r dewis.";
+$labels['helplistkeyboardnavmessages'] = "Saeth dde/chwith: ehangu/crebachu edefyn neges (yn modd edefynnau yn unig).
+Enter: Agor y neges dewiswyd/dan sylw.
+Delete: Symud y negeseuon dewiswyd i'r Sbwriel.";
+$labels['helplistkeyboardnavcontacts'] = "Enter: Agor y cyswllt dewiswyd/dan sylw.";
 ?>
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 8e0c1c276..6ab018fb9 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Mae\'r sesiwn yn anghywir neu wedi dod i ben.';
 $messages['storageerror'] = 'Methwyd cysylltu a\'r gweinydd storfa.';
 $messages['servererror'] = 'Gwall Gweinydd!';
 $messages['servererrormsg'] = 'Gwall Gweinydd: $msg';
+$messages['connerror'] = 'Gwall Cysylltiad (Methwyd cysylltu a\'r gweinydd)!';
 $messages['dberror'] = 'Gwall Cronfa Ddata!';
+$messages['windowopenerror'] = 'Fe ataliwyd y ffenest naid!';
 $messages['requesttimedout'] = 'Cais wedi dod i derfyn amser';
 $messages['errorreadonly'] = 'Methwyd gweithredu. Mae\'r ffolder yn darllen-yn-unig';
 $messages['errornoperm'] = 'Methwyd gweithredu. Gwrthodwyd caniatad';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Canfuwyd $nr cyswllt.';
 $messages['searchnomatch'] = 'Ni gafwyd hyd i unrhyw ganlyniadau chwilio';
 $messages['searching'] = 'Yn chwilio...';
 $messages['checking'] = 'Yn gofyn...';
+$messages['stillsearching'] = 'Dal i chwilio...';
 $messages['nospellerrors'] = 'Ni gafwyd hyd i unrhyw wallau gwirio';
 $messages['folderdeleted'] = 'Dilëwyd y ffolder yn llwyddiannus';
 $messages['foldersubscribed'] = 'Ffolder wedi ei danysgrifio yn llwyddiannus';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Mewnforiwyd $nr neges yn llwyddiannus';
 $messages['importmessageerror'] = 'Methwyd mewnforio! Nid yw\'r ffeil a lwythwyd yn ffeil neges neu blwch ebost dilys';
 $messages['opnotpermitted'] = 'Ni chaniateir y weithred!';
 $messages['nofromaddress'] = 'Cyfeiriad e-bost ar goll yn y personoliaeth a ddewiswyd';
-$messages['editorwarning'] = 'Mi fydd newid i\'r golygydd testun plaen yn golygu byddwch chi\'n colli unrhyw arddulliau yn eich testun. Hoffech chi barhau?';
+$messages['editorwarning'] = 'Fe allai newid math y golygydd testun olygu byddwch yn colli unrhyw arddulliau yn eich testun? Hoffech chi barhau?';
 $messages['httpreceivedencrypterror'] = 'Fe gafwyd gwall angheuol yn y ffurfweddiad. Cysylltwch â\'ch gweinyddwr ar unwaith. <b>Nid oedd yn bosib dangos eich neges.</b>';
 $messages['smtpconnerror'] = 'Gwall SMTP ($code): Methwyd cysylltu a\'r gweinydd';
 $messages['smtpautherror'] = 'Gwall SMTP ($code): Methwyd dilysu\'r cyfrif';
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 66103ad63..5e6834912 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Flere funktioner...';
 $labels['more']             = 'Mere';
 $labels['back']             = 'Tilbage';
 $labels['options']          = 'Indstillinger';
+$labels['first'] = 'Første';
+$labels['last'] = 'Sidste';
+$labels['previous'] = 'Forrige';
+$labels['next'] = 'Næste';
 $labels['select'] = 'Vælg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
 $labels['currpage'] = 'Aktuel side';
+$labels['isread'] = 'Læs';
 $labels['unread'] = 'Ulæste';
 $labels['flagged'] = 'Markeret';
+$labels['unflagged'] = 'Ikke markeret';
 $labels['unanswered'] = 'Ubesvaret';
 $labels['withattachment'] = 'Med vedhæftning';
 $labels['deleted'] = 'Slettede';
 $labels['undeleted'] = 'Ikke slettet';
+$labels['replied'] = 'Besvaret';
+$labels['forwarded'] = 'Videresendt';
 $labels['invert'] = 'Invertér';
 $labels['filter'] = 'Filtrer';
 $labels['list'] = 'Liste';
@@ -171,6 +179,8 @@ $labels['importmessages'] = 'Importer beskeder';
 $labels['quota'] = 'Diskforbrug';
 $labels['unknown']  = 'ukendt';
 $labels['unlimited']  = 'ubegrænset';
+$labels['quotaused'] = 'Brugt';
+$labels['quotastorage'] = 'Disk plads';
 $labels['quicksearch']  = 'Hurtigsøg';
 $labels['resetsearch']  = 'Nulstil søgning';
 $labels['searchmod']  = 'Søgeparametre';
@@ -178,6 +188,9 @@ $labels['msgtext']  = 'Hele beskeden';
 $labels['body']  = 'Body';
 $labels['type'] = 'Type';
 $labels['namex'] = 'Navn';
+$labels['currentfolder'] = 'Nuværende mappe';
+$labels['subfolders'] = 'Denne og undermapper';
+$labels['allfolders'] = 'Alle mapper';
 $labels['openinextwin'] = 'Åbn i nyt vindue';
 $labels['emlsave'] = 'Download (.eml)';
 $labels['changeformattext'] = 'Vis i ren tekst format';
@@ -193,6 +206,10 @@ $labels['returnreceipt']  = 'Anmod om kvittering ved læst';
 $labels['dsn']            = 'Anmod om leveringsstatus';
 $labels['mailreplyintro'] = '$sender skrev den $date:';
 $labels['originalmessage'] = 'Original besked';
+$labels['selectimage']    = 'Vælg billede';
+$labels['addimage']       = 'Tilføje billede';
+$labels['selectmedia']    = 'Vælg video';
+$labels['addmedia']       = 'Tilføj video';
 $labels['editidents']    = 'Ret identiteter';
 $labels['spellcheck']    = 'Stav';
 $labels['checkspelling'] = 'Stavekontrol';
@@ -203,9 +220,10 @@ $labels['restoremessage'] = 'Gendan besked';
 $labels['responses'] = 'Svar';
 $labels['insertresponse'] = 'Indsæt et svar';
 $labels['manageresponses'] = 'Administrer svar';
-$labels['savenewresponse'] = 'Gem et nyt svar';
-$labels['editresponses'] = 'Rediger svar';
+$labels['savenewresponse'] = 'Opret ny svar';
+$labels['addresponse'] = 'Tilføj svar';
 $labels['editresponse'] = 'Rediger svar';
+$labels['editresponses'] = 'Rediger svar';
 $labels['responsename'] = 'Navn';
 $labels['responsetext'] = 'Svartekst';
 $labels['attach'] = 'Vedhæft';
@@ -270,6 +288,7 @@ $labels['assistant'] = 'Assistent';
 $labels['spouse'] = 'Ægtefælle/partner';
 $labels['allfields'] = 'Alle felter';
 $labels['search'] = 'Søg';
+$labels['searchresult'] = 'Søgeresultat ';
 $labels['advsearch'] = 'Avanceret søg';
 $labels['advanced'] = 'Avanceret';
 $labels['other'] = 'Andet';
@@ -288,11 +307,13 @@ $labels['typehomepage']  = 'Hjemmeside';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Tilføj felt...';
-$labels['addcontact'] = 'Tilføj ny kontakt';
+$labels['addcontact'] = 'Tilføj kontakt';
 $labels['editcontact'] = 'Redigér kontakt';
 $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Kontaktegenskaber';
+$labels['contactnameandorg'] = 'Navn og organisation';
 $labels['personalinfo'] = 'Personlig information';
+$labels['contactphoto'] = 'Kontaktfoto';
 $labels['edit']   = 'Redigér';
 $labels['cancel'] = 'Annullér';
 $labels['save']   = 'Gem';
@@ -301,7 +322,7 @@ $labels['rename'] = 'Omdøb';
 $labels['addphoto'] = 'Tilføj';
 $labels['replacephoto'] = 'Erstat';
 $labels['uploadphoto'] = 'Overfør billede';
-$labels['newcontact']     = 'Opret nyt kontaktkort';
+$labels['newcontact']     = 'Opret ny kontakt';
 $labels['deletecontact']  = 'Slet valgte kontakter';
 $labels['composeto']      = 'Skriv besked til';
 $labels['contactsfromto'] = 'Kontakter $from til $to af $count';
@@ -310,10 +331,12 @@ $labels['export']         = 'Eksportér';
 $labels['exportall']      = 'Eksporter alt';
 $labels['exportsel']      = 'Eksporter udvalgte';
 $labels['exportvcards']   = 'Eksportér kontakter i vCard format';
-$labels['newcontactgroup'] = 'Opret ny kontaktgruppe';
+$labels['newcontactgroup']       = 'Opret gruppe';
+$labels['addgroup']       = 'Tilføj gruppe';
 $labels['grouprename']    = 'Omdøb gruppe';
 $labels['groupdelete']    = 'Slet gruppe';
 $labels['groupremoveselected'] = 'Fjern markerede kontakter fra gruppen';
+$labels['uponelevel']     = 'Et niveau op';
 $labels['previouspage']   = 'Vis den forrige side';
 $labels['firstpage']      = 'Vis første side';
 $labels['nextpage']       = 'Vis næste side';
@@ -340,10 +363,10 @@ $labels['preferences'] = 'Indstillinger';
 $labels['userpreferences'] = 'Brugerindstillinger';
 $labels['editpreferences'] = 'Redigér brugerindstillinger';
 $labels['identities'] = 'Identiteter';
-$labels['manageidentities'] = 'Styr identiteterne for denne konto';
-$labels['newidentity'] = 'Ny identitet';
-$labels['newitem'] = 'Nyt punkt';
-$labels['edititem'] = 'Redigér punkt';
+$labels['manageidentities'] = 'Administrer identiteter ';
+$labels['newidentity'] = 'Opret ny identitet ';
+$labels['addidentity'] = 'Tilføj identitet';
+$labels['edititem'] = 'Rediger identitet';
 $labels['preferhtml'] = 'Vis HTML';
 $labels['defaultcharset'] = 'Standard tegnkodning';
 $labels['htmlmessage'] = 'HTML-besked';
@@ -400,7 +423,9 @@ $labels['2231folding'] = 'Fuld RFC 2231 understøttelse (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 understøttelse (MS Outlook)';
 $labels['2047folding'] = 'Fuld RFC 2047 understøttelse (andre)';
 $labels['force7bit'] = 'Brug MIME indkodning for 8-bits tegn';
+$labels['savelocalstorage'] = " ";
 $labels['advancedoptions'] = 'Avancerede indstillinger';
+$labels['toggleadvancedoptions'] = 'Skift avancerede indstillinger';
 $labels['focusonnewmessage'] = 'Fokusér browservindue når der kommer nye beskeder';
 $labels['checkallfolders'] = 'Tjek alle mapper for nye beskeder';
 $labels['displaynext'] = 'Efter slet/flyt besked, vis næste besked';
@@ -442,14 +467,14 @@ $labels['asattachment'] = 'som vedhæftning';
 $labels['replyallmode'] = 'Standardhandling til [Svar alle]-knap';
 $labels['replyalldefault'] = 'Svar til alle';
 $labels['replyalllist'] = 'svar kun til mail-liste (hvis fundet)';
-$labels['folder']  = 'Mappe';
-$labels['folders']  = 'Mapper';
-$labels['foldername']  = 'Mappenavn';
-$labels['subscribed']  = 'Abonneret';
+$labels['folder'] = 'Mappe';
+$labels['folders'] = 'Mapper';
+$labels['foldername'] = 'Mappenavn';
+$labels['subscribed'] = 'Abonneret';
 $labels['messagecount'] = 'Beskeder';
-$labels['create']  = 'Opret';
-$labels['createfolder']  = 'Opret ny mappe';
-$labels['managefolders']  = 'Administrér mapper';
+$labels['create'] = 'Opret';
+$labels['createfolder'] = 'Opret ny mappe';
+$labels['managefolders'] = 'Administrér mapper';
 $labels['specialfolders'] = 'Specielle mapper';
 $labels['properties'] = 'Egenskaber';
 $labels['folderproperties'] = 'Mappeegenskaber';
@@ -459,9 +484,13 @@ $labels['info'] = 'Information';
 $labels['getfoldersize'] = 'Klik for at tjekke mappestørrelse';
 $labels['changesubscription'] = 'Klik for at ændre abonnement';
 $labels['foldertype'] = 'Mappetype';
-$labels['personalfolder']  = 'Privat mappe';
-$labels['otherfolder']  = 'Anden brugers mappe';
-$labels['sharedfolder']  = 'Offentlig mappe';
+$labels['personalfolder'] = 'Privat mappe';
+$labels['otherfolder'] = 'Anden brugers mappe';
+$labels['sharedfolder'] = 'Offentlig mappe';
+$labels['findfolders'] = 'Find mapper';
+$labels['namespace.personal'] = 'Personlig';
+$labels['namespace.other'] = 'Andre brugere';
+$labels['namespace.shared'] = 'Del';
 $labels['sortby'] = 'Sortér efter';
 $labels['sortasc']  = 'Ældste først';
 $labels['sortdesc'] = 'Nyeste først';
@@ -494,4 +523,12 @@ $labels['vietnamese'] = 'Vietnamesisk';
 $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
+$labels['arialabeltopnav'] = 'Vindueskontrol';
+$labels['arialabeltasknav'] = 'Application opgaver';
+$labels['arialabelactivetask'] = 'Aktiv opgave';
+$labels['arialabelmessagessearchfilter'] = 'E-mail filter';
+$labels['arialabelmailsearchform'] = 'E-mail søgeform';
+$labels['arialabelcontactsearchform'] = 'Kontakt søgeform';
+$labels['arialabelmailquicksearchbox'] = 'E-mail søgeinput';
+$labels['arialabelquicksearchbox'] = 'Søge input';
 ?>
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index 4a567aed8..61f35b23d 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Din session er ugyldig eller udløbet.';
 $messages['storageerror'] = 'Forbindelse til e-mailserveren fejlede.';
 $messages['servererror'] = 'Server fejl!';
 $messages['servererrormsg'] = 'Server fejl: $msg';
+$messages['connerror'] = 'Forbindelsesfejl (kunne ikke oprette forbindelse til server)!';
 $messages['dberror'] = 'Database fejl!';
+$messages['windowopenerror'] = 'Popup-vinduet blev blokeret!';
 $messages['requesttimedout'] = 'Forespørgselstiden udløb';
 $messages['errorreadonly'] = 'Kunne ikke udføre den ønskede handling. Mappen er skrivebeskyttet.';
 $messages['errornoperm'] = 'Kunne ikke udføre den ønskede handling. Adgang nægtet.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Fandt $nr kontakter.';
 $messages['searchnomatch'] = 'Søgningen fandt ingen beskeder.';
 $messages['searching'] = 'Søger...';
 $messages['checking'] = 'Tjekker...';
+$messages['stillsearching'] = 'Søger stadig...';
 $messages['nospellerrors'] = 'Ingen stavefejl fundet.';
 $messages['folderdeleted'] = 'Mappen er slettet.';
 $messages['foldersubscribed'] = 'Mappe-abonnement oprettet.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Importerede $nr beskeder';
 $messages['importmessageerror'] = 'Import mislykkedes! Den uploadede fil er ikke en gyldig besked eller mailbox-fil';
 $messages['opnotpermitted'] = 'Handlingen er ikke tilladt!';
 $messages['nofromaddress'] = 'Der mangler en e-mailadresse i den valgte identitet.';
-$messages['editorwarning'] = 'Al formatering af teksten forsvinder, hvis der skiftes til ren tekst. Vil du fortsætte?';
+$messages['editorwarning'] = 'Al formatering af teksten kan forsvinde, hvis der skiftes editor Vil du fortsætte?';
 $messages['httpreceivedencrypterror'] = 'Der er opstået en fatal konfigurationsfejl. Kontakt venligst din system-administrator med det samme. <b>Din besked kunne ikke afsendes.</b>';
 $messages['smtpconnerror'] = 'SMTP fejl ($code): Forbindelsen til serveren afbrudt';
 $messages['smtpautherror'] = 'SMTP fejl ($code): Autenticering fejlede';
diff --git a/program/localization/de_CH/csv2vcard.inc b/program/localization/de_CH/csv2vcard.inc
index c6c2c5924..7d4b04d04 100644
--- a/program/localization/de_CH/csv2vcard.inc
+++ b/program/localization/de_CH/csv2vcard.inc
@@ -15,14 +15,7 @@
 | Author: Aleksander Machniak <alec@alec.pl>                            |
 +-----------------------------------------------------------------------+
 */
-
-// This is a list of CSV column names specified in CSV file header
-// These must be original texts used in Outlook/Thunderbird exported csv files
-// Encoding UTF-8
-
 $map = array();
-
-// MS Outlook 2010
 $map['anniversary'] = "Jahrestag";
 $map['assistants_name'] = "Name Assistent";
 $map['assistants_phone'] = "Telefon Assistent";
@@ -69,8 +62,6 @@ $map['spouse'] = "Spouse";
 $map['suffix'] = "Suffix";
 $map['title'] = "Title";
 $map['web_page'] = "Webseite";
-
-// Thunderbird
 $map['birth_day'] = "Geburtstag";
 $map['birth_month'] = "Geburtsmonat";
 $map['birth_year'] = "Geburtsjahr";
@@ -91,8 +82,6 @@ $map['work_phone'] = "Tel. dienstlich";
 $map['work_address'] = "Dienstlich: Adresse";
 $map['work_country'] = "Dienstlich: Land";
 $map['work_zipcode'] = "Dienstlich: PLZ";
-
-// Atmail
 $map['date_of_birth'] = "Date of Birth";
 $map['email'] = "Email";
 $map['home_mobile'] = "Home Mobile";
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index f53640ab5..039bfe113 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Mehr ...';
 $labels['more']             = 'Mehr';
 $labels['back']             = 'Zurück';
 $labels['options']          = 'Optionen';
+$labels['first'] = 'Erste';
+$labels['last'] = 'Letzte';
+$labels['previous'] = 'Vorherige';
+$labels['next'] = 'Nächste';
 $labels['select'] = 'Auswählen';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
 $labels['currpage'] = 'Aktuelle Seite';
+$labels['isread'] = 'Gelesen';
 $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
+$labels['unflagged'] = 'Nicht markiert';
 $labels['unanswered'] = 'Unbeantwortete';
 $labels['withattachment'] = 'Mit Anhang';
 $labels['deleted'] = 'Gelöschte';
 $labels['undeleted'] = 'Nicht gelöscht';
+$labels['replied'] = 'Beantwortet';
+$labels['forwarded'] = 'Weitergeleitet';
 $labels['invert'] = 'Umkehren';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Liste';
@@ -168,9 +176,14 @@ $labels['folderactions'] = 'Ordneraktionen...';
 $labels['compact'] = 'Packen';
 $labels['empty'] = 'Leeren';
 $labels['importmessages'] = 'Nachrichten importieren';
-$labels['quota'] = 'Verwendeter Speicherplatz';
+$labels['quota'] = 'Kapazität';
 $labels['unknown']  = 'unbekannt';
 $labels['unlimited']  = 'unlimitiert';
+$labels['quotatype'] = 'Kapazitätstyp';
+$labels['quotatotal'] = 'Limit';
+$labels['quotaused'] = 'Verwendet';
+$labels['quotastorage'] = 'Speicherplatz';
+$labels['quotamessage'] = 'Anzahl Nachrichten';
 $labels['quicksearch']  = 'Schnellsuche';
 $labels['resetsearch']  = 'Löschen';
 $labels['searchmod']  = 'Suchkriterien ändern';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Ganze Nachricht';
 $labels['body']  = 'Inhalt';
 $labels['type'] = 'Typ';
 $labels['namex'] = 'Name';
+$labels['searchscope'] = 'Suchbereich';
+$labels['currentfolder'] = 'Aktueller Ordner';
+$labels['subfolders'] = 'Aktueller und Unterordner';
+$labels['allfolders'] = 'Alle Ordner';
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Herunterladen (.eml)';
 $labels['changeformattext'] = 'Als reiner Text anzeigen';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Empfangsbestätigung (MDN)';
 $labels['dsn']            = 'Übermittlungsbestätigung (DSN)';
 $labels['mailreplyintro'] = 'Am $date, schrieb $sender:';
 $labels['originalmessage'] = 'Originalnachricht';
+$labels['selectimage']    = 'Bild auswählen';
+$labels['addimage']       = 'Bild hinzufügen';
+$labels['selectmedia']    = 'Video auswählen';
+$labels['addmedia']       = 'Video hinzufügen';
 $labels['editidents']    = 'Absender bearbeiten';
 $labels['spellcheck']    = 'Rechtschreibung';
 $labels['checkspelling'] = 'Rechtschreibung prüfen';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'Nachricht wiederherstellen?';
 $labels['responses'] = 'Antworten';
 $labels['insertresponse'] = 'Antwort einfügen';
 $labels['manageresponses'] = 'Antworten verwalten';
-$labels['savenewresponse'] = 'Neue Antwort speichern';
-$labels['editresponses'] = 'Antworten bearbeiten';
+$labels['savenewresponse'] = 'Neue Antwort erstellen';
+$labels['addresponse'] = 'Antwort hinzufügen';
 $labels['editresponse'] = 'Antwort bearbeiten';
+$labels['editresponses'] = 'Antworten bearbeiten';
 $labels['responsename'] = 'Name';
 $labels['responsetext'] = 'Antworttext';
 $labels['attach'] = 'Anhängen';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Hochladen';
 $labels['uploadprogress'] = '$percent ($current von $total)';
 $labels['close']  = 'Schliessen';
 $labels['messageoptions']  = 'Optionen...';
+$labels['togglecomposeoptions'] = 'Nachrichten-Optionen ein-/ausblenden';
 $labels['low']     = 'Niedrig';
 $labels['lowest']  = 'Niedrigste';
 $labels['normal']  = 'Normal';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Assistent';
 $labels['spouse'] = 'Partner/in';
 $labels['allfields'] = 'Alle Felder';
 $labels['search'] = 'Suche';
+$labels['searchresult'] = 'Suchresultat';
 $labels['advsearch'] = 'Erweiterte Suche';
 $labels['advanced'] = 'Erweitert';
 $labels['other'] = 'Andere';
@@ -292,7 +316,9 @@ $labels['addcontact'] = 'Kontakt hinzufügen';
 $labels['editcontact'] = 'Kontakt bearbeiten';
 $labels['contacts'] = 'Kontakte';
 $labels['contactproperties'] = 'Kontaktdaten';
+$labels['contactnameandorg'] = 'Name und Organisation';
 $labels['personalinfo'] = 'Persönliche Informationen';
+$labels['contactphoto'] = 'Kontakt-Bild';
 $labels['edit']   = 'Bearbeiten';
 $labels['cancel'] = 'Abbrechen';
 $labels['save']   = 'Speichern';
@@ -310,10 +336,12 @@ $labels['export']         = 'Exportieren';
 $labels['exportall']      = 'Alle exportieren';
 $labels['exportsel']      = 'Ausgewählte exportieren';
 $labels['exportvcards']   = 'Kontakte im vCard-Format exportieren';
-$labels['newcontactgroup'] = 'Neue Adressgruppe erstellen';
+$labels['newcontactgroup']       = 'Neue Addressgruppe erstellen';
+$labels['addgroup']       = 'Gruppe hinzufügen';
 $labels['grouprename']    = 'Gruppe umbenennen';
 $labels['groupdelete']    = 'Gruppe löschen';
 $labels['groupremoveselected'] = 'Gewählte Kontakte aus Gruppe entfernen';
+$labels['uponelevel']     = 'Eine Ebene nach oben';
 $labels['previouspage']   = 'Eine Seite zurück';
 $labels['firstpage']      = 'Erste Seite';
 $labels['nextpage']       = 'Nächste Seite';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Einstellungen';
 $labels['userpreferences'] = 'Benutzereinstellungen';
 $labels['editpreferences'] = 'Einstellungen bearbeiten';
 $labels['identities'] = 'Absender';
-$labels['manageidentities'] = 'Absender für dieses Konto verwalten';
-$labels['newidentity'] = 'Neuer Absender';
-$labels['newitem'] = 'Neuer Eintrag';
-$labels['edititem'] = 'Eintrag bearbeiten';
+$labels['manageidentities'] = 'Absender verwalten';
+$labels['newidentity'] = 'Neuen Absender erfassen';
+$labels['addidentity'] = 'Absender hinzufügen';
+$labels['edititem'] = 'Absender bearbeiten';
 $labels['preferhtml'] = 'HTML bevorzugen';
 $labels['defaultcharset'] = 'Standard-Zeichensatz';
 $labels['htmlmessage'] = 'HTML Nachricht';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'Vollständig RFC 2231 kompatibel (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 kompatibel (Microsoft Outlook)';
 $labels['2047folding'] = 'Vollständig RFC 2047 kompatibel (andere)';
 $labels['force7bit'] = 'MIME-Kodierung für 8-bit Zeichen';
+$labels['savelocalstorage'] = "Im Browser speichern (temporär)";
 $labels['advancedoptions'] = 'Erweiterte Einstellungen';
+$labels['toggleadvancedoptions'] = 'Erweiterte Einstellungen ein-/ausblenden';
 $labels['focusonnewmessage'] = 'Fokussiere Browserfenster bei neuen Nachrichten';
 $labels['checkallfolders'] = 'Alle Ordner auf neue Nachrichten prüfen';
 $labels['displaynext'] = 'Zeige nächste Nachricht nach verschieben/löschen';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'als Anhang';
 $labels['replyallmode'] = 'Standard Funktion für [Allen antworten]';
 $labels['replyalldefault'] = 'Allen antworten';
 $labels['replyalllist'] = 'Nur der Mailing-Liste antworten (falls vorhanden)';
-$labels['folder']  = 'Ordner';
-$labels['folders']  = 'Ordner';
-$labels['foldername']  = 'Ordnername';
-$labels['subscribed']  = 'Abonniert';
+$labels['folder'] = 'Ordner';
+$labels['folders'] = 'Ordner';
+$labels['foldername'] = 'Ordnername';
+$labels['subscribed'] = 'Abonniert';
 $labels['messagecount'] = 'Nachrichten';
-$labels['create']  = 'Erstellen';
-$labels['createfolder']  = 'Neuen Ordner erstellen';
-$labels['managefolders']  = 'Ordner verwalten';
+$labels['create'] = 'Erstellen';
+$labels['createfolder'] = 'Neuen Ordner erstellen';
+$labels['managefolders'] = 'Ordner verwalten';
 $labels['specialfolders'] = 'Spezialordner';
 $labels['properties'] = 'Eigenschaften';
 $labels['folderproperties'] = 'Ordnereigenschaften';
@@ -459,9 +489,13 @@ $labels['info'] = 'Informationen';
 $labels['getfoldersize'] = 'Ordnergrösse anzeigen';
 $labels['changesubscription'] = 'Abonnieren';
 $labels['foldertype'] = 'Ordnertyp';
-$labels['personalfolder']  = 'Privater Ordner';
-$labels['otherfolder']  = 'Order eines anderen Benutzers';
-$labels['sharedfolder']  = 'Öffentlicher Ordner';
+$labels['personalfolder'] = 'Privater Ordner';
+$labels['otherfolder'] = 'Order eines anderen Benutzers';
+$labels['sharedfolder'] = 'Öffentlicher Ordner';
+$labels['findfolders'] = 'Ordner suchen';
+$labels['namespace.personal'] = 'Persönlich';
+$labels['namespace.other'] = 'Andere Benutzer';
+$labels['namespace.shared'] = 'Freigegeben';
 $labels['sortby'] = 'Sortieren nach';
 $labels['sortasc']  = 'aufsteigend sortieren';
 $labels['sortdesc'] = 'absteigend sortieren';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamesisch';
 $labels['japanese'] = 'Japanisch';
 $labels['korean'] = 'Koreanisch';
 $labels['chinese'] = 'Chinesisch';
+$labels['arialabeltopnav'] = 'Fensterkontrolle';
+$labels['arialabeltasknav'] = 'Anwendungsbereiche';
+$labels['arialabeltoolbar'] = 'Funktionsleiste';
+$labels['arialabelactivetask'] = 'Aktive Anwendung';
+$labels['arialabelmessagessearchfilter'] = 'Nachrichtenfilter';
+$labels['arialabelmailsearchform'] = 'Nachrichtensuche';
+$labels['arialabelcontactsearchform'] = 'Kontaktsuche';
+$labels['arialabelmailquicksearchbox'] = 'Nachrichten-Sucheingabe';
+$labels['arialabelquicksearchbox'] = 'Sucheingabe';
+$labels['arialabelfoldersearchfilter'] = 'Ordnerfilter';
+$labels['arialabelfoldersearchform'] = 'Ordnersuche';
+$labels['arialabelfolderlist'] = 'Ordner-Auswahl';
+$labels['arialabelmessagelist'] = 'Nachrichtenliste';
+$labels['arialabelmailpreviewframe'] = 'Nachrichtenvorschau';
+$labels['arialabelmailboxmenu'] = 'Ordneraktionen-Menü';
+$labels['arialabellistselectmenu'] = 'Nachrichtenauswahl-Menü';
+$labels['arialabelthreadselectmenu'] = 'Konversationsauswahl-Menü';
+$labels['arialabelmessagelistoptions'] = 'Einstellungen zur Nachrichten-Anzeige und -sortierung';
+$labels['arialabelmailimportdialog'] = 'Nachrichten-Import Dialog';
+$labels['arialabelmessagenav'] = 'Nachrichten-Navigation';
+$labels['arialabelmessagebody'] = 'Nachrichtentext';
+$labels['arialabelmessageactions'] = 'Nachrichten-Aktionen';
+$labels['arialabelcontactquicksearch'] = 'Kontaktsuche';
+$labels['arialabelcontactsearchbox'] = 'Sucheingabe';
+$labels['arialabelmessageheaders'] = 'Nachrichten-Kopfzeilen';
+$labels['arialabelforwardingoptions'] = 'Weiterleitungsoptionen';
+$labels['arialabelreplyalloptions'] = 'Beantwortungsoptionen';
+$labels['arialabelmoremessageactions'] = 'Weitere Nachricht-Aktionen';
+$labels['arialabelmarkmessagesas'] = 'Ausgewählte Nachrichten markieren als...';
+$labels['arialabelcomposeoptions'] = 'Nachrichten-Verfassungs-Optionen';
+$labels['arialabelresponsesmenu'] = 'Gespeicherte Antworten Menü';
+$labels['arialabelattachmentuploadform'] = 'Anhang hochladen (Dateiauswahl)';
+$labels['arialabelattachmentpreview'] = 'Dateivorschau';
+$labels['ariasummarycomposecontacts'] = 'Kontakte und Adressgruppen zur Auswahl als Empfänger';
+$labels['arialabelcontactexportoptions'] = 'Export-Optionen';
+$labels['arialabelabookgroupoptions'] = 'Adressbuch/Adressgruppen-Optionen';
+$labels['arialabelpreferencesform'] = 'Einstellungen (Formular)';
+$labels['arialabelidentityeditfrom'] = 'Absender bearbeiten (Formular)';
+$labels['arialabelresonseeditfrom'] = 'Antwort bearbeiten (Formular)';
+$labels['arialabelsearchterms'] = 'Suchbegriffe';
+$labels['helplistnavigation'] = 'Tastatur-Navigation in der Liste';
+$labels['helplistkeyboardnavigation'] = "Pfeiltasten Auf/Ab: Bewege Zeilenauswahl/Fokus.
+Leertaste: Fokussierte Zeile auswählen.
+Shift + Auf/Ab: Zeile darüber/darunter auswählen.
+Ctrl + Leertaste: Fokussierte Zeile der Auswahl hinzufügen/entfernen.";
+$labels['helplistkeyboardnavmessages'] = "Pfeiltasten Rechts/Links: Konversation auf-/zuklappen.
+Eingabe: Ausgewählte/fokussierte Nachricht öffnen.
+Löschen: Ausgewählte Nachricht in den Papierkorb verschieben resp. löschen.";
+$labels['helplistkeyboardnavcontacts'] = "Eingabe: Ausgewählten Kontakt öffnen.";
 ?>
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index 63a1411d0..5e58b85ae 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen';
 $messages['storageerror'] = 'Keine Verbindung zum IMAP Server';
 $messages['servererror'] = 'Serverfehler!';
 $messages['servererrormsg'] = 'Serverfehler: $msg';
+$messages['connerror'] = 'Verbindungsfehler (Server nicht erreichbar)!';
 $messages['dberror'] = 'Datenbankfehler!';
+$messages['windowopenerror'] = 'Das Popup-Fenster wurde blockiert!';
 $messages['requesttimedout'] = 'Zeitlimit überschritten';
 $messages['errorreadonly'] = 'Die Aktion kann nicht ausgeführt werden. Der Ordner ist schreibgeschützt.';
 $messages['errornoperm'] = 'Die Aktion kann nicht ausgeführt werden. Zugriff verweigert.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr Kontakte gefunden.';
 $messages['searchnomatch'] = 'Die Suche lieferte keine Treffer.';
 $messages['searching'] = 'Suche...';
 $messages['checking'] = 'Überprüfung...';
+$messages['stillsearching'] = 'Suche läuft...';
 $messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden.';
 $messages['folderdeleted'] = 'Der Ordner wurde erfolgreich gelöscht.';
 $messages['foldersubscribed'] = 'Der Ordner wurde erfolgreich abonniert.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = '$nr Nachricht(n) erfolgreich importiert';
 $messages['importmessageerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist keine E-Mail-Nachricht oder Mailbox-Datei.';
 $messages['opnotpermitted'] = 'Operation nicht erlaubt!';
 $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['editorwarning'] = 'Ein Wechsel des Editors kann zu Verlust der Textformatierungen führen. Wollen 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.';
diff --git a/program/localization/de_DE/csv2vcard.inc b/program/localization/de_DE/csv2vcard.inc
index 116349d28..fa3317bab 100644
--- a/program/localization/de_DE/csv2vcard.inc
+++ b/program/localization/de_DE/csv2vcard.inc
@@ -15,14 +15,7 @@
 | Author: Aleksander Machniak <alec@alec.pl>                            |
 +-----------------------------------------------------------------------+
 */
-
-// This is a list of CSV column names specified in CSV file header
-// These must be original texts used in Outlook/Thunderbird exported csv files
-// Encoding UTF-8
-
 $map = array();
-
-// MS Outlook 2010
 $map['anniversary'] = "Jahrestag";
 $map['assistants_name'] = "Name Assistent";
 $map['assistants_phone'] = "Telefon Assistent";
@@ -69,8 +62,6 @@ $map['spouse'] = "Spouse";
 $map['suffix'] = "Suffix";
 $map['title'] = "Title";
 $map['web_page'] = "Webseite";
-
-// Thunderbird
 $map['birth_day'] = "Geburtstag";
 $map['birth_month'] = "Geburtsmonat";
 $map['birth_year'] = "Geburtsjahr";
@@ -91,8 +82,6 @@ $map['work_phone'] = "Tel. dienstlich";
 $map['work_address'] = "Dienstlich: Adresse";
 $map['work_country'] = "Dienstlich: Land";
 $map['work_zipcode'] = "Dienstlich: PLZ";
-
-// Atmail
 $map['date_of_birth'] = "Date of Birth";
 $map['email'] = "Email";
 $map['home_mobile'] = "Home Mobile";
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index e0a347e42..97c605e3d 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Mehr...';
 $labels['more']             = 'Mehr';
 $labels['back']             = 'Zurück';
 $labels['options']          = 'Optionen';
+$labels['first'] = 'Erste(r)';
+$labels['last'] = 'Letzte(r)';
+$labels['previous'] = 'Vorherige(r)';
+$labels['next'] = 'Nächste(r)';
 $labels['select'] = 'Auswahl';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
 $labels['currpage'] = 'Aktuelle Seite';
+$labels['isread'] = 'Gelesen';
 $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
+$labels['unflagged'] = 'Nicht gekennzeichnet';
 $labels['unanswered'] = 'Unbeantwortete';
 $labels['withattachment'] = 'Mit Anhang';
 $labels['deleted'] = 'Gelöschte';
 $labels['undeleted'] = 'Nicht gelöscht';
+$labels['replied'] = 'Beantwortet';
+$labels['forwarded'] = 'Weitergeleitet';
 $labels['invert'] = 'Invertieren';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Liste';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Nachrichten importieren';
 $labels['quota'] = 'Speicherplatz';
 $labels['unknown']  = 'unbekannt';
 $labels['unlimited']  = 'unbegrenzt';
+$labels['quotatype'] = 'Kapazitätstyp';
+$labels['quotatotal'] = 'Limit';
+$labels['quotaused'] = 'Verwendet';
+$labels['quotastorage'] = 'Festplattenspeicher';
+$labels['quotamessage'] = 'Nachrichtenanzahl';
 $labels['quicksearch']  = 'Schnellsuche';
 $labels['resetsearch']  = 'Suche zurücksetzen';
 $labels['searchmod']  = 'Suchkriterien ändern';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Nachricht';
 $labels['body']  = 'Inhalt';
 $labels['type'] = 'Typ';
 $labels['namex'] = 'Name';
+$labels['searchscope'] = 'Bereich';
+$labels['currentfolder'] = 'Aktueller Ordner';
+$labels['subfolders'] = 'Dieser und alle Unterordner';
+$labels['allfolders'] = 'Alle Ordner';
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Lokal speichern (.eml)';
 $labels['changeformattext'] = 'Als reiner Text anzeigen';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Empfangsbestätigung (MDN)';
 $labels['dsn']            = 'Übermittlungsbestätigung (DSN)';
 $labels['mailreplyintro'] = 'Am $date, schrieb $sender:';
 $labels['originalmessage'] = 'Originalnachricht';
+$labels['selectimage']    = 'Bild auswählen';
+$labels['addimage']       = 'Bild hinzufügen';
+$labels['selectmedia']    = 'Film auswählen';
+$labels['addmedia']       = 'Film hinzufügen';
 $labels['editidents']    = 'Absender ändern';
 $labels['spellcheck']    = 'Rechtschreibung';
 $labels['checkspelling'] = 'Rechtschreibung prüfen';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'Nachricht wiederherstellen?';
 $labels['responses'] = 'Schnellantworten';
 $labels['insertresponse'] = 'Schnellantwort hinzufügen';
 $labels['manageresponses'] = 'Schnellantworten verwalten';
-$labels['savenewresponse'] = 'Neue Schnellantwort speichern';
-$labels['editresponses'] = 'Schnellantworten bearbeiten';
+$labels['savenewresponse'] = 'Neue Antwort erstellen';
+$labels['addresponse'] = 'Antwort hinzufügen';
 $labels['editresponse'] = 'Schnellantwort bearbeiten';
+$labels['editresponses'] = 'Schnellantworten bearbeiten';
 $labels['responsename'] = 'Name';
 $labels['responsetext'] = 'Text der Antwort';
 $labels['attach'] = 'Anhängen';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Hochladen';
 $labels['uploadprogress'] = '$percent ($current von $total)';
 $labels['close']  = 'Schließen';
 $labels['messageoptions']  = 'Optionen...';
+$labels['togglecomposeoptions'] = 'Zusammenstellungsoptionen auswählen';
 $labels['low']     = 'Niedrig';
 $labels['lowest']  = 'Niedrigste';
 $labels['normal']  = 'Normal';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Assistenz';
 $labels['spouse'] = 'Partner/in';
 $labels['allfields'] = 'Alle Felder';
 $labels['search'] = 'Suche';
+$labels['searchresult'] = 'Suchergebnis';
 $labels['advsearch'] = 'Detaillierte Suche';
 $labels['advanced'] = 'Erweitert';
 $labels['other'] = 'Andere';
@@ -292,7 +316,9 @@ $labels['addcontact'] = 'Kontakt hinzufügen';
 $labels['editcontact'] = 'Kontakt bearbeiten';
 $labels['contacts'] = 'Kontakte';
 $labels['contactproperties'] = 'Kontaktdaten';
+$labels['contactnameandorg'] = 'Name und Organisation';
 $labels['personalinfo'] = 'Persönliche Informationen';
+$labels['contactphoto'] = 'Foto des Kontakts';
 $labels['edit']   = 'Bearbeiten';
 $labels['cancel'] = 'Abbrechen';
 $labels['save']   = 'Speichern';
@@ -310,10 +336,12 @@ $labels['export']         = 'Exportieren';
 $labels['exportall']      = 'Alles exportieren';
 $labels['exportsel']      = 'Auswahl exportieren';
 $labels['exportvcards']   = 'Kontakte im vCard-Format exportieren';
-$labels['newcontactgroup'] = 'Neue Kontaktgruppe erstellen';
+$labels['newcontactgroup']       = 'Neue Gruppe erstellen';
+$labels['addgroup']       = 'Gruppe hinzufügen';
 $labels['grouprename']    = 'Gruppe umbenennen';
 $labels['groupdelete']    = 'Gruppe löschen';
 $labels['groupremoveselected'] = 'Gewählte Kontakte aus Gruppe entfernen';
+$labels['uponelevel']     = 'Eine Ebene nach oben';
 $labels['previouspage']   = 'Seite zurück';
 $labels['firstpage']      = 'Erste Seite';
 $labels['nextpage']       = 'Nächste Seite';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Einstellungen';
 $labels['userpreferences'] = 'Benutzereinstellungen';
 $labels['editpreferences'] = 'Benutzereinstellungen bearbeiten';
 $labels['identities'] = 'Identitäten';
-$labels['manageidentities'] = 'Absender für dieses Konto verwalten';
-$labels['newidentity'] = 'Neuer Absender';
-$labels['newitem'] = 'Neuer Eintrag';
-$labels['edititem'] = 'Eintrag bearbeiten';
+$labels['manageidentities'] = 'Identitäten verwalten';
+$labels['newidentity'] = 'Neue Identität erstellen';
+$labels['addidentity'] = 'Identität hinzufügen';
+$labels['edititem'] = 'Identität bearbeiten';
 $labels['preferhtml'] = 'HTML anzeigen';
 $labels['defaultcharset'] = 'Standard Zeichensatz';
 $labels['htmlmessage'] = 'HTML-Nachricht';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'vollständig RFC 2231 kompatibel (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 kompatibel (Microsoft Outlook)';
 $labels['2047folding'] = 'vollständig RFC 2047 kompatibel (andere)';
 $labels['force7bit'] = 'MIME-Kodierung für 8-bit Zeichen';
+$labels['savelocalstorage'] = "Vorübergehend lokal im Browser speichern";
 $labels['advancedoptions'] = 'Erweiterte Einstellungen';
+$labels['toggleadvancedoptions'] = 'Erweiterte Optionen auswählen';
 $labels['focusonnewmessage'] = 'Fokussiere Browserfenster bei neuen Nachrichten';
 $labels['checkallfolders'] = 'Alle Ordner auf neue Nachrichten prüfen';
 $labels['displaynext'] = 'Zeige nächste Nachricht nach verschieben/löschen';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'als Anhang';
 $labels['replyallmode'] = 'Standardaktion des "Allen antworten" Button';
 $labels['replyalldefault'] = 'Allen antworten';
 $labels['replyalllist'] = 'Nur der Mailingliste antworten (wenn gefunden)';
-$labels['folder']  = 'Ordner';
-$labels['folders']  = 'Ordner';
-$labels['foldername']  = 'Ordnername';
-$labels['subscribed']  = 'Abonniert';
+$labels['folder'] = 'Ordner';
+$labels['folders'] = 'Ordner';
+$labels['foldername'] = 'Ordnername';
+$labels['subscribed'] = 'Abonniert';
 $labels['messagecount'] = 'Nachrichten';
-$labels['create']  = 'Erstellen';
-$labels['createfolder']  = 'Neuen Ordner erstellen';
-$labels['managefolders']  = 'Ordner verwalten';
+$labels['create'] = 'Erstellen';
+$labels['createfolder'] = 'Neuen Ordner erstellen';
+$labels['managefolders'] = 'Ordner verwalten';
 $labels['specialfolders'] = 'Spezialordner';
 $labels['properties'] = 'Eigenschaften';
 $labels['folderproperties'] = 'Ordnereigenschaften';
@@ -459,9 +489,13 @@ $labels['info'] = 'Informationen';
 $labels['getfoldersize'] = 'Ordnergröße anzeigen';
 $labels['changesubscription'] = 'Abonnieren';
 $labels['foldertype'] = 'Ordnertyp';
-$labels['personalfolder']  = 'Privater Ordner';
-$labels['otherfolder']  = 'Ordner eines anderen Benutzers';
-$labels['sharedfolder']  = 'Öffentlicher Ordner';
+$labels['personalfolder'] = 'Privater Ordner';
+$labels['otherfolder'] = 'Ordner eines anderen Benutzers';
+$labels['sharedfolder'] = 'Öffentlicher Ordner';
+$labels['findfolders'] = 'Suche Ordner';
+$labels['namespace.personal'] = 'Persönlich';
+$labels['namespace.other'] = 'Andere Benutzer';
+$labels['namespace.shared'] = 'Geteilt';
 $labels['sortby'] = 'Sortieren nach';
 $labels['sortasc']  = 'Aufsteigend sortieren';
 $labels['sortdesc'] = 'Absteigend sortieren';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamesisch';
 $labels['japanese'] = 'Japanisch';
 $labels['korean'] = 'Koreanisch';
 $labels['chinese'] = 'Chinesisch';
+$labels['arialabeltopnav'] = 'Fensterkontrolle';
+$labels['arialabeltasknav'] = 'Anwendungsaufgaben';
+$labels['arialabeltoolbar'] = 'Anwendungstoolbar';
+$labels['arialabelactivetask'] = 'Aktive Aufgabe';
+$labels['arialabelmessagessearchfilter'] = 'Filter für die E-Mailliste';
+$labels['arialabelmailsearchform'] = 'Suchmaske für E-Mails';
+$labels['arialabelcontactsearchform'] = 'Suchmaske für Kontakte';
+$labels['arialabelmailquicksearchbox'] = 'Eingabe für E-Mailsuche';
+$labels['arialabelquicksearchbox'] = 'Eingabe für Suche';
+$labels['arialabelfoldersearchfilter'] = 'Ordnerauflistungsfilter';
+$labels['arialabelfoldersearchform'] = 'Ordnersuchfeld';
+$labels['arialabelfolderlist'] = 'E-Mailordnerauswahl';
+$labels['arialabelmessagelist'] = 'Liste der E-Mailnachrichten';
+$labels['arialabelmailpreviewframe'] = 'Vorschau der Nachricht';
+$labels['arialabelmailboxmenu'] = 'Aktionsmenü für Ordner';
+$labels['arialabellistselectmenu'] = 'Aktionsmenü für Listen';
+$labels['arialabelthreadselectmenu'] = 'Listenmenü für Threads';
+$labels['arialabelmessagelistoptions'] = 'Nachrichtenauflistung und Sortierungsoptionen';
+$labels['arialabelmailimportdialog'] = 'Nachrichten-Import-Dialog';
+$labels['arialabelmessagenav'] = 'Nachrichtennavigation';
+$labels['arialabelmessagebody'] = 'Nachrichten-Body';
+$labels['arialabelmessageactions'] = 'Nachrichtenaktionen';
+$labels['arialabelcontactquicksearch'] = 'Kontaktsuchformular';
+$labels['arialabelcontactsearchbox'] = 'Kontakte Sucheingabe';
+$labels['arialabelmessageheaders'] = 'Nachrichten-Header';
+$labels['arialabelforwardingoptions'] = 'Weiterleitungsoptionen';
+$labels['arialabelreplyalloptions'] = 'Allen antworten-Optionen';
+$labels['arialabelmoremessageactions'] = 'Weitere Nachrichtenaktionen';
+$labels['arialabelmarkmessagesas'] = 'Ausgewählte Nachricht markieren als...';
+$labels['arialabelcomposeoptions'] = 'Erstellungsoptionen';
+$labels['arialabelresponsesmenu'] = 'Schnellantworten Menü';
+$labels['arialabelattachmentuploadform'] = 'Anhang Hochladeformular';
+$labels['arialabelattachmentpreview'] = 'Anhangvorschau';
+$labels['ariasummarycomposecontacts'] = 'Liste von Kontakten und Gruppen als Empfänger';
+$labels['arialabelcontactexportoptions'] = 'Kontakt-Export-Optionen';
+$labels['arialabelabookgroupoptions'] = 'Adressbuch/Gruppen-Optionen';
+$labels['arialabelpreferencesform'] = 'Einstellungsformular';
+$labels['arialabelidentityeditfrom'] = 'Identität Bearbeitungsformular';
+$labels['arialabelresonseeditfrom'] = 'Antwort Bearbeitungsformular';
+$labels['arialabelsearchterms'] = 'Suchbegriffe';
+$labels['helplistnavigation'] = 'Tastaturnavigation auflisten';
+$labels['helplistkeyboardnavigation'] = "Pfeil hoch/runter: Zeilenfokus/Zeilenselektion verschieben
+Leerzeichen: Selektiere ausgewählte Zeile
+Shift + Pfeil hoch/runter: Wähle weitere Zeilen oberhalb/unterhalb
+Strg + Leerzeichen: Gewählte Zeile zur/von der Auswahl hinzufügen/entfernen";
+$labels['helplistkeyboardnavmessages'] = "Pfeil rechts/links: Nachricht im Thread erweitern/einklappen (nur im Threadmodus)
+Enter: Öffne die ausgewählte/fokussierte Nachricht
+Rücktaste: Verschiebe gewählte Nachricht in den Mülleimer";
+$labels['helplistkeyboardnavcontacts'] = "Enter: Ausgewählten Kontakt öffnen.";
 ?>
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index d9e6d9687..23bd5cdbf 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Ihre Sitzung ist ungültig oder abgelaufen.';
 $messages['storageerror'] = 'Verbindung zum Speicherserver fehlgeschlagen.';
 $messages['servererror'] = 'Serverfehler!';
 $messages['servererrormsg'] = 'Serverfehler: $msg';
+$messages['connerror'] = 'Verbindungsfehler (Fehler beim Erreichen des Servers)!';
 $messages['dberror'] = 'Datenbankfehler!';
+$messages['windowopenerror'] = 'Das Popup-Fenster wurde blockiert!';
 $messages['requesttimedout'] = 'Zeitüberschreitung der Anforderung';
 $messages['errorreadonly'] = 'Die Aktion kann nicht ausgeführt werden. Der Ordner ist schreibgeschützt.';
 $messages['errornoperm'] = 'Die Aktion kann nicht ausgeführt werden. Zugriff verweigert.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr Kontakte gefunden.';
 $messages['searchnomatch'] = 'Die Suche lieferte keine Treffer.';
 $messages['searching'] = 'Suche...';
 $messages['checking'] = 'Prüfe...';
+$messages['stillsearching'] = 'Suche...';
 $messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden.';
 $messages['folderdeleted'] = 'Ordner erfolgreich gelöscht.';
 $messages['foldersubscribed'] = 'Der Ordner wurde erfolgreich abonniert.';
@@ -103,8 +106,8 @@ $messages['converting'] = 'Entferne Formatierungen...';
 $messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden.';
 $messages['fileuploaderror'] = 'Hochladen der Datei fehlgeschlagen.';
 $messages['filesizeerror'] = 'Die hochzuladende Datei überschreitet die Maximalgröße von $size.';
-$messages['copysuccess'] = 'Erfolgreich kopiert $ nr Kontakte.';
-$messages['movesuccess'] = 'Erfolgreich verschoben $ nr Kontakte.';
+$messages['copysuccess'] = 'Erfolgreich kopiert $nr Kontakte.';
+$messages['movesuccess'] = 'Erfolgreich verschoben $nr Kontakte.';
 $messages['copyerror'] = 'Die Kontakte konnten nicht kopiert werden.';
 $messages['moveerror'] = 'Die Kontakte konnten nicht verschoben werden.';
 $messages['sourceisreadonly'] = 'Das Adressverzeichnis kann nicht verändert werden.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Nachrichten $nr erfolgreich importiert';
 $messages['importmessageerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist keine gültige Importdatei.';
 $messages['opnotpermitted'] = 'Operation nicht erlaubt!';
 $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['editorwarning'] = 'Wenn sie den Editor wechseln, könnten Textformatierungen verloren gehen. Möchten sie fortfahren?';
 $messages['httpreceivedencrypterror'] = 'Ein fataler Konfigurationsfehler ist aufgetreten. Kontaktieren Sie bitte sofort Ihren Administrator. <b>Ihre Nachricht konnte nicht versendet werden.</b>';
 $messages['smtpconnerror'] = 'SMTP Fehler ($code): Die Verbindung ist fehlgeschlagen.';
 $messages['smtpautherror'] = 'SMTP Fehler ($code): Die Authentisierung ist fehlgeschlagen.';
@@ -146,7 +149,7 @@ $messages['smtperror'] = 'SMTP Fehler: $msg';
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
 $messages['toomanyrecipients'] = 'Zuviele Empfänger. Reduzieren Sie die Anzahl Empfängeradressen auf $max.';
 $messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max.';
-$messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen es erneut.';
+$messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen Sie es erneut.';
 $messages['contactdelerror'] = 'Fehler beim Löschen.';
 $messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht.';
 $messages['contactrestoreerror'] = 'Konnte die gelöschten Kontakte nicht wiederherstellen.';
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index b22b3f3d5..a452d0caa 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -141,6 +141,8 @@ $labels['unanswered'] = 'Αναπάντητο';
 $labels['withattachment'] = 'Με επισύναψη';
 $labels['deleted'] = 'Διεγραμμένο';
 $labels['undeleted'] = 'Μη διεγραμμένο';
+$labels['replied'] = 'Απαντημένο';
+$labels['forwarded'] = 'Προωθημένο';
 $labels['invert'] = 'Αναστροφή';
 $labels['filter'] = 'Φίλτρο';
 $labels['list'] = 'Λίστα';
@@ -171,6 +173,11 @@ $labels['importmessages'] = 'Εισαγωγή μηνυμάτων';
 $labels['quota'] = 'Χρήση δίσκου';
 $labels['unknown']  = 'άγνωστο';
 $labels['unlimited']  = 'απεριόριστο';
+$labels['quotatype'] = 'Είδος περιορισμού';
+$labels['quotatotal'] = 'Όριο';
+$labels['quotaused'] = 'Χρησιμοποιημένα';
+$labels['quotastorage'] = 'Χώρος στο δίσκο';
+$labels['quotamessage'] = 'Πλήθος μηνυμάτων';
 $labels['quicksearch']  = 'Γρήγορη Αναζήτηση';
 $labels['resetsearch']  = 'Επαναφορά Αναζήτησης';
 $labels['searchmod']  = 'Aλλαγή αναζήτησης';
@@ -178,6 +185,9 @@ $labels['msgtext']  = 'Σε όλο το μήνυμα';
 $labels['body']  = 'Σώμα';
 $labels['type'] = 'Τυπος';
 $labels['namex'] = 'όνομα';
+$labels['currentfolder'] = 'Τρέχων φάκελος';
+$labels['subfolders'] = 'Αυτός και υποφάκελοι';
+$labels['allfolders'] = 'Όλοι οι φάκελοι';
 $labels['openinextwin'] = 'Άνοιγμα σε νέο παράθυρο';
 $labels['emlsave'] = 'Λήψη αρχείου (.eml)';
 $labels['changeformattext'] = 'Εμφάνιση σε μορφή απλού κειμένου';
@@ -193,6 +203,10 @@ $labels['returnreceipt']  = 'Αναφορά Παράδοσης';
 $labels['dsn']            = 'Κατάσταση αναφοράς παράδοσης';
 $labels['mailreplyintro'] = 'Στις $date, $sender έγραψε:';
 $labels['originalmessage'] = 'Αρχικό μήνυμα';
+$labels['selectimage']    = 'Επιλογή εικόνας';
+$labels['addimage']       = 'Προσθήκη εικόνας';
+$labels['selectmedia']    = 'Επιλογή ταινίας';
+$labels['addmedia']       = 'Προσθήκη ταινίας';
 $labels['editidents']    = 'Επεξεργασία ταυτοτήτων';
 $labels['spellcheck']    = 'Συλλαβισμός';
 $labels['checkspelling'] = 'Έλεγχος ορθογραφίας';
@@ -203,9 +217,10 @@ $labels['restoremessage'] = 'Επαναφορά μηνύματος;';
 $labels['responses'] = 'Απαντήσεις';
 $labels['insertresponse'] = 'Εισάγετε μια απάντηση';
 $labels['manageresponses'] = 'Διαχείριση απαντήσεων';
-$labels['savenewresponse'] = 'Αποθήκευση νέας απάντησης';
-$labels['editresponses'] = 'Μεταβολή απαντήσεων';
+$labels['savenewresponse'] = 'Δημιουργία νέας απάντησης';
+$labels['addresponse'] = 'Προσθήκη απάντησης';
 $labels['editresponse'] = 'Μεταβολή απάντησης';
+$labels['editresponses'] = 'Μεταβολή απαντήσεων';
 $labels['responsename'] = 'Όνομα';
 $labels['responsetext'] = 'Κείμενο απάντησης';
 $labels['attach'] = 'Επισύναψη';
@@ -214,6 +229,7 @@ $labels['upload'] = 'Φόρτωση';
 $labels['uploadprogress'] = '$percent ($current από $total)';
 $labels['close']  = 'Κλείσιμο';
 $labels['messageoptions']  = 'Επιλογές μηνύματος';
+$labels['togglecomposeoptions'] = 'Εναλλαγή επιλογών σύνθεσης';
 $labels['low']     = 'Χαμηλή';
 $labels['lowest']  = 'Χαμηλότερη';
 $labels['normal']  = 'Κανονική';
@@ -270,6 +286,7 @@ $labels['assistant'] = 'Υπάλληλος';
 $labels['spouse'] = 'Σύζυγος';
 $labels['allfields'] = 'Όλα τα πεδία';
 $labels['search'] = 'Αναζήτηση';
+$labels['searchresult'] = 'Αποτελέσματα αναζήτησης';
 $labels['advsearch'] = 'Προηγμένη Αναζήτηση';
 $labels['advanced'] = 'Προχωρημένες ρυθμίσεις';
 $labels['other'] = 'Άλλα';
@@ -288,11 +305,13 @@ $labels['typehomepage']  = 'Αρχική Σελίδα';
 $labels['typeblog'] = 'Ιστολόγιο';
 $labels['typeprofile'] = 'Προφίλ';
 $labels['addfield'] = 'Προσθήκη πεδίου...';
-$labels['addcontact'] = 'Προσθήκη νέας επαφής';
+$labels['addcontact'] = 'Προσθήκη επαφής';
 $labels['editcontact'] = 'Επεξεργασία επαφής';
 $labels['contacts'] = 'Επαφές';
 $labels['contactproperties'] = 'Ιδιότητες επαφών';
+$labels['contactnameandorg'] = 'Όνομα και οργανισμός';
 $labels['personalinfo'] = 'Προσωπικές πληροφορίες';
+$labels['contactphoto'] = 'Φωτογραφία επαφής';
 $labels['edit']   = 'Επεξεργασία';
 $labels['cancel'] = 'Ακύρωση';
 $labels['save']   = 'Αποθήκευση';
@@ -301,7 +320,7 @@ $labels['rename'] = 'Μετονομασία';
 $labels['addphoto'] = 'Προσθήκη';
 $labels['replacephoto'] = 'Αντικατάσταση';
 $labels['uploadphoto'] = 'Φόρτωση εικόνας';
-$labels['newcontact']     = 'Δημιουργία νέας κάρτας επαφής';
+$labels['newcontact']     = 'Δημιουργία νέας επαφής';
 $labels['deletecontact']  = 'Διαγραφή επιλεγμένων επαφών';
 $labels['composeto']      = 'Σύνθεση μηνύματος προς';
 $labels['contactsfromto'] = 'Επαφή $from από $to έως $count';
@@ -310,10 +329,12 @@ $labels['export']         = 'Εξαγωγή';
 $labels['exportall']      = 'Εξαγωγή όλων';
 $labels['exportsel']      = 'Εξαγωγή επιλεγμένων';
 $labels['exportvcards']   = 'Εξαγωγή επαφών σε vCard';
-$labels['newcontactgroup'] = 'Δημιουργία νέας Ομάδας επαφών';
+$labels['newcontactgroup']       = 'Δημιουργία νέας ομάδας';
+$labels['addgroup']       = 'Προσθήκη ομάδας';
 $labels['grouprename']    = 'Μετονομασία ομάδας';
 $labels['groupdelete']    = 'Διαγραφή ομάδας';
 $labels['groupremoveselected'] = 'Αφαίρεση επιλεγμένων επαφών από την ομάδα';
+$labels['uponelevel']     = 'Πάνω ένα επίπεδο';
 $labels['previouspage']   = 'Εμφάνιση προηγούμενης σελίδας';
 $labels['firstpage']      = 'Εμφάνιση της πρώτης σελίδας';
 $labels['nextpage']       = 'Εμφάνιση επόμενης σελίδας';
@@ -321,7 +342,7 @@ $labels['lastpage']       = 'Εμφάνιση της τελευταίας σελ
 $labels['group'] = 'Ομάδα';
 $labels['groups'] = 'Ομάδες';
 $labels['listgroup'] = 'Μέλη της ομάδας λίστας';
-$labels['personaladrbook'] = 'Προσωπικές Διυθύνσεις';
+$labels['personaladrbook'] = 'Προσωπικές Διευθύνσεις';
 $labels['searchsave'] = 'Αποθήκευση αναζήτησης';
 $labels['searchdelete'] = 'Διαγραφή αποθηκευμένης αναζήτησης';
 $labels['import'] = 'Εισαγωγή';
@@ -340,10 +361,10 @@ $labels['preferences'] = 'Προτιμήσεις';
 $labels['userpreferences'] = 'Προτιμήσεις χρήστη';
 $labels['editpreferences'] = 'Επεξεργασία προτιμήσεων χρήστη';
 $labels['identities'] = 'Ταυτότητες';
-$labels['manageidentities'] = 'Διαχείριση ταυτοτήτων για αυτόν το λογαριασμό';
-$labels['newidentity'] = 'Νέα ταυτότητα';
-$labels['newitem'] = 'Νέο αντικείμενο';
-$labels['edititem'] = 'Επεξεργασία αντικειμένου';
+$labels['manageidentities'] = 'Διαχείριση ταυτοτήτων';
+$labels['newidentity'] = 'Δημιουργία νέας ταυτότητας';
+$labels['addidentity'] = 'Προσθήκη ταυτότητας';
+$labels['edititem'] = 'Επεξεργασία ταυτότητας';
 $labels['preferhtml'] = 'Προβολή σε HTML';
 $labels['defaultcharset'] = 'Προεπιλεγμένη κωδικοποίηση χαρακτήρων';
 $labels['htmlmessage'] = 'Μήνυμα σε μορφή HTML';
@@ -400,7 +421,9 @@ $labels['2231folding'] = 'Full RFC 2231 (μορφή Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (μορφή MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (άλλη μορφή)';
 $labels['force7bit'] = 'Να γίνεται χρήση της κωδικοποίησης MIME για τους χαρακτήρες 8-bit';
+$labels['savelocalstorage'] = "Προσωρινή αποθήκευση στην τοπική αποθήκη του περιηγητή";
 $labels['advancedoptions'] = 'Προχωρημένες επιλογές';
+$labels['toggleadvancedoptions'] = 'Εναλλαγή προχωρημένων επιλογών';
 $labels['focusonnewmessage'] = 'Τα νέα μηνύματα να επιλέγονται αυτόματα';
 $labels['checkallfolders'] = 'Να γίνεται έλεγχος σε όλους τους φακέλους για νέα μηνύματα';
 $labels['displaynext'] = 'Μετά από κάθε μετακίνηση/διαγραφή μηνήματος να εμφανίζεται το επόμενο';
@@ -442,14 +465,14 @@ $labels['asattachment'] = 'σαν επισύναψη';
 $labels['replyallmode'] = 'Προεπιλεγμένη ενέργεια του κουμπιού [Απάντηση σε όλους]';
 $labels['replyalldefault'] = 'απάντηση σε όλους';
 $labels['replyalllist'] = 'Απάντηση μόνο σε λίστα e-mail (αν υπάρχει)';
-$labels['folder']  = 'Φάκελος';
-$labels['folders']  = 'Φάκελοι';
-$labels['foldername']  = 'Όνομα φακέλου';
-$labels['subscribed']  = 'Εγγεγραμμένος';
+$labels['folder'] = 'Φάκελος';
+$labels['folders'] = 'Φάκελοι';
+$labels['foldername'] = 'Όνομα φακέλου';
+$labels['subscribed'] = 'Εγγεγραμμένος';
 $labels['messagecount'] = 'Μηνύματα';
-$labels['create']  = 'Δημιουργία';
-$labels['createfolder']  = 'Δημιουργία νέου φακέλου';
-$labels['managefolders']  = 'Διαχείριση φακέλων';
+$labels['create'] = 'Δημιουργία';
+$labels['createfolder'] = 'Δημιουργία νέου φακέλου';
+$labels['managefolders'] = 'Διαχείριση φακέλων';
 $labels['specialfolders'] = 'Ειδικοί Φάκελοι';
 $labels['properties'] = 'Ιδιότητες';
 $labels['folderproperties'] = 'Ιδιότητες φακέλου';
@@ -459,9 +482,13 @@ $labels['info'] = 'Πληροφορίες';
 $labels['getfoldersize'] = 'Κάντε κλικ εδώ για να δείτε το μέγεθος του φακέλου';
 $labels['changesubscription'] = 'Κάντε κλικ εδώ για να αλλάξετε τη συνδρομή σας';
 $labels['foldertype'] = 'Τύπος φακέλου';
-$labels['personalfolder']  = 'Προσωπικός φάκελος';
-$labels['otherfolder']  = 'Φάκελοι άλλων χρηστών';
-$labels['sharedfolder']  = 'Κοινόχρηστος φάκελος';
+$labels['personalfolder'] = 'Προσωπικός φάκελος';
+$labels['otherfolder'] = 'Φάκελοι άλλων χρηστών';
+$labels['sharedfolder'] = 'Κοινόχρηστος φάκελος';
+$labels['findfolders'] = 'Εύρεση φακέλων';
+$labels['namespace.personal'] = 'Προσωπικά';
+$labels['namespace.other'] = 'Άλλοι χρήστες';
+$labels['namespace.shared'] = 'Διαμοιρασμένος';
 $labels['sortby'] = 'Ταξινόμηση κατά';
 $labels['sortasc']  = 'Αύξουσα ταξινόμηση';
 $labels['sortdesc'] = 'Φθίνουσα ταξινόμηση';
@@ -494,4 +521,44 @@ $labels['vietnamese'] = 'Βιετναμέζικα';
 $labels['japanese'] = 'Ιαπωνικά';
 $labels['korean'] = 'Κορεατικά';
 $labels['chinese'] = 'Κινεζικά';
+$labels['arialabeltopnav'] = 'Έλεγχος παραθύρου';
+$labels['arialabeltasknav'] = 'Εργασίες εφαρμογής';
+$labels['arialabeltoolbar'] = 'Μπάρα εργαλείων εφαρμογής';
+$labels['arialabelactivetask'] = 'Ενεργή εργασία';
+$labels['arialabelmessagessearchfilter'] = 'Φίλτρο λίστας αλληλογραφίας';
+$labels['arialabelmailsearchform'] = 'Φόρμα αναζήτησης μηνύματος e-mail';
+$labels['arialabelcontactsearchform'] = 'Φόρμα αναζήτησης επαφών';
+$labels['arialabelmailquicksearchbox'] = 'Πεδίο αναζήτησης e-mail';
+$labels['arialabelfoldersearchfilter'] = 'Φίλτρο λίστας φακέλων';
+$labels['arialabelfoldersearchform'] = 'Φόρμα αναζήτησης φακέλων';
+$labels['arialabelfolderlist'] = 'Επιλογή καταλόγου e-mail';
+$labels['arialabelmessagelist'] = 'Λίστα μηνυμάτων e-mail';
+$labels['arialabelmailpreviewframe'] = 'Προεπισκόπηση μηνύματος';
+$labels['arialabelmailboxmenu'] = 'Μενού ενεργειών φακέλων';
+$labels['arialabellistselectmenu'] = 'Μενού επιλογής λίστας';
+$labels['arialabelthreadselectmenu'] = 'Μενού λίστας θεμάτων';
+$labels['arialabelmessagelistoptions'] = 'Εμφάνιση λίστας μηνυμάτων και επιλογές ταξινόμησης';
+$labels['arialabelmailimportdialog'] = 'Διάλογος εισαγωγής μηνύματος';
+$labels['arialabelmessagenav'] = 'Πλοήγηση μηνύματος';
+$labels['arialabelmessagebody'] = 'Σώμα μηνύματος';
+$labels['arialabelmessageactions'] = 'Ενέργειες μηνύματος';
+$labels['arialabelcontactquicksearch'] = 'Φόρμα αναζήτησης επαφών';
+$labels['arialabelcontactsearchbox'] = 'Πεδίο αναζήτησης επαφής';
+$labels['arialabelmessageheaders'] = 'Κεφαλίδες μηνυμάτων';
+$labels['arialabelforwardingoptions'] = 'Επιλογές προώθησης';
+$labels['arialabelreplyalloptions'] = 'Επιλογές απάντησης προς όλους';
+$labels['arialabelmoremessageactions'] = 'Περισσότερες ενέργειες μηνύματος';
+$labels['arialabelmarkmessagesas'] = 'Σήμανση επιλεγμένων μηνυμάτων ως...';
+$labels['arialabelcomposeoptions'] = 'Επιλογές σύνθεσης';
+$labels['arialabelresponsesmenu'] = 'Μενού έτοιμων απαντήσεων';
+$labels['arialabelattachmentuploadform'] = 'Φόρμα μεταφόρτωσης συνημμένων';
+$labels['arialabelattachmentpreview'] = 'Προεπισκόπηση συνημμένων';
+$labels['ariasummarycomposecontacts'] = 'Επιλογή ως παραλήπτες από λίστα επαφών και ομάδων';
+$labels['arialabelcontactexportoptions'] = 'Επιλογές εξαγωγής επαφών';
+$labels['arialabelabookgroupoptions'] = 'Επιλογές βιβλίου διευθύνσεων/ομάδων';
+$labels['arialabelpreferencesform'] = 'Φόρμα προτιμήσεων';
+$labels['arialabelidentityeditfrom'] = 'Φόρμα επεξεργασίας ταυτότητας';
+$labels['arialabelresonseeditfrom'] = 'Φόρμα επεξεργασίας απάντησης';
+$labels['arialabelsearchterms'] = 'Όροι αναζήτησης';
+$labels['helplistnavigation'] = 'Εμφάνιση πλοήγησης πληκτρολογίου';
 ?>
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index 2c38f5fff..bc53a076e 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Η συνεδρία σας είναι άκυρη ή
 $messages['storageerror'] = 'Η σύνδεση με το διακομιστή αποθήκευσης απέτυχε.';
 $messages['servererror'] = 'Σφάλμα του εξυπηρετητή!';
 $messages['servererrormsg'] = 'Σφάλμα εξυπηρετητή: $msg';
+$messages['connerror'] = 'Σφάλμα σύνδεσης (Αποτυχία πρόσβασης στον διακομιστή)!';
 $messages['dberror'] = 'Σφάλμα βάσης δεδομένων!';
+$messages['windowopenerror'] = 'Το αναδυόμενο παράθυρο αποκλείστηκε!';
 $messages['requesttimedout'] = 'Το αίτημα εξέπνευσε χρονικά';
 $messages['errorreadonly'] = 'Η διαδικασία δεν μπορεί να ολοκληρωθεί. Ο φάκελος είναι μόνο για ανάγνωση.';
 $messages['errornoperm'] = 'Η διαδικασία δεν μπορεί να ολοκληρωθεί. Άρνηση πρόσβασης.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Βρέθηκαν $nr επαφές.';
 $messages['searchnomatch'] = 'Η αναζήτηση δεν επέστρεψε αποτελέσματα.';
 $messages['searching'] = 'Αναζήτηση...';
 $messages['checking'] = 'Έλεγχος...';
+$messages['stillsearching'] = 'Αναζήτηση...';
 $messages['nospellerrors'] = 'Δεν βρέθηκαν ορθογραφικά λάθη.';
 $messages['folderdeleted'] = 'Ο φάκελος διαγράφηκε επιτυχώς.';
 $messages['foldersubscribed'] = 'Ο φάκελος εχει εγγραφεί με επιτυχία.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Επιτυχής εισαγωγή $nr μη�
 $messages['importmessageerror'] = 'Η εισαγωγή απέτυχε! Το ανεβασμένο αρχείο δεν είναι έγκυρο αρχείο μηνύματος ή φακέλου μηνυμάτων.';
 $messages['opnotpermitted'] = 'Η λειτουργία δεν επιτρέπεται!';
 $messages['nofromaddress'] = 'Άδεια διεύθυνση e-mail στην επιλεγμένη ταυτότητα.';
-$messages['editorwarning'] = 'Η μετάβαση στην επεξεργασία απλού κειμένου θα προκαλέσει κατάργηση της μορφοποίησης. Είστε βέβαιοι πως θέλετε να συνεχίσετε;';
+$messages['editorwarning'] = 'Η αλλαγή του τύπου επεξεργασίας μπορεί να προκαλέσει απώλεια της μορφοποίησης κειμένου. Είστε βέβαιοι πως θέλετε να συνεχίσετε;';
 $messages['httpreceivedencrypterror'] = 'Ανεπανόρθωτο σφάλμα. Επικοινωνήστε με το διαχειριστή του εξυπηρετητή. <b>Το μήνυμά σας δεν στάλθηκε.</b>';
 $messages['smtpconnerror'] = 'Σφάλμα SMTP ($code): Απέτυχε η σύνδεση με τον εξυπηρετητή.';
 $messages['smtpautherror'] = 'Σφάλμα SMTP ($code): Σφάλμα ταυτοποίησης.';
diff --git a/program/localization/en_CA/messages.inc b/program/localization/en_CA/messages.inc
index 171e9afb3..4d390f5e2 100644
--- a/program/localization/en_CA/messages.inc
+++ b/program/localization/en_CA/messages.inc
@@ -22,6 +22,7 @@ $messages['sessionerror'] = 'Your session is invalid or expired.';
 $messages['storageerror'] = 'Connection to storage server failed.';
 $messages['servererror'] = 'Server Error!';
 $messages['servererrormsg'] = 'Server Error: $msg';
+$messages['connerror'] = 'Connection Error (Failed to reach the server)!';
 $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
@@ -32,6 +33,8 @@ $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
 $messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
+$messages['mailboxempty'] = 'Mailbox is empty';
+$messages['nomessages'] = 'No messages';
 $messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Loading...';
 $messages['uploading'] = 'Uploading file...';
@@ -90,6 +93,7 @@ $messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Search returned no matches.';
 $messages['searching'] = 'Searching...';
 $messages['checking'] = 'Checking...';
+$messages['stillsearching'] = 'Still searching...';
 $messages['nospellerrors'] = 'No spelling errors found.';
 $messages['folderdeleted'] = 'Folder successfully deleted.';
 $messages['foldersubscribed'] = 'Folder successfully subscribed.';
@@ -133,7 +137,6 @@ $messages['importmessagesuccess'] = 'Successfully imported $nr messages';
 $messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Operation not permitted!';
 $messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
 $messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
 $messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 628b41bde..d7abe3527 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'More actions...';
 $labels['more']             = 'More';
 $labels['back']             = 'Back';
 $labels['options']          = 'Options';
+$labels['first'] = 'First';
+$labels['last'] = 'Last';
+$labels['previous'] = 'Previous';
+$labels['next'] = 'Next';
 $labels['select'] = 'Select';
 $labels['all'] = 'All';
 $labels['none'] = 'None';
 $labels['currpage'] = 'Current page';
+$labels['isread'] = 'Read';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
+$labels['unflagged'] = 'Not Flagged';
 $labels['unanswered'] = 'Unanswered';
 $labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
+$labels['replied'] = 'Replied';
+$labels['forwarded'] = 'Forwarded';
 $labels['invert'] = 'Invert';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'List';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Disk usage';
 $labels['unknown']  = 'unknown';
 $labels['unlimited']  = 'unlimited';
+$labels['quotatype'] = 'Quota type';
+$labels['quotatotal'] = 'Limit';
+$labels['quotaused'] = 'Used';
+$labels['quotastorage'] = 'Disk space';
+$labels['quotamessage'] = 'Messages count';
 $labels['quicksearch']  = 'Quick search';
 $labels['resetsearch']  = 'Reset search';
 $labels['searchmod']  = 'Search modifiers';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Entire message';
 $labels['body']  = 'Body';
 $labels['type'] = 'Type';
 $labels['namex'] = 'Name';
+$labels['searchscope'] = 'Scope';
+$labels['currentfolder'] = 'Current folder';
+$labels['subfolders'] = 'This and subfolders';
+$labels['allfolders'] = 'All folders';
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
 $labels['changeformattext'] = 'Display in plain text format';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Return receipt';
 $labels['dsn']            = 'Delivery status notification';
 $labels['mailreplyintro'] = 'On $date, $sender wrote:';
 $labels['originalmessage'] = 'Original Message';
+$labels['selectimage']    = 'Select image';
+$labels['addimage']       = 'Add image';
+$labels['selectmedia']    = 'Select movie';
+$labels['addmedia']       = 'Add movie';
 $labels['editidents']    = 'Edit identities';
 $labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Check spelling';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'Restore message?';
 $labels['responses'] = 'Responses';
 $labels['insertresponse'] = 'Insert a response';
 $labels['manageresponses'] = 'Manage responses';
-$labels['savenewresponse'] = 'Save new response';
-$labels['editresponses'] = 'Edit responses';
+$labels['savenewresponse'] = 'Create new response';
+$labels['addresponse'] = 'Add response';
 $labels['editresponse'] = 'Edit response';
+$labels['editresponses'] = 'Edit responses';
 $labels['responsename'] = 'Name';
 $labels['responsetext'] = 'Response Text';
 $labels['attach'] = 'Attach';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Upload';
 $labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'Close';
 $labels['messageoptions']  = 'Message options...';
+$labels['togglecomposeoptions'] = 'Toggle composition options';
 $labels['low']     = 'Low';
 $labels['lowest']  = 'Lowest';
 $labels['normal']  = 'Normal';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Assistant';
 $labels['spouse'] = 'Spouse';
 $labels['allfields'] = 'All fields';
 $labels['search'] = 'Search';
+$labels['searchresult'] = 'Search result';
 $labels['advsearch'] = 'Advanced Search';
 $labels['advanced'] = 'Advanced';
 $labels['other'] = 'Other';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Home Page';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profile';
 $labels['addfield'] = 'Add field...';
-$labels['addcontact'] = 'Add new contact';
+$labels['addcontact'] = 'Add contact';
 $labels['editcontact'] = 'Edit contact';
 $labels['contacts'] = 'Contacts';
 $labels['contactproperties'] = 'Contact properties';
+$labels['contactnameandorg'] = 'Name and Organization';
 $labels['personalinfo'] = 'Personal information';
+$labels['contactphoto'] = 'Contact photo';
 $labels['edit']   = 'Edit';
 $labels['cancel'] = 'Cancel';
 $labels['save']   = 'Save';
@@ -301,7 +327,7 @@ $labels['rename'] = 'Rename';
 $labels['addphoto'] = 'Add';
 $labels['replacephoto'] = 'Replace';
 $labels['uploadphoto'] = 'Upload photo';
-$labels['newcontact']     = 'Create new contact card';
+$labels['newcontact']     = 'Create new contact';
 $labels['deletecontact']  = 'Delete selected contacts';
 $labels['composeto']      = 'Compose mail to';
 $labels['contactsfromto'] = 'Contacts $from to $to of $count';
@@ -310,10 +336,12 @@ $labels['export']         = 'Export';
 $labels['exportall']      = 'Export all';
 $labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
+$labels['newcontactgroup']       = 'Create new group';
+$labels['addgroup']       = 'Add group';
 $labels['grouprename']    = 'Rename group';
 $labels['groupdelete']    = 'Delete group';
 $labels['groupremoveselected'] = 'Remove selected contacts from group';
+$labels['uponelevel']     = 'Up one level';
 $labels['previouspage']   = 'Show previous set';
 $labels['firstpage']      = 'Show first set';
 $labels['nextpage']       = 'Show next set';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Preferences';
 $labels['userpreferences'] = 'User preferences';
 $labels['editpreferences'] = 'Edit user preferences';
 $labels['identities'] = 'Identities';
-$labels['manageidentities'] = 'Manage identities for this account';
-$labels['newidentity'] = 'New identity';
-$labels['newitem'] = 'New item';
-$labels['edititem'] = 'Edit item';
+$labels['manageidentities'] = 'Manage identities';
+$labels['newidentity'] = 'Create new identity';
+$labels['addidentity'] = 'Add identity';
+$labels['edititem'] = 'Edit identity';
 $labels['preferhtml'] = 'Display HTML';
 $labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML Message';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (other)';
 $labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['savelocalstorage'] = "Save in the browser's local storage (temporarily)";
 $labels['advancedoptions'] = 'Advanced options';
+$labels['toggleadvancedoptions'] = 'Toggle advanced options';
 $labels['focusonnewmessage'] = 'Focus browser window on new message';
 $labels['checkallfolders'] = 'Check all folders for new messages';
 $labels['displaynext'] = 'After message delete/move display the next message';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'as attachment';
 $labels['replyallmode'] = 'Default action of [Reply all] button';
 $labels['replyalldefault'] = 'reply to all';
 $labels['replyalllist'] = 'reply to mailing list only (if found)';
-$labels['folder']  = 'Folder';
-$labels['folders']  = 'Folders';
-$labels['foldername']  = 'Folder name';
-$labels['subscribed']  = 'Subscribed';
+$labels['folder'] = 'Folder';
+$labels['folders'] = 'Folders';
+$labels['foldername'] = 'Folder name';
+$labels['subscribed'] = 'Subscribed';
 $labels['messagecount'] = 'Messages';
-$labels['create']  = 'Create';
-$labels['createfolder']  = 'Create new folder';
-$labels['managefolders']  = 'Manage folders';
+$labels['create'] = 'Create';
+$labels['createfolder'] = 'Create new folder';
+$labels['managefolders'] = 'Manage folders';
 $labels['specialfolders'] = 'Special Folders';
 $labels['properties'] = 'Properties';
 $labels['folderproperties'] = 'Folder properties';
@@ -459,9 +489,13 @@ $labels['info'] = 'Information';
 $labels['getfoldersize'] = 'Click to get folder size';
 $labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
+$labels['personalfolder'] = 'Private Folder';
+$labels['otherfolder'] = 'Other User\'s Folder';
+$labels['sharedfolder'] = 'Public Folder';
+$labels['findfolders'] = 'Find folders';
+$labels['namespace.personal'] = 'Personal';
+$labels['namespace.other'] = 'Other users';
+$labels['namespace.shared'] = 'Shared';
 $labels['sortby'] = 'Sort by';
 $labels['sortasc']  = 'Sort ascending';
 $labels['sortdesc'] = 'Sort descending';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamese';
 $labels['japanese'] = 'Japanese';
 $labels['korean'] = 'Korean';
 $labels['chinese'] = 'Chinese';
+$labels['arialabeltopnav'] = 'Window control';
+$labels['arialabeltasknav'] = 'Application tasks';
+$labels['arialabeltoolbar'] = 'Application toolbar';
+$labels['arialabelactivetask'] = 'Active task';
+$labels['arialabelmessagessearchfilter'] = 'Email listing filter';
+$labels['arialabelmailsearchform'] = 'Email message search form';
+$labels['arialabelcontactsearchform'] = 'Contacts search form';
+$labels['arialabelmailquicksearchbox'] = 'Email search input';
+$labels['arialabelquicksearchbox'] = 'Search input';
+$labels['arialabelfoldersearchfilter'] = 'Folder listing filter';
+$labels['arialabelfoldersearchform'] = 'Folder search form';
+$labels['arialabelfolderlist'] = 'Email folder selection';
+$labels['arialabelmessagelist'] = 'Email Messages Listing';
+$labels['arialabelmailpreviewframe'] = 'Message preview';
+$labels['arialabelmailboxmenu'] = 'Folder actions menu';
+$labels['arialabellistselectmenu'] = 'List selection menu';
+$labels['arialabelthreadselectmenu'] = 'Threads listing menu';
+$labels['arialabelmessagelistoptions'] = 'Message list display and sorting options';
+$labels['arialabelmailimportdialog'] = 'Message import dialog';
+$labels['arialabelmessagenav'] = 'Message navigation';
+$labels['arialabelmessagebody'] = 'Message Body';
+$labels['arialabelmessageactions'] = 'Message actions';
+$labels['arialabelcontactquicksearch'] = 'Contacts search form';
+$labels['arialabelcontactsearchbox'] = 'Contact search input';
+$labels['arialabelmessageheaders'] = 'Message headers';
+$labels['arialabelforwardingoptions'] = 'Forwarding options';
+$labels['arialabelreplyalloptions'] = 'Reply-all options';
+$labels['arialabelmoremessageactions'] = 'More message actions';
+$labels['arialabelmarkmessagesas'] = 'Mark selected messages as...';
+$labels['arialabelcomposeoptions'] = 'Composition options';
+$labels['arialabelresponsesmenu'] = 'Canned responses menu';
+$labels['arialabelattachmentuploadform'] = 'Attachment upload form';
+$labels['arialabelattachmentpreview'] = 'Attachment preview';
+$labels['ariasummarycomposecontacts'] = 'List of contacts and groups to select as recipients';
+$labels['arialabelcontactexportoptions'] = 'Contact export options';
+$labels['arialabelabookgroupoptions'] = 'Addressbook/group options';
+$labels['arialabelpreferencesform'] = 'Preferences form';
+$labels['arialabelidentityeditfrom'] = 'Identity edit form';
+$labels['arialabelresonseeditfrom'] = 'Response edit form';
+$labels['arialabelsearchterms'] = 'Search terms';
+$labels['helplistnavigation'] = 'List keyboard navigation';
+$labels['helplistkeyboardnavigation'] = "Arrows up/down: Move row focus/selection.
+Space: Select focused row.
+Shift + up/down: Select additional row above/below.
+Ctrl + Space: Add focused row to selection/remove from selection.";
+$labels['helplistkeyboardnavmessages'] = "Arrows right/left: expand/collapse message thread (in threads mode only).
+Enter: Open the selected/focused message.
+Delete: Move selected messages to Trash.";
+$labels['helplistkeyboardnavcontacts'] = "Enter: Open the selected/focused contact.";
 ?>
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index 8ee7aef5a..11c0c0125 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Your session is invalid or has expired.';
 $messages['storageerror'] = 'Connection to IMAP server failed.';
 $messages['servererror'] = 'Server Error!';
 $messages['servererrormsg'] = 'Server Error: $msg';
+$messages['connerror'] = 'Connection Error (Failed to reach the server)!';
 $messages['dberror'] = 'Database Error!';
+$messages['windowopenerror'] = 'The popup window was blocked!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Search found no matches.';
 $messages['searching'] = 'Searching...';
 $messages['checking'] = 'Checking...';
+$messages['stillsearching'] = 'Still searching...';
 $messages['nospellerrors'] = 'No spelling errors found.';
 $messages['folderdeleted'] = 'Successfully deleted folder.';
 $messages['foldersubscribed'] = 'Successfully subscribed to folder.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Successfully imported $nr messages';
 $messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Operation not permitted!';
 $messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['editorwarning'] = 'Switching editor type may cause text formatting to be lost. Do you wish to continue?';
 $messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
 $messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
diff --git a/program/localization/es_419/labels.inc b/program/localization/es_419/labels.inc
index 437295bf1..2f5d4cdc6 100644
--- a/program/localization/es_419/labels.inc
+++ b/program/localization/es_419/labels.inc
@@ -19,37 +19,40 @@ $labels['welcome']   = 'Bienvenido a $product';
 $labels['username']  = 'Usuario';
 $labels['password']  = 'Contraseña';
 $labels['server']    = 'Servidor';
-$labels['login']     = 'Login';
+$labels['login']     = 'Ingresar';
 $labels['logout']   = 'Salir';
 $labels['mail']     = 'Correo';
-$labels['settings'] = 'Configuración';
-$labels['addressbook'] = 'Libreta de Direcciones';
-$labels['inbox']  = 'Bandeja de Entrada';
+$labels['settings'] = 'Configuraciones';
+$labels['addressbook'] = 'Libreta de direcciones';
+$labels['inbox']  = 'Bandeja de entrada';
 $labels['drafts'] = 'Borradores';
 $labels['sent']   = 'Enviados';
 $labels['trash']  = 'Papelera';
+$labels['junk']   = 'No deseado';
 $labels['show_real_foldernames'] = 'Mostrar el nombre real para carpetas especiales';
-$labels['subject'] = 'Tema';
+$labels['subject'] = 'Asunto';
 $labels['from']    = 'De';
 $labels['sender']  = 'Remitente';
 $labels['to']      = 'Para';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
-$labels['replyto'] = 'Responder-a';
+$labels['replyto'] = 'Responder a';
+$labels['followupto'] = 'Seguir a';
 $labels['date']    = 'Fecha';
 $labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
-$labels['readstatus'] = 'Leer estado';
-$labels['listoptions'] = 'Listar opciones';
+$labels['readstatus'] = 'Leído';
+$labels['listoptions'] = 'Listar opciones...';
 $labels['mailboxlist'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
-$labels['threadsfromto'] = 'Hilo $from hasta $to de $count';
+$labels['threadsfromto'] = 'Hilo $from a $to de $count';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
 $labels['fromtoshort'] = '$from - $to de $count';
 $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a...';
+$labels['copyto']   = 'Copiar a...';
 $labels['download'] = 'Descargar';
 $labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Mostrar';
@@ -79,10 +82,10 @@ $labels['may']	= 'May';
 $labels['jun']	= 'Jun';
 $labels['jul'] 	= 'Jul';
 $labels['aug']	= 'Ago';
-$labels['sep']	= 'Sep';
+$labels['sep']	= 'Set';
 $labels['oct']	= 'Oct';
 $labels['nov']	= 'Nov';
-$labels['dec']	= 'Dec';
+$labels['dec']	= 'Dic';
 $labels['longjan']	= 'Enero';
 $labels['longfeb']	= 'Febrero';
 $labels['longmar']	= 'Marzo';
@@ -91,7 +94,7 @@ $labels['longmay']	= 'Mayo';
 $labels['longjun']	= 'Junio';
 $labels['longjul']	= 'Julio';
 $labels['longaug']	= 'Agosto';
-$labels['longsep']	= 'Septiembre';
+$labels['longsep']	= 'Setiembre';
 $labels['longoct']	= 'Octubre';
 $labels['longnov']	= 'Noviembre';
 $labels['longdec']	= 'Diciembre';
@@ -101,14 +104,14 @@ $labels['checkmail']        = 'Revisar si hay nuevos mensajes';
 $labels['compose']          = 'Escribir';
 $labels['writenewmessage']  = 'Crear mensaje nuevo';
 $labels['reply']            = 'Responder';
-$labels['replytomessage']   = 'Responder a remitente';
-$labels['replytoallmessage'] = 'Responder a la lista o al remittente y todos los destinatarios';
+$labels['replytomessage']   = 'Responder al remitente';
+$labels['replytoallmessage'] = 'Responder a la lista o al remitente y a todos los destinatarios';
 $labels['replyall']         = 'Responder a todos';
 $labels['replylist']        = 'Responder a la lista';
-$labels['forward']          = 'Re-enviar';
-$labels['forwardinline']    = 'Reenviar en linea';
-$labels['forwardattachment'] = 'Re-enviar como archivo adjunto';
-$labels['forwardmessage']   = 'Re-enviar el mensaje';
+$labels['forward']          = 'Reenviar';
+$labels['forwardinline']    = 'Reenviar en el mensaje';
+$labels['forwardattachment'] = 'Reenviar como archivo adjunto';
+$labels['forwardmessage']   = 'Reenviar el mensaje';
 $labels['deletemessage']    = 'Eliminar el mensaje';
 $labels['movemessagetotrash'] = 'Mover a la papelera';
 $labels['printmessage']     = 'Imprimir este mensaje';
@@ -128,22 +131,30 @@ $labels['moreactions']      = 'Más acciones...';
 $labels['more']             = 'Más';
 $labels['back']             = 'Atrás';
 $labels['options']          = 'Opciones';
+$labels['first'] = 'Primero';
+$labels['last'] = 'Último';
+$labels['previous'] = 'Anterior';
+$labels['next'] = 'Siguiente';
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
 $labels['currpage'] = 'Página actual';
+$labels['isread'] = 'Leido';
 $labels['unread'] = 'No leido';
 $labels['flagged'] = 'Marcado';
+$labels['unflagged'] = 'No marcado';
 $labels['unanswered'] = 'No respondido';
 $labels['withattachment'] = 'Con archivo adjunto';
 $labels['deleted'] = 'Eliminado';
 $labels['undeleted'] = 'No eliminado';
+$labels['replied'] = 'Respondido';
+$labels['forwarded'] = 'Reenviado';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Enumerar';
 $labels['threads'] = 'Hilos';
 $labels['expand-all'] = 'Expandir todos';
-$labels['expand-unread'] = 'Espandir no leidos';
+$labels['expand-unread'] = 'Expandir no leídos';
 $labels['collapse-all'] = 'Colapsar todos';
 $labels['threaded'] = 'En hilo';
 $labels['autoexpand_threads'] = 'Expandir hilos';
@@ -155,24 +166,35 @@ $labels['attachment'] = 'Archivo adjunto';
 $labels['nonesort'] = 'Ninguno';
 $labels['sentdate'] = 'Fecha de envío';
 $labels['arrival'] = 'Fecha de recepción';
-$labels['asc'] = 'ascendiente';
-$labels['desc'] = 'descendiente';
+$labels['asc'] = 'ascendente';
+$labels['desc'] = 'descendente';
 $labels['listcolumns'] = 'Enumerar columnas';
 $labels['listsorting'] = 'Ordenar columnas';
 $labels['listorder'] = 'Ordenado por';
-$labels['folderactions'] = 'Acciones de carpeta';
+$labels['listmode'] = 'Modo de visualización de lista';
+$labels['folderactions'] = 'Acciones de carpeta...';
 $labels['compact'] = 'Comprimir';
 $labels['empty'] = 'Vaciar';
 $labels['importmessages'] = 'Importar mensajes';
 $labels['quota'] = 'Uso de disco';
 $labels['unknown']  = 'desconocido';
 $labels['unlimited']  = 'ilimitado';
+$labels['quotatype'] = 'Tipo de cuota';
+$labels['quotatotal'] = 'Límite';
+$labels['quotaused'] = 'Usado';
+$labels['quotastorage'] = 'Espacio en disco';
+$labels['quotamessage'] = 'Conteo de mensajes';
 $labels['quicksearch']  = 'Búsqueda rápida';
+$labels['resetsearch']  = 'Eliminar busqueda';
 $labels['searchmod']  = 'Modificadores de búsqueda';
 $labels['msgtext']  = 'Mensaje completo';
 $labels['body']  = 'Cuerpo';
 $labels['type'] = 'Tipo';
 $labels['namex'] = 'Nombre';
+$labels['searchscope'] = 'Alcance';
+$labels['currentfolder'] = 'Carpeta actual';
+$labels['subfolders'] = 'Esta y subcarpetas';
+$labels['allfolders'] = 'Todas las carpetas';
 $labels['openinextwin'] = 'Abrir en una ventana nueva';
 $labels['emlsave'] = 'Descargar (.eml)';
 $labels['changeformattext'] = 'Mostrar en texto plano';
@@ -181,47 +203,66 @@ $labels['editasnew']      = 'Editar como nuevo';
 $labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar mensaje';
 $labels['savemessage']    = 'Guardar como borrador';
-$labels['addattachment']  = 'Adjuntar archivo';
+$labels['addattachment']  = 'Adjuntar un archivo';
+$labels['charset']        = 'Tipo de codificación de caracteres';
 $labels['editortype']     = 'Tipo de editor';
+$labels['returnreceipt']  = 'Confirmación de recepción';
+$labels['dsn']            = 'Notificación de estado del envío';
 $labels['mailreplyintro'] = 'El $date, $sender escribió:';
-$labels['originalmessage'] = 'Mensaje Original';
+$labels['originalmessage'] = 'Mensaje original';
+$labels['selectimage']    = 'Seleccionar imagen';
+$labels['addimage']       = 'Agregar imagen';
+$labels['selectmedia']    = 'Seleccionar película';
+$labels['addmedia']       = 'Agregar película';
 $labels['editidents']    = 'Editar identidades';
-$labels['resumeediting'] = 'Resumir edición';
+$labels['spellcheck']    = 'Corrección ortográfica';
+$labels['checkspelling'] = 'Verificar ortografía';
+$labels['resumeediting'] = 'Continuar con la edición';
 $labels['revertto']      = 'Revertir a';
 $labels['restore'] = 'Restaurar';
 $labels['restoremessage'] = '¿Restaurar mensaje?';
 $labels['responses'] = 'Respuestas';
 $labels['insertresponse'] = 'Insertar una respuesta';
 $labels['manageresponses'] = 'Administrar respuestas';
-$labels['savenewresponse'] = 'Guardar nueva respuesta';
-$labels['editresponses'] = 'Editar respuestas';
+$labels['savenewresponse'] = 'Crear nueva respuesta';
+$labels['addresponse'] = 'Agregar respuesta';
 $labels['editresponse'] = 'Editar respuesta';
+$labels['editresponses'] = 'Editar respuestas';
 $labels['responsename'] = 'Nombre';
+$labels['responsetext'] = 'Texto de respuesta';
 $labels['attach'] = 'Adjuntar';
 $labels['attachments'] = 'Archivos adjuntos';
+$labels['upload'] = 'Subir';
 $labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close']  = 'Cerrar';
-$labels['messageoptions']  = 'Opciones de mensaje';
+$labels['messageoptions']  = 'Opciones de mensaje...';
+$labels['togglecomposeoptions'] = 'Cambiar opciones de escritura';
 $labels['low']     = 'Bajo';
 $labels['lowest']  = 'Más bajo';
 $labels['normal']  = 'Normal';
 $labels['high']    = 'Alto';
 $labels['highest'] = 'Más alto';
-$labels['nosubject']  = '(sin título)';
+$labels['nosubject']  = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imágenes';
 $labels['alwaysshow'] = 'Mostrar siempre las imagenes de $sender';
 $labels['isdraft']    = 'Este mensaje es un borrador.';
-$labels['andnmore']   = '$nr more...';
+$labels['andnmore']   = '$nr más...';
+$labels['togglemoreheaders'] = 'Mostrar más encabezados';
+$labels['togglefullheaders'] = 'Mostrar todos los encabezados';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto plano';
 $labels['savesentmessagein'] = 'Guardar mensaje enviado en ';
-$labels['dontsave'] = 'No guardar';
+$labels['dontsave'] = 'no guardar';
 $labels['maxuploadsize'] = 'El tamaño máximo permitido por archivo es $size';
-$labels['addcc'] = 'Y Cc';
-$labels['addbcc'] = 'Y Bcc';
-$labels['addreplyto'] = 'Agregar Responder-a';
-$labels['mdnrequest'] = 'El remitente de este mensaje a pedido ser notificado cuando leas el mensaje. ¿Quieres notificar al remitente?';
-$labels['name']         = 'Nombre de pantalla';
+$labels['addcc'] = 'Agregar Cc';
+$labels['addbcc'] = 'Agregar Bcc';
+$labels['addreplyto'] = 'Agregar Responder a';
+$labels['addfollowupto'] = 'Agregar Seguir a';
+$labels['mdnrequest'] = 'El remitente de este mensaje a pedido ser notificado cuando lea el mensaje. ¿Quiere notificar al remitente?';
+$labels['receiptread'] = 'Confirmación del recepción (leído)';
+$labels['yourmessage'] = 'Esta es una confirmación de recepción de tu mensaje';
+$labels['receiptnote'] = 'Nota: esta confirmación solo prueba que el mensaje se ha mostrado en la computadora del destinatario. No es garantía de que el destinatario haya leído o entendido el contenido del mensaje.';
+$labels['name']         = 'Nombre para mostrar';
 $labels['firstname']    = 'Primer nombre';
 $labels['surname']      = 'Apellido';
 $labels['middlename']   = 'Segundo Nombre';
@@ -230,49 +271,54 @@ $labels['namesuffix']   = 'Sufijo';
 $labels['nickname']     = 'Sobrenombre';
 $labels['jobtitle']     = 'Puesto';
 $labels['department']   = 'Departamento';
+$labels['gender']       = 'Sexo';
 $labels['maidenname']   = 'Apellido de soltera';
-$labels['email']        = 'Email';
+$labels['email']        = 'Dirección de correo electrónico';
 $labels['phone']        = 'Teléfono';
 $labels['address']      = 'Dirección';
 $labels['street']       = 'Calle';
 $labels['locality']     = 'Ciudad';
 $labels['zipcode']      = 'Código Postal';
 $labels['region']       = 'Estado/Provincia';
-$labels['country']      = 'Pais';
+$labels['country']      = 'País';
 $labels['birthday']     = 'Cumpleaños';
 $labels['anniversary']  = 'Aniversario';
-$labels['website']      = 'Sitio Web';
-$labels['instantmessenger'] = 'IM';
+$labels['website']      = 'Sitio web';
+$labels['instantmessenger'] = 'Mensajería instantánea';
 $labels['notes'] = 'Notas';
 $labels['male']   = 'masculino';
 $labels['female'] = 'femenino';
 $labels['manager'] = 'Administrador';
 $labels['assistant'] = 'Asistente';
-$labels['spouse'] = 'Conjuge';
+$labels['spouse'] = 'Cónyuge';
 $labels['allfields'] = 'Todos los campos';
 $labels['search'] = 'Buscar';
-$labels['advsearch'] = 'Busqueda Avanzada';
-$labels['advanced'] = 'Avanzado';
+$labels['searchresult'] = 'Resultado de búsqueda';
+$labels['advsearch'] = 'Búsqueda avanzada';
+$labels['advanced'] = 'Avanzada';
 $labels['other'] = 'Otro';
 $labels['typehome']   = 'Casa';
 $labels['typework']   = 'Trabajo';
 $labels['typeother']  = 'Otro';
-$labels['typemobile']  = 'Móvil';
+$labels['typemobile']  = 'Celular';
 $labels['typemain']  = 'Principal';
-$labels['typehomefax']  = 'Fax Casa';
-$labels['typeworkfax']  = 'Fax Oficina';
+$labels['typehomefax']  = 'Fax (casa)';
+$labels['typeworkfax']  = 'Fax (oficina)';
 $labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Pager';
 $labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistente';
-$labels['typehomepage']  = 'Página Web';
+$labels['typeassistant']  = 'Asistente';
+$labels['typehomepage']  = 'Página web';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
 $labels['addfield'] = 'Agregar campo...';
-$labels['addcontact'] = 'Agregar nuevo contacto';
+$labels['addcontact'] = 'Agregar contacto';
 $labels['editcontact'] = 'Editar contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Propiedades del contacto';
-$labels['personalinfo'] = 'Información Personal';
+$labels['contactnameandorg'] = 'Nombre y organización';
+$labels['personalinfo'] = 'Información personal';
+$labels['contactphoto'] = 'Foto del contacto';
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
@@ -281,19 +327,21 @@ $labels['rename'] = 'Renombrar';
 $labels['addphoto'] = 'Agregar';
 $labels['replacephoto'] = 'Remplazar';
 $labels['uploadphoto'] = 'Subir foto';
-$labels['newcontact']     = 'Crear nueva tarjeta de contacto';
+$labels['newcontact']     = 'Crear nuevo contacto';
 $labels['deletecontact']  = 'Eliminar contactos seleccionados';
-$labels['composeto']      = 'Escribir mail a ';
-$labels['contactsfromto'] = 'Contactos $from hasta $to de $count';
+$labels['composeto']      = 'Escribir a ';
+$labels['contactsfromto'] = 'Contactos $from a $to de $count';
 $labels['print']          = 'Imprimir';
 $labels['export']         = 'Exportar';
 $labels['exportall']      = 'Exportar todo';
-$labels['exportsel']      = 'Exportar los seleccionados';
+$labels['exportsel']      = 'Exportar lo seleccionado';
 $labels['exportvcards']   = 'Exportar contactos en formato vCard';
-$labels['newcontactgroup'] = 'Crear grupo de contactos nuevo';
+$labels['newcontactgroup']       = 'Crear grupo nuevo';
+$labels['addgroup']       = 'Agregar grupo';
 $labels['grouprename']    = 'Renombrar grupo';
 $labels['groupdelete']    = 'Eliminar grupo';
 $labels['groupremoveselected'] = 'Eliminar contactos seleccionados del grupo';
+$labels['uponelevel']     = 'Arriba un nivel';
 $labels['previouspage']   = 'Mostrar página anterior';
 $labels['firstpage']      = 'Mostrar primera página';
 $labels['nextpage']       = 'Mostrar página siguiente';
@@ -303,102 +351,161 @@ $labels['groups'] = 'Grupos';
 $labels['listgroup'] = 'Mostrar miembros del grupo';
 $labels['personaladrbook'] = 'Direcciones personales';
 $labels['searchsave'] = 'Guardar búsqueda';
-$labels['searchdelete'] = 'Eliminar busqueda';
+$labels['searchdelete'] = 'Eliminar búsqueda';
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
-$labels['importfromfile'] = 'Importar desde archivo';
+$labels['importfromfile'] = 'Importar desde archivo:';
 $labels['importtarget'] = 'Agregar contactos a';
-$labels['importreplace'] = 'Remplazar la libreta de direcciones completa';
-$labels['importgroups'] = 'Importar tareas del grupo';
+$labels['importreplace'] = 'Remplazar toda la libreta de direcciones';
+$labels['importgroups'] = 'Importar asignaciones del grupo';
 $labels['importgroupsall'] = 'Todo (crear grupos si es necesario)';
+$labels['importgroupsexisting'] = 'Solo para grupos existentes';
+$labels['importdesc'] = 'Puede subir contactos desde una libreta de direcciones existente. .<br/>Actualmente soportamos importar direcciones de los formatos <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> o CSV (separado por comas).';
 $labels['done'] = 'Listo';
-$labels['about'] = 'Sobre';
+$labels['settingsfor'] = 'Configuraciones para';
+$labels['about'] = 'Acerca de';
 $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario ';
 $labels['editpreferences'] = 'Editar preferencias de usuario ';
-$labels['identities'] = 'identidades';
-$labels['manageidentities'] = 'Administrar identidades para esta cuenta ';
-$labels['newidentity'] = 'Identidad nueva ';
-$labels['newitem'] = 'Elemento nuevo ';
-$labels['edititem'] = 'Editar elemento ';
+$labels['identities'] = 'Identidades';
+$labels['manageidentities'] = 'Administrar identidades';
+$labels['newidentity'] = 'Crear nueva identidad';
+$labels['addidentity'] = 'Agregar identidad';
+$labels['edititem'] = 'Editar identidad';
 $labels['preferhtml'] = 'Mostrar HTML ';
+$labels['defaultcharset'] = 'Caracteres predeterminados';
 $labels['htmlmessage'] = 'Mensaje HTML ';
+$labels['messagepart'] = 'Parte';
 $labels['digitalsig'] = 'Firma digital';
 $labels['dateformat'] = 'Formato de fecha';
 $labels['timeformat'] = 'Formato de hora';
+$labels['prettydate'] = 'Fechas bonitas';
 $labels['setdefault']  = 'Predeterminar';
 $labels['autodetect']  = 'Automático';
 $labels['language']  = 'Idioma';
 $labels['timezone']  = 'Zona horaria';
-$labels['pagesize']  = 'Columnas por página ';
+$labels['pagesize']  = 'Filas por página ';
 $labels['signature'] = 'Firma';
+$labels['dstactive']  = 'Horario de ahorro de energía';
 $labels['showinextwin'] = 'Abrir mensaje en una ventana nueva ';
 $labels['composeextwin'] = 'Escribir en una ventana nueva ';
 $labels['htmleditor'] = 'Escribir mensajes HTML';
+$labels['htmlonreply'] = 'al responder un mensaje HTML';
+$labels['htmlonreplyandforward'] = 'al renviar o responder un mensaje HTML';
 $labels['htmlsignature'] = 'Firma HTML ';
-$labels['showemail'] = 'Mostrar dirección de email junto al nombre de pantalla';
+$labels['showemail'] = 'Mostrar dirección de correo electrónico junto al nombre a mostrar';
 $labels['previewpane'] = 'Mostrar vista previa ';
+$labels['skin'] = 'Tipo de interfaz';
 $labels['logoutclear'] = 'Vaciar la papelera al salir';
-$labels['logoutcompact'] = 'Comprimir la bandeja de entrada al salir';
+$labels['logoutcompact'] = 'Comprimir la Bandeja de entrada al salir';
 $labels['uisettings'] = 'Interfaz de usuario';
+$labels['serversettings'] = 'Configuración del servidor';
+$labels['mailboxview'] = 'Visualización de la bandeja';
+$labels['mdnrequests'] = 'Al solicitarse confirmación de recepción';
+$labels['askuser'] = 'preguntarme';
+$labels['autosend'] = 'enviar confirmación de recepción';
+$labels['autosendknown'] = 'enviar confirmación de recepción a mis contactos; de lo contrario, preguntarme';
+$labels['autosendknownignore'] = 'enviar confirmación de recepción a mis contactos; de lo contrario, ignorar';
 $labels['ignore'] = 'ignorar';
-$labels['readwhendeleted'] = 'Marcar mensaje como leído al elimiarlo ';
-$labels['skipdeleted'] = 'No mostrar mensajes eliminados ';
+$labels['readwhendeleted'] = 'Marcar mensaje como leído al eliminarlo ';
+$labels['flagfordeletion'] = 'Marcar el mensaje para eliminación en lugar de eliminarlo';
+$labels['skipdeleted'] = 'No mostrar mensajes eliminados';
+$labels['deletealways'] = 'Si falla el mover los mensajes a la Papelera, eliminarlos';
+$labels['deletejunk'] = 'Eliminar directamente los mensajes en No deseado';
+$labels['showremoteimages'] = 'Mostrar imágenes remotas en el mensaje';
+$labels['fromknownsenders'] = 'de remitentes conocidos';
 $labels['always'] = 'siempre ';
 $labels['showinlineimages'] = 'Mostrar imágenes adjuntas debajo del mensaje';
 $labels['autosavedraft']  = 'Guardar borrador automáticamente';
 $labels['everynminutes']  = 'cada $n minuto(s)';
+$labels['refreshinterval']  = 'Actualizar (buscar nuevos mensajes, etc.)';
 $labels['never']  = 'nunca';
 $labels['immediately']  = 'inmediatamente';
 $labels['messagesdisplaying'] = 'Mostrando mensajes';
 $labels['messagescomposition'] = 'Escribiendo mensajes';
+$labels['mimeparamfolding'] = 'Nombres de archivos adjuntos';
+$labels['2231folding'] = 'RFC 2231 completo (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'RFC 2047 completo (otros)';
+$labels['force7bit'] = 'Usar codificación MIME para caracteres de 8 bits';
+$labels['savelocalstorage'] = "Guardar en el almacenamiento local del navegador (temporalmente)";
 $labels['advancedoptions'] = 'Opciones avanzadas';
-$labels['mainoptions'] = 'Opciones Principales';
-$labels['browseroptions'] = 'Opciones del Navagador';
+$labels['toggleadvancedoptions'] = 'Cambiar opciones avanzadas';
+$labels['focusonnewmessage'] = 'Enfocar la ventana del navegador en el nuevo mensaje';
+$labels['checkallfolders'] = 'Buscar nuevos mensajes en todas las carpetas';
+$labels['displaynext'] = 'Luego de eliminar/mover mensajes, mostrar el próximo';
+$labels['defaultfont'] = 'Tipo de letra predeterminado en mensajes HTML';
+$labels['mainoptions'] = 'Opciones principales';
+$labels['browseroptions'] = 'Opciones del navegador';
 $labels['section'] = 'Sección';
 $labels['maintenance'] = 'Mantenimiento';
-$labels['newmessage'] = 'Mensaje Nuevo';
-$labels['signatureoptions'] = 'Opciones de Firma';
+$labels['newmessage'] = 'Mensaje nuevo';
+$labels['signatureoptions'] = 'Opciones de firma';
 $labels['whenreplying'] = 'Al responder';
-$labels['replyempty'] = 'No citar el mensaje original ';
+$labels['replyempty'] = 'no citar el mensaje original ';
 $labels['replytopposting'] = 'comenzar mensaje nuevo arriba de la cita';
 $labels['replybottomposting'] = 'comenzar mensaje nuevo debajo de la cita';
-$labels['replyremovesignature'] = 'Al responder borrar la firma original del mensaje';
+$labels['replyremovesignature'] = 'Al responder, borrar la firma original del mensaje';
 $labels['autoaddsignature'] = 'Agregar firma automáticamente';
-$labels['newmessageonly'] = 'solo mensajes nuevos';
+$labels['newmessageonly'] = 'solo mensaje nuevo';
+$labels['replyandforwardonly'] = 'solo responde y reenvía';
 $labels['insertsignature'] = 'insertar firma';
+$labels['previewpanemarkread']  = 'Marcar como leídos mensajes mostrados en la vista previa';
+$labels['afternseconds']  = 'luego de $n segundos';
+$labels['reqmdn'] = 'Solicitar siempre una confirmación de recepción';
+$labels['reqdsn'] = 'Solicitar siempre una notificación de estado de envío';
+$labels['replysamefolder'] = 'Colocar respuestas en la carpeta del mensaje que ha sido respondido';
+$labels['defaultabook'] = 'Libreta de direcciones predeterminada';
+$labels['autocompletesingle'] = 'Al autocompletar, omitir direcciones de correo electrónico alternativas';
+$labels['listnamedisplay'] = 'Enumerar contactos como';
+$labels['spellcheckbeforesend'] = 'Verificar ortografía antes de enviar un mensaje';
+$labels['spellcheckoptions'] = 'Opciones de la corrección ortográfica';
 $labels['spellcheckignoresyms'] = 'Ignorar palabras con símbolos';
 $labels['spellcheckignorenums'] = 'Ignorar palabras con números';
+$labels['spellcheckignorecaps'] = 'Ignorar palabras con todas las letras en mayúsculas';
 $labels['addtodict'] = 'Agregar al diccionario';
-$labels['standardwindows'] = 'Tratar popups como ventanas comunes';
+$labels['mailtoprotohandler'] = 'Registrar manejador de protocolo para enlaces mailto:';
+$labels['standardwindows'] = 'Tratar ventanas emergentes como ventanas comunes';
+$labels['forwardmode'] = 'Reenvío de mensajes';
+$labels['inline'] = 'en el mensaje';
 $labels['asattachment'] = 'como adjunto';
+$labels['replyallmode'] = 'Acción predeterminada del botón [Responder a todos]';
 $labels['replyalldefault'] = 'responder a todos';
-$labels['folder']  = 'Carpeta';
-$labels['folders']  = 'Carpetas';
-$labels['foldername']  = 'Nombre de carpeta';
+$labels['replyalllist'] = 'responder solamente a la lista de correos (si hay una)';
+$labels['folder'] = 'Carpeta';
+$labels['folders'] = 'Carpetas';
+$labels['foldername'] = 'Nombre de carpeta';
+$labels['subscribed'] = 'Suscrita(s)';
 $labels['messagecount'] = 'Mensajes';
-$labels['create']  = 'Crear';
-$labels['createfolder']  = 'Crear carpeta nueva';
-$labels['managefolders']  = 'Administrar carpetas';
-$labels['specialfolders'] = 'Capetas Especiales';
+$labels['create'] = 'Crear';
+$labels['createfolder'] = 'Crear carpeta nueva';
+$labels['managefolders'] = 'Administrar carpetas';
+$labels['specialfolders'] = 'Capetas especiales';
 $labels['properties'] = 'Propiedades';
+$labels['folderproperties'] = 'Propiedades de la carpeta';
+$labels['parentfolder'] = 'Carpeta madre';
 $labels['location'] = 'Ubicación';
 $labels['info'] = 'Información';
-$labels['getfoldersize'] = 'Click para ver el tamaño de la carpeta';
-$labels['changesubscription'] = 'Click para cambiar la subscripción';
-$labels['foldertype'] = 'Tipo de Carpeta';
-$labels['personalfolder']  = 'Carpeta Privada';
-$labels['otherfolder']  = 'Carpeta de otro usuario';
-$labels['sharedfolder']  = 'Carpeta pública';
+$labels['getfoldersize'] = 'Haga clic para obtener el tamaño de la carpeta';
+$labels['changesubscription'] = 'Haga clic para cambiar la subscripción';
+$labels['foldertype'] = 'Tipo de carpeta';
+$labels['personalfolder'] = 'Carpeta privada';
+$labels['otherfolder'] = 'Carpeta de otro usuario';
+$labels['sharedfolder'] = 'Carpeta pública';
+$labels['findfolders'] = 'Buscar carpetas';
+$labels['namespace.personal'] = 'Personal';
+$labels['namespace.other'] = 'Otros usuarios';
+$labels['namespace.shared'] = 'Compartido';
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc']  = 'Ordenar ascendientemente';
-$labels['sortdesc'] = 'Ordenar descendientemente';
+$labels['sortasc']  = 'Ordenar de forma ascendente';
+$labels['sortdesc'] = 'Ordenar de forma descendente';
 $labels['undo'] = 'Deshacer';
 $labels['installedplugins'] = 'Extensiones instaladas';
 $labels['plugin'] = 'Extensión';
 $labels['version'] = 'Versión';
 $labels['source'] = 'Fuente';
 $labels['license'] = 'Licencia';
+$labels['support'] = 'Obtener soporte técnico';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -409,15 +516,65 @@ $labels['westerneuropean'] = 'Europeo Occidental';
 $labels['easterneuropean'] = 'Europeo Oriental';
 $labels['southeasterneuropean'] = 'Europeo Sur-Oriental';
 $labels['baltic'] = 'Baltico';
-$labels['arabic'] = 'Arabigo';
+$labels['cyrillic'] = 'Cirílico';
+$labels['arabic'] = 'Arábe';
 $labels['greek'] = 'Griego';
 $labels['hebrew'] = 'Hebreo';
-$labels['turkish'] = 'Turko';
-$labels['nordic'] = 'Nordico';
-$labels['thai'] = 'Thai';
+$labels['turkish'] = 'Turco';
+$labels['nordic'] = 'Nórdico';
+$labels['thai'] = 'Tailandés';
 $labels['celtic'] = 'Celta';
-$labels['vietnamese'] = 'Vietnamese';
+$labels['vietnamese'] = 'Vietnamita';
 $labels['japanese'] = 'Japonés';
-$labels['korean'] = 'Koreano';
+$labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chino';
+$labels['arialabeltopnav'] = 'Control de ventana';
+$labels['arialabeltasknav'] = 'Tareas de la aplicación';
+$labels['arialabeltoolbar'] = 'Barra de herramientas de la aplicación';
+$labels['arialabelactivetask'] = 'Tarea activa';
+$labels['arialabelmessagessearchfilter'] = 'Listado de filtros de correo electrónico';
+$labels['arialabelmailsearchform'] = 'Formulario de búsqueda de mensajes de correo electrónico';
+$labels['arialabelcontactsearchform'] = 'Formulario de búsqueda de contactos';
+$labels['arialabelmailquicksearchbox'] = 'Ingreso de búsqueda de correo electrónico';
+$labels['arialabelquicksearchbox'] = 'Ingreso de búsqueda';
+$labels['arialabelfoldersearchfilter'] = 'Filtro de lista de carpetas';
+$labels['arialabelfoldersearchform'] = 'Formulario de busqueda de carpetas';
+$labels['arialabelfolderlist'] = 'Selección de carpeta de correo electrónico';
+$labels['arialabelmessagelist'] = 'Listado de mensajes de correo electrónico';
+$labels['arialabelmailpreviewframe'] = 'Previsualización del mensaje';
+$labels['arialabelmailboxmenu'] = 'Menú de acciones de carpeta';
+$labels['arialabellistselectmenu'] = 'Menú de lista de selección';
+$labels['arialabelthreadselectmenu'] = 'Menú de listado de hilos';
+$labels['arialabelmessagelistoptions'] = 'Opciones de organización y visualización de mensajes';
+$labels['arialabelmailimportdialog'] = 'Diálogo de importación de mensajes';
+$labels['arialabelmessagenav'] = 'Navegación de mensajes';
+$labels['arialabelmessagebody'] = 'Cuerpo del mensaje';
+$labels['arialabelmessageactions'] = 'Acciones del mensaje';
+$labels['arialabelcontactquicksearch'] = 'Formulario de búsqueda de contactos';
+$labels['arialabelcontactsearchbox'] = 'Ingreso de búsqueda de contacto';
+$labels['arialabelmessageheaders'] = 'Encabezados del mensaje';
+$labels['arialabelforwardingoptions'] = 'Opciones de reenvío';
+$labels['arialabelreplyalloptions'] = 'Opciones de Responder a todos';
+$labels['arialabelmoremessageactions'] = 'Más acciones de mensaje';
+$labels['arialabelmarkmessagesas'] = 'Marcar mensajes seleccionados como...';
+$labels['arialabelcomposeoptions'] = 'Opciones de escritura';
+$labels['arialabelresponsesmenu'] = 'Menú de respuestas enlatadas';
+$labels['arialabelattachmentuploadform'] = 'Formulario para subir archivos adjuntos';
+$labels['arialabelattachmentpreview'] = 'Previsualización de archivos adjuntos';
+$labels['ariasummarycomposecontacts'] = 'Lista de contactos y grupos para seleccionar como destinatarios';
+$labels['arialabelcontactexportoptions'] = 'Opciones de exportación de contactos';
+$labels['arialabelabookgroupoptions'] = 'Opciones de libreta de direcciones/grupos';
+$labels['arialabelpreferencesform'] = 'Formulario de preferencias';
+$labels['arialabelidentityeditfrom'] = 'Formulario de edición de identidad';
+$labels['arialabelresonseeditfrom'] = 'Formulario de edición de respuestas';
+$labels['arialabelsearchterms'] = 'Términos de busqueda';
+$labels['helplistnavigation'] = 'Listar navegación por teclado';
+$labels['helplistkeyboardnavigation'] = "Flechas arriba/abajo: Mover la selección/enfoque de la fila.
+Espacio: Seleccionar fila enfocada.
+Mayús + arriba/abajo: Seleccionar más filas arriba/debajo.
+Ctrl + Espacio: Agregar/eliminar la fila enfocada a/de la selección.";
+$labels['helplistkeyboardnavmessages'] = "Flechas derecha/izquierda: Expandir/colapsar mensajes en hilo (solo en modo en hilo).
+Intro: Abrir el mensaje seleccionado/enfocado.
+Eliminar: Mover los mensajes seleccionados a la Papelera.";
+$labels['helplistkeyboardnavcontacts'] = "Intro: Abrir el contacto seleccionado/enfocado.";
 ?>
diff --git a/program/localization/es_419/messages.inc b/program/localization/es_419/messages.inc
index a22c53da8..ffb83cf39 100644
--- a/program/localization/es_419/messages.inc
+++ b/program/localization/es_419/messages.inc
@@ -16,11 +16,165 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 $messages['errortitle']  = '¡Ha ocurrido un error!';
-$messages['loginfailed']  = 'Falló el Login';
+$messages['loginfailed']  = 'Falló el Login.';
 $messages['cookiesdisabled'] = 'Su navegador no acepta cookies.';
-$messages['sessionerror'] = 'Su sesión es inválida o ha expirado.';
+$messages['sessionerror'] = 'Su sesión no es válida o ha expirado.';
 $messages['storageerror'] = 'Ha fallado la conexión al servidor de almacenamiento.';
 $messages['servererror'] = '¡Error del servidor!';
 $messages['servererrormsg'] = 'Error del servidor: $msg';
-$messages['dberror'] = 'Error en la base de datos';
+$messages['connerror'] = '¡Error de conexión (no se puede contactar con el servidor)!';
+$messages['dberror'] = '¡Error en la base de datos!';
+$messages['windowopenerror'] = '¡La ventana emergente ha sido bloqueada!';
+$messages['requesttimedout'] = 'Tiempo de espera expirado';
+$messages['errorreadonly'] = 'No es posible realizar la operación. La carpeta es de solo lectura';
+$messages['errornoperm'] = 'No es posible realizar la operación. Permiso denegado.';
+$messages['erroroverquota'] = 'No es posible realizar la operación. No hay espacio en disco.';
+$messages['erroroverquotadelete'] = 'No hay espacio libre en disco. Use Mayúsculas+Eliminar para borrar mensajes.';
+$messages['invalidrequest'] = '¡Solicitud no válida! No se ha guardado la información.';
+$messages['invalidhost'] = 'Nombre de servidor no válido.';
+$messages['nomessagesfound'] = 'No se encontraron mensajes en esta casilla.';
+$messages['loggedout'] = 'Has terminado correctamente la sesión. ¡Adiós!';
+$messages['mailboxempty'] = 'Casilla vacía';
+$messages['nomessages'] = 'Ningún mensaje';
+$messages['refreshing'] = 'Actualizando...';
+$messages['loading'] = 'Cargando...';
+$messages['uploading'] = 'Subiendo archivo...';
+$messages['uploadingmany'] = 'Subiendo archivos...';
+$messages['loadingdata'] = 'Cargando información...';
+$messages['checkingmail'] = 'Revisando por nuevos mensajes...';
+$messages['sendingmessage'] = 'Enviando mensaje...';
+$messages['messagesent'] = 'Mensaje enviado exitosamente.';
+$messages['savingmessage'] = 'Guardando mensaje...';
+$messages['messagesaved'] = 'Mensaje guardado en Borrador.';
+$messages['successfullysaved'] = 'Guardado exitosamente.';
+$messages['savingresponse'] = 'Guardando texto de respuesta...';
+$messages['deleteresponseconfirm'] = '¿Estás seguro que quieres eliminar este texto de respuesta?';
+$messages['addedsuccessfully'] = 'Contacto agregado exitosamente a la libreta de direcciones.';
+$messages['contactexists'] = 'Un contacto con la misma dirección de correo electrónico ya existe.';
+$messages['contactnameexists'] = 'Un contacto con el mismo nombre ya existe.';
+$messages['blockedimages'] = 'Para proteger su privacidad, las imágenes remotas están bloqueadas en este mensaje.';
+$messages['encryptedmessage'] = 'Este es un mensaje encriptado y no se puede mostrar. ¡Lo lamento!';
+$messages['nocontactsfound'] = 'No se encontraron contactos.';
+$messages['contactnotfound'] = 'El contacto solicitado no fue encontrado.';
+$messages['contactsearchonly'] = 'Ingresa algunos términos para encontrar contactos.';
+$messages['sendingfailed'] = 'Error al enviar mensaje.';
+$messages['senttooquickly'] = 'Por favor espera $sec seg(s). antes de enviar este mensaje.';
+$messages['errorsavingsent'] = 'Ha ocurrido un error grabando el mensaje enviado.';
+$messages['errorsaving'] = 'Ha ocurrido un error grabando.';
+$messages['errormoving'] = 'No se pudo mover el/los mensaje(s).';
+$messages['errorcopying'] = 'No se pudo copiar el/los mensaje(s).';
+$messages['errordeleting'] = 'No se pudo eliminar el/los mensaje(s).';
+$messages['errormarking'] = 'No se pudo marcar el/los mensaje(s).';
+$messages['deletecontactconfirm']  = '¿Estás seguro que quieres eliminar el/los contacto(s) seleccionado(s)?';
+$messages['deletegroupconfirm']  = '¿Estás seguro que quieres eliminar el grupo seleccionado?';
+$messages['deletemessagesconfirm'] = '¿Estás seguro que quieres eliminar el/los mensaje(s) seleccionado(s)?';
+$messages['deletefolderconfirm']  = '¿Estás seguro que quieres eliminar esta carpeta?';
+$messages['purgefolderconfirm']  = '¿Estás seguro que quieres eliminar todos los mensajes en esta carpeta?';
+$messages['contactdeleting'] = 'Eliminando contacto(s)...';
+$messages['groupdeleting'] = 'Eliminando grupo...';
+$messages['folderdeleting'] = 'Eliminando carpeta...';
+$messages['foldermoving'] = 'Moviendo carpeta...';
+$messages['foldersubscribing'] = 'Suscribiendo carpeta...';
+$messages['folderunsubscribing'] = 'Desuscribiendo carpeta...';
+$messages['formincomplete'] = 'El formulario no se ha completado en su totalidad.';
+$messages['noemailwarning'] = 'Por favor ingresa una dirección de correo electrónico válida.';
+$messages['nonamewarning']  = 'Por favor ingresa un nombre.';
+$messages['nopagesizewarning'] = 'Por favor ingresa un tamaño de página.';
+$messages['nosenderwarning'] = 'Por favor ingresa una dirección remitente de correo electrónico.';
+$messages['norecipientwarning'] = 'Por favor ingresa al menos un destinatario.';
+$messages['nosubjectwarning']  = 'El campo "Asunto" está vacio. ¿Deseas ingresar uno ahora?';
+$messages['nobodywarning'] = '¿Enviar este mensaje sin texto?';
+$messages['notsentwarning'] = 'El mensaje no ha sido enviado. ¿Deseas descartar este mensaje?';
+$messages['restoresavedcomposedata'] = 'Se ha encontrado un mensaje escrito pero no enviado\n\nAsunto: $subject\nGuardado: $date\n\n¿Desea restaurar este mensaje?';
+$messages['noldapserver'] = 'Por favor ingresa un servidor ldap para buscar.';
+$messages['nosearchname'] = 'Por favor ingresa un nombre de contacto o dirección de correo electrónico.';
+$messages['notuploadedwarning'] = 'Aún no se han subido todos los archivos adjuntos. Por favor espera o cancela la subida.';
+$messages['searchsuccessful'] = '$nr mensajes encontrados.';
+$messages['contactsearchsuccessful'] = '$nr contactos encontrados.';
+$messages['searchnomatch'] = 'La búsqueda no retornó resultados.';
+$messages['searching'] = 'Buscando...';
+$messages['checking'] = 'Verificando...';
+$messages['stillsearching'] = 'Todavía buscando...';
+$messages['nospellerrors'] = 'No se han encontrado errores gramaticales.';
+$messages['folderdeleted'] = 'Carpeta eliminada exitosamente.';
+$messages['foldersubscribed'] = 'Carpeta suscripta exitosamente';
+$messages['folderunsubscribed'] = 'Carpeta desuscripta exitosamente';
+$messages['folderpurged'] = 'La carpeta ha sido vaciada exitosamente';
+$messages['folderexpunged'] = 'La carpeta ha sido compactada exitosamente';
+$messages['deletedsuccessfully'] = 'Eliminado exitosamente.';
+$messages['converting'] = 'Quitando el formato...';
+$messages['messageopenerror'] = 'No se pudo cargar el mensaje desde el servidor.';
+$messages['fileuploaderror'] = 'Subida de archivo falló.';
+$messages['filesizeerror'] = 'El archivo subido excede el tamaño máxmo de $size.';
+$messages['copysuccess'] = 'Copiados $nr contactos exitosamente.';
+$messages['movesuccess'] = 'Movidos $nr contactos exitosamente.';
+$messages['copyerror'] = 'No se pudo copiar ninguno de los contactos.';
+$messages['moveerror'] = 'No se pudo mover ninguno de los contactos.';
+$messages['sourceisreadonly'] = 'Esta dirección fuente es de solo lectura.';
+$messages['errorsavingcontact'] = 'No se puedo guardar la dirección del contacto.';
+$messages['movingmessage'] = 'Moviendo mensaje(s)...';
+$messages['copyingmessage'] = 'Copiando mensaje(s)...';
+$messages['copyingcontact'] = 'Copiando contacto(s)...';
+$messages['movingcontact'] = 'Moviendo contacto(s)...';
+$messages['deletingmessage'] = 'Eliminando mensaje(s)...';
+$messages['markingmessage'] = 'Marcando mensaje(s)...';
+$messages['addingmember'] = 'Agregando contacto(s) al grupo...';
+$messages['removingmember'] = 'Eliminando contacto(s) del grupo...';
+$messages['receiptsent'] = 'Se ha enviado con éxito una confirmación de lectura.';
+$messages['errorsendingreceipt'] = 'No se pudo enviar el aviso de retorno.';
+$messages['deleteidentityconfirm'] = '¿Estás seguro que quieres eliminar esta identidad?';
+$messages['nodeletelastidentity'] = 'No puedes eliminar esta identidad, es tu última.';
+$messages['forbiddencharacter'] = 'Lo nombre de la carpeta contiene un caracter no permitido.';
+$messages['selectimportfile'] = 'Por favor selecciona un archivo para subir.';
+$messages['addresswriterror'] = 'La libreta de direcciones seleccionada no se puede escribir.';
+$messages['contactaddedtogroup'] = 'Se han eliminado los contactos a este grupo exitosamente';
+$messages['contactremovedfromgroup'] = 'Se han eliminado los contactos de este grupo exitosamente';
+$messages['nogroupassignmentschanged'] = 'No se han cambiado las asignaciones de grupo.';
+$messages['importwait'] = 'Importando, por favor espera...';
+$messages['importformaterror'] = '¡Ha fallado la importación! El archivo subido no tiene un formato válido.';
+$messages['importconfirm'] = '<b>Se han importado $inserted contactos exitosamente</b>';
+$messages['importconfirmskipped'] = '<b>Salteadas $skipped entradas existentes</b>';
+$messages['importmessagesuccess'] = 'Importados $nr mensajes exitosamente.';
+$messages['importmessageerror'] = '¡Ha fallado la importación! El archivo subido no tiene un formato válido.';
+$messages['opnotpermitted'] = '¡Operación no permitida!';
+$messages['nofromaddress'] = 'No se encuentra la dirección de correo electrónico en la entidad seleccionada.';
+$messages['editorwarning'] = 'Cambiar el tipo de editor puede causar que el formato de texto se pierda. ¿Desea continuar?';
+$messages['httpreceivedencrypterror'] = 'Ha ocurrido un error fatal de configuración. Contacte a su administrador de inmediato. <b>Su mensaje no puede ser enviado.</b>';
+$messages['smtpconnerror'] = 'Error SMTP ($code): Ha fallado la conexión con el servidor.';
+$messages['smtpautherror'] = 'Error SMTP ($code): Error de autenticación.';
+$messages['smtpfromerror'] = 'Error SMTP ($code): Fallo en establecer remitente "$from" ($msg).';
+$messages['smtptoerror'] = 'Error SMTP ($code): Fallo al agregar destinatario "$to" ($msg).';
+$messages['smtprecipientserror'] = 'Error SMTP: No es posible obtener la lista de destinatarios.';
+$messages['smtperror'] = 'Error SMTP: $msg';
+$messages['emailformaterror'] = 'Dirección de correo electrónico no válida: $email';
+$messages['toomanyrecipients'] = 'Demasiados destinatarios. Reduzca el número de destinatarios a $max.';
+$messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max.';
+$messages['internalerror'] = 'Ha ocurrido un error interno. Por favor intenta de nuevo.';
+$messages['contactdelerror'] = 'No se pudo eliminar el/los contacto(s).';
+$messages['contactdeleted'] = 'Contacto(s) eliminados exitosamente';
+$messages['contactrestoreerror'] = 'No se pudo restaurar los contacto(s) eliminados.';
+$messages['contactrestored'] = 'Contacto(s) restaurados exitosamente.';
+$messages['groupdeleted'] = 'Grupo eliminado exitosamente.';
+$messages['grouprenamed'] = 'Grupo renombrado exitosamente.';
+$messages['groupcreated'] = 'Grupo creado exitosamente.';
+$messages['savedsearchdeleted'] = 'Búsqueda guardada eliminada exitosamente.';
+$messages['savedsearchdeleteerror'] = 'No se pudo eliminar la búsqueda guardada.';
+$messages['savedsearchcreated'] = 'Búsqueda guardada creada exitosamente.';
+$messages['savedsearchcreateerror'] = 'No se puedo crear la búsqueda guardada.';
+$messages['messagedeleted'] = 'Mensaje(s) eliminado(s) exitosamente.';
+$messages['messagemoved'] = 'Mensaje(s) movido(s) exitosamente.';
+$messages['messagecopied'] = 'Mensaje(s) copiado(s) exitosamente.';
+$messages['messagemarked'] = 'Mensaje(s) marcado(s) exitosamente.';
+$messages['autocompletechars'] = 'Ingrese al menos $min caracteres para el autocompletado.';
+$messages['autocompletemore'] = 'No se han encontrado resultados. Por favor ingrese más caracteres.';
+$messages['namecannotbeempty'] = 'El nombre no puede estar vacio.';
+$messages['nametoolong'] = 'El nombre es demasiado largo.';
+$messages['folderupdated'] = 'Carpeta actualizada exitosamente.';
+$messages['foldercreated'] = 'Carpeta creada exitosamente.';
+$messages['invalidimageformat'] = 'Formato de imagen no válido.';
+$messages['mispellingsfound'] = 'Errores de gramática detectados en el mensaje.';
+$messages['parentnotwritable'] = 'No se puede mover/crear la carpeta en la carpeta pariente seleccionada. No tiene derechos de acceso.';
+$messages['messagetoobig'] = 'La parte del mensaje es demasiado grande para ser procesada.';
+$messages['attachmentvalidationerror'] = '¡ATENCIÓN! Este archivo adjunto es sospechoso porque su tipo no coincide con el declarado en el mensaje. Si no confia el remitente, no debería abrirlo en su navegador porque podría tener contenido malicioso.<br/><br/><em>Esperado: $expected; encontrado: $detected</em>';
+$messages['noscriptwarning'] = 'Atención: ¡Este servicio de Webmail requiere Javascript! Para usarlo por favor habilite Javascript en las opciones de su navegador.';
 ?>
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index eb4630ed4..50b93cdaa 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -29,6 +29,7 @@ $labels['drafts'] = 'Borradores';
 $labels['sent']   = 'Enviados';
 $labels['trash']  = 'Papelera';
 $labels['junk']   = 'Basura';
+$labels['show_real_foldernames'] = 'Mostrar nombres reales para carpetas especiales';
 $labels['subject'] = 'Asunto';
 $labels['from']    = 'Remitente';
 $labels['sender']  = 'Remitente';
@@ -36,10 +37,12 @@ $labels['to']      = 'Destinatario';
 $labels['cc']      = 'Copia';
 $labels['bcc']     = 'Cco';
 $labels['replyto'] = 'Responder a';
+$labels['followupto'] = 'Seguir-A';
 $labels['date']    = 'Fecha';
 $labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
+$labels['readstatus'] = 'Leer estado';
 $labels['listoptions'] = 'Listar opciones...';
 $labels['mailboxlist'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
@@ -49,7 +52,9 @@ $labels['fromtoshort'] = '$from – $to de $count';
 $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a...';
+$labels['copyto']   = 'Copiar a...';
 $labels['download'] = 'Descargar';
+$labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrar esto siempre';
 $labels['filename'] = 'Nombre del archivo';
@@ -126,15 +131,24 @@ $labels['moreactions']      = 'Mas acciones...';
 $labels['more']             = 'Más';
 $labels['back']             = 'Atrás';
 $labels['options']          = 'Opciones';
+$labels['first'] = 'Primero';
+$labels['last'] = 'Último';
+$labels['previous'] = 'Anterior';
+$labels['next'] = 'Siguiente';
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
 $labels['currpage'] = 'Página actual';
+$labels['isread'] = 'Leído';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Marcado';
+$labels['unflagged'] = 'No marcado';
 $labels['unanswered'] = 'Sin respuesta';
+$labels['withattachment'] = 'Con adjunto';
 $labels['deleted'] = 'Eliminado';
 $labels['undeleted'] = 'No eliminado';
+$labels['replied'] = 'Respondido';
+$labels['forwarded'] = 'Reenviado';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
@@ -157,18 +171,34 @@ $labels['desc'] = 'Descendente';
 $labels['listcolumns'] = 'Listar columnas';
 $labels['listsorting'] = 'Ordenar por';
 $labels['listorder'] = 'Ordenado por';
+$labels['listmode'] = 'Modo vista en lista';
 $labels['folderactions'] = 'Acciones de carpeta...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
+$labels['importmessages'] = 'Importar mensajes';
 $labels['quota'] = 'Uso de disco';
 $labels['unknown']  = 'desconocido';
 $labels['unlimited']  = 'sin límite';
+$labels['quotatype'] = 'Tipo de cuota';
+$labels['quotatotal'] = 'Límite';
+$labels['quotaused'] = 'Usado';
+$labels['quotastorage'] = 'Espacio de disco';
+$labels['quotamessage'] = 'Cantidad de mensajes';
 $labels['quicksearch']  = 'Búsqueda rápida';
 $labels['resetsearch']  = 'Reajustar la búsqueda';
 $labels['searchmod']  = 'Opciones de búsqueda';
 $labels['msgtext']  = 'Mensaje completo';
+$labels['body']  = 'Cuerpo';
+$labels['type'] = 'Tipo';
+$labels['namex'] = 'Nombre';
+$labels['searchscope'] = 'Alcance';
+$labels['currentfolder'] = 'Carpeta actual';
+$labels['subfolders'] = 'Este y subcarpetas';
+$labels['allfolders'] = 'Todas las carpetas';
 $labels['openinextwin'] = 'Abrir en ventana nueva';
 $labels['emlsave'] = 'Guardar (.eml)';
+$labels['changeformattext'] = 'Mostrar en formato de texto plano';
+$labels['changeformathtml'] = 'Mostrar en formato HTML';
 $labels['editasnew']      = 'Editar como nuevo';
 $labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar ahora el mensaje';
@@ -180,17 +210,33 @@ $labels['returnreceipt']  = 'Acuse de recibo';
 $labels['dsn']            = 'Notificación de estado del envío';
 $labels['mailreplyintro'] = 'El $date, $sender escribió:';
 $labels['originalmessage'] = 'Mensaje original';
+$labels['selectimage']    = 'Seleccionar imagen';
+$labels['addimage']       = 'Agregar imagen';
+$labels['selectmedia']    = 'Seleccionar película';
+$labels['addmedia']       = 'Agregar película';
 $labels['editidents']    = 'Editar identidades';
 $labels['spellcheck']    = 'Gramática';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Continuar edición';
 $labels['revertto']      = 'Revertir a';
+$labels['restore'] = 'Restaurar';
+$labels['restoremessage'] = '¿Restaurar mensaje?';
+$labels['responses'] = 'Respuestas';
+$labels['insertresponse'] = 'Insertar una respuesta';
+$labels['manageresponses'] = 'Administrar respuestas';
+$labels['savenewresponse'] = 'Crear nueva respuesta';
+$labels['addresponse'] = 'Agregar respuesta';
+$labels['editresponse'] = 'Editar respuesta';
+$labels['editresponses'] = 'Editar respuestas';
+$labels['responsename'] = 'Nombre';
+$labels['responsetext'] = 'Texto de la respuesta';
 $labels['attach'] = 'Adjuntar';
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Agregar';
 $labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close']  = 'Cerrar';
 $labels['messageoptions']  = 'Opciones de mensaje...';
+$labels['togglecomposeoptions'] = 'Activar opciones de composición';
 $labels['low']     = 'Bajo';
 $labels['lowest']  = 'Bajísimo';
 $labels['normal']  = 'Normal';
@@ -202,6 +248,7 @@ $labels['alwaysshow'] = 'Siempre mostrar imágenes de $sender';
 $labels['isdraft']    = 'Este es un borrador.';
 $labels['andnmore']   = '$nr más...';
 $labels['togglemoreheaders'] = 'Mostrarme más encabezados de mensaje';
+$labels['togglefullheaders'] = 'Activar encabezados en crudo';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto';
 $labels['savesentmessagein'] = 'Guardar mensaje enviado en';
@@ -210,6 +257,7 @@ $labels['maxuploadsize'] = 'El tamaño maximo permitido por archivo es $size';
 $labels['addcc'] = 'Añadir Cc';
 $labels['addbcc'] = 'Añadir Cco';
 $labels['addreplyto'] = 'Añadir Respuesta a';
+$labels['addfollowupto'] = 'Agregar Seguir-A';
 $labels['mdnrequest'] = 'El emisor de este mensaje desea ser notificado cuando usted lo lea. ¿Quiere enviar esta notificación?';
 $labels['receiptread'] = 'Notificación de lectura';
 $labels['yourmessage'] = 'Esta es una notificación de lectura de su mensaje';
@@ -245,6 +293,7 @@ $labels['assistant'] = 'Asistente';
 $labels['spouse'] = 'Cónygue';
 $labels['allfields'] = 'Todos los campos';
 $labels['search'] = 'Buscar';
+$labels['searchresult'] = 'Resultado de búsqueda';
 $labels['advsearch'] = 'Búsqueda Avanzada';
 $labels['advanced'] = 'Avanzado';
 $labels['other'] = 'Otro';
@@ -263,11 +312,13 @@ $labels['typehomepage']  = 'Página Personal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
 $labels['addfield'] = 'Agregar campo...';
-$labels['addcontact'] = 'Añadir nuevo contacto';
+$labels['addcontact'] = 'Agregar contacto';
 $labels['editcontact'] = 'Editar contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Propiedades del contacto';
+$labels['contactnameandorg'] = 'Nombre y organización';
 $labels['personalinfo'] = 'Información personal';
+$labels['contactphoto'] = 'Foto de contacto';
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
@@ -276,30 +327,39 @@ $labels['rename'] = 'Renombrar';
 $labels['addphoto'] = 'Agregar';
 $labels['replacephoto'] = 'Reemplazar';
 $labels['uploadphoto'] = 'Subir foto';
-$labels['newcontact']     = 'Añadir nuevo contacto';
+$labels['newcontact']     = 'Crear nuevo contacto';
 $labels['deletecontact']  = 'Eliminar contactos seleccionados';
 $labels['composeto']      = 'Enviar mensaje a';
 $labels['contactsfromto'] = 'Contactos $from a $to de $count';
 $labels['print']          = 'Imprimir';
 $labels['export']         = 'Exportar';
+$labels['exportall']      = 'Exportar todo';
+$labels['exportsel']      = 'Exportar lo seleccionado';
 $labels['exportvcards']   = 'Exportar contactos en format vCard';
-$labels['newcontactgroup'] = 'Crear Nuevo Grupo de Contacto';
+$labels['newcontactgroup']       = 'Crear nuevo grupo';
+$labels['addgroup']       = 'Agregar grupo';
 $labels['grouprename']    = 'Renombrar grupo';
 $labels['groupdelete']    = 'Eliminar grupo';
 $labels['groupremoveselected'] = 'Remover del grupo los contactos seleccionados';
+$labels['uponelevel']     = 'Subir un nivel';
 $labels['previouspage']   = 'Mostrar grupo anterior';
 $labels['firstpage']      = 'Mostrar primer grupo';
 $labels['nextpage']       = 'Mostrar siguiente grupo';
 $labels['lastpage']       = 'Mostrar último grupo';
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
+$labels['listgroup'] = 'Listar miembros del grupo';
 $labels['personaladrbook'] = 'Direcciones personales';
 $labels['searchsave'] = 'Guardar búsqueda';
 $labels['searchdelete'] = 'Eliminar búsqueda';
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde el archivo:';
+$labels['importtarget'] = 'Agregar contactos a';
 $labels['importreplace'] = 'Reemplazar completamente la lista de contactos';
+$labels['importgroups'] = 'Importar asignaciones de grupo';
+$labels['importgroupsall'] = 'Todo (crea grupos si es necesario)';
+$labels['importgroupsexisting'] = 'Sólo para grupos existentes';
 $labels['importdesc'] = 'Puedes subir contactos desde una libreta de direcciones existente.<br/>Actualmente soportamos la importación de direcciones utilizando el formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> o CSV (Valores Separados por Coma).';
 $labels['done'] = 'Hecho';
 $labels['settingsfor'] = 'Configuración para';
@@ -308,13 +368,15 @@ $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
 $labels['identities'] = 'Identidades';
-$labels['manageidentities'] = 'Gestionar identidades para esta cuenta';
-$labels['newidentity'] = 'Nueva identidad';
-$labels['newitem'] = 'Nuevo';
-$labels['edititem'] = 'Editar';
+$labels['manageidentities'] = 'Administrar identidades';
+$labels['newidentity'] = 'Crear nueva identidad';
+$labels['addidentity'] = 'Agregar identidad';
+$labels['edititem'] = 'Editar identidad';
 $labels['preferhtml'] = 'Prefiero HTML';
 $labels['defaultcharset'] = 'Juego de Caracteres por Defecto';
 $labels['htmlmessage'] = 'Mensaje HTML';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Firma digital';
 $labels['dateformat'] = 'Formato de fecha';
 $labels['timeformat'] = 'Formato de tiempo';
 $labels['prettydate'] = 'Fecha detallada';
@@ -331,6 +393,7 @@ $labels['htmleditor'] = 'Componer mensaje en HTML';
 $labels['htmlonreply'] = 'al responder un mensaje HTML';
 $labels['htmlonreplyandforward'] = 'al reenviar o responder un mensaje HTML';
 $labels['htmlsignature'] = 'Firma HTML';
+$labels['showemail'] = 'Mostrar dirección de correo electrónico junto al nombre a mostrar';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
 $labels['logoutclear'] = 'Vaciar papelera al cerrar sesión';
@@ -341,17 +404,21 @@ $labels['mailboxview'] = 'Vista de buzón';
 $labels['mdnrequests'] = 'Notificaciones de envío';
 $labels['askuser'] = 'preguntar al usuario';
 $labels['autosend'] = 'enviar automáticamente';
+$labels['autosendknown'] = 'enviar acuse de recibo a mis contactos, sino preguntarme';
+$labels['autosendknownignore'] = 'enviar acuse de recibo a mis contactos, sino ignorar';
 $labels['ignore'] = 'ignorar';
 $labels['readwhendeleted'] = 'Marcar el mensage como leído al borrarlo';
 $labels['flagfordeletion'] = 'Marcar el mensage para borrarse en vez de borrarlo';
 $labels['skipdeleted'] = 'No mostrar mensajes eliminados';
 $labels['deletealways'] = 'Cuando no se pueda mover un mensaje a la papelera, eliminarlo';
+$labels['deletejunk'] = 'Eliminar directamente mensajes en No deseado';
 $labels['showremoteimages'] = 'Mostrar imágenes remotas';
 $labels['fromknownsenders'] = 'de remitentes conocidos';
 $labels['always'] = 'siempre';
 $labels['showinlineimages'] = 'Mostrar imágenes adjuntas debajo del mensaje';
 $labels['autosavedraft']  = 'Guardar borrador automáticamente';
 $labels['everynminutes']  = 'cada $n minuto(s)';
+$labels['refreshinterval']  = 'Actualizar (verificar por nuevos mensajes, etc.)';
 $labels['never']  = 'nunca';
 $labels['immediately']  = 'inmediatamente';
 $labels['messagesdisplaying'] = 'Vista de mensajes';
@@ -361,16 +428,21 @@ $labels['2231folding'] = 'RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 (Otro)';
 $labels['force7bit'] = 'Usar codificación MIME para caracteres de 8 bit';
+$labels['savelocalstorage'] = "Guardar en el almacenamiento local del navegador (temporalmente)";
 $labels['advancedoptions'] = 'Opciones Avanzadas';
+$labels['toggleadvancedoptions'] = 'Activar opciones avanzadas';
 $labels['focusonnewmessage'] = 'Traer al frente la ventana del navegador cuando haya nuevos mensajes';
 $labels['checkallfolders'] = 'Verificar todas las carpetas por nuevos mensajes';
 $labels['displaynext'] = 'Luedo de eliminar/mover, mostrar el próximo mensaje';
+$labels['defaultfont'] = 'Fuente por defecto para mensajes HTML';
 $labels['mainoptions'] = 'Opciones Principales';
+$labels['browseroptions'] = 'Opciones de navegador';
 $labels['section'] = 'Selección';
 $labels['maintenance'] = 'Mantenimiento';
 $labels['newmessage'] = 'Nuevo Mensaje';
 $labels['signatureoptions'] = 'Opciones de Firma';
 $labels['whenreplying'] = 'Al Responder';
+$labels['replyempty'] = 'no citar el mensaje original';
 $labels['replytopposting'] = 'iniciar el nuevo mensaje sobre el original';
 $labels['replybottomposting'] = 'iniciar el nuevo mensaje debajo del original';
 $labels['replyremovesignature'] = 'Al responder, eliminar la firma del mensaje original';
@@ -380,18 +452,60 @@ $labels['replyandforwardonly'] = 'respuestas o reenvios solamente';
 $labels['insertsignature'] = 'Insertar firma';
 $labels['previewpanemarkread']  = 'Marcar mensajes previsualizados como leidos';
 $labels['afternseconds']  = 'despues de $n segundos';
-$labels['folder']  = 'Carpeta';
-$labels['folders']  = 'Carpetas';
-$labels['foldername']  = 'Nombre de carpeta';
-$labels['subscribed']  = 'Suscripta';
+$labels['reqmdn'] = 'Siempre solicitar acuse de recibo';
+$labels['reqdsn'] = 'Siempre solicitar notificación de estado de envío';
+$labels['replysamefolder'] = 'Colocar respuestas en la carpeta del mensaje siendo respondido';
+$labels['defaultabook'] = 'Libreta de direcciones por defecto';
+$labels['autocompletesingle'] = 'Saltar dirección de correo electrónico alternativo al autocompletar';
+$labels['listnamedisplay'] = 'Listar contactos como';
+$labels['spellcheckbeforesend'] = 'Verificar la ortografía antes de enviar un mensaje';
+$labels['spellcheckoptions'] = 'Opciones del verificador de ortografía';
+$labels['spellcheckignoresyms'] = 'Ignorar palabras con símbolos';
+$labels['spellcheckignorenums'] = 'Ignorar palabras con números';
+$labels['spellcheckignorecaps'] = 'Ignorar palabras con todas las letras en mayúscula';
+$labels['addtodict'] = 'Agregar al diccionario';
+$labels['mailtoprotohandler'] = 'Registrar protocolo para manejar enlaces mailto:';
+$labels['standardwindows'] = 'Manejar emergentes como ventanas estándar';
+$labels['forwardmode'] = 'Mensajes redireccionando';
+$labels['inline'] = 'en línea';
+$labels['asattachment'] = 'como adjunto';
+$labels['replyallmode'] = 'Acción por defecto del botón [Responder a todos]';
+$labels['replyalldefault'] = 'responder a todos';
+$labels['replyalllist'] = 'responder sólo a la lista de correos (si se encuentra)';
+$labels['folder'] = 'Carpeta';
+$labels['folders'] = 'Carpetas';
+$labels['foldername'] = 'Nombre de carpeta';
+$labels['subscribed'] = 'Suscripta';
 $labels['messagecount'] = 'Mensajes';
-$labels['create']  = 'Crear';
-$labels['createfolder']  = 'Crear nueva carpeta';
-$labels['managefolders']  = 'Administrar carpetas';
+$labels['create'] = 'Crear';
+$labels['createfolder'] = 'Crear nueva carpeta';
+$labels['managefolders'] = 'Administrar carpetas';
 $labels['specialfolders'] = 'Carpetas Especiales';
+$labels['properties'] = 'Propiedades';
+$labels['folderproperties'] = 'Propiedades de carpeta';
+$labels['parentfolder'] = 'Carpeta pariente';
+$labels['location'] = 'Ubicación';
+$labels['info'] = 'Información';
+$labels['getfoldersize'] = 'Clic para obtener el tamaño de la carpeta';
+$labels['changesubscription'] = 'Clic para cambiar suscripción';
+$labels['foldertype'] = 'Tipo de carpeta';
+$labels['personalfolder'] = 'Carpeta privada';
+$labels['otherfolder'] = 'Carpeta de otros usuarios';
+$labels['sharedfolder'] = 'Carpeta pública';
+$labels['findfolders'] = 'Buscar carpetas';
+$labels['namespace.personal'] = 'Personal';
+$labels['namespace.other'] = 'Otros usuarios';
+$labels['namespace.shared'] = 'Compartido';
 $labels['sortby'] = 'Ordenar por';
 $labels['sortasc']  = 'Orden ascendente';
 $labels['sortdesc'] = 'Orden descendente';
+$labels['undo'] = 'Deshacer';
+$labels['installedplugins'] = 'Extensiones instaladas';
+$labels['plugin'] = 'Extensión';
+$labels['version'] = 'Versión';
+$labels['source'] = 'Fuente';
+$labels['license'] = 'Licencia';
+$labels['support'] = 'Obtener soporte';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -414,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamita';
 $labels['japanese'] = 'Japonés';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chino';
+$labels['arialabeltopnav'] = 'Control de ventana';
+$labels['arialabeltasknav'] = 'Tareas de aplicación';
+$labels['arialabeltoolbar'] = 'Barra de herramientas de aplicación';
+$labels['arialabelactivetask'] = 'Tarea activa';
+$labels['arialabelmessagessearchfilter'] = 'Filtro de listado de correo electrónico';
+$labels['arialabelmailsearchform'] = 'Formulario de búsqueda de correo electrónico';
+$labels['arialabelcontactsearchform'] = 'Formulario de búsqueda de contactos';
+$labels['arialabelmailquicksearchbox'] = 'Ingreso de búsqueda de correo electrónico';
+$labels['arialabelquicksearchbox'] = 'Ingreso de búsqueda';
+$labels['arialabelfoldersearchfilter'] = 'Filtro de listado de carpetas';
+$labels['arialabelfoldersearchform'] = 'Formulario de búsqueda de carpetas';
+$labels['arialabelfolderlist'] = 'Selección de carpeta de correo electrónico';
+$labels['arialabelmessagelist'] = 'Listado de mensajes de correo electrónico';
+$labels['arialabelmailpreviewframe'] = 'Previsualización de mensaje';
+$labels['arialabelmailboxmenu'] = 'Menú de acciones de carpeta';
+$labels['arialabellistselectmenu'] = 'Menú de selección de lista';
+$labels['arialabelthreadselectmenu'] = 'Menú de listado por hilo';
+$labels['arialabelmessagelistoptions'] = 'Opciones de mostrado de mensajes y ordenamiento';
+$labels['arialabelmailimportdialog'] = 'Diálogo de importación de mensaje';
+$labels['arialabelmessagenav'] = 'Navegación de mensajes';
+$labels['arialabelmessagebody'] = 'Cuerpo de mensaje';
+$labels['arialabelmessageactions'] = 'Acciones de mensaje';
+$labels['arialabelcontactquicksearch'] = 'Formulario de búsqueda de contactos';
+$labels['arialabelcontactsearchbox'] = 'Ingreso de búsqueda de contactos';
+$labels['arialabelmessageheaders'] = 'Encabezados de mensaje';
+$labels['arialabelforwardingoptions'] = 'Opciones de reenvío';
+$labels['arialabelreplyalloptions'] = 'Opciones de Responder a todos';
+$labels['arialabelmoremessageactions'] = 'Más acciones de mensaje';
+$labels['arialabelmarkmessagesas'] = 'Marcar mensaje seleccionado como...';
+$labels['arialabelcomposeoptions'] = 'Opciones de composición';
+$labels['arialabelresponsesmenu'] = 'Menú de respuestas enlatadas';
+$labels['arialabelattachmentuploadform'] = 'Formulario para subir adjuntos';
+$labels['arialabelattachmentpreview'] = 'Previsualización de adjunto';
+$labels['ariasummarycomposecontacts'] = 'Listar los contactos y grupos para seleccionar como destinatarios';
+$labels['arialabelcontactexportoptions'] = 'Opciones de exportación de mensajes';
+$labels['arialabelabookgroupoptions'] = 'Opciones de libreta de direcciones/grupo';
+$labels['arialabelpreferencesform'] = 'Formulario de preferencias';
+$labels['arialabelidentityeditfrom'] = 'Formulario de edición de identidades';
+$labels['arialabelresonseeditfrom'] = 'Formulario de edición de respuesta';
+$labels['arialabelsearchterms'] = 'Términos de búsqueda';
+$labels['helplistnavigation'] = 'Listar navegación por teclado';
+$labels['helplistkeyboardnavigation'] = "Flechas arriba/abajo: Mueve el foco de la fila/selección.
+Espacio: Selecciona la fila en foco.
+Shift + arriba/abajo: Selecciona fila adicional arriba/abajo.
+Ctrl + Espacio: Agrega fila seleccionada en foco para seleccionar/eliminar.";
+$labels['helplistkeyboardnavmessages'] = "Flechas arriba/abajo: expande/colapsa el hilo del mensaje (sólo en modo de hilos).
+Intro: Abre el mensaje seleccionado/en foco.
+Supr: Mueve el mensaje seleccionado a la Papelera.";
+$labels['helplistkeyboardnavcontacts'] = "Intro: Abre el contacto seleccionado/en foco";
 ?>
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index 6f1cd1cb5..a1050e6a2 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -22,14 +22,20 @@ $messages['sessionerror'] = 'Su sesión no existe o ha expirado';
 $messages['storageerror'] = 'Error de conexión con el servidor IMAP';
 $messages['servererror'] = '¡Error en el servidor!';
 $messages['servererrormsg'] = 'Error en servidor: $msg';
+$messages['connerror'] = 'Error de conexión (No se pudo conectar con el servidor)!';
 $messages['dberror'] = 'Error en base de datos!';
+$messages['windowopenerror'] = 'La ventana emergente ha sido bloqueada!';
 $messages['requesttimedout'] = 'Tiempo de espera agotado';
 $messages['errorreadonly'] = 'No se pudo realizar la operación. La carpeta es de sólo lectura.';
 $messages['errornoperm'] = 'No se pudo realizar la operación. Permiso denegado.';
+$messages['erroroverquota'] = 'No se pudo realizar la operación. Espacio en disco insuficiente.';
+$messages['erroroverquotadelete'] = 'Espacio en disco insuficiente. Utilice SHIFT+DEL para eliminar un mensaje.';
 $messages['invalidrequest'] = 'Peteción invalida! No se guardó nada.';
 $messages['invalidhost'] = 'Nombre de servidor inválido.';
 $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla';
 $messages['loggedout'] = 'Ha cerrado la sesión. ¡Hasta pronto!';
+$messages['mailboxempty'] = 'La casilla está vacía';
+$messages['nomessages'] = '0 mensajes';
 $messages['refreshing'] = 'Actualizando...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Subiendo archivo...';
@@ -41,6 +47,8 @@ $messages['messagesent'] = 'Mensaje enviado correctamente';
 $messages['savingmessage'] = 'Guardar mensaje...';
 $messages['messagesaved'] = 'Mensaje guardado en borradores';
 $messages['successfullysaved'] = 'Guardado correctamente';
+$messages['savingresponse'] = 'Guardando texto de respuesta...';
+$messages['deleteresponseconfirm'] = 'Realmente deseas eliminar este texto de respuesta?';
 $messages['addedsuccessfully'] = 'Contacto añadido correctamente a la libreta de direcciones';
 $messages['contactexists'] = 'Ya existe un contacto con esta dirección de correo';
 $messages['contactnameexists'] = 'Ya existe un contacto con el mismo nombre.';
@@ -51,6 +59,8 @@ $messages['contactnotfound'] = 'El contacto solicitado no existe';
 $messages['contactsearchonly'] = 'Ingresá algún término de búsqueda para encontrar contactos';
 $messages['sendingfailed'] = 'Error al enviar mensaje';
 $messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de enviar este mensaje';
+$messages['errorsavingsent'] = 'Ocurrió un error al guardar el mensaje enviado';
+$messages['errorsaving'] = 'Ocurrió un error al guardar';
 $messages['errormoving'] = 'No se pudo mover el mensaje';
 $messages['errorcopying'] = 'No se pudo copiar el mensaje';
 $messages['errordeleting'] = 'No se ha podido eliminar el mensaje';
@@ -75,6 +85,7 @@ $messages['norecipientwarning'] = 'Por favor, introduzca al menos un destinatari
 $messages['nosubjectwarning']  = 'El campo "Asunto" esta vacío. ¿Desea completarlo en este momento?';
 $messages['nobodywarning'] = '¿Quiere enviar este mensaje sin texto?';
 $messages['notsentwarning'] = 'El mensaje no ha sido enviado. ¿Desea descartar su mensaje?';
+$messages['restoresavedcomposedata'] = 'Se ha encontrado un mensaje redactado anteriormente que no ha sido enviado.\n\nAsunto: $subject\nGuardado: $date\n\nDeseas recuperar este mensaje?';
 $messages['noldapserver'] = 'Por favor, seleccione un servidor LDAP para buscar';
 $messages['nosearchname'] = 'Por favor, introduzca un nombre o la dirección de e-mail';
 $messages['notuploadedwarning'] = 'Todavia no se subieron todos los archivos adjuntos. Por favor aguarde o cancele la subida.';
@@ -83,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr contactos encontrados.';
 $messages['searchnomatch'] = 'La búsqueda no obtuvo resultados';
 $messages['searching'] = 'Buscando...';
 $messages['checking'] = 'Revisando...';
+$messages['stillsearching'] = 'Búsqueda en progreso...';
 $messages['nospellerrors'] = 'No se encontraron errores ortográficos';
 $messages['folderdeleted'] = 'Carpeta eliminada exitosamente';
 $messages['foldersubscribed'] = 'Suscripción a carpeta exitosa.';
@@ -94,11 +106,16 @@ $messages['converting'] = 'Removiendo el formato del mensaje...';
 $messages['messageopenerror'] = 'No puedo descargar el mensaje del servidor';
 $messages['fileuploaderror'] = 'Error al subir archivos';
 $messages['filesizeerror'] = 'El archivo excede el tamaño maximo ($size)';
+$messages['copysuccess'] = '$nr contactos copiados exitosamente.';
+$messages['movesuccess'] = '$nr contactos movidos exitosamente.';
+$messages['copyerror'] = 'No se pudo copiar ningún contacto.';
+$messages['moveerror'] = 'No se pudo mover ningún contacto.';
 $messages['sourceisreadonly'] = 'Esta dirección es de sólo-lectura';
 $messages['errorsavingcontact'] = 'No se pudo guardar la dirección de contacto';
 $messages['movingmessage'] = 'Moviendo mensaje...';
 $messages['copyingmessage'] = 'Copiando mensaje...';
 $messages['copyingcontact'] = 'Copiando contacto(s)...';
+$messages['movingcontact'] = 'Moviendo contacto(s)...';
 $messages['deletingmessage'] = 'Eliminando contacto(s)...';
 $messages['markingmessage'] = 'Marcando mensaje(s)...';
 $messages['addingmember'] = 'Agregando contacto(s) al grupo...';
@@ -117,9 +134,11 @@ $messages['importwait'] = 'Importando, aguarde por favor...';
 $messages['importformaterror'] = 'Importación fallida! El archivo subido no es un archivo de importación de datos válido.';
 $messages['importconfirm'] = '<b>Se importaron $inserted contactos correctamente. $skipped ya existentes fueron ignorados</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Se ignoraron $skipped entradas ya existentes</b>';
+$messages['importmessagesuccess'] = '$nr mensajes importados exitosamente';
+$messages['importmessageerror'] = 'Importación fallida! El archivo subido no es un mensaje o archivo mailbox válido';
 $messages['opnotpermitted'] = 'Operación no permitida!';
 $messages['nofromaddress'] = 'El contacto seleccionado no tiene dirección de e-mail';
-$messages['editorwarning'] = 'Si cambia a texto plano se perderán todas las opciones de formato. ¿Desea continuar?';
+$messages['editorwarning'] = 'Cambiar el tipo de editor puede causar la pérdida del formato. Deseas continuar?';
 $messages['httpreceivedencrypterror'] = 'Ha ocurrido un error fatal de configuración. Contacte inmediatamente a su administrador. <b>Su mensaje no ha sido enviado.</b>';
 $messages['smtpconnerror'] = 'Error SMTP ($code): Conexión al servidor falló';
 $messages['smtpautherror'] = 'Error SMTP ($code): Falló la autentificación';
@@ -130,6 +149,7 @@ $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'La dirección $email no es válida';
 $messages['toomanyrecipients'] = 'Demasiados destinatarios. Reduzca la cantidad a un máximo de $max.';
 $messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max';
+$messages['internalerror'] = 'Ocurrió un error interno. Por favor, intenta nuevamente.';
 $messages['contactdelerror'] = 'No se pudo eliminar el/los contactos(s).';
 $messages['contactdeleted'] = 'Contacto(s) eliminado/s exitosamente.';
 $messages['contactrestoreerror'] = 'No se pudo recuperar el/los contacto/s eliminado(s).';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index ba17a4dff..5a210be74 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -37,13 +37,13 @@ $labels['to']      = 'Destinatario';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Cco';
 $labels['replyto'] = 'Responder a';
-$labels['followupto'] = 'Responder-a';
+$labels['followupto'] = 'Responder a todos';
 $labels['date']    = 'Fecha';
 $labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
-$labels['readstatus'] = 'Leer estado';
-$labels['listoptions'] = 'Lista de opciones...';
+$labels['readstatus'] = 'Estado de lectura';
+$labels['listoptions'] = 'Opciones de listado';
 $labels['mailboxlist'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
 $labels['threadsfromto'] = 'Hilos $from a $to de $count';
@@ -100,13 +100,13 @@ $labels['longnov']	= 'Noviembre';
 $labels['longdec']	= 'Diciembre';
 $labels['today'] = 'Hoy';
 $labels['refresh']          = 'Actualizar';
-$labels['checkmail']        = 'Revisar si hay mensajes nuevos';
+$labels['checkmail']        = 'Comprobar si hay mensajes nuevos';
 $labels['compose']          = 'Redactar';
 $labels['writenewmessage']  = 'Crear un mensaje nuevo';
 $labels['reply']            = 'Responder';
-$labels['replytomessage']   = 'Responder mensaje';
+$labels['replytomessage']   = 'Responder al remitente';
 $labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
-$labels['replyall']         = 'Responder a todos';
+$labels['replyall']         = 'Responder a la lista o al remitente y a todos los destinatarios';
 $labels['replylist']        = 'Responder a la lista';
 $labels['forward']          = 'Reenviar';
 $labels['forwardinline']    = 'Reenviar directamente';
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Más acciones…';
 $labels['more']             = 'Más';
 $labels['back']             = 'Volver';
 $labels['options']          = 'Opciones';
+$labels['first'] = 'Primero';
+$labels['last'] = 'Último';
+$labels['previous'] = 'Anterior';
+$labels['next'] = 'Siguiente';
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
 $labels['currpage'] = 'Página actual';
+$labels['isread'] = 'Leído';
 $labels['unread'] = 'Sin leer';
-$labels['flagged'] = 'Señalado';
+$labels['flagged'] = 'Marcado';
+$labels['unflagged'] = 'No marcado';
 $labels['unanswered'] = 'Sin respuesta';
 $labels['withattachment'] = 'Con adjunto';
 $labels['deleted'] = 'Eliminado';
 $labels['undeleted'] = 'No eliminado';
+$labels['replied'] = 'Contestado';
+$labels['forwarded'] = 'Reenviado';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
@@ -152,7 +160,7 @@ $labels['threaded'] = 'Encadenados';
 $labels['autoexpand_threads'] = 'Expandir hilos de mensajes';
 $labels['do_expand'] = 'todos los hilos';
 $labels['expand_only_unread'] = 'solo con mensajes no leídos';
-$labels['fromto'] = 'Remitente/Destinatario';
+$labels['fromto'] = 'De/A';
 $labels['flag'] = 'Marca';
 $labels['attachment'] = 'Adjunto';
 $labels['nonesort'] = 'Ninguno';
@@ -164,13 +172,18 @@ $labels['listcolumns'] = 'Listar columnas';
 $labels['listsorting'] = 'Columna de listado';
 $labels['listorder'] = 'Orden de listado';
 $labels['listmode'] = 'Modo de vista de lista';
-$labels['folderactions'] = 'Acciones de bandeja...';
+$labels['folderactions'] = 'Acciones de carpeta...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
 $labels['importmessages'] = 'Importar mensajes';
 $labels['quota'] = 'Uso de disco';
 $labels['unknown']  = 'desconocido';
 $labels['unlimited']  = 'sin límite';
+$labels['quotatype'] = 'Tipo de cuota';
+$labels['quotatotal'] = 'Límite';
+$labels['quotaused'] = 'Usado';
+$labels['quotastorage'] = 'Espacio en disco';
+$labels['quotamessage'] = 'Número de mensajes';
 $labels['quicksearch']  = 'Búsqueda rápida';
 $labels['resetsearch']  = 'Reiniciar la búsqueda';
 $labels['searchmod']  = 'Opciones de búsqueda';
@@ -178,34 +191,43 @@ $labels['msgtext']  = 'Mensaje completo';
 $labels['body']  = 'Cuerpo';
 $labels['type'] = 'Tipo';
 $labels['namex'] = 'Nombre';
+$labels['searchscope'] = 'Ámbito';
+$labels['currentfolder'] = 'Carpeta actual';
+$labels['subfolders'] = 'Ésta y subcarpetas';
+$labels['allfolders'] = 'Todas las carpetas';
 $labels['openinextwin'] = 'Abrir en nueva ventana';
 $labels['emlsave'] = 'Descargar (.eml)';
 $labels['changeformattext'] = 'Mostrar en formato de texto sencillo';
 $labels['changeformathtml'] = 'Mostrar en formato HTML';
 $labels['editasnew']      = 'Editar como nuevo';
 $labels['send']           = 'Enviar';
-$labels['sendmessage']    = 'Enviar ahora el mensaje';
+$labels['sendmessage']    = 'Enviar el mensaje';
 $labels['savemessage']    = 'Guardar como borrador';
 $labels['addattachment']  = 'Adjuntar un archivo';
 $labels['charset']        = 'Codificación';
 $labels['editortype']     = 'Tipo de editor';
 $labels['returnreceipt']  = 'Acuse de recibo';
-$labels['dsn']            = 'Entrega de notificaciones de estado';
+$labels['dsn']            = 'Notificación de estado de la entrega';
 $labels['mailreplyintro'] = 'El $date, $sender escribió:';
 $labels['originalmessage'] = 'Mensaje original';
+$labels['selectimage']    = 'Elegir una imagen';
+$labels['addimage']       = 'Añadir una imagen';
+$labels['selectmedia']    = 'Seleccionar película';
+$labels['addmedia']       = 'Añadir película';
 $labels['editidents']    = 'Editar identidades';
 $labels['spellcheck']    = 'Corrector ortográfico';
 $labels['checkspelling'] = 'Revisar ortografía';
-$labels['resumeediting'] = 'Continuar edición';
+$labels['resumeediting'] = 'Segui editando';
 $labels['revertto']      = 'Revertir a';
 $labels['restore'] = 'Restaurar';
 $labels['restoremessage'] = '¿Restaurar el mensaje?';
 $labels['responses'] = 'Respuestas';
 $labels['insertresponse'] = 'Insertar una respuesta';
 $labels['manageresponses'] = 'Gestionar respuestas';
-$labels['savenewresponse'] = 'Guardar nueva respuesta';
-$labels['editresponses'] = 'Editar respuestas';
+$labels['savenewresponse'] = 'Crear nueva respuesta';
+$labels['addresponse'] = 'Añadir respuesta';
 $labels['editresponse'] = 'Editar respuesta';
+$labels['editresponses'] = 'Editar respuestas';
 $labels['responsename'] = 'Nombre';
 $labels['responsetext'] = 'Texto de respuesta';
 $labels['attach'] = 'Adjuntar';
@@ -214,29 +236,30 @@ $labels['upload'] = 'Subir';
 $labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close']  = 'Cerrar';
 $labels['messageoptions']  = 'Opciones de mensaje...';
+$labels['togglecomposeoptions'] = 'Mostrar opciones de escritura';
 $labels['low']     = 'Bajo';
-$labels['lowest']  = 'Bajísimo';
+$labels['lowest']  = 'El más bajo';
 $labels['normal']  = 'Normal';
 $labels['high']    = 'Alto';
-$labels['highest'] = 'Altísimo';
+$labels['highest'] = 'El más alto';
 $labels['nosubject']  = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imágenes';
 $labels['alwaysshow'] = 'Mostrar siempre imágenes de $sender';
-$labels['isdraft']    = 'Este mensaje es un borrador';
+$labels['isdraft']    = 'Esto es un borrador';
 $labels['andnmore']   = '$nr más…';
 $labels['togglemoreheaders'] = 'Mostrar más encabezados del mensaje';
 $labels['togglefullheaders'] = 'Mostrar u ocultar encabezados de mensajes';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Sólo texto';
 $labels['savesentmessagein'] = 'Guardar mensaje enviado en';
-$labels['dontsave'] = 'No guardar';
+$labels['dontsave'] = 'no guardar';
 $labels['maxuploadsize'] = 'Tamaño de archivo máximo permitido: $size';
 $labels['addcc'] = 'Añadir Cc';
 $labels['addbcc'] = 'Añadir Cco';
 $labels['addreplyto'] = 'Añadir Responder a';
 $labels['addfollowupto'] = 'Añadir Seguir a';
 $labels['mdnrequest'] = 'El emisor de este mensaje desea ser notificado cuando usted lo lea. ¿Quiere enviar esta notificación?';
-$labels['receiptread'] = 'Notificación de lectura';
+$labels['receiptread'] = 'Devolver un acuse de recibo';
 $labels['yourmessage'] = 'Esto es un acuse de recibo de su mensaje';
 $labels['receiptnote'] = 'Nota: Esta notificación sólo significa que su mensaje fue abierto en el ordenador del destinatario. Eso no garantiza que el destinatario haya leído o entendido el contenido del mensaje.';
 $labels['name']         = 'Nombre para mostrar';
@@ -246,7 +269,7 @@ $labels['middlename']   = 'Segundo nombre';
 $labels['nameprefix']   = 'Prefijo';
 $labels['namesuffix']   = 'Sufijo';
 $labels['nickname']     = 'Alias';
-$labels['jobtitle']     = 'Tratamiento';
+$labels['jobtitle']     = 'Cargo';
 $labels['department']   = 'Departamento';
 $labels['gender']       = 'Sexo';
 $labels['maidenname']   = 'Apellido de soltera';
@@ -263,13 +286,14 @@ $labels['anniversary']  = 'Santo';
 $labels['website']      = 'Página web';
 $labels['instantmessenger'] = 'Mensajería instantánea';
 $labels['notes'] = 'Notas';
-$labels['male']   = 'Hombre';
-$labels['female'] = 'Mujer';
+$labels['male']   = 'hombre';
+$labels['female'] = 'mujer';
 $labels['manager'] = 'Director';
 $labels['assistant'] = 'Auxiliar';
 $labels['spouse'] = 'Cónyuge';
 $labels['allfields'] = 'Todos los campos';
 $labels['search'] = 'Buscar';
+$labels['searchresult'] = 'Resultado de búsqueda';
 $labels['advsearch'] = 'Búsqueda avanzada';
 $labels['advanced'] = 'Avanzadas';
 $labels['other'] = 'Otro';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Inicio';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
 $labels['addfield'] = 'Añadir campo...';
-$labels['addcontact'] = 'Añadir nuevo contacto';
+$labels['addcontact'] = 'Añadir contacto';
 $labels['editcontact'] = 'Editar contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Propiedades del contacto';
+$labels['contactnameandorg'] = 'Nombre y organización';
 $labels['personalinfo'] = 'Información personal';
+$labels['contactphoto'] = 'Foto del contacto';
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
@@ -301,7 +327,7 @@ $labels['rename'] = 'Renombrar';
 $labels['addphoto'] = 'Añadir';
 $labels['replacephoto'] = 'Reemplazar';
 $labels['uploadphoto'] = 'Subir foto';
-$labels['newcontact']     = 'Crear nueva tarjeta de contacto';
+$labels['newcontact']     = 'Crear nuevo contacto';
 $labels['deletecontact']  = 'Eliminar contactos seleccionados';
 $labels['composeto']      = 'Escribir mensaje a';
 $labels['contactsfromto'] = 'Contactos $from a $to de $count';
@@ -310,10 +336,12 @@ $labels['export']         = 'Exportar';
 $labels['exportall']      = 'Exportar todo';
 $labels['exportsel']      = 'Exportar lo seleccionado';
 $labels['exportvcards']   = 'Exportar contactos en formato vCard';
-$labels['newcontactgroup'] = 'Crear un nuevo grupo de contactos';
+$labels['newcontactgroup']       = 'Crear nuevo grupo';
+$labels['addgroup']       = 'Añadir grupo';
 $labels['grouprename']    = 'Renombrar grupo';
 $labels['groupdelete']    = 'Borrar grupo';
 $labels['groupremoveselected'] = 'Eliminar los contactos seleccionados del grupo';
+$labels['uponelevel']     = 'Subir un nivel';
 $labels['previouspage']   = 'Mostrar grupo anterior';
 $labels['firstpage']      = 'Mostrar primer grupo';
 $labels['nextpage']       = 'Mostrar grupo siguiente';
@@ -332,7 +360,7 @@ $labels['importreplace'] = 'Reemplazar toda la lista de contactos';
 $labels['importgroups'] = 'Importar asignaciones de grupo';
 $labels['importgroupsall'] = 'Todos (crear grupos si es necesario)';
 $labels['importgroupsexisting'] = 'Sólo para los grupos existentes';
-$labels['importdesc'] = 'Puede subir contactos desde una libreta de direcciones existente.<br/>Actualmente permitimos la importación desde los formatos de datos <a href="http://es.wikipedia.org/wiki/VCard">vCard</a> o CSV (separados por comas).';
+$labels['importdesc'] = 'Puede subir los contactos de una libreta de direcciones ya existente.<br/>Actualmente permitimos la importación de datos en los formatos  <a href="http://es.wikipedia.org/wiki/VCard">vCard</a> y CSV (separados por comas).';
 $labels['done'] = 'Hecho';
 $labels['settingsfor'] = 'Configuración para';
 $labels['about'] = 'Acerca de';
@@ -340,11 +368,11 @@ $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
 $labels['identities'] = 'Identidades';
-$labels['manageidentities'] = 'Gestionar identidades para esta cuenta';
-$labels['newidentity'] = 'Nueva identidad';
-$labels['newitem'] = 'Nuevo';
-$labels['edititem'] = 'Editar';
-$labels['preferhtml'] = 'Prefiero HTML';
+$labels['manageidentities'] = 'Administrar identidades';
+$labels['newidentity'] = 'Create new identity';
+$labels['addidentity'] = 'Añadir identidad';
+$labels['edititem'] = 'Editar identidad';
+$labels['preferhtml'] = 'Mostrar HTML';
 $labels['defaultcharset'] = 'Juego de caracteres predeterminado';
 $labels['htmlmessage'] = 'Mensaje HTML';
 $labels['messagepart'] = 'Parte';
@@ -362,10 +390,10 @@ $labels['dstactive']  = 'Cambio de horario';
 $labels['showinextwin'] = 'Abrir mensaje en una ventana nueva';
 $labels['composeextwin'] = 'Redactar en una ventana nueva';
 $labels['htmleditor'] = 'Componer mensaje en HTML';
-$labels['htmlonreply'] = 'sólo en respuesta a un mensaje HTML';
+$labels['htmlonreply'] = 'en respuesta a un mensaje HTML';
 $labels['htmlonreplyandforward'] = 'en reenvío o respuesta al mensaje HTML';
 $labels['htmlsignature'] = 'Firma HTML';
-$labels['showemail'] = 'Mostrar dirección de correo electrónico al visualizar el nombre';
+$labels['showemail'] = 'Mostrar dirección de correo electrónico con nombre';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
 $labels['logoutclear'] = 'Vaciar papelera al cerrar sesión';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 (otro)';
 $labels['force7bit'] = 'Usar codificación MIME para caracteres de 8 bits';
+$labels['savelocalstorage'] = "Guardar (temporalmente) en el almacén local del navegador";
 $labels['advancedoptions'] = 'Opciones avanzadas';
+$labels['toggleadvancedoptions'] = 'Mostrar opciones avanzadas';
 $labels['focusonnewmessage'] = 'Activar la ventana del navegador si hay un mensaje nuevo';
 $labels['checkallfolders'] = 'Comprobar en todas las bandejas si hay mensajes nuevos';
 $labels['displaynext'] = 'Después de borrar/mover un mensaje, mostrar el siguiente';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'como adjunto';
 $labels['replyallmode'] = 'Acción predeterminada del botón [Responder a todos]';
 $labels['replyalldefault'] = 'responder a todos';
 $labels['replyalllist'] = 'responder sólo a la lista de correo (si se encuentra)';
-$labels['folder']  = 'Bandeja';
-$labels['folders']  = 'Carpetas';
-$labels['foldername']  = 'Nombre de bandeja';
-$labels['subscribed']  = 'Suscrita';
+$labels['folder'] = 'Bandeja';
+$labels['folders'] = 'Carpetas';
+$labels['foldername'] = 'Nombre de bandeja';
+$labels['subscribed'] = 'Suscrita';
 $labels['messagecount'] = 'Mensajes';
-$labels['create']  = 'Crear';
-$labels['createfolder']  = 'Crear nueva bandeja';
-$labels['managefolders']  = 'Administrar bandejas';
+$labels['create'] = 'Crear';
+$labels['createfolder'] = 'Crear nueva bandeja';
+$labels['managefolders'] = 'Administrar bandejas';
 $labels['specialfolders'] = 'Bandejas especiales';
 $labels['properties'] = 'Propiedades';
 $labels['folderproperties'] = 'Propiedades de bandeja';
@@ -459,9 +489,13 @@ $labels['info'] = 'Información';
 $labels['getfoldersize'] = 'Clic para saber el tamaño de la bandeja';
 $labels['changesubscription'] = 'Clic para cambiar suscripción';
 $labels['foldertype'] = 'Tipo de bandeja';
-$labels['personalfolder']  = 'Bandeja privada';
-$labels['otherfolder']  = 'Bandeja de otro usuario';
-$labels['sharedfolder']  = 'Bandeja pública';
+$labels['personalfolder'] = 'Bandeja privada';
+$labels['otherfolder'] = 'Bandeja de otro usuario';
+$labels['sharedfolder'] = 'Bandeja pública';
+$labels['findfolders'] = 'Encontrar carpetas';
+$labels['namespace.personal'] = 'Personal';
+$labels['namespace.other'] = 'Otros usuarios';
+$labels['namespace.shared'] = 'Compartido';
 $labels['sortby'] = 'Ordenar por';
 $labels['sortasc']  = 'Orden ascendente';
 $labels['sortdesc'] = 'Orden descendente';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamita';
 $labels['japanese'] = 'Japonés';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chino';
+$labels['arialabeltopnav'] = 'Control de ventana';
+$labels['arialabeltasknav'] = 'Tareas de la aplicación';
+$labels['arialabeltoolbar'] = 'Barra de herramientas de la aplicación';
+$labels['arialabelactivetask'] = 'Tarea activa';
+$labels['arialabelmessagessearchfilter'] = 'Filtro de listado de correo electrónico';
+$labels['arialabelmailsearchform'] = 'Formulario de búsqueda de mensaje de correo electrónico';
+$labels['arialabelcontactsearchform'] = 'Formulario de búsqueda de contactos';
+$labels['arialabelmailquicksearchbox'] = 'Entrada de búsqueda de correo electrónico';
+$labels['arialabelquicksearchbox'] = 'Entrada de búsqueda';
+$labels['arialabelfoldersearchfilter'] = 'Filtro de listas de carpetas';
+$labels['arialabelfoldersearchform'] = 'Formulario de búsqueda de carpeta';
+$labels['arialabelfolderlist'] = 'Selección de carpeta de correo electrónico';
+$labels['arialabelmessagelist'] = 'Listado de mensajes de correo electrónico';
+$labels['arialabelmailpreviewframe'] = 'Previsualizar mensaje';
+$labels['arialabelmailboxmenu'] = 'Menú de acciones de carpeta';
+$labels['arialabellistselectmenu'] = 'Menú de selección de listado';
+$labels['arialabelthreadselectmenu'] = 'Menú de listado de conversaciones';
+$labels['arialabelmessagelistoptions'] = 'Opciones para mostrar y ordenar los mensajes';
+$labels['arialabelmailimportdialog'] = 'Diálogo de importación de mensaje';
+$labels['arialabelmessagenav'] = 'Navegación entre mensajes';
+$labels['arialabelmessagebody'] = 'Cuerpo del mensaje';
+$labels['arialabelmessageactions'] = 'Acciones del mensaje';
+$labels['arialabelcontactquicksearch'] = 'Formulario de búsqueda de contactos';
+$labels['arialabelcontactsearchbox'] = 'Entra de búsqueda de contacto';
+$labels['arialabelmessageheaders'] = 'Encabezados del mensaje';
+$labels['arialabelforwardingoptions'] = 'Opciones de reenvío';
+$labels['arialabelreplyalloptions'] = 'Opciones de "Responder a todos"';
+$labels['arialabelmoremessageactions'] = 'Más acciones de mensaje';
+$labels['arialabelmarkmessagesas'] = 'Marcar los mensajes seleccionados como…';
+$labels['arialabelcomposeoptions'] = 'Opciones de composición';
+$labels['arialabelresponsesmenu'] = 'Menú de respuestas enlatadas';
+$labels['arialabelattachmentuploadform'] = 'Formulario de subida de adjunto';
+$labels['arialabelattachmentpreview'] = 'Previsualizar adjunto';
+$labels['ariasummarycomposecontacts'] = 'Lista de contactos y grupos para elegir como destinatarios';
+$labels['arialabelcontactexportoptions'] = 'Opciones de exportación de contacto';
+$labels['arialabelabookgroupoptions'] = 'Opciones de grupo de contactos de la agenda';
+$labels['arialabelpreferencesform'] = 'Formulario de preferencias';
+$labels['arialabelidentityeditfrom'] = 'Formulario de edición de identidad';
+$labels['arialabelresonseeditfrom'] = 'Formulario de edición de respuesta';
+$labels['arialabelsearchterms'] = 'Términos de búsqueda';
+$labels['helplistnavigation'] = 'Listar la navegación por teclado';
+$labels['helplistkeyboardnavigation'] = "Flechas arriba/abajo: Mover de fila el foco o selección.
+Espacio: Seleccionar la fila enfocada.
+Mayúscula + arriba/abajo: Seleccionar otra fila de arriba/abajo.
+Control + Espacio: Añadir fila enfocada a la selección / quitar de la selección.";
+$labels['helplistkeyboardnavmessages'] = "Flechas izquierda/derecha: expandir/recoger hilo de mensaje (sólo en modo hilo).
+Retorno: Abrir el mensaje seleccionado/enfocado.
+Borrar: Mover los mensajes seleccionado a la Papelera.";
+$labels['helplistkeyboardnavcontacts'] = "Retorno: Abrir el contacto seleccionado";
 ?>
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 53a136b0f..665df6165 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Su sesión no es válida o ha expirado.';
 $messages['storageerror'] = 'Error de conexión con el servidor IMAP.';
 $messages['servererror'] = '¡Error del servidor!';
 $messages['servererrormsg'] = 'Error de servidor: $msg';
+$messages['connerror'] = '¡Error de conexión (fallo al intentar alcanzar el servidor)!';
 $messages['dberror'] = '¡Error de base de datos!';
+$messages['windowopenerror'] = 'iLa ventana emergente fue bloqueada!';
 $messages['requesttimedout'] = 'Ha expirado el tiempo de respuesta';
 $messages['errorreadonly'] = 'Imposible realizar la operación. La bandeja es sólo de lectura.';
 $messages['errornoperm'] = 'Imposible realizar la operación. Permiso denegado.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Encontrados $nr contactos.';
 $messages['searchnomatch'] = 'No se obtuvieron resultados.';
 $messages['searching'] = 'Buscando...';
 $messages['checking'] = 'Revisando...';
+$messages['stillsearching'] = 'Todavía buscando...';
 $messages['nospellerrors'] = 'No se encontraron errores ortográficos.';
 $messages['folderdeleted'] = 'Bandeja eliminada correctamente.';
 $messages['foldersubscribed'] = 'Suscrito a bandeja correctamente.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = '$nr mensajes importados con éxito';
 $messages['importmessageerror'] = '¡Ha fallado la importación! El fichero subido no es un fichero válido de mensaje o buzón de correo';
 $messages['opnotpermitted'] = '¡Operación no permitida!';
 $messages['nofromaddress'] = 'El contacto seleccionado no tiene dirección de e-mail';
-$messages['editorwarning'] = 'Cambiando a texto plano perderá el formato del mensaje. ¿Desea continuar?';
+$messages['editorwarning'] = 'Cambiar el tipo de editor puede ocasionar la pérdida del formato del texto. ¿Desea continuar?';
 $messages['httpreceivedencrypterror'] = 'Ha ocurrido un error fatal de configuración. Contacte inmediatamente a su administrador. <b>Su mensaje no ha sido enviado.</b>';
 $messages['smtpconnerror'] = 'Error SMTP ($code): Ha fallado la conexión al servidor.';
 $messages['smtpautherror'] = 'Error SMTP ($code): Error de autenticación.';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index 42a268dd2..57c53c09a 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -52,6 +52,7 @@ $labels['fromtoshort'] = '$from – $to kokku $count';
 $labels['copy']     = 'Kopeeri';
 $labels['move']     = 'Liiguta';
 $labels['moveto']   = 'liiguta kausta...';
+$labels['copyto']   = 'Kopeeri...';
 $labels['download'] = 'laadi arvutisse';
 $labels['open']     = 'Ava';
 $labels['showattachment'] = 'Näita';
@@ -130,16 +131,24 @@ $labels['moreactions']      = 'Muud toimingud...';
 $labels['more']             = 'Rohkem';
 $labels['back']             = 'Tagasi';
 $labels['options']          = 'Valikud';
+$labels['first'] = 'Esimene';
+$labels['last'] = 'Viimane';
+$labels['previous'] = 'Eelmine';
+$labels['next'] = 'Järgmine';
 $labels['select'] = 'Vali';
 $labels['all'] = 'kõik';
 $labels['none'] = 'Puudub';
 $labels['currpage'] = 'Praegune leht';
+$labels['isread'] = 'Loe';
 $labels['unread'] = 'Lugemata';
 $labels['flagged'] = 'Märgistatud';
+$labels['unflagged'] = 'Märgistamatta';
 $labels['unanswered'] = 'Vastamata';
 $labels['withattachment'] = 'Koos manusega';
 $labels['deleted'] = 'Kustutatud';
 $labels['undeleted'] = 'Pole kustutatud';
+$labels['replied'] = 'Vastatud';
+$labels['forwarded'] = 'Edastatud';
 $labels['invert'] = 'Vaheta';
 $labels['filter'] = 'Filtreeri';
 $labels['list'] = 'Nimekiri';
@@ -170,6 +179,11 @@ $labels['importmessages'] = 'Impordi kirju';
 $labels['quota'] = 'Kettakasutus';
 $labels['unknown']  = 'teadmata';
 $labels['unlimited']  = 'piiramatu';
+$labels['quotatype'] = 'Piirangu tüüp';
+$labels['quotatotal'] = 'Limiit';
+$labels['quotaused'] = 'Kasutatud';
+$labels['quotastorage'] = 'Ketta ruum';
+$labels['quotamessage'] = 'Kirjade arv';
 $labels['quicksearch']  = 'Kiirotsing';
 $labels['resetsearch']  = 'Lähtesta otsing';
 $labels['searchmod']  = 'Otsingu laiendid';
@@ -177,6 +191,10 @@ $labels['msgtext']  = 'Kogu kirjast';
 $labels['body']  = 'Keha';
 $labels['type'] = 'Tüüp';
 $labels['namex'] = 'Nimi';
+$labels['searchscope'] = 'Skoop';
+$labels['currentfolder'] = 'Käesolev kaust';
+$labels['subfolders'] = 'See ja alamkaust';
+$labels['allfolders'] = 'Kõik kaustad';
 $labels['openinextwin'] = 'Ava uues aknas';
 $labels['emlsave'] = 'Salvesta (.eml)';
 $labels['changeformattext'] = 'Näita lihttekstina';
@@ -192,11 +210,26 @@ $labels['returnreceipt']  = 'Kättesaamiskinnitus';
 $labels['dsn']            = 'Kohalejõudmise teavitus';
 $labels['mailreplyintro'] = '$date kirjutas $sender:';
 $labels['originalmessage'] = 'Esialgne kiri';
+$labels['selectimage']    = 'Vali pilt';
+$labels['addimage']       = 'Lisa pilt';
+$labels['selectmedia']    = 'Vali film';
+$labels['addmedia']       = 'Lisa film';
 $labels['editidents']    = 'Muuda Identiteete';
 $labels['spellcheck']    = 'Õigekiri';
 $labels['checkspelling'] = 'Kontrolli õigekirja';
 $labels['resumeediting'] = 'Jätka muutmist';
 $labels['revertto']      = 'Pööra tagasi';
+$labels['restore'] = 'Taasta';
+$labels['restoremessage'] = 'Taasta kiri?';
+$labels['responses'] = 'Vastused';
+$labels['insertresponse'] = 'Lisa vastus';
+$labels['manageresponses'] = 'Halda vastuseid';
+$labels['savenewresponse'] = 'Loo uus vastus';
+$labels['addresponse'] = 'Lisa vastus';
+$labels['editresponse'] = 'Muuda vastust';
+$labels['editresponses'] = 'Muuda vastuseid';
+$labels['responsename'] = 'Nimi';
+$labels['responsetext'] = 'Vastuse sisu';
 $labels['attach'] = 'Manusta';
 $labels['attachments'] = 'Manused';
 $labels['upload'] = 'Kinnita manus';
@@ -277,11 +310,13 @@ $labels['typehomepage']  = 'Veebileht';
 $labels['typeblog'] = 'Ajaveeb';
 $labels['typeprofile'] = 'Profiil';
 $labels['addfield'] = 'Lisa väli...';
-$labels['addcontact'] = 'Uue kontakti lisamine';
+$labels['addcontact'] = 'Lisa kontakt';
 $labels['editcontact'] = 'Muuda kontakti';
 $labels['contacts'] = 'Kontaktid';
 $labels['contactproperties'] = 'Kontakti omadused';
+$labels['contactnameandorg'] = 'Nimi ja Organisatsioon';
 $labels['personalinfo'] = 'Isiklik info';
+$labels['contactphoto'] = 'Kontakti pilt';
 $labels['edit']   = 'Muuda';
 $labels['cancel'] = 'Katkesta';
 $labels['save']   = 'Salvesta';
@@ -290,7 +325,7 @@ $labels['rename'] = 'Nimeta ümber';
 $labels['addphoto'] = 'Lisa';
 $labels['replacephoto'] = 'Asenda';
 $labels['uploadphoto'] = 'Lisa foto';
-$labels['newcontact']     = 'Uue sissekande loomine';
+$labels['newcontact']     = 'Loo uus kontakt';
 $labels['deletecontact']  = 'Kustuta märgistatud kontaktid';
 $labels['composeto']      = 'Kirjuta kiri';
 $labels['contactsfromto'] = 'Kirjed $from kuni $to, kokku $count';
@@ -299,10 +334,11 @@ $labels['export']         = 'Ekspordi';
 $labels['exportall']      = 'Ekspordi kõik';
 $labels['exportsel']      = 'Ekspordi valitud';
 $labels['exportvcards']   = 'Ekspordi kontaktid vCardi formaadis';
-$labels['newcontactgroup'] = 'Loo uus kontaktigrupp';
+$labels['newcontactgroup']       = 'Loo uus grupp';
 $labels['grouprename']    = 'Nimeta grupp ümber';
 $labels['groupdelete']    = 'Kustuta grupp';
 $labels['groupremoveselected'] = 'Eemalda valitud kontaktid grupist';
+$labels['uponelevel']     = 'Üks tase kõrgemale';
 $labels['previouspage']   = 'Näita eelmist lehte';
 $labels['firstpage']      = 'Näita esimest komplekti';
 $labels['nextpage']       = 'Näita järgmist lehte';
@@ -316,7 +352,11 @@ $labels['searchdelete'] = 'Kustuta otsing';
 $labels['import'] = 'Impordi';
 $labels['importcontacts'] = 'Impordi kontakte';
 $labels['importfromfile'] = 'Impordi failist:';
+$labels['importtarget'] = 'Lisa kontaktid ';
 $labels['importreplace'] = 'Asenda kogu aadressiraamat';
+$labels['importgroups'] = 'Impordi grupi ülessanded';
+$labels['importgroupsall'] = 'Kõik (loo vajadusel grupid)';
+$labels['importgroupsexisting'] = 'Ainult olemasolevatele gruppidele';
 $labels['importdesc'] = 'Sa saad laadida kontakte olemasolevast aadressiraamatust.<br/>Praegu on võimalik importida <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> või CSV (komaga eraldatud) formaadis andmeid. ';
 $labels['done'] = 'Valmis';
 $labels['settingsfor'] = 'Kasutajaeelistused kontole';
@@ -325,10 +365,10 @@ $labels['preferences'] = 'Eelistused';
 $labels['userpreferences'] = 'Kasutaja eelistused';
 $labels['editpreferences'] = 'Muuda kasutaja eelistusi';
 $labels['identities'] = 'Identiteedid';
-$labels['manageidentities'] = 'Halda selle konto identiteete';
-$labels['newidentity'] = 'Uus identiteet';
-$labels['newitem'] = 'Uus sissekanne';
-$labels['edititem'] = 'Muuda sissekannet';
+$labels['manageidentities'] = 'Halda identiteete';
+$labels['newidentity'] = 'Loo uus identiteet';
+$labels['addidentity'] = 'Lisa identiteet';
+$labels['edititem'] = 'Muuda identiteeti';
 $labels['preferhtml'] = 'Eelista HTMLi';
 $labels['defaultcharset'] = 'Vaikimisi märgistik';
 $labels['htmlmessage'] = 'HTML kirjad';
@@ -386,6 +426,7 @@ $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Täielik RFC 2047 (muu)';
 $labels['force7bit'] = '8-bitiste märkide puhul kasuta MIME kodeerimist';
 $labels['advancedoptions'] = 'Lisaseadistused';
+$labels['toggleadvancedoptions'] = 'Näita lisaseadistusi';
 $labels['focusonnewmessage'] = 'Fookusta brauseri aken uue kirja korral';
 $labels['checkallfolders'] = 'Kontrolli uusi kirju kõigist kaustadest';
 $labels['displaynext'] = 'Pärast kirja kustutamist/liigutamist näita järgmist kirja';
@@ -424,14 +465,17 @@ $labels['standardwindows'] = 'Käsitle hüpikaknaid tavaliste akendena';
 $labels['forwardmode'] = 'Kirja edastamine';
 $labels['inline'] = 'kirja sees';
 $labels['asattachment'] = 'manusena';
-$labels['folder']  = 'Kaust';
-$labels['folders']  = 'Kaustad';
-$labels['foldername']  = 'Kausta nimi';
-$labels['subscribed']  = 'Näitan';
+$labels['replyallmode'] = 'Vaike käitumine [Vasta kõigile] nupul';
+$labels['replyalldefault'] = 'Vasta kõigile';
+$labels['replyalllist'] = 'vasta ainult postiloendile (juhul kui leitud)';
+$labels['folder'] = 'Kaust';
+$labels['folders'] = 'Kaustad';
+$labels['foldername'] = 'Kausta nimi';
+$labels['subscribed'] = 'Näitan';
 $labels['messagecount'] = 'Kirju';
-$labels['create']  = 'Loo';
-$labels['createfolder']  = 'Uue kausta loomine';
-$labels['managefolders']  = 'Halda kaustu';
+$labels['create'] = 'Loo';
+$labels['createfolder'] = 'Uue kausta loomine';
+$labels['managefolders'] = 'Halda kaustu';
 $labels['specialfolders'] = 'Erilised kaustad';
 $labels['properties'] = 'Omadused';
 $labels['folderproperties'] = 'Kausta omadused';
@@ -441,9 +485,13 @@ $labels['info'] = 'Teave';
 $labels['getfoldersize'] = 'Kliki kausta suuruse teadasaamiseks';
 $labels['changesubscription'] = 'Kliki kausta tellimuste muutmiseks';
 $labels['foldertype'] = 'Kausta tüüp';
-$labels['personalfolder']  = 'Isiklik kaust';
-$labels['otherfolder']  = 'Teiste kasutajate kaust';
-$labels['sharedfolder']  = 'Avalik kaust';
+$labels['personalfolder'] = 'Isiklik kaust';
+$labels['otherfolder'] = 'Teiste kasutajate kaust';
+$labels['sharedfolder'] = 'Avalik kaust';
+$labels['findfolders'] = 'Otsi kaustasi';
+$labels['namespace.personal'] = 'Isiklik';
+$labels['namespace.other'] = 'Teised kasutajad';
+$labels['namespace.shared'] = 'Jagatud';
 $labels['sortby'] = 'Järjesta';
 $labels['sortasc']  = 'Järjesta kasvavalt';
 $labels['sortdesc'] = 'Järjesta kahanevalt';
@@ -476,4 +524,51 @@ $labels['vietnamese'] = 'vietnami';
 $labels['japanese'] = 'jaapani';
 $labels['korean'] = 'korea';
 $labels['chinese'] = 'hiina';
+$labels['arialabeltopnav'] = 'Akna kontroll';
+$labels['arialabeltasknav'] = 'Rakenduse ülesanded';
+$labels['arialabeltoolbar'] = 'Rakenduse tööriba';
+$labels['arialabelactivetask'] = 'Aktiivne ülesanne';
+$labels['arialabelmessagessearchfilter'] = 'E-kirja näitamise filter';
+$labels['arialabelmailsearchform'] = 'E-kirja otsimise vorm';
+$labels['arialabelcontactsearchform'] = 'Kontakti otsimise vorm';
+$labels['arialabelmailquicksearchbox'] = 'E-kirja otsingu sisend';
+$labels['arialabelquicksearchbox'] = 'Otsingu sisend';
+$labels['arialabelfoldersearchfilter'] = 'Kausta näitamise filter';
+$labels['arialabelfoldersearchform'] = 'Kausta otsimise vorm';
+$labels['arialabelfolderlist'] = 'E-kirja kausta valik';
+$labels['arialabelmessagelist'] = 'E-kirjade näitamine';
+$labels['arialabelmailpreviewframe'] = 'Kirja eelvaade';
+$labels['arialabelmailboxmenu'] = 'Kausta tegevuste menüü';
+$labels['arialabellistselectmenu'] = 'Nimekirja valiku menüü';
+$labels['arialabelthreadselectmenu'] = 'Lõimede näitamise menüü';
+$labels['arialabelmessagelistoptions'] = 'Kirjade näitamise ja sorteerimise võimalused';
+$labels['arialabelmailimportdialog'] = 'Kirja importi dialoog';
+$labels['arialabelmessagenav'] = 'Kirja navigatsioon';
+$labels['arialabelmessagebody'] = 'Kirja sisu';
+$labels['arialabelmessageactions'] = 'Kirja tegevus';
+$labels['arialabelcontactquicksearch'] = 'Kontakti otsingu vorm';
+$labels['arialabelcontactsearchbox'] = 'Kontakti otsingu sisend';
+$labels['arialabelmessageheaders'] = 'Kirja päis';
+$labels['arialabelforwardingoptions'] = 'Edasisuunamise valikud';
+$labels['arialabelreplyalloptions'] = 'Vasta kõigile valikud';
+$labels['arialabelmoremessageactions'] = 'Rohkem kirja tegevusi';
+$labels['arialabelmarkmessagesas'] = 'Märgi valitud kirjad';
+$labels['arialabelattachmentuploadform'] = 'Manuse ülesselaadimise vorm';
+$labels['arialabelattachmentpreview'] = 'Manuse eelvaade';
+$labels['ariasummarycomposecontacts'] = 'Nimekiri kontaktidest ja gruppidest keda valida vastuvõtjateks';
+$labels['arialabelcontactexportoptions'] = 'Kontakti ekspordi võimalused';
+$labels['arialabelabookgroupoptions'] = 'Telefoniraamatu/grupi võimalused';
+$labels['arialabelpreferencesform'] = 'Eelistuste vorm';
+$labels['arialabelidentityeditfrom'] = 'Identiteedi muutmis vorm';
+$labels['arialabelresonseeditfrom'] = 'Vastuse muutmis vorm';
+$labels['arialabelsearchterms'] = 'Otsingusõnad';
+$labels['helplistnavigation'] = 'Näita klaviatuuri navigatsiooni';
+$labels['helplistkeyboardnavigation'] = "Nooled üles/alla: Muuda rida fokuseeri/vali
+Tühik: Vali fokuseeritud rida
+Shift + üles/alla: Vali lisaks rida alt/ülevalt
+Ctrl + Space: Lisa fokuseeritud rida valikusse/eemalda valikust";
+$labels['helplistkeyboardnavmessages'] = "Nooled paremale/vasakule: laienda/peida kirjade lõimed
+Enter: Ava valitud/fokuseeritud kiri
+Delete: Liigutda valitud kiri prügikasti.";
+$labels['helplistkeyboardnavcontacts'] = "Enter: Ava valitud/fokuseeritud kontakt";
 ?>
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 07443d426..f904decac 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Sinu seanss on aegunud või vigane';
 $messages['storageerror'] = 'Ei õnnestunud IMAP serveriga ühendust luua';
 $messages['servererror'] = 'Serveri tõrge!';
 $messages['servererrormsg'] = 'Serveri tõrge: $msg';
+$messages['connerror'] = 'Viga ühenduses (Ei suutnud luua ühendust serveriga)';
 $messages['dberror'] = 'Andmebaasi tõrge!';
+$messages['windowopenerror'] = 'Hüpikaken blokeeriti!';
 $messages['requesttimedout'] = 'Päring aegus';
 $messages['errorreadonly'] = 'Operatsioon nurjus. Kaustale on vaid lugemisõigus';
 $messages['errornoperm'] = 'Operatsioon nurjus. Ligipääsu õigused puuduvad';
@@ -32,6 +34,8 @@ $messages['invalidrequest'] = 'Lubamatu päring! Andmeid ei salvestatud.';
 $messages['invalidhost'] = 'Lubamatu serveri nimi.';
 $messages['nomessagesfound'] = 'Postkast paistab tühi olevat';
 $messages['loggedout'] = 'Sinu seanss on edukalt lõpetatud. Nägemiseni!';
+$messages['mailboxempty'] = 'Kirjakast on tühi';
+$messages['nomessages'] = 'Pole teateid';
 $messages['refreshing'] = 'Värskendamine…';
 $messages['loading'] = 'Laadin...';
 $messages['uploading'] = 'Laadin faili üles...';
@@ -43,6 +47,8 @@ $messages['messagesent'] = 'Kiri edukalt saadetud';
 $messages['savingmessage'] = 'Salvestan kirja...';
 $messages['messagesaved'] = 'Kiri salvestatud mustanditesse';
 $messages['successfullysaved'] = 'Edukalt salvestatud';
+$messages['savingresponse'] = 'Salvestan vastuse teksti...';
+$messages['deleteresponseconfirm'] = 'Soovid valitud vastuse kustutada?';
 $messages['addedsuccessfully'] = 'Kontakt lisati edukalt aadressiraamatusse';
 $messages['contactexists'] = 'Sellise e-posti aadressiga kontakt on juba olemas';
 $messages['contactnameexists'] = 'Sama nimega kontakt on juba olemas.';
@@ -53,6 +59,8 @@ $messages['contactnotfound'] = 'Otsitud kontakti ei leitud';
 $messages['contactsearchonly'] = 'Sisesta otsingusõna kontaktide leidmiseks';
 $messages['sendingfailed'] = 'Kirja saatmine ebaõnnestus';
 $messages['senttooquickly'] = 'Palun oota enne selle kirja saatmist $sec sekundit.';
+$messages['errorsavingsent'] = 'Saadetud kirja salvestamisel ilmnes tõrge';
+$messages['errorsaving'] = 'Salvestamisel ilmnes tõrge.';
 $messages['errormoving'] = 'Ei suutnud seda kirja liigutada';
 $messages['errorcopying'] = 'Kirju ei õnnestunud kopeerida';
 $messages['errordeleting'] = 'Ei suutnud seda kirja kustutada';
@@ -77,6 +85,7 @@ $messages['norecipientwarning'] = 'Palun sisesta vähemalt üks adressaat';
 $messages['nosubjectwarning']  = 'Väli „Pealkiri“ on tühi. Soovid selle ära täita?';
 $messages['nobodywarning'] = 'Saadan selle kirja ilma tekstita?';
 $messages['notsentwarning'] = 'Kirja saatmine nurjus. Soovid selle ära visata?';
+$messages['restoresavedcomposedata'] = 'Eelnevalt loodud aga saatmatta kiri leiti.\n\nTeema: $subject\nSalvestatud: $date\n\nKas sa soovid antud kirja taastada?';
 $messages['noldapserver'] = 'Palun vali otsinguks LDAPi server';
 $messages['nosearchname'] = 'Palun sisesta kontakti nimi või e-posti aadress';
 $messages['notuploadedwarning'] = 'Kõiki manuseid ei ole veel üles laaditud. Palun oota või tühista üleslaadimine.';
@@ -85,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Leiti $nr kontakti.';
 $messages['searchnomatch'] = 'Otsingule vastavaid kirju ei leitud';
 $messages['searching'] = 'Otsin...';
 $messages['checking'] = 'Kontrollin...';
+$messages['stillsearching'] = 'Otsin....';
 $messages['nospellerrors'] = 'Õigekirjavigu ei leitud';
 $messages['folderdeleted'] = 'Kausta kustutamine õnnestus';
 $messages['foldersubscribed'] = 'Kausta tellimine õnnestus';
@@ -139,6 +149,7 @@ $messages['smtperror'] = 'SMTP tõrge: $msg';
 $messages['emailformaterror'] = 'Lubamatu e-posti aadress: $email';
 $messages['toomanyrecipients'] = 'Liiga palju adressaate. Vähenda kirja saajate hulka $max-ni.';
 $messages['maxgroupmembersreached'] = 'Grupi liikmete arv ületab suurima lubatud $max';
+$messages['internalerror'] = 'Ilmnes sisemine tõrge. Palun proovi uuesti.';
 $messages['contactdelerror'] = 'Kontaktide kustutamine nurjus';
 $messages['contactdeleted'] = 'Kontaktide kustutamine õnnestus';
 $messages['contactrestoreerror'] = 'Kustutatud kontakti(de) taastamine nurjus.';
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index 8bf6e2fef..b75cc8b90 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -131,25 +131,33 @@ $labels['moreactions']      = 'Ekintza gehiago...';
 $labels['more']             = 'Gehiago';
 $labels['back']             = 'Atzera';
 $labels['options']          = 'Aukerak';
+$labels['first'] = 'Lehenengoa';
+$labels['last'] = 'Azkena';
+$labels['previous'] = 'Aurrekoa';
+$labels['next'] = 'Hurrengoa';
 $labels['select'] = 'Hautatu';
 $labels['all'] = 'Denak';
 $labels['none'] = 'Bat ere ez';
 $labels['currpage'] = 'Uneko orrialdea';
+$labels['isread'] = 'Irakurri';
 $labels['unread'] = 'Irakurri gabeak';
 $labels['flagged'] = 'Banderaduna';
+$labels['unflagged'] = 'Etiketatu gabe';
 $labels['unanswered'] = 'Erantzun gabea';
 $labels['withattachment'] = 'Eranskinarekin';
 $labels['deleted'] = 'Ezabatuak';
 $labels['undeleted'] = 'Ezabatu gabeak';
+$labels['replied'] = 'Erantzunda';
+$labels['forwarded'] = 'Birbidalita';
 $labels['invert'] = 'Alderantzizkatu';
 $labels['filter'] = 'Iragazkia';
 $labels['list'] = 'Zerrenda';
 $labels['threads'] = 'Hariak';
-$labels['expand-all'] = 'Irekin denak';
+$labels['expand-all'] = 'Ireki denak';
 $labels['expand-unread'] = 'Ireki irakurri gabeak';
 $labels['collapse-all'] = 'Tolestu guztiak';
 $labels['threaded'] = 'Harian';
-$labels['autoexpand_threads'] = 'Irekin mezu-hariak';
+$labels['autoexpand_threads'] = 'Ireki mezu-hariak';
 $labels['do_expand'] = 'hari guztiak';
 $labels['expand_only_unread'] = 'soilik irakurri gabeko mezuak dutenak';
 $labels['fromto'] = 'Nork/Nori';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Inportatu mezuak';
 $labels['quota'] = 'Disko erabilera';
 $labels['unknown']  = 'ezezaguna';
 $labels['unlimited']  = 'mugagabea';
+$labels['quotatype'] = 'Kuota mota';
+$labels['quotatotal'] = 'Muga';
+$labels['quotaused'] = 'Erabilita';
+$labels['quotastorage'] = 'Diskoko tokia';
+$labels['quotamessage'] = 'Mezuen kontua';
 $labels['quicksearch']  = 'Bilaketa azkarra';
 $labels['resetsearch']  = 'Bilaketa berrabiarazi';
 $labels['searchmod']  = 'Bilatu modifikadoreak';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Mezu osoa';
 $labels['body']  = 'Gorputza';
 $labels['type'] = 'Mota';
 $labels['namex'] = 'Izena';
+$labels['searchscope'] = 'Esparrua';
+$labels['currentfolder'] = 'Uneko karpeta';
+$labels['subfolders'] = 'Hau eta azpikarpetak';
+$labels['allfolders'] = 'Karpeta guztiak';
 $labels['openinextwin'] = 'Lehio berrian ireki';
 $labels['emlsave'] = 'Deskargatu (.eml)';
 $labels['changeformattext'] = 'Bistaratu testua formaturik gabe';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Bidali jasotze-agiria';
 $labels['dsn']            = 'Entrega-egoeraren jakinarazpena';
 $labels['mailreplyintro'] = '$date egunean, $sender-(e)k idatzi du:';
 $labels['originalmessage'] = 'Jatorrizko mezua';
+$labels['selectimage']    = 'Hautatu irudia';
+$labels['addimage']       = 'Gehitu irudia';
+$labels['selectmedia']    = 'Hautatu bideoa';
+$labels['addmedia']       = 'Gehitu bideoa';
 $labels['editidents']    = 'Editatu identitateak';
 $labels['spellcheck']    = 'Ortografia-egiaztatu';
 $labels['checkspelling'] = 'Egiaztaketa ortografikoa';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'Leheneratu mezua?';
 $labels['responses'] = 'Erantzunak';
 $labels['insertresponse'] = 'Txertatu erantzun bat';
 $labels['manageresponses'] = 'Kudeatu erantzunak';
-$labels['savenewresponse'] = 'Gorde erantzun berria';
-$labels['editresponses'] = 'Editatu erantzunak';
+$labels['savenewresponse'] = 'Sortu erantzun berria';
+$labels['addresponse'] = 'Gehitu erantzuna';
 $labels['editresponse'] = 'Editatu erantzuna';
+$labels['editresponses'] = 'Editatu erantzunak';
 $labels['responsename'] = 'Izena';
 $labels['responsetext'] = 'Erantzun testua';
 $labels['attach'] = 'Erantsi';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Igo';
 $labels['uploadprogress'] = '$percent ($current/$total)';
 $labels['close']  = 'Itxi';
 $labels['messageoptions']  = 'Mezu-aukerak';
+$labels['togglecomposeoptions'] = 'Toggle konposizio aukerak';
 $labels['low']     = 'Baxua';
 $labels['lowest']  = 'Baxuena';
 $labels['normal']  = 'Normala';
@@ -288,11 +311,13 @@ $labels['typehomepage']  = 'Etxeko orria';
 $labels['typeblog'] = 'Bloga';
 $labels['typeprofile'] = 'Profila';
 $labels['addfield'] = 'Gehitu eremua...';
-$labels['addcontact'] = 'Gehitu kontaktu berria';
+$labels['addcontact'] = 'Gehitu kontaktua';
 $labels['editcontact'] = 'Editatu kontaktua';
 $labels['contacts'] = 'Kontaktuak';
 $labels['contactproperties'] = 'Kontaktuen ezaugarriak';
+$labels['contactnameandorg'] = 'Izena eta erakundea';
 $labels['personalinfo'] = 'Informazio pertsonala';
+$labels['contactphoto'] = 'Kontaktuaren argazkia';
 $labels['edit']   = 'Editatu';
 $labels['cancel'] = 'Utzi';
 $labels['save']   = 'Gorde';
@@ -301,7 +326,7 @@ $labels['rename'] = 'Berrizendatu';
 $labels['addphoto'] = 'Gehitu';
 $labels['replacephoto'] = 'Ordeztu';
 $labels['uploadphoto'] = 'Kargatu argazkia';
-$labels['newcontact']     = 'Sortu kontaktu-txartel berria';
+$labels['newcontact']     = 'Sortu kontaktu berria';
 $labels['deletecontact']  = 'Ezabatu hautatutako kontaktuak';
 $labels['composeto']      = 'Idatzi mezua honi:';
 $labels['contactsfromto'] = '$from -tik $to -ra $count kontaktuak';
@@ -310,10 +335,11 @@ $labels['export']         = 'Esportatu';
 $labels['exportall']      = 'Esportatu dena';
 $labels['exportsel']      = 'Esportatu hautaketa';
 $labels['exportvcards']   = 'Esportatu kontaktuak vCard formatuan';
-$labels['newcontactgroup'] = 'Sortu kontaktu-talde berria';
+$labels['newcontactgroup']       = 'Sortu talde berria';
 $labels['grouprename']    = 'Berrizendatu taldea';
 $labels['groupdelete']    = 'Ezabatu taldea';
 $labels['groupremoveselected'] = 'Ezabatu taldetik hautatutako kontaktuak';
+$labels['uponelevel']     = 'Igo maila bat';
 $labels['previouspage']   = 'Aurreko orria ikusi';
 $labels['firstpage']      = 'Lehenengo orria ikusi';
 $labels['nextpage']       = 'Hurrengo orria ikusi';
@@ -340,10 +366,10 @@ $labels['preferences'] = 'Hobespenak';
 $labels['userpreferences'] = 'Erabiltzaile hobespenak';
 $labels['editpreferences'] = 'Erabiltzaile hobespenak editatu';
 $labels['identities'] = 'Identitateak';
-$labels['manageidentities'] = 'Kontu honetako identitateak kudeatu';
-$labels['newidentity'] = 'Identitate berria';
-$labels['newitem'] = 'Elementu berria';
-$labels['edititem'] = 'Elementua Editatu';
+$labels['manageidentities'] = 'Kudeatu identitateak';
+$labels['newidentity'] = 'Sortu identitate berria';
+$labels['addidentity'] = 'Gehitu identitatea';
+$labels['edititem'] = 'Editatu identitatea';
 $labels['preferhtml'] = 'HTML nahiago';
 $labels['defaultcharset'] = 'Lehenetsitako karaktere-jokoa';
 $labels['htmlmessage'] = 'HTML mezua';
@@ -402,6 +428,7 @@ $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (beste batzuk)';
 $labels['force7bit'] = 'Erabili MIME kodeketa 8 bitekok karakterentzat';
 $labels['advancedoptions'] = 'Aukera aurreratuak';
+$labels['toggleadvancedoptions'] = 'Toggle aukera aurreratuak';
 $labels['focusonnewmessage'] = 'Fokatu leihoa mezu berrian';
 $labels['checkallfolders'] = 'Egiaztatu karpeta guztiak mezu berrien bila';
 $labels['displaynext'] = 'Mezu bat ezabatu/mugitzean erakutsi hurrengo mezua';
@@ -443,14 +470,14 @@ $labels['asattachment'] = 'eranskin moduan';
 $labels['replyallmode'] = '[Erantzun denei] botoiaren lehenetsitako ekintza';
 $labels['replyalldefault'] = 'erantzun denei';
 $labels['replyalllist'] = 'erantzun posta zerrendara soilik (aurkitzekotan)';
-$labels['folder']  = 'Karpeta';
-$labels['folders']  = 'Karpetak';
-$labels['foldername']  = 'Karpeta izena';
-$labels['subscribed']  = 'Harpideturik';
+$labels['folder'] = 'Karpeta';
+$labels['folders'] = 'Karpetak';
+$labels['foldername'] = 'Karpeta izena';
+$labels['subscribed'] = 'Harpideturik';
 $labels['messagecount'] = 'Mezuak';
-$labels['create']  = 'Sortu';
-$labels['createfolder']  = 'Karpeta berria sortu';
-$labels['managefolders']  = 'Karpeta kudeaketa';
+$labels['create'] = 'Sortu';
+$labels['createfolder'] = 'Karpeta berria sortu';
+$labels['managefolders'] = 'Karpeta kudeaketa';
 $labels['specialfolders'] = 'Karpeta bereziak';
 $labels['properties'] = 'Ezaugarriak';
 $labels['folderproperties'] = 'Karpeta-ezaugarriak';
@@ -460,9 +487,9 @@ $labels['info'] = 'Informazioa';
 $labels['getfoldersize'] = 'Klikatu ikusteko karpetaren tamaina';
 $labels['changesubscription'] = 'Klikatu harpidetza aldatzeko';
 $labels['foldertype'] = 'Karpeta mota';
-$labels['personalfolder']  = 'Karpeta pribatua';
-$labels['otherfolder']  = 'Beste erabiltzaileen karpetak';
-$labels['sharedfolder']  = 'Karpeta publikoa';
+$labels['personalfolder'] = 'Karpeta pribatua';
+$labels['otherfolder'] = 'Beste erabiltzaileen karpetak';
+$labels['sharedfolder'] = 'Karpeta publikoa';
 $labels['sortby'] = 'Honela ordenatu';
 $labels['sortasc']  = 'Goraka ordenatu';
 $labels['sortdesc'] = 'Beheraka ordenatu';
@@ -495,4 +522,51 @@ $labels['vietnamese'] = 'Vietnamdarra';
 $labels['japanese'] = 'Japoniarra';
 $labels['korean'] = 'Korearra';
 $labels['chinese'] = 'Txinatarra';
+$labels['arialabeltopnav'] = 'Leihoen kontrola';
+$labels['arialabeltasknav'] = 'Aplikazioaren atazak';
+$labels['arialabeltoolbar'] = 'Aplikazioaren tresna barra';
+$labels['arialabelactivetask'] = 'Ataza aktiboa';
+$labels['arialabelmessagessearchfilter'] = 'E-posten zerrendako iragazkia';
+$labels['arialabelmailsearchform'] = 'Mezu elektronikoak bilatzeko formularioa';
+$labels['arialabelcontactsearchform'] = 'Kontaktuak bilatzeko formularioa';
+$labels['arialabelmailquicksearchbox'] = 'E-posta bilaketa sarrera';
+$labels['arialabelquicksearchbox'] = 'Bilaketa sarrera';
+$labels['arialabelfolderlist'] = 'E-posta karpeta hautaketa';
+$labels['arialabelmessagelist'] = 'E-posta mezuen zerrendatzea';
+$labels['arialabelmailpreviewframe'] = 'Mezuaren aurrebista';
+$labels['arialabelmailboxmenu'] = 'Karpetako ekintzen menua';
+$labels['arialabellistselectmenu'] = 'Zerrenda hautatzeko menua';
+$labels['arialabelthreadselectmenu'] = 'Hariak zerrendatzeko menua';
+$labels['arialabelmessagelistoptions'] = 'Mezuen zerrenda bistaratzeko eta ordenatzeko aukerak';
+$labels['arialabelmailimportdialog'] = 'Mezuak inportatzeko elkarrizketa';
+$labels['arialabelmessagenav'] = 'Mezu nabigazioa';
+$labels['arialabelmessagebody'] = 'Mezuaren gorputza';
+$labels['arialabelmessageactions'] = 'Mezuen ekintzak';
+$labels['arialabelcontactquicksearch'] = 'Kontaktuak bilatzeko formularioa';
+$labels['arialabelcontactsearchbox'] = 'Kontaktuak bilatzeko sarrera';
+$labels['arialabelmessageheaders'] = 'Mezuen goiburuak';
+$labels['arialabelforwardingoptions'] = 'Birbidaltzeko aukerak';
+$labels['arialabelreplyalloptions'] = 'Guztiei erantzuteko aukerak';
+$labels['arialabelmoremessageactions'] = 'Mezu ekintza gehiago';
+$labels['arialabelmarkmessagesas'] = 'Markatu hautatutako mezua gisa honetara...';
+$labels['arialabelcomposeoptions'] = 'Konposizio aukerak';
+$labels['arialabelresponsesmenu'] = 'Erantzun finkoen menua';
+$labels['arialabelattachmentuploadform'] = 'Eranskinak kargatzeko formularioa';
+$labels['arialabelattachmentpreview'] = 'Eranskinaren aurrebista';
+$labels['ariasummarycomposecontacts'] = 'Kontaktuak eta taldeak hartzaile gisa hautatzeko zerrenda';
+$labels['arialabelcontactexportoptions'] = 'Kontaktuak esportatzeko aukerak';
+$labels['arialabelabookgroupoptions'] = 'Kontaktu eta taldeen helbide-liburuaren aukerak';
+$labels['arialabelpreferencesform'] = 'Hobespenen formularioa';
+$labels['arialabelidentityeditfrom'] = 'Identitatea editatzeko formularioa';
+$labels['arialabelresonseeditfrom'] = 'Erantzuna editatzeko formularioa';
+$labels['helplistnavigation'] = 'Zerrendatu teklatuaren nabigazioa';
+$labels['helplistkeyboardnavigation'] = "Gezia gora/behera: Mugitu ilararen fokua/hautaketa.
+Zuriunea: Hautatu fokatutako ilara.
+Maius + gora/behera: Hautatu beste ilara goian/behean.
+Ctrl + Zuriunea: Gehitu fokatutako ilara hautaketara/ezabatu hautaketatik.";
+$labels['helplistkeyboardnavmessages'] = "Gezia eskuin/ezker: zabaldu/tolestu mezuaren haria (bakarrik haria moduan).
+Sartu: Ireki hautatutako/fokatutako mezua.
+Ezabatu: Eraman hautatutako mezuak zakarrontzira.
+";
+$labels['helplistkeyboardnavcontacts'] = "Sartu: Ireki hautatutako/fokatutako kontaktua.";
 ?>
diff --git a/program/localization/eu_ES/messages.inc b/program/localization/eu_ES/messages.inc
index 2352be1f0..bdaeaf4fa 100644
--- a/program/localization/eu_ES/messages.inc
+++ b/program/localization/eu_ES/messages.inc
@@ -17,12 +17,14 @@
 */
 $messages['errortitle']  = 'Errore bat gertatu da!';
 $messages['loginfailed']  = 'Saio hasierak huts egin du.';
-$messages['cookiesdisabled'] = 'Zure nabigatzaileak ez ditu cookie-rik onartzen';
-$messages['sessionerror'] = 'Zure saioa baliogabea da edo iraungita dago';
-$messages['storageerror'] = 'Huts egin du biltegiratze-zerbitzarira konektatzean';
+$messages['cookiesdisabled'] = 'Zure nabigatzaileak ez ditu cookie-rik onartzen.';
+$messages['sessionerror'] = 'Zure saioa baliogabea da edo iraungita dago.';
+$messages['storageerror'] = 'Huts egin du biltegiratze-zerbitzarira konektatzean.';
 $messages['servererror'] = 'Zerbitzari-errorea!';
 $messages['servererrormsg'] = 'Zerbitzari-errorea: $msg';
+$messages['connerror'] = 'Konexio errorea (zerbitzaria atzitzeak huts egin du)!';
 $messages['dberror'] = 'Datu-basearen errorea!';
+$messages['windowopenerror'] = 'Popup leihoa blokeatua';
 $messages['requesttimedout'] = 'Eskaera denboraz kanpo.';
 $messages['errorreadonly'] = 'Ezin da ekintza burutu. Karpeta soilik irakurtzekoa da.';
 $messages['errornoperm'] = 'Ezin da ekintza burutu. Baimena ukatua.';
@@ -30,8 +32,10 @@ $messages['erroroverquota'] = 'Ezin da ekintza burutu. Diskoan ez dago tokirik.'
 $messages['erroroverquotadelete'] = 'Diskoan ez dago tokirik. Erabili SHIFT+DEL mezua ezabatzeko.';
 $messages['invalidrequest'] = 'Eskaera ez da baliozkoa! Datuak ez dira gorde.';
 $messages['invalidhost'] = 'Zerbitzari-izena ez da baliozkoa.';
-$messages['nomessagesfound'] = 'Ez da mezurik aurkitu posta kutxa honetan';
+$messages['nomessagesfound'] = 'Ez da mezurik aurkitu postontzi honetan.';
 $messages['loggedout'] = 'Saioa behar bezala amaitu duzu. Agur!';
+$messages['mailboxempty'] = 'Postontzia hutsik dago';
+$messages['nomessages'] = 'Ez dago mezurik';
 $messages['refreshing'] = 'Freskatzen...';
 $messages['loading'] = 'Kargatzen...';
 $messages['uploading'] = 'Fitxategia kargatzen...';
@@ -39,25 +43,25 @@ $messages['uploadingmany'] = 'Fitxategiak kargatzen...';
 $messages['loadingdata'] = 'Datuak kargatzen...';
 $messages['checkingmail'] = 'Mezu berrien bila arakatzen...';
 $messages['sendingmessage'] = 'Mezua bidaltzen...';
-$messages['messagesent'] = 'Mezua behar bezala bidali da';
+$messages['messagesent'] = 'Mezua behar bezala bidali da.';
 $messages['savingmessage'] = 'Mezua gordetzen...';
-$messages['messagesaved'] = 'Mezua zirriborroetan gordea';
-$messages['successfullysaved'] = 'Behar bezala gorde da';
+$messages['messagesaved'] = 'Mezua zirriborroetan gordea.';
+$messages['successfullysaved'] = 'Behar bezala gorde da.';
 $messages['savingresponse'] = 'Erantzun-testua gordetzen...';
 $messages['deleteresponseconfirm'] = 'Seguru zaude erantzun-testu hau  ezabatu nahi duzula?';
-$messages['addedsuccessfully'] = 'Txartela behar bezala gehitu da helbide liburura';
-$messages['contactexists'] = 'ePosta honetako txartel bat badago dagoeneko';
+$messages['addedsuccessfully'] = 'Kontaktua behar bezala gehitu da helbide-liburura.';
+$messages['contactexists'] = 'Dagoeneko e-posta helbide berdina duen kontaktu bat dago.';
 $messages['contactnameexists'] = 'Lehendik badago izen hori duen kontaktua.';
 $messages['blockedimages'] = 'Zure pribazitatea mantentzeko urruneko irudiak blokeatu egin dira.';
 $messages['encryptedmessage'] = 'Hau enkriptaturiko mezu bat da eta ezin da bistarazi. Barkatu!';
-$messages['nocontactsfound'] = 'Ez da txartelik aurkitu';
-$messages['contactnotfound'] = 'Eskatutako txartela ez da aurkitu';
+$messages['nocontactsfound'] = 'Ez da kontakturik aurkitu.';
+$messages['contactnotfound'] = 'Eskatutako kontaktua ez da aurkitu.';
 $messages['contactsearchonly'] = 'Sartu kontaktua aurkitzeko bilaketa daturen bat.';
-$messages['sendingfailed'] = 'Huts mezua bidaltzerakoan';
+$messages['sendingfailed'] = 'Huts mezua bidaltzerakoan.';
 $messages['senttooquickly'] = 'Itxaron $sec segundo mezua bidali aurretik, mesedez.';
 $messages['errorsavingsent'] = 'Errore bat gertatu da bidalitako mezua gordetzean.';
 $messages['errorsaving'] = 'Errore bat gertatu da gordetzean.';
-$messages['errormoving'] = 'Ezin da mezua mugitu';
+$messages['errormoving'] = 'Ezin d(ir)a mezua(k) mugitu.';
 $messages['errorcopying'] = 'Ezin d(ir)a kopiatu mezua(k).';
 $messages['errordeleting'] = 'Ezin da mezua ezabatu';
 $messages['errormarking'] = 'Ezin d(ir)a markatu mezua(k).';
@@ -90,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr kontaktu aurkitu dira.';
 $messages['searchnomatch'] = 'Bilaketak ez du emaitzarik itzuli';
 $messages['searching'] = 'Bilatzen...';
 $messages['checking'] = 'Arakatzen...';
+$messages['stillsearching'] = 'Oraindik bilatzen...';
 $messages['nospellerrors'] = 'Ez da ortografia errorerik aurkitu';
 $messages['folderdeleted'] = 'Karpeta behar bezala ezabatu da';
 $messages['foldersubscribed'] = 'Karpeta ongi harpidetu da.';
@@ -130,10 +135,10 @@ $messages['importformaterror'] = 'Huts egin du inportatzean. Kargatu duzun fitxa
 $messages['importconfirm'] = '<b>Ongi inportatu dira $inserted kontaktu</b>';
 $messages['importconfirmskipped'] = '<b>Saltatu dira  $skipped sarrera</b>';
 $messages['importmessagesuccess'] = '$nr mezu ongi inportatu dira.';
-$messages['importmessageerror'] = 'Inportazio akatsa! Kargatutako fitxategia ez da baliozko mezua edo posta-fitxategia.';
+$messages['importmessageerror'] = 'Inportazio akatsa! Kargatutako fitxategia ez da baliozko mezua edo postontzi-fitxategia';
 $messages['opnotpermitted'] = 'Ekintza ez baimendua!';
 $messages['nofromaddress'] = 'Helbide elektronikoa falta da hautatutako identitatean.';
-$messages['editorwarning'] = 'Formaturik gabeko testu-editorera pasatzeak ekar dezake testu-formatu guztien galera. Jarraitu nahi duzu?';
+$messages['editorwarning'] = 'Editore mota aldatzeak ekar dezake testuaren formatua galtzea. Jarraitu nahi duzu?';
 $messages['httpreceivedencrypterror'] = 'Ezarpen akats larria gertatu da. Jarri harremanetan zure administratzailearekin ahalik eta lasterren.  <b>Zure mezua ezin da bidali.</b>';
 $messages['smtpconnerror'] = 'SMTP errorea ($code): Zerbitzariarekiko konexioak huts egin du.';
 $messages['smtpautherror'] = 'SMTP errorea ($code): Egiaztapenak huts egin du.';
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index 4abf65245..d4b958503 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -29,8 +29,10 @@ $labels['drafts'] = 'نامه های ناتکمیل';
 $labels['sent']   = 'ارسال شده';
 $labels['trash']  = 'اشغال دانی';
 $labels['junk']   = 'بیکاره';
+$labels['show_real_foldernames'] = 'نمایش نام واقعی برای فولدرهای خاص';
 $labels['subject'] = 'مضمون';
 $labels['from']    = 'ارسال کننده';
+$labels['sender']  = 'فرستنده';
 $labels['to']      = 'ګيرينده';
 $labels['cc']      = 'تکثیر';
 $labels['bcc']     = 'تکثیر پنهان';
@@ -39,12 +41,18 @@ $labels['date']    = 'تاريخ';
 $labels['size']    = 'اندازه';
 $labels['priority'] = 'اولویت';
 $labels['organization'] = 'تنظیمات';
+$labels['readstatus'] = 'خواندن وضعیت';
+$labels['listoptions'] = 'لیست کردن آپشن ها...';
 $labels['mailboxlist'] = 'پوشه ها';
 $labels['messagesfromto'] = 'از  مقدار پيغام به مقدار حساب شده';
 $labels['messagenrof'] = 'از شمار پيغام های حساب شده';
 $labels['copy']     = 'تکثیر';
+$labels['move']     = 'انتقال';
 $labels['moveto']   = 'انتقال بدهید به ...';
+$labels['copyto']   = 'کپی کردن به...';
 $labels['download'] = 'داونلود کردن';
+$labels['open']     = 'باز کردن';
+$labels['showattachment'] = 'نمایش';
 $labels['filename'] = 'نام فايل';
 $labels['filesize'] = 'اندازه فايل';
 $labels['addtoaddressbook'] = 'در کتاب ادرس علاوه نماييد';
@@ -87,11 +95,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['forwardmessage']   = 'فرستادن این پیام به دیگران / فارورد';
 $labels['deletemessage']    = 'حذف کردن پيغام';
 $labels['movemessagetotrash'] = 'پيغام را به اشيآيي حذف شده منتقل نماييد';
@@ -102,19 +115,35 @@ $labels['nextmessage']      = 'پيغام بعدي رانشان دهيد';
 $labels['lastmessage']      = 'پيغام اخير را نشان دهيد';
 $labels['backtolist']       = 'بازگشتن به لست پيغام';
 $labels['viewsource']       = 'منبع / کود را نشان دهيد';
+$labels['mark']             = 'نشانه گذاری';
 $labels['markmessages']     = 'پيغام ها را نشاني کنيد';
 $labels['markread']         = 'مانند خوانده شده';
 $labels['markunread']       = 'مانند خوانده نشده';
 $labels['markflagged']      = 'مانند نشانی شده';
 $labels['markunflagged']    = 'مانند نشانی ناشده';
+$labels['more']             = 'بیشتر';
+$labels['back']             = 'بازگشت';
+$labels['options']          = 'انتخاب ها';
+$labels['first'] = 'اول';
+$labels['last'] = 'انتها';
+$labels['previous'] = 'قبلی';
+$labels['next'] = 'بعدی';
 $labels['select'] = 'انتخاب کردن';
 $labels['all'] = 'تمام';
 $labels['none'] = 'هيچ کدام';
+$labels['isread'] = 'خواندن';
 $labels['unread'] = 'ناخوانده';
 $labels['flagged'] = 'نشانی شده';
 $labels['unanswered'] = 'پیامهای جواب نداده شده';
+$labels['deleted'] = 'حذف شد';
 $labels['filter'] = 'تصفیه کردن';
+$labels['list'] = 'لیست';
+$labels['attachment'] = 'الصاق';
 $labels['nonesort'] = 'هيچ کدام';
+$labels['sentdate'] = 'تاریخ ارسال';
+$labels['arrival'] = 'تاریخ دریافت';
+$labels['asc'] = 'صعودی';
+$labels['desc'] = 'نزولی';
 $labels['compact'] = 'خلاصه';
 $labels['empty'] = 'خالي';
 $labels['quota'] = '‌طريقه استعمال ديسک';
@@ -159,13 +188,11 @@ $labels['name']         = 'نشان دادن نام';
 $labels['firstname']    = 'اسم/ نام';
 $labels['surname']      = 'اسم فاميلي / تخلص';
 $labels['email']        = 'ايميل';
-$labels['addcontact'] = 'آدرس جديد را علاوه کنيد';
 $labels['editcontact'] = 'آدرس جدید را تصحیح کنید';
 $labels['edit']   = 'تصحيح کردن';
 $labels['cancel'] = 'لغو کردن/ حذف کردن';
 $labels['save']   = 'حفظ کردن';
 $labels['delete'] = 'حذف کردن';
-$labels['newcontact']     = 'کارت تماس جديد را بسازيد';
 $labels['deletecontact']  = 'آدرس های انتخاب شده را حذف کنيد';
 $labels['composeto']      = 'ايمیل را نوشته کنيد به';
 $labels['contactsfromto'] = 'از$count$to به $from آدرس ها از';
@@ -188,10 +215,6 @@ $labels['preferences'] = 'ترجيحات';
 $labels['userpreferences'] = 'ترجيحات کاربر';
 $labels['editpreferences'] = 'تصحيح کردن ترجيحات  کاربر';
 $labels['identities'] = 'شناخت ها';
-$labels['manageidentities'] = 'اداره کردن شناسای ها برای اين آدرس';
-$labels['newidentity'] = 'شناخت جديد';
-$labels['newitem'] = 'فقره جديد';
-$labels['edititem'] = 'تصحيح کردن فقره';
 $labels['preferhtml'] = 'نشان دادن ايچ ټي ام ايل';
 $labels['htmlmessage'] = 'پيغام ايچ ټي‌ام ايل';
 $labels['prettydate'] = 'تاريخ های مهم';
@@ -234,14 +257,14 @@ $labels['2047folding'] = 'Full RFC 2047 (دیگر ها)';
 $labels['advancedoptions'] = 'انتخاب های پیشرفته';
 $labels['focusonnewmessage'] = 'فوکس دادن پینجره مرورگر به پیام جدید';
 $labels['checkallfolders'] = 'تمام پوشه ها را بخاطر پیام های جدید بررسی کنید';
-$labels['folder']  = 'پوشه';
-$labels['folders']  = 'پوشه ها';
-$labels['foldername']  = 'نام پوشه';
-$labels['subscribed']  = 'مشترک';
+$labels['folder'] = 'پوشه';
+$labels['folders'] = 'پوشه ها';
+$labels['foldername'] = 'نام پوشه';
+$labels['subscribed'] = 'مشترک';
 $labels['messagecount'] = 'پيغام ها';
-$labels['create']  = 'ایجاد کردن';
-$labels['createfolder']  = 'ایجاد پوشه جدید';
-$labels['managefolders']  = 'اداره کردن پوشه ها';
+$labels['create'] = 'ایجاد کردن';
+$labels['createfolder'] = 'ایجاد پوشه جدید';
+$labels['managefolders'] = 'اداره کردن پوشه ها';
 $labels['specialfolders'] = 'پوشه های مخصوص';
 $labels['sortby'] = 'فهرست کردن توسط';
 $labels['sortasc']  = 'فهرست کردن از طرف بالا به پايين';
diff --git a/program/localization/fa_AF/messages.inc b/program/localization/fa_AF/messages.inc
index 10bd8f4fe..ea8301c53 100644
--- a/program/localization/fa_AF/messages.inc
+++ b/program/localization/fa_AF/messages.inc
@@ -20,12 +20,15 @@ $messages['loginfailed']  = 'خطا در ورود به سیستم';
 $messages['cookiesdisabled'] = 'جستجوگر شما  cookies را قبول نميکند';
 $messages['sessionerror'] = 'جلسه شما وجود ندارد و يا هم از زمان معين آن گذشته است';
 $messages['storageerror'] = 'وصل شدن به آیمیپ سرور موفق نشد';
+$messages['servererror'] = 'خطای سرور!';
 $messages['servererrormsg'] = 'خطای سرور: $msg';
 $messages['dberror'] = 'خطای پایگاه داده';
 $messages['requesttimedout'] = 'عدم پاسخگویی در زمان مقرر';
 $messages['invalidhost'] = 'نام سرور نامعتبر است';
 $messages['nomessagesfound'] = 'هيچ پيغامی در اين صندوق پستي دريافت نه شد';
 $messages['loggedout'] = 'جلسه شما بصورت مکمل فسخ شده است  خدا حافظ';
+$messages['mailboxempty'] = 'میل باکس خالی است';
+$messages['nomessages'] = 'پیامی وجود ندارد';
 $messages['refreshing'] = 'دوباره سازی....';
 $messages['loading'] = 'در حال بارگزاری...';
 $messages['uploading'] = 'در حال بارگزاری فایل...';
@@ -53,9 +56,11 @@ $messages['deletecontactconfirm']  = 'آيا واقعاً شما ميخواهي�
 $messages['deletemessagesconfirm'] = 'آيا واقعاً شما ميخواهيد که پيغام هاي انتخاب شده را حذف کنيد؟';
 $messages['deletefolderconfirm']  = 'آيا واقعاً شما ميخواهيد که اين پوشه را حذف کنيد؟';
 $messages['purgefolderconfirm']  = 'آيا واقعاً شما ميخواهيد  تمام پيغام های که  در اين پوشه وجود دارد حذف کنيد؟';
+$messages['contactdeleting'] = 'در حال حذف کانتکت(ها)...';
 $messages['groupdeleting'] = 'در حال حذف گروه...';
 $messages['folderdeleting'] = 'در حال حذف پوشه';
 $messages['foldermoving'] = 'در حال انتقال پوشه';
+$messages['foldersubscribing'] = 'در حال عضویت در فولدر...';
 $messages['formincomplete'] = 'فورمه بصورت مکمل خانه پري نه شده است';
 $messages['noemailwarning'] = 'لطفاً يک ايميل ادرس موجود را داخل کنيد';
 $messages['nonamewarning']  = 'لطفاً يک نام وارد کنيد';
@@ -72,6 +77,7 @@ $messages['contactsearchsuccessful'] = '$nr حساب کاربری یافت شد'
 $messages['searchnomatch'] = 'جستجو گر موفق به دریافت هیچ گونه اثری نشد';
 $messages['searching'] = 'در حال جستجو..';
 $messages['checking'] = 'در حال بررسی';
+$messages['stillsearching'] = 'در حال جستجو...';
 $messages['nospellerrors'] = 'هيچ اشتباه املايي را دريافت نه کرد';
 $messages['folderdeleted'] = 'پوشه موفقانه از بين رفت/ حذف گرديد';
 $messages['folderpurged'] = 'محتوای پوشه ها با موفقیت پاک شدند';
@@ -83,6 +89,7 @@ $messages['filesizeerror'] = 'تثبیت شده میباشد$size حجم فای�
 $messages['sourceisreadonly'] = 'اجازه نمامه کود / منبع این آدرس قفط خواندنی است';
 $messages['errorsavingcontact'] = 'ادرس این پیام را حفظکرده نتوانست';
 $messages['movingmessage'] = 'ذر حال انتقال پیام...';
+$messages['markingmessage'] = 'در حال نشانه گذاری پیغام(ها)...';
 $messages['receiptsent'] = 'یک رسید برای ارسال کننده این پیام فرستاده شد.';
 $messages['errorsendingreceipt'] = 'رسيد ارسال شده نتوانست';
 $messages['nodeletelastidentity'] = 'شما این شناخت نامه را حذف کرده نمیتوانید. این آخرین شناخت نامه شما است.';
@@ -93,5 +100,15 @@ $messages['importwait'] = 'در حال وارد کردن لطفا صبر کنی�
 $messages['importconfirm'] = '<b>Successfully imported $inserted contacts, $skipped existing entries skipped</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = 'اجازه این عملکرد را ندارید';
 $messages['nofromaddress'] = 'بخش ایمیل آدرس در شناخت نامه انتخاب شده مفقود است.';
-$messages['editorwarning'] = 'استفاده از تصحیح کننده متن ساده تمام فرمت و ساختار داده شده را از بین خواهد برد. آیا میخواهید که ادامه بدهید.';
+$messages['smtperror'] = 'خطای SMTP: $msg';
+$messages['contactrestored'] = 'دفتر نشانی(ها) با موفقیت بازیابی شد.';
+$messages['groupdeleted'] = 'گروه با موفقیت حذف شد.';
+$messages['grouprenamed'] = 'تغییر نام گروه با موفقیت انجام شد.';
+$messages['groupcreated'] = 'گروه با موفقیت ایجاد شد';
+$messages['messagedeleted'] = 'پیام(ها) با موفقیت حذف شدند.';
+$messages['messagemoved'] = 'پیام(ها) با موفقیت منتقل شدند.';
+$messages['messagecopied'] = 'پیام(ها) با موفقیت کپی شدند.';
+$messages['messagemarked'] = 'پیام(ها) با موفقیت نشانه گذاری شدند.';
+$messages['namecannotbeempty'] = 'نام نمی تواند خالی باشد.';
+$messages['nametoolong'] = 'نام بسیار طولانی است.';
 ?>
diff --git a/program/localization/fa_IR/labels.inc b/program/localization/fa_IR/labels.inc
index a6b978f6e..a3fa3ee2e 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -131,16 +131,23 @@ $labels['moreactions']      = 'کارهای دیگر...';
 $labels['more']             = 'بيشتر';
 $labels['back']             = 'بازگشت';
 $labels['options']          = 'گزینه‌ها';
+$labels['first'] = 'اول';
+$labels['last'] = 'آخر';
+$labels['previous'] = 'قبل';
+$labels['next'] = 'بعد';
 $labels['select'] = 'انتخاب';
 $labels['all'] = 'همه';
 $labels['none'] = 'هیچ‌کدام';
 $labels['currpage'] = 'صفحه جاری';
+$labels['isread'] = 'خوانده شده';
 $labels['unread'] = 'خوانده‌نشده';
 $labels['flagged'] = 'پرچم‌دار';
 $labels['unanswered'] = 'پاسخ داده نشده';
 $labels['withattachment'] = 'با پیوست';
 $labels['deleted'] = 'حذف شده';
 $labels['undeleted'] = 'حذف نشده';
+$labels['replied'] = 'پاسخ داده شده';
+$labels['forwarded'] = 'ارجاع داده شده';
 $labels['invert'] = 'وارونه';
 $labels['filter'] = 'صافی';
 $labels['list'] = 'فهرست';
@@ -171,6 +178,9 @@ $labels['importmessages'] = 'وارد کردن پیغام‌ها';
 $labels['quota'] = 'فضای استفاده شده';
 $labels['unknown']  = 'ناشناخته';
 $labels['unlimited']  = 'نامحدود';
+$labels['quotatotal'] = 'محدود کردن';
+$labels['quotaused'] = 'استفاده شده';
+$labels['quotastorage'] = 'فضای دیسک';
 $labels['quicksearch']  = 'جستجوی سریع';
 $labels['resetsearch']  = 'جستجوی دوباره';
 $labels['searchmod']  = 'اصلاحات جستجو';
@@ -178,6 +188,7 @@ $labels['msgtext']  = 'کل پیغام';
 $labels['body']  = 'بدنه';
 $labels['type'] = 'نوع';
 $labels['namex'] = 'نام';
+$labels['allfolders'] = 'همه پوشه‌ها';
 $labels['openinextwin'] = 'باز کردن در پنجره‌ی جدید';
 $labels['emlsave'] = 'بارگیری (.eml)';
 $labels['changeformattext'] = 'نمایش در قالب متنی';
@@ -193,6 +204,9 @@ $labels['returnreceipt']  = 'رسید دریافت';
 $labels['dsn']            = 'اعلام وضعیت دریافت';
 $labels['mailreplyintro'] = 'در $date، $sender نوشته است:';
 $labels['originalmessage'] = 'پیغام اصلی';
+$labels['selectimage']    = 'انتخاب تصویر';
+$labels['addimage']       = 'افزودن تصویر';
+$labels['addmedia']       = 'افزودن رسانه';
 $labels['editidents']    = 'ویرایش شناسه‌ها';
 $labels['spellcheck']    = 'املاء';
 $labels['checkspelling'] = 'بررسی املایی';
@@ -203,9 +217,9 @@ $labels['restoremessage'] = 'بازیابی پیغام؟';
 $labels['responses'] = 'پاسخ‌ها';
 $labels['insertresponse'] = 'درج پاسخ';
 $labels['manageresponses'] = 'مدیریت پاسخ‌ها';
-$labels['savenewresponse'] = 'ذخیره پاسخ جدید';
-$labels['editresponses'] = 'ویرایش پاسخ‌ها';
+$labels['addresponse'] = 'افزودن پاسخ';
 $labels['editresponse'] = 'ویرایش پاسخ';
+$labels['editresponses'] = 'ویرایش پاسخ‌ها';
 $labels['responsename'] = 'نام';
 $labels['responsetext'] = 'متن پاسخ';
 $labels['attach'] = 'پیوست کردن';
@@ -270,6 +284,7 @@ $labels['assistant'] = 'دستیار';
 $labels['spouse'] = 'همسر';
 $labels['allfields'] = 'همه زمینه‌ها';
 $labels['search'] = 'جستجو';
+$labels['searchresult'] = 'نتیجه جستجو';
 $labels['advsearch'] = 'جستجوی پیشرفته';
 $labels['advanced'] = 'پیشرفته';
 $labels['other'] = 'سایر';
@@ -288,11 +303,12 @@ $labels['typehomepage']  = 'صفحه خانگی';
 $labels['typeblog'] = 'بلاگ';
 $labels['typeprofile'] = 'نمایه';
 $labels['addfield'] = 'افزودن زمینه...';
-$labels['addcontact'] = 'افزودن تماس جدید';
+$labels['addcontact'] = 'افزودن تماس';
 $labels['editcontact'] = 'ویرایش تماس';
 $labels['contacts'] = 'تماس‌ها';
 $labels['contactproperties'] = 'خصوصیات تماس';
 $labels['personalinfo'] = 'اطلاعات شخصی';
+$labels['contactphoto'] = 'تصویر تماس';
 $labels['edit']   = 'ویرایش';
 $labels['cancel'] = 'لغو';
 $labels['save']   = 'ذخیره';
@@ -301,7 +317,6 @@ $labels['rename'] = 'تغییر نام';
 $labels['addphoto'] = 'افزودن';
 $labels['replacephoto'] = 'جایگزینی';
 $labels['uploadphoto'] = 'بارگذاری تصویر';
-$labels['newcontact']     = 'ایجاد کارت تماس جدید';
 $labels['deletecontact']  = 'حذف تماس‌های انتخاب شده';
 $labels['composeto']      = 'نوشتن پست به';
 $labels['contactsfromto'] = 'تماس‌های $from تا $to از $count';
@@ -310,7 +325,8 @@ $labels['export']         = 'صدور';
 $labels['exportall']      = 'خارج کردن همه';
 $labels['exportsel']      = 'خارج کردن انتخاب شده‌ها';
 $labels['exportvcards']   = 'صدور اطلاعات تماس‌ها با فرمت vCard';
-$labels['newcontactgroup'] = 'افزودن گروه تماس جدید';
+$labels['newcontactgroup']       = 'ایجاد گروه جدید';
+$labels['addgroup']       = 'افزودن گروه';
 $labels['grouprename']    = 'تغییر نام گروه';
 $labels['groupdelete']    = 'حذف گروه';
 $labels['groupremoveselected'] = 'حذف نشانی‌های انتخاب شده از گروه';
@@ -340,10 +356,7 @@ $labels['preferences'] = 'ترجیحات';
 $labels['userpreferences'] = 'ترجیحات کاربر';
 $labels['editpreferences'] = 'ویرایش ترجیحات کاربر';
 $labels['identities'] = 'شناسه‌ها';
-$labels['manageidentities'] = 'مدیریت شناسه‌ها برای این حساب';
-$labels['newidentity'] = 'شناسه جدید';
-$labels['newitem'] = 'مورد جدید';
-$labels['edititem'] = 'ویرایش مورد';
+$labels['addidentity'] = 'افزودن هویت';
 $labels['preferhtml'] = 'HTML نمایش';
 $labels['defaultcharset'] = 'مجموعه نمایه پیش‌فرض';
 $labels['htmlmessage'] = 'HTML پیغام';
@@ -442,14 +455,14 @@ $labels['asattachment'] = 'به عنوان پیوست';
 $labels['replyallmode'] = 'عمل پیش‌فرض برای دکمه [پاسخ به همه]';
 $labels['replyalldefault'] = 'پاسخ به همه';
 $labels['replyalllist'] = 'پاسخ به فقط لیست پستی (در صورت یافتن)';
-$labels['folder']  = 'پوشه';
-$labels['folders']  = 'پوشه‌ها';
-$labels['foldername']  = 'نام پوشه';
-$labels['subscribed']  = 'مشترک شد';
+$labels['folder'] = 'پوشه';
+$labels['folders'] = 'پوشه‌ها';
+$labels['foldername'] = 'نام پوشه';
+$labels['subscribed'] = 'مشترک شد';
 $labels['messagecount'] = 'پیغام‌ها';
-$labels['create']  = 'ایجاد';
-$labels['createfolder']  = 'ایجاد پوشه‌ی جدید';
-$labels['managefolders']  = 'مدیریت پوشه‌ها';
+$labels['create'] = 'ایجاد';
+$labels['createfolder'] = 'ایجاد پوشه‌ی جدید';
+$labels['managefolders'] = 'مدیریت پوشه‌ها';
 $labels['specialfolders'] = 'پوشه‌های ویژه';
 $labels['properties'] = 'خصوصیات';
 $labels['folderproperties'] = 'خصوصیات پوشه';
@@ -459,9 +472,10 @@ $labels['info'] = 'اطلاعات';
 $labels['getfoldersize'] = 'برای فهمیدن حجم پوشه کلیک کنید';
 $labels['changesubscription'] = 'برای تغییر اشتراک کلیک کنید';
 $labels['foldertype'] = 'نوع پوشه';
-$labels['personalfolder']  = 'پوشه خصوصی';
-$labels['otherfolder']  = 'پوشه کاربران دیگر';
-$labels['sharedfolder']  = 'پوشه عمومی';
+$labels['personalfolder'] = 'پوشه خصوصی';
+$labels['otherfolder'] = 'پوشه کاربران دیگر';
+$labels['sharedfolder'] = 'پوشه عمومی';
+$labels['namespace.personal'] = 'شخصی';
 $labels['sortby'] = 'مرتب‌سازی بر اساس';
 $labels['sortasc']  = 'مرتب‌سازی صعودی';
 $labels['sortdesc'] = 'مرتب‌سازی نزولی';
@@ -494,4 +508,6 @@ $labels['vietnamese'] = 'ویتنامی';
 $labels['japanese'] = 'ژاپنی';
 $labels['korean'] = 'کره‌ای';
 $labels['chinese'] = 'چینی';
+$labels['arialabelactivetask'] = 'وظیفه فعال';
+$labels['arialabelmessagebody'] = 'بدنه پیغام';
 ?>
diff --git a/program/localization/fa_IR/messages.inc b/program/localization/fa_IR/messages.inc
index e5d5667cf..4d1bf902d 100644
--- a/program/localization/fa_IR/messages.inc
+++ b/program/localization/fa_IR/messages.inc
@@ -22,6 +22,7 @@ $messages['sessionerror'] = 'نشست شما معتبر نیست، یا منقض
 $messages['storageerror'] = 'اتصال به سرور مخزن ناموفق بود.';
 $messages['servererror'] = 'خطای سرور!';
 $messages['servererrormsg'] = 'خطای سرور: $msg';
+$messages['connerror'] = 'خطای ارتباط (عدم دسترسی به سرور)!';
 $messages['dberror'] = 'خطای پایگاه داده!';
 $messages['requesttimedout'] = 'زمان درخواست تمام شد';
 $messages['errorreadonly'] = ' عمل مورد نظر انجام نشد. پوشه فقط خواندنی است.';
@@ -93,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr مخاطب ییدا شد.';
 $messages['searchnomatch'] = 'جست‌و‌جو هیچ نتیجه‌ای نداشت.';
 $messages['searching'] = 'در حال جست‌و‌جو...';
 $messages['checking'] = 'در حال بررسی...';
+$messages['stillsearching'] = 'هنور در حال جستجو...';
 $messages['nospellerrors'] = 'هیچ اشکال املایی پیدا نشد.';
 $messages['folderdeleted'] = 'پوشه با موفقیت حذف شد.';
 $messages['foldersubscribed'] = 'اشتراک پوشه با موفقیت انجام شد.';
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index f9d6e5481..4ebe59b01 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -131,6 +131,8 @@ $labels['moreactions']      = 'Lisää toimintoja...';
 $labels['more']             = 'Lisää';
 $labels['back']             = 'Takaisin';
 $labels['options']          = 'Asetukset';
+$labels['previous'] = 'Edellinen';
+$labels['next'] = 'Seuraava';
 $labels['select'] = 'Valitse';
 $labels['all'] = 'Kaikki';
 $labels['none'] = 'Ei mikään';
@@ -171,6 +173,11 @@ $labels['importmessages'] = 'Tuo viestejä';
 $labels['quota'] = 'Levytila';
 $labels['unknown']  = 'tuntematon';
 $labels['unlimited']  = 'rajoittamaton';
+$labels['quotatype'] = 'Kiintiön tyyppi';
+$labels['quotatotal'] = 'Raja';
+$labels['quotaused'] = 'Käytetty';
+$labels['quotastorage'] = 'Levytila';
+$labels['quotamessage'] = 'Viestien määrä';
 $labels['quicksearch']  = 'Pikahaku';
 $labels['resetsearch']  = 'Nollaa haku';
 $labels['searchmod']  = 'Hakukriteerit';
@@ -178,6 +185,10 @@ $labels['msgtext']  = 'Koko viesti';
 $labels['body']  = 'Runko';
 $labels['type'] = 'Tyyppi';
 $labels['namex'] = 'Nimi';
+$labels['searchscope'] = 'Rajaus';
+$labels['currentfolder'] = 'Nykyinen kansio';
+$labels['subfolders'] = 'Nykyinen kansio ja sen alikansiot';
+$labels['allfolders'] = 'Kaikki kansiot';
 $labels['openinextwin'] = 'Avaa uudessa ikkunassa';
 $labels['emlsave'] = 'Tallenna (.eml)';
 $labels['changeformattext'] = 'Näytä raakatekstimuodossa';
@@ -193,6 +204,10 @@ $labels['returnreceipt']  = 'Perillesaapumisilmoitus';
 $labels['dsn']            = 'Toimituksen tilailmoitus';
 $labels['mailreplyintro'] = '$sender kirjoitti $date:';
 $labels['originalmessage'] = 'Alkuperäinen viesti';
+$labels['selectimage']    = 'Valitse kuva';
+$labels['addimage']       = 'Lisää kuva';
+$labels['selectmedia']    = 'Valitse elokuva';
+$labels['addmedia']       = 'Lisää elokuva';
 $labels['editidents']    = 'Muokkaa identiteettejä';
 $labels['spellcheck']    = 'Oikeinkirjoitus';
 $labels['checkspelling'] = 'Tarkista oikeinkirjoitus';
@@ -202,9 +217,10 @@ $labels['restore'] = 'Palauta';
 $labels['restoremessage'] = 'Palautetaanko viesti?';
 $labels['responses'] = 'Vastaukset';
 $labels['manageresponses'] = 'Hallitse vastauksia';
-$labels['savenewresponse'] = 'Tallenna uusi vastaus';
-$labels['editresponses'] = 'Muokkaa vastauksia';
+$labels['savenewresponse'] = 'Luo uusi vastaus';
+$labels['addresponse'] = 'Lisää vastaus';
 $labels['editresponse'] = 'Muokkaa vastausta';
+$labels['editresponses'] = 'Muokkaa vastauksia';
 $labels['responsename'] = 'Nimi';
 $labels['responsetext'] = 'Vastausteksti';
 $labels['attach'] = 'Liitä';
@@ -287,10 +303,11 @@ $labels['typehomepage']  = 'Kotisivu';
 $labels['typeblog'] = 'Blogi';
 $labels['typeprofile'] = 'Profiili';
 $labels['addfield'] = 'Lisää kenttä...';
-$labels['addcontact'] = 'Lisää uusi yhteystieto';
+$labels['addcontact'] = 'Lisää yhteystieto';
 $labels['editcontact'] = 'Muokkaa yhteystietoa';
 $labels['contacts'] = 'Yhteystiedot';
 $labels['contactproperties'] = 'Yhteystiedon ominaisuudet';
+$labels['contactnameandorg'] = 'Nimi ja organisaatio';
 $labels['personalinfo'] = 'Henkilökohtaiset tiedot';
 $labels['edit']   = 'Muokkaa';
 $labels['cancel'] = 'Peruuta';
@@ -309,24 +326,30 @@ $labels['export']         = 'Vie (export)';
 $labels['exportall']      = 'Vie kaikki';
 $labels['exportsel']      = 'Vie valitut';
 $labels['exportvcards']   = 'Vie yhteystiedot vCard-muodossa';
-$labels['newcontactgroup'] = 'Luo uusi yhteystietoryhmä';
+$labels['newcontactgroup']       = 'Luo uusi ryhmä';
+$labels['addgroup']       = 'Lisää ryhmä';
 $labels['grouprename']    = 'Nimeä ryhmä uudelleen';
 $labels['groupdelete']    = 'Poista ryhmä';
 $labels['groupremoveselected'] = 'Poista valitut yhteystiedot ryhmästä';
+$labels['uponelevel']     = 'Yksi taso ylös';
 $labels['previouspage']   = 'Näytä edellinen luettelo';
 $labels['firstpage']      = 'Näytä ensimmäinen luettelo';
 $labels['nextpage']       = 'Näytä seuraava luettelo';
 $labels['lastpage']       = 'Näytä viimeinen luettelo';
 $labels['group'] = 'Ryhmä';
 $labels['groups'] = 'Ryhmät';
+$labels['listgroup'] = 'Listaa ryhmän jäsenet';
 $labels['personaladrbook'] = 'Henkilökohtaiset osoitteet';
 $labels['searchsave'] = 'Tallenna haku';
 $labels['searchdelete'] = 'Poista haku';
 $labels['import'] = 'Tuo';
 $labels['importcontacts'] = 'Tuo yhteystiedot';
 $labels['importfromfile'] = 'Tuo tiedostosta:';
+$labels['importtarget'] = 'Lisää yhteystiedot kohteeseen';
 $labels['importreplace'] = 'Korvaa koko osoitekirja';
+$labels['importgroups'] = 'Tuo ryhmämääritykset';
 $labels['importgroupsall'] = 'Kaikki (luo ryhmät tarvittaessa)';
+$labels['importgroupsexisting'] = 'Vain olemassa oleville ryhmille';
 $labels['importdesc'] = 'Voit tuoda yhteystietoja olemassa olevasta osoitekirjasta.<br/>Tuettuja muotoja ovat <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ja CSV (pilkuin erotetut arvot).';
 $labels['done'] = 'Valmis';
 $labels['settingsfor'] = 'Asetukset';
@@ -335,10 +358,10 @@ $labels['preferences'] = 'Asetukset';
 $labels['userpreferences'] = 'Käyttäjän asetukset';
 $labels['editpreferences'] = 'Muokkaa käyttäjän asetuksia';
 $labels['identities'] = 'Identiteetit';
-$labels['manageidentities'] = 'Muokkaa tunnuksen identiteettejä';
-$labels['newidentity'] = 'Uusi identiteetti';
-$labels['newitem'] = 'Uusi';
-$labels['edititem'] = 'Muokkaa';
+$labels['manageidentities'] = 'Hallitse henkilöyksiä';
+$labels['newidentity'] = 'Luo uusi henkilöys';
+$labels['addidentity'] = 'Lisää henkilöys';
+$labels['edititem'] = 'Muokkaa henkilöyttä';
 $labels['preferhtml'] = 'Käytä HTML:aa';
 $labels['defaultcharset'] = 'Oletusmerkistökoodaus';
 $labels['htmlmessage'] = 'HTML-viesti';
@@ -394,6 +417,7 @@ $labels['2231folding'] = 'Täysin RFC 2231:n mukainen (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231:n mukainen (MS Outlook)';
 $labels['2047folding'] = 'Täysin RFC 2047:n mukainen (muut)';
 $labels['force7bit'] = 'Käytä MIME-koodausta 8-bittisille merkeille';
+$labels['savelocalstorage'] = "Tallenna selaimen paikalliseen tallennustilaan (väliaikaisesti)";
 $labels['advancedoptions'] = 'Lisäasetukset';
 $labels['focusonnewmessage'] = 'Tarkenna selainikkuna uuteen viestiin';
 $labels['checkallfolders'] = 'Tarkista kaikki kansiot uusien viestien varalta';
@@ -435,14 +459,14 @@ $labels['asattachment'] = 'liitteenä';
 $labels['replyallmode'] = 'Oletustoiminto [Vastaa kaikille]-painikkeelle';
 $labels['replyalldefault'] = 'vastaa kaikille';
 $labels['replyalllist'] = 'vastaa pelkälle postituslistalle (jos havaittu)';
-$labels['folder']  = 'Kansio';
-$labels['folders']  = 'Kansiot';
-$labels['foldername']  = 'Kansion nimi';
-$labels['subscribed']  = 'Näytetään';
+$labels['folder'] = 'Kansio';
+$labels['folders'] = 'Kansiot';
+$labels['foldername'] = 'Kansion nimi';
+$labels['subscribed'] = 'Näytetään';
 $labels['messagecount'] = 'Viestejä';
-$labels['create']  = 'Luo uusi';
-$labels['createfolder']  = 'Luo uusi kansio';
-$labels['managefolders']  = 'Kansioiden hallinta';
+$labels['create'] = 'Luo uusi';
+$labels['createfolder'] = 'Luo uusi kansio';
+$labels['managefolders'] = 'Kansioiden hallinta';
 $labels['specialfolders'] = 'Erikoiskansiot';
 $labels['properties'] = 'Ominaisuudet';
 $labels['folderproperties'] = 'Kansion ominaisuudet';
@@ -452,9 +476,13 @@ $labels['info'] = 'Tietoja';
 $labels['getfoldersize'] = 'Napsauta saadaksesi kansion koon';
 $labels['changesubscription'] = 'Klikkaa muuttaaksesi tilausta';
 $labels['foldertype'] = 'Kansion tyyppi';
-$labels['personalfolder']  = 'Yksityinen kansio';
-$labels['otherfolder']  = 'Toisen käyttäjän kansio';
-$labels['sharedfolder']  = 'Julkinen kansio';
+$labels['personalfolder'] = 'Yksityinen kansio';
+$labels['otherfolder'] = 'Toisen käyttäjän kansio';
+$labels['sharedfolder'] = 'Julkinen kansio';
+$labels['findfolders'] = 'Etsi kansioita';
+$labels['namespace.personal'] = 'Henkilökohtainen';
+$labels['namespace.other'] = 'Muut käyttäjät';
+$labels['namespace.shared'] = 'Jaettu';
 $labels['sortby'] = 'Järjestä';
 $labels['sortasc']  = 'Järjestä nousevasti (a-ö)';
 $labels['sortdesc'] = 'Järjestä laskevasti (ö-a)';
@@ -487,4 +515,18 @@ $labels['vietnamese'] = 'Vietnamilainen';
 $labels['japanese'] = 'Japanilainen';
 $labels['korean'] = 'Korealainen';
 $labels['chinese'] = 'Kiinalainen';
+$labels['arialabeltoolbar'] = 'Sovelluksen työkalupalkki';
+$labels['arialabelmailpreviewframe'] = 'Viestin esikatselu';
+$labels['arialabelmessagebody'] = 'Viestin runko';
+$labels['arialabelmessageactions'] = 'Viestitoiminnot';
+$labels['arialabelmessageheaders'] = 'Viestin otsakkeet';
+$labels['arialabelreplyalloptions'] = 'Vastaa kaikille -valinnat';
+$labels['arialabelmoremessageactions'] = 'Lisää viestitoimintoja';
+$labels['arialabelmarkmessagesas'] = 'Merkitse valitut viestit...';
+$labels['arialabelattachmentuploadform'] = 'Liitteen lähetyslomake';
+$labels['arialabelattachmentpreview'] = 'Liitteen esikatselu';
+$labels['arialabelabookgroupoptions'] = 'Osoitekirjan/ryhmän valinnat';
+$labels['arialabelidentityeditfrom'] = 'Henkilöyden muokkauslomake';
+$labels['arialabelsearchterms'] = 'Hakuehdot';
+$labels['helplistkeyboardnavcontacts'] = "Enter: avaa valittu/kohdistettu yhteystieto.";
 ?>
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index 77a165860..a4ad87c9f 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Sessio ei kelpaa tai ei ole enää voimassa';
 $messages['storageerror'] = 'Yhteys IMAP-palvelimeen epäonnistui';
 $messages['servererror'] = 'Palvelinvirhe!';
 $messages['servererrormsg'] = 'Palvelinvirhe: $msg';
+$messages['connerror'] = 'Yhteysvirhe, ei yhteyttä palvelimeen!';
 $messages['dberror'] = 'Tietokantavirhe!';
+$messages['windowopenerror'] = 'Ponnahdusikkuna estettiin!';
 $messages['requesttimedout'] = 'Pyyntö aikakatkaistiin';
 $messages['errorreadonly'] = 'Toiminnon suoritus ei onnistu, koska hakemisto on vain lukutilassa.';
 $messages['errornoperm'] = 'Toimintoa ei voitu suorittaa. Ei oikeuksia.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Löydetty $nr yhteystietoa';
 $messages['searchnomatch'] = 'Haku ei tuottanut tuloksia';
 $messages['searching'] = 'Etsitään...';
 $messages['checking'] = 'Tarkistetaan...';
+$messages['stillsearching'] = 'Etsitään edelleen...';
 $messages['nospellerrors'] = 'Kirjoitusvirheitä ei löytynyt.';
 $messages['folderdeleted'] = 'Kansio poistettu onnistuneesti';
 $messages['foldersubscribed'] = 'Kansio tilattu onnistuneesti.';
@@ -126,6 +129,7 @@ $messages['selectimportfile'] = 'Valitse lähetettävä tiedosto';
 $messages['addresswriterror'] = 'Valittuun osoitekirjaan ei voi kirjoittaa';
 $messages['contactaddedtogroup'] = 'Yhteystiedot lisätty ryhmään';
 $messages['contactremovedfromgroup'] = 'Yhteystiedot poistettu ryhmästä';
+$messages['nogroupassignmentschanged'] = 'Ryhmämäärityksiä ei muutettu.';
 $messages['importwait'] = 'Tuodaan, odota...';
 $messages['importformaterror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole kelvollinen tuontitiedosto.';
 $messages['importconfirm'] = '<b>$inserted yhteystietoa tuotu onnistuneesti</b>';
@@ -134,7 +138,7 @@ $messages['importmessagesuccess'] = '$nr viestiä tuotiin onnistuneesti';
 $messages['importmessageerror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole kelvollinen viesti tai mailbox-tiedosto';
 $messages['opnotpermitted'] = 'Toiminto ei ole sallittu!';
 $messages['nofromaddress'] = 'Valittu identiteetti ei sisällä sähköpostiosoitetta';
-$messages['editorwarning'] = 'Vaihtaminen tekstieditoriin aiheuttaa viestin muotoilun katoamisen. Haluatko jatkaa?';
+$messages['editorwarning'] = 'Muokkaintyypin vaihtaminen saattaa aiheuttaa tekstin muotoilun katoamisen. Haluatko jatkaa?';
 $messages['httpreceivedencrypterror'] = 'Vakava virhe asetuksissa. Ota välittömästi yhteys ylläpitoon. <b>Viestiäsi ei voida lähettää.</b>';
 $messages['smtpconnerror'] = 'SMTP-virhe ($code): Palvelimelle yhdistäminen epäonnistui';
 $messages['smtpautherror'] = 'SMTP-virhe ($code): Tunnistus epäonnistui';
diff --git a/program/localization/fo_FO/messages.inc b/program/localization/fo_FO/messages.inc
index 7bec7c974..6bc957342 100644
--- a/program/localization/fo_FO/messages.inc
+++ b/program/localization/fo_FO/messages.inc
@@ -135,7 +135,6 @@ $messages['importmessagesuccess'] = 'Innflutt $nr boð.';
 $messages['importmessageerror'] = 'Innflyting bar ikki til! Tann uppsendi fílurin er ikki gyldigur boð ella postkassa fílur';
 $messages['opnotpermitted'] = 'Ger ikki loyvd!';
 $messages['nofromaddress'] = 'Manglar teldupostur í valda samleika.';
-$messages['editorwarning'] = 'Um tú skiftur til reinan tekst verður øll forsniðing mist. Ynskir tú at halda fram?';
 $messages['httpreceivedencrypterror'] = 'Ein oyðandi samansetings feilur uppstóð. Vinarliga set teg í samband við umsitaran beinanvegin. <b>Tíni boð kundu ikki sendast.</b>';
 $messages['smtpconnerror'] = 'SMTP Feilur ($code): Samband til ambatara riggaði ikki.';
 $messages['smtpautherror'] = 'SMTP Feilur ($code): Atgongd nokta.';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 41e642875..f6671c25a 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Plus d\'actions...';
 $labels['more']             = 'Plus';
 $labels['back']             = 'Retour';
 $labels['options']          = 'Options';
+$labels['first'] = 'Premier';
+$labels['last'] = 'Dernier';
+$labels['previous'] = 'Précédent';
+$labels['next'] = 'Suivant';
 $labels['select'] = 'Choisir';
 $labels['all'] = 'Tous';
 $labels['none'] = 'Aucun';
 $labels['currpage'] = 'Page courante';
+$labels['isread'] = 'Lu';
 $labels['unread'] = 'Non lu';
 $labels['flagged'] = 'Signalé';
+$labels['unflagged'] = 'Non signalé';
 $labels['unanswered'] = 'Non répondu';
 $labels['withattachment'] = 'Avec fichier joint';
 $labels['deleted'] = 'Supprimé';
 $labels['undeleted'] = 'Non supprimé';
+$labels['replied'] = 'Réponse faite';
+$labels['forwarded'] = 'Transféré';
 $labels['invert'] = 'Inverser';
 $labels['filter'] = 'Filtrer';
 $labels['list'] = 'Lister';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Importer des messages';
 $labels['quota'] = 'Utilisation du disque';
 $labels['unknown']  = 'inconnue';
 $labels['unlimited']  = 'illimitée';
+$labels['quotatype'] = 'Type de quota';
+$labels['quotatotal'] = 'Limite';
+$labels['quotaused'] = 'Utilisé';
+$labels['quotastorage'] = 'Espace disque';
+$labels['quotamessage'] = 'Nombre de messages';
 $labels['quicksearch']  = 'Recherche rapide';
 $labels['resetsearch']  = 'Réinitialiser la recherche';
 $labels['searchmod']  = 'Modificateurs de recherche';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Message entier';
 $labels['body']  = 'Corps';
 $labels['type'] = 'Type';
 $labels['namex'] = 'Nom';
+$labels['searchscope'] = 'Portée';
+$labels['currentfolder'] = 'Répertoire actuel';
+$labels['subfolders'] = 'Ceci et les sous-dossiers';
+$labels['allfolders'] = 'Tous les dossiers';
 $labels['openinextwin'] = 'Ouvrir dans une nouvelle fenêtre';
 $labels['emlsave'] = 'Télécharger (.eml)';
 $labels['changeformattext'] = 'Afficher au format texte en clair';
@@ -193,19 +210,24 @@ $labels['returnreceipt']  = 'Accusé de réception';
 $labels['dsn']            = 'Notification d\'état de distribution';
 $labels['mailreplyintro'] = 'Le $date, $sender a écrit :';
 $labels['originalmessage'] = 'Message original';
+$labels['selectimage']    = 'Sélectionner l\'image';
+$labels['addimage']       = 'Ajouter une image';
+$labels['selectmedia']    = 'Choisir un film';
+$labels['addmedia']       = 'Ajouter un film';
 $labels['editidents']    = 'Éditer les identités';
 $labels['spellcheck']    = 'Orthographe';
 $labels['checkspelling'] = 'Vérification de l\'orthographe';
 $labels['resumeediting'] = 'Retourner à l\'édition';
 $labels['revertto']      = 'Revenir à';
 $labels['restore'] = 'Restaurer';
-$labels['restoremessage'] = 'Restaurer le message?';
+$labels['restoremessage'] = 'Restaurer le message ?';
 $labels['responses'] = 'Réponses';
 $labels['insertresponse'] = 'Insérer une réponse';
 $labels['manageresponses'] = 'Gérer les réponses';
-$labels['savenewresponse'] = 'Enregistrer une nouvelle réponse';
-$labels['editresponses'] = 'Éditer les réponses';
+$labels['savenewresponse'] = 'Créer une nouvelle réponse';
+$labels['addresponse'] = 'Ajouter une réponse';
 $labels['editresponse'] = 'Éditer la réponse';
+$labels['editresponses'] = 'Éditer les réponses';
 $labels['responsename'] = 'Nom';
 $labels['responsetext'] = 'Texte de la réponse';
 $labels['attach'] = 'Joindre';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Téléverser';
 $labels['uploadprogress'] = '$percent ($current sur $total)';
 $labels['close']  = 'Fermer';
 $labels['messageoptions']  = 'Options du message...';
+$labels['togglecomposeoptions'] = 'Activer/désactiver les options de rédaction';
 $labels['low']     = 'Basse';
 $labels['lowest']  = 'La plus basse';
 $labels['normal']  = 'Normale';
@@ -235,7 +258,7 @@ $labels['addcc'] = 'Ajouter Cc';
 $labels['addbcc'] = 'Ajouter Cci';
 $labels['addreplyto'] = 'Ajouter Répondre à';
 $labels['addfollowupto'] = 'Ajouter Transférer à';
-$labels['mdnrequest'] = 'L\'expéditeur de ce message a demandé d\'être prévenu quand vous lirez ce message. Souhaitez-vous prévenir l\'expéditeur?';
+$labels['mdnrequest'] = 'L\'expéditeur de ce message a demandé d\'être prévenu quand vous lirez ce message. Souhaitez-vous prévenir l\'expéditeur ?';
 $labels['receiptread'] = 'Accusé de réception (lu)';
 $labels['yourmessage'] = 'Ceci est un accusé de réception pour votre message';
 $labels['receiptnote'] = 'Note : cet accusé indique seulement que le message a été affiché sur l\'ordinateur du destinataire. Il n\'y a aucune garantie que le destinataire ait lu ou compris le contenu du message.';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Assistant';
 $labels['spouse'] = 'Époux/épouse';
 $labels['allfields'] = 'Tous les champs';
 $labels['search'] = 'Recherche';
+$labels['searchresult'] = 'Résultat de la recherche';
 $labels['advsearch'] = 'Recherche avancée';
 $labels['advanced'] = 'Détails';
 $labels['other'] = 'Autre';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Page d\'accueil';
 $labels['typeblog'] = 'Blogue';
 $labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Ajouter un champ...';
-$labels['addcontact'] = 'Ajouter comme nouveau contact';
+$labels['addcontact'] = 'Ajouter un contact';
 $labels['editcontact'] = 'Modifier le contact';
 $labels['contacts'] = 'Contacts';
 $labels['contactproperties'] = 'Propriétés du contact';
+$labels['contactnameandorg'] = 'Nom et organisation';
 $labels['personalinfo'] = 'Informations personnelles';
+$labels['contactphoto'] = 'Photo du contact';
 $labels['edit']   = 'Modifier';
 $labels['cancel'] = 'Annuler';
 $labels['save']   = 'Enregistrer';
@@ -301,7 +327,7 @@ $labels['rename'] = 'Renommer';
 $labels['addphoto'] = 'Ajouter';
 $labels['replacephoto'] = 'Remplacer';
 $labels['uploadphoto'] = 'Téléverser une photo';
-$labels['newcontact']     = 'Créer une nouvelle carte de contact';
+$labels['newcontact']     = 'Créer un nouveau contact';
 $labels['deletecontact']  = 'Supprimer les contacts sélectionnés';
 $labels['composeto']      = 'Rédiger un message à';
 $labels['contactsfromto'] = 'Contacts de $from à $to sur $count';
@@ -310,10 +336,12 @@ $labels['export']         = 'Exporter';
 $labels['exportall']      = 'Tout exporter';
 $labels['exportsel']      = 'Exporter la sélection';
 $labels['exportvcards']   = 'Exporter les contacts au format vCard';
-$labels['newcontactgroup'] = 'Créer un nouveau groupe de contacts';
+$labels['newcontactgroup']       = 'Créer un nouveau groupe';
+$labels['addgroup']       = 'Ajouter un groupe';
 $labels['grouprename']    = 'Renommer le groupe';
 $labels['groupdelete']    = 'Supprimer le groupe';
 $labels['groupremoveselected'] = 'Retirer les contacts sélectionnés du groupe';
+$labels['uponelevel']     = 'Monter d\'un niveau';
 $labels['previouspage']   = 'Afficher page précédente';
 $labels['firstpage']      = 'Afficher la première page';
 $labels['nextpage']       = 'Afficher la page suivante';
@@ -329,7 +357,7 @@ $labels['importcontacts'] = 'Importer les contacts';
 $labels['importfromfile'] = 'Importer depuis un fichier :';
 $labels['importtarget'] = 'Ajouter les contacts à';
 $labels['importreplace'] = 'Remplacer le carnet d\'adresses entier';
-$labels['importgroups'] = 'Importer les affectations de groupes';
+$labels['importgroups'] = 'Importer les affectations de groupe';
 $labels['importgroupsall'] = 'Tous (créer les groupes si nécessaire)';
 $labels['importgroupsexisting'] = 'Seulement pour les groupes existants';
 $labels['importdesc'] = 'Vous pouvez téléverser des contacts à partir d\'un carnet d\'adresses existant.<br/>Nous prenons en charge présentement l\'importation d\'adresses à partir des format de données <a href="http://fr.wikipedia.org/wiki/VCard">vCard</a> ou CSV (séparé par une virgule).';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Préférences';
 $labels['userpreferences'] = 'Préférences utilisateur';
 $labels['editpreferences'] = 'Modifier les préférences utilisateur';
 $labels['identities'] = 'Identités';
-$labels['manageidentities'] = 'Gérer les identités pour ce compte';
-$labels['newidentity'] = 'Nouvelle identité';
-$labels['newitem'] = 'Nouvel élément';
-$labels['edititem'] = 'Modifier l\'élément';
+$labels['manageidentities'] = 'Gérer les identités';
+$labels['newidentity'] = 'Créer une nouvelle identité';
+$labels['addidentity'] = 'Ajouter une identité';
+$labels['edititem'] = 'Modifier l\'identité';
 $labels['preferhtml'] = 'Afficher en HTML';
 $labels['defaultcharset'] = 'Jeu de caractère par défaut';
 $labels['htmlmessage'] = 'Message en HTML';
@@ -390,7 +418,7 @@ $labels['always'] = 'toujours';
 $labels['showinlineimages'] = 'Afficher les images jointes sous le message';
 $labels['autosavedraft']  = 'Enregistrer automatiquement le brouillon';
 $labels['everynminutes']  = 'toutes les $n minute(s)';
-$labels['refreshinterval']  = 'Rafraîchir (vérifier les nouveaux messages, etc...)';
+$labels['refreshinterval']  = 'Rafraîchir (vérifier les nouveaux messages, etc.)';
 $labels['never']  = 'jamais';
 $labels['immediately']  = 'Immédiatement';
 $labels['messagesdisplaying'] = 'Affichage des messages';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'RFC 2231 complet (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 complet (autre)';
 $labels['force7bit'] = 'Utiliser l\'encodage MIME pour les caractères 8 bits';
+$labels['savelocalstorage'] = "Enregistrer dans le stockage local du navigateur (temporaire)";
 $labels['advancedoptions'] = 'Options avancées';
+$labels['toggleadvancedoptions'] = 'Activer/désactiver les options avancées';
 $labels['focusonnewmessage'] = 'Cibler la fenêtre du navigateur quand un nouveau message arrive';
 $labels['checkallfolders'] = 'Vérifier les nouveaux messages dans tous les dossiers';
 $labels['displaynext'] = 'Après avoir supprimé/déplacé un message, afficher le suivant';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'en fichier joint';
 $labels['replyallmode'] = 'Action par défaut du bouton [Répondre à tous]';
 $labels['replyalldefault'] = 'répondre à tous';
 $labels['replyalllist'] = 'répondre seulement à la liste de diffusion (si trouvée)';
-$labels['folder']  = 'Dossier';
-$labels['folders']  = 'Dossiers';
-$labels['foldername']  = 'Nom du dossier';
-$labels['subscribed']  = 'Abonné';
+$labels['folder'] = 'Dossier';
+$labels['folders'] = 'Dossiers';
+$labels['foldername'] = 'Nom du dossier';
+$labels['subscribed'] = 'Abonné';
 $labels['messagecount'] = 'Messages';
-$labels['create']  = 'Créer';
-$labels['createfolder']  = 'Créer un nouveau dossier';
-$labels['managefolders']  = 'Gérer les dossiers';
+$labels['create'] = 'Créer';
+$labels['createfolder'] = 'Créer un nouveau dossier';
+$labels['managefolders'] = 'Gérer les dossiers';
 $labels['specialfolders'] = 'Dossiers spéciaux';
 $labels['properties'] = 'Propriétés';
 $labels['folderproperties'] = 'Propriétés du dossier';
@@ -459,9 +489,13 @@ $labels['info'] = 'Informations';
 $labels['getfoldersize'] = 'Cliquer pour obtenir la taille de dossier';
 $labels['changesubscription'] = 'Cliquer pour modifier l\'abonnement';
 $labels['foldertype'] = 'Type de dossier';
-$labels['personalfolder']  = 'Dossier privé';
-$labels['otherfolder']  = 'Dossier d\'autres utilisateurs';
-$labels['sharedfolder']  = 'Dossier public';
+$labels['personalfolder'] = 'Dossier privé';
+$labels['otherfolder'] = 'Dossier d\'autres utilisateurs';
+$labels['sharedfolder'] = 'Dossier public';
+$labels['findfolders'] = 'Trouver des dossiers';
+$labels['namespace.personal'] = 'Personnel';
+$labels['namespace.other'] = 'Autres utilisateurs';
+$labels['namespace.shared'] = 'Partagé';
 $labels['sortby'] = 'Trier par';
 $labels['sortasc']  = 'Tri ascendant';
 $labels['sortdesc'] = 'Tri descendant';
@@ -494,4 +528,54 @@ $labels['vietnamese'] = 'Vietnamien';
 $labels['japanese'] = 'Japonais';
 $labels['korean'] = 'Coréen';
 $labels['chinese'] = 'Chinois';
+$labels['arialabeltopnav'] = 'Contrôle de la fenêtre';
+$labels['arialabeltasknav'] = 'Tâches de l\'application';
+$labels['arialabeltoolbar'] = 'Barre d\'outils de l\'application';
+$labels['arialabelactivetask'] = 'Tâche active';
+$labels['arialabelmessagessearchfilter'] = 'Filtre de listage des courriels';
+$labels['arialabelmailsearchform'] = 'Formulaire de recherche des courriels';
+$labels['arialabelcontactsearchform'] = 'Formulaire de recherche des contacts';
+$labels['arialabelmailquicksearchbox'] = 'Saisie de la recherche de courriels';
+$labels['arialabelquicksearchbox'] = 'Saisie de la recherche';
+$labels['arialabelfoldersearchfilter'] = 'Filtre de listage des dossiers';
+$labels['arialabelfoldersearchform'] = 'Formulaire de recherche de dossiers';
+$labels['arialabelfolderlist'] = 'Sélection du dossier des courriels';
+$labels['arialabelmessagelist'] = 'Listage des courriels';
+$labels['arialabelmailpreviewframe'] = 'Aperçu des messages';
+$labels['arialabelmailboxmenu'] = 'Menu d\'action des dossiers';
+$labels['arialabellistselectmenu'] = 'Menu de sélection des listes';
+$labels['arialabelthreadselectmenu'] = 'Menu de listage des fils';
+$labels['arialabelmessagelistoptions'] = 'Options d\'affichage et de tri des listes de messages';
+$labels['arialabelmailimportdialog'] = 'Fenêtre d\'Importation des messages';
+$labels['arialabelmessagenav'] = 'Parcourir les message';
+$labels['arialabelmessagebody'] = 'Corps des messages';
+$labels['arialabelmessageactions'] = 'Actions sur les messages';
+$labels['arialabelcontactquicksearch'] = 'Formulaire de recherche de contacts';
+$labels['arialabelcontactsearchbox'] = 'Saisie de la recherche de contacts';
+$labels['arialabelmessageheaders'] = 'En-tête des messages';
+$labels['arialabelforwardingoptions'] = 'Options de réacheminement';
+$labels['arialabelreplyalloptions'] = 'Options de réponse à tous';
+$labels['arialabelmoremessageactions'] = 'Actions supplémentaires sur le message';
+$labels['arialabelmarkmessagesas'] = 'Marquer les messages sélectionnés comme...';
+$labels['arialabelcomposeoptions'] = 'Options de rédaction';
+$labels['arialabelresponsesmenu'] = 'Menu des réponses pré-déterminées';
+$labels['arialabelattachmentuploadform'] = 'Formulaire de téléversement de fichiers joints';
+$labels['arialabelattachmentpreview'] = 'Aperçu des fichiers joints';
+$labels['ariasummarycomposecontacts'] = 'Liste des contacts et des groupes à sélectionner comme destinataires';
+$labels['arialabelcontactexportoptions'] = 'Options d\'exportation des contacts';
+$labels['arialabelabookgroupoptions'] = 'Options du carnet d\'adresses/groupes';
+$labels['arialabelpreferencesform'] = 'Formulaire des préférences';
+$labels['arialabelidentityeditfrom'] = 'Formulaire de modification de l\'identité';
+$labels['arialabelresonseeditfrom'] = 'Formulaire de modification des réponses';
+$labels['arialabelsearchterms'] = 'Termes de recherche';
+$labels['helplistnavigation'] = 'Navigation au clavier des listes ';
+$labels['helplistkeyboardnavigation'] = "Flèche haut/bas : déplacer la cible de sélection.
+Espace : sélectionner la rangée ciblée.
+Maj + haut/bas :  Sélectionner des rangées supplémentaires
+au-dessus/en-dessous.
+Ctl + espace : ajouter la rangée ciblée à la sélection/enlever la rangée ciblée de la sélection.";
+$labels['helplistkeyboardnavmessages'] = "Flèche droite/gauche : déplier/replier les fils de messages (en mode fils seulement).
+Entrée : ouvrir le message sélectionné/cible.
+Suppr : déplacer les messages sélectionnés vers la corbeille.";
+$labels['helplistkeyboardnavcontacts'] = "Entrée : ouvrir le contact sélectionné/cible.";
 ?>
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index 82d883c34..8eb888ed9 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -15,23 +15,25 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-$messages['errortitle']  = 'Une erreur est survenue!';
+$messages['errortitle']  = 'Une erreur est survenue !';
 $messages['loginfailed']  = 'La connexion a échoué.';
 $messages['cookiesdisabled'] = 'Votre navigateur n\'accepte pas les fichiers témoins.';
 $messages['sessionerror'] = 'Votre session est invalide ou a expiré.';
 $messages['storageerror'] = 'Erreur de connexion au serveur de stockage.';
-$messages['servererror'] = 'Erreur de serveur!';
+$messages['servererror'] = 'Erreur de serveur !';
 $messages['servererrormsg'] = 'Erreur de serveur : $msg';
+$messages['connerror'] = 'Erreur de connexion (n\'a pu atteindre le serveur) !';
 $messages['dberror'] = 'Erreur de base de données!';
+$messages['windowopenerror'] = 'La fenêtre contextuelle a été bloquée !';
 $messages['requesttimedout'] = 'Délai de la requête expiré';
 $messages['errorreadonly'] = 'Impossible d\'effectuer l\'opération. Le dossier est en lecture seule.';
 $messages['errornoperm'] = 'Impossible d\'effectuer l\'opération. Permission refusée.';
 $messages['erroroverquota'] = 'Impossible d\'effectuer l\'opération. Aucun espace disque libre.';
 $messages['erroroverquotadelete'] = 'Aucun espace disque libre. Utiliser Maj+Suppr pour supprimer un message.';
-$messages['invalidrequest'] = 'Requête invalide! Aucune donnée n\'a été enregistrée.';
+$messages['invalidrequest'] = 'Requête invalide ! Aucune donnée n\'a été enregistrée.';
 $messages['invalidhost'] = 'Nom du serveur invalide.';
-$messages['nomessagesfound'] = 'Aucun message trouvé dans cette boîte de coourriel';
-$messages['loggedout'] = 'Vous avez correctement terminé cette session. Au revoir!';
+$messages['nomessagesfound'] = 'Aucun message trouvé dans cette boîte de courriel';
+$messages['loggedout'] = 'Vous avez correctement terminé cette session. Au revoir !';
 $messages['mailboxempty'] = 'La boîte de courriel est vide';
 $messages['nomessages'] = 'Aucun message';
 $messages['refreshing'] = 'Rafraîchissement...';
@@ -46,12 +48,12 @@ $messages['savingmessage'] = 'Enregistrement du message...';
 $messages['messagesaved'] = 'Message sauvegardé dans Brouillons.';
 $messages['successfullysaved'] = 'Enregistré avec succès.';
 $messages['savingresponse'] = 'Enregistrement du texte de réponse...';
-$messages['deleteresponseconfirm'] = 'Voulez-vous vraiment supprimer ce texte de réponse?';
+$messages['deleteresponseconfirm'] = 'Voulez-vous vraiment supprimer ce texte de réponse ?';
 $messages['addedsuccessfully'] = 'Le contact a été ajouté avec succès au carnet d\'adresses.';
 $messages['contactexists'] = 'Un contact avec la même adresse courriel existe déjà.';
 $messages['contactnameexists'] = 'Un contact avec le même nom existe déjà.';
 $messages['blockedimages'] = 'Pour protéger votre confidentialité, les images distantes sont bloquées dans ce message.';
-$messages['encryptedmessage'] = 'Ce message est chiffré et ne peut pas être affiché. Désolé!';
+$messages['encryptedmessage'] = 'Ce message est chiffré et ne peut pas être affiché. Désolé !';
 $messages['nocontactsfound'] = 'Aucun contact n\'a été trouvé.';
 $messages['contactnotfound'] = 'Le contact demandé n\'a pas été trouvé.';
 $messages['contactsearchonly'] = 'Saisir des termes d\'interrogation pour trouver des contacts.';
@@ -63,11 +65,11 @@ $messages['errormoving'] = 'Impossible de déplacer le(s) message(s).';
 $messages['errorcopying'] = 'Impossible de copier le(s) message(s).';
 $messages['errordeleting'] = 'Impossible de supprimer le(s) message(s).';
 $messages['errormarking'] = 'Impossible de marquer le(s) message(s).';
-$messages['deletecontactconfirm']  = 'Vouiez-vous vraiment supprimer le(s) contact(s) sélectionné(s)?';
-$messages['deletegroupconfirm']  = 'Vouiez-vous vraiment supprimer le groupe sélectionné?';
-$messages['deletemessagesconfirm'] = 'Vouiez-vous vraiment supprimer le(s) message(s) sélectionné(s)?';
-$messages['deletefolderconfirm']  = 'Vouiez-vous vraiment supprimer ce dossier?';
-$messages['purgefolderconfirm']  = 'Vouiez-vous vraiment supprimer tous les messages dans ce dossier?';
+$messages['deletecontactconfirm']  = 'Voulez-vous vraiment supprimer le(s) contact(s) sélectionné(s) ?';
+$messages['deletegroupconfirm']  = 'Voulez-vous vraiment supprimer le groupe sélectionné ?';
+$messages['deletemessagesconfirm'] = 'Voulez-vous vraiment supprimer le(s) message(s) sélectionné(s) ?';
+$messages['deletefolderconfirm']  = 'Voulez-vous vraiment supprimer ce dossier ?';
+$messages['purgefolderconfirm']  = 'Voulez-vous vraiment supprimer tous les messages dans ce dossier ?';
 $messages['contactdeleting'] = 'Suppression des contacts...';
 $messages['groupdeleting'] = 'Suppression du groupe...';
 $messages['folderdeleting'] = 'Suppression du dossier...';
@@ -77,21 +79,22 @@ $messages['folderunsubscribing'] = 'Désabonnement au dossier...';
 $messages['formincomplete'] = 'Le formulaire n\'a pas été entièrement rempli.';
 $messages['noemailwarning'] = 'Veuillez saisir une adresse courriel valide.';
 $messages['nonamewarning']  = 'Veuillez saisir un nom.';
-$messages['nopagesizewarning'] = 'Veuillez sasisir une taille de page.';
+$messages['nopagesizewarning'] = 'Veuillez saisir une taille de page.';
 $messages['nosenderwarning'] = 'Veuillez saisir l\'adresse courriel de l\'expéditeur.';
 $messages['norecipientwarning'] = 'Veuillez saisir au moins un destinataire.';
-$messages['nosubjectwarning']  = 'Le champ « Objet » est vide. Voudriez-vous le saisir maintenant?';
-$messages['nobodywarning'] = 'Envoyer ce message sans texte?';
-$messages['notsentwarning'] = 'Le message n\'a pas été envoyé. Voulez-vous abandonner ce message?';
-$messages['restoresavedcomposedata'] = 'Un message précédemment rédigé mais non envoyé a été trouvé.\n\nObjet : $subject\nEnregistré le : $date\n\nVoulez-vous restaurer ce message?';
+$messages['nosubjectwarning']  = 'Le champ « Objet » est vide. Voudriez-vous le saisir maintenant ?';
+$messages['nobodywarning'] = 'Envoyer ce message sans texte ?';
+$messages['notsentwarning'] = 'Le message n\'a pas été envoyé. Voulez-vous abandonner ce message ?';
+$messages['restoresavedcomposedata'] = 'Un message précédemment rédigé mais non envoyé a été trouvé.\n\nObjet : $subject\nEnregistré le : $date\n\nVoulez-vous restaurer ce message ?';
 $messages['noldapserver'] = 'Veuillez choisir un serveur ldap à rechercher.';
 $messages['nosearchname'] = 'Veuillez saisir un nom de contact ou une adresse de courriel.';
-$messages['notuploadedwarning'] = 'Toutes les fichiers joints n\'ont pas encore été téléversés. Veuillez patienter ou annuler le téléversement.';
+$messages['notuploadedwarning'] = 'Tous les fichiers joints n\'ont pas encore été téléversés. Veuillez patienter ou annuler le téléversement.';
 $messages['searchsuccessful'] = '$nr messages trouvés.';
 $messages['contactsearchsuccessful'] = '$nr contacts trouvés.';
-$messages['searchnomatch'] = 'La recherche n\'a retourné aucune concordance.';
+$messages['searchnomatch'] = 'La recherche n\'a retourné aucun résultat.';
 $messages['searching'] = 'Recherche...';
 $messages['checking'] = 'Vérification...';
+$messages['stillsearching'] = 'Recherche toujours en cours...';
 $messages['nospellerrors'] = 'Aucune faute d\'orthographe trouvée.';
 $messages['folderdeleted'] = 'Le dossier a été effacé avec succès.';
 $messages['foldersubscribed'] = 'L\'abonnement au dossier a réussi.';
@@ -108,7 +111,7 @@ $messages['movesuccess'] = '$nr contacts déplacés avec succès.';
 $messages['copyerror'] = 'Aucun contact n\'a pu être copié.';
 $messages['moveerror'] = 'Aucun contact n\'a pu être déplacé.';
 $messages['sourceisreadonly'] = 'Cette source d\'adresse est en lecture seule.';
-$messages['errorsavingcontact'] = 'Impossible de enregistrer l\'adresse du contact.';
+$messages['errorsavingcontact'] = 'Impossible d\'enregistrer l\'adresse du contact.';
 $messages['movingmessage'] = 'Déplacement des messages...';
 $messages['copyingmessage'] = 'Copie des messages...';
 $messages['copyingcontact'] = 'Copie des contacts...';
@@ -119,23 +122,23 @@ $messages['addingmember'] = 'Ajout des contacts au groupe...';
 $messages['removingmember'] = 'Suppression des contacts du groupe...';
 $messages['receiptsent'] = 'L\'accusé de lecture a été avec succès.';
 $messages['errorsendingreceipt'] = 'Impossible d\'envoyer l\'accusé de lecture.';
-$messages['deleteidentityconfirm'] = 'Voulez-vous vraiment supprimer cette identité?';
+$messages['deleteidentityconfirm'] = 'Voulez-vous vraiment supprimer cette identité ?';
 $messages['nodeletelastidentity'] = 'Vous ne pouvez pas effacer cette identité, c\'est votre dernière.';
 $messages['forbiddencharacter'] = 'Le nom du dossier contient un caractère interdit.';
 $messages['selectimportfile'] = 'Veuillez choisir un fichier à téléverser.';
 $messages['addresswriterror'] = 'Impossible d\'écrire dans le carnet d\'adresse choisi.';
 $messages['contactaddedtogroup'] = 'Les contacts ont été ajoutés à ce groupe avec succès.';
 $messages['contactremovedfromgroup'] = 'Les contacts ont été supprimés de ce groupe avec succès.';
-$messages['nogroupassignmentschanged'] = 'Aucune affection de groupes n\'a été changée.';
+$messages['nogroupassignmentschanged'] = 'Aucune affection de groupe n\'a été changée.';
 $messages['importwait'] = 'Importation, veuillez patienter...';
-$messages['importformaterror'] = 'Échec lors de l\'importation! Le fichier téléversé n\'est pas un fichier d\'importation de données valide.';
+$messages['importformaterror'] = 'Échec lors de l\'importation ! Le fichier téléversé n\'est pas un fichier d\'importation de données valide.';
 $messages['importconfirm'] = '<b>Les $inserted contacts ont été importés avec succès</b>';
 $messages['importconfirmskipped'] = '<b>Les $skipped entrées existantes ont été ignorées</b>';
 $messages['importmessagesuccess'] = '$nr messages importés avec succès';
-$messages['importmessageerror'] = 'L\'importation a échoué! Le fichier téléversé n\'est pas un message valide ou un fichier de boîte de courriel.';
-$messages['opnotpermitted'] = 'Opération non permise!';
+$messages['importmessageerror'] = 'L\'importation a échoué ! Le fichier téléversé n\'est pas un message valide ou un fichier de boîte de courriel.';
+$messages['opnotpermitted'] = 'Opération non permise !';
 $messages['nofromaddress'] = 'Adresse courriel manquante dans l\'identité choisie.';
-$messages['editorwarning'] = 'Passer à l\'éditeur de texte en clair causera la perte de toute la mise en forme du texte. Souhaitez-vous continuer?';
+$messages['editorwarning'] = 'Changer de type d\'éditeur pourrait causer la perte du formatage du texte. Souhaitez-vous continuer ?';
 $messages['httpreceivedencrypterror'] = 'Une erreur fatale de configuration est survenue. Contactez votre administrateur immédiatement. <b>Votre message ne peut pas être envoyé.</b>';
 $messages['smtpconnerror'] = 'Erreur SMTP ($code) : échec lors de la connexion au serveur.';
 $messages['smtpautherror'] = 'Erreur SMTP ($code) : échec lors de l\'authentification.';
@@ -172,6 +175,6 @@ $messages['invalidimageformat'] = 'N\'est pas un format d\'image valide.';
 $messages['mispellingsfound'] = 'Fautes d\'orthographe détectées dans le message.';
 $messages['parentnotwritable'] = 'Impossible de créer/déplacer le dossier dans le dossier parent choisi. Aucun droit d\'accès.';
 $messages['messagetoobig'] = 'La partie message est trop grosse pour être traité.';
-$messages['attachmentvalidationerror'] = 'AVERTISSEMENT! Ce fichier joint est suspect parce que son type ne correspond pas au type déclaré dans le message. Si vous ne faites pas confiance à l\'expéditeur, vous ne devriez pas l\'ouvrir dans le navigateur, car son contenu peut être malveillant.<br/><br/><em>Attendu : $expected; trouvé : $detected</em>';
-$messages['noscriptwarning'] = 'Avertissement : Ce service de courriel Web exige Javascript! Afin de l\'utiliser, veuillez activer Javascript dans les paramètres de votre navigateur.';
+$messages['attachmentvalidationerror'] = 'AVERTISSEMENT ! Ce fichier joint est suspect parce que son type ne correspond pas au type déclaré dans le message. Si vous ne faites pas confiance à l\'expéditeur, vous ne devriez pas l\'ouvrir dans le navigateur car son contenu peut être malveillant.<br/><br/><em>Attendu : $expected ; trouvé : $detected</em>';
+$messages['noscriptwarning'] = 'Avertissement : Ce service de courriel Web exige Javascript ! Afin de l\'utiliser, veuillez activer Javascript dans les paramètres de votre navigateur.';
 ?>
diff --git a/program/localization/fy_NL/labels.inc b/program/localization/fy_NL/labels.inc
index dc1e57969..b2787579c 100644
--- a/program/localization/fy_NL/labels.inc
+++ b/program/localization/fy_NL/labels.inc
@@ -82,5 +82,5 @@ $labels['longdec']	= 'desimber';
 $labels['today'] = 'Hjoed';
 $labels['refresh']          = 'Ferfarskje';
 $labels['reply']            = 'Beäntwurdzje';
-$labels['folders']  = 'Mappen';
+$labels['folders'] = 'Mappen';
 ?>
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index dc33d008d..77e55b2d7 100644
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -46,6 +46,8 @@ $labels['copy']     = 'Cóipeáil';
 $labels['move']     = 'Bog';
 $labels['moveto']   = 'bog go...';
 $labels['download'] = 'síos-luchtú';
+$labels['open']     = 'Oscail';
+$labels['showattachment'] = 'Taispeáin';
 $labels['filename'] = 'Comhad';
 $labels['filesize'] = 'Toirt';
 $labels['addtoaddressbook'] = 'Sábháil i mo leabhair seoltaí';
@@ -138,13 +140,11 @@ $labels['name']         = 'Leasainm';
 $labels['firstname']    = 'Ainm baiste';
 $labels['surname']      = 'Sloinne';
 $labels['email']        = 'Ríomhphost';
-$labels['addcontact'] = 'Sábháil duine nua';
 $labels['editcontact'] = 'Chuir chara in eagar';
 $labels['edit']   = 'Athraigh';
 $labels['cancel'] = 'Cealaigh';
 $labels['save']   = 'Sábháil';
 $labels['delete'] = 'Scrios';
-$labels['newcontact']     = 'Scríobh carta teagmháil nua';
 $labels['deletecontact']  = 'Scrios na daoine seo';
 $labels['composeto']      = 'Scríobh teachtaireacht go';
 $labels['contactsfromto'] = 'Daoine as $from to $to as $count';
@@ -161,12 +161,9 @@ $labels['preferences'] = 'Tosaíocht';
 $labels['userpreferences'] = 'Tosaíocht Pearsanta';
 $labels['editpreferences'] = 'Athraigh tosaíocht pearsanta';
 $labels['identities'] = 'Céannachtaí';
-$labels['manageidentities'] = 'Stiúir céannachtaí i cuntas seo';
-$labels['newidentity'] = 'Céannacht nua';
-$labels['newitem'] = 'Mír nua';
-$labels['edititem'] = 'Athraigh mhír';
 $labels['preferhtml'] = 'Taispeáin an HTML';
 $labels['htmlmessage'] = 'Teachtaireacht HTML';
+$labels['messagepart'] = 'Cuid';
 $labels['prettydate'] = 'Dátaí Dheas';
 $labels['setdefault']  = 'Socraigh an réamhshocraithe';
 $labels['language']  = 'Teanga';
@@ -177,15 +174,18 @@ $labels['dstactive']  = 'Laethúil um shamhradh';
 $labels['htmleditor'] = 'Scríobh teachtaireachta HTML';
 $labels['htmlsignature'] = 'Mana clabhsúir HTML';
 $labels['previewpane'] = 'Taispeáin an pána réamhamharc';
+$labels['always'] = 'riamh';
 $labels['autosavedraft']  = 'Sábháil dréachta go huathoibríoch';
 $labels['never']  = 'riamh';
-$labels['folder']  = 'Fillteán';
-$labels['folders']  = 'Fillteán';
-$labels['foldername']  = 'Ainm fillteán';
-$labels['subscribed']  = 'Síntiú';
-$labels['create']  = 'Cruthaigh';
-$labels['createfolder']  = 'Cruthaigh fillteán nua';
-$labels['managefolders']  = 'Stiúir na fillteán';
+$labels['immediately']  = 'láithreach';
+$labels['afternseconds']  = 'tar éis $n soicindí';
+$labels['folder'] = 'Fillteán';
+$labels['folders'] = 'Fillteán';
+$labels['foldername'] = 'Ainm fillteán';
+$labels['subscribed'] = 'Síntiú';
+$labels['create'] = 'Cruthaigh';
+$labels['createfolder'] = 'Cruthaigh fillteán nua';
+$labels['managefolders'] = 'Stiúir na fillteán';
 $labels['sortby'] = 'Sórtáil trí';
 $labels['sortasc']  = 'Sórtáil in ord méadaitheach';
 $labels['sortdesc'] = 'Sórtáil in ord neartaitheach';
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 899f35c5e..fa847c197 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -52,6 +52,7 @@ $labels['fromtoshort'] = '$from - $to de $count';
 $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover para...';
+$labels['copyto']   = 'Copiar a...';
 $labels['download'] = 'Descargar';
 $labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Amosar';
@@ -130,16 +131,24 @@ $labels['moreactions']      = 'Máis accións...';
 $labels['more']             = 'Máis';
 $labels['back']             = 'Atrás';
 $labels['options']          = 'Opcións';
+$labels['first'] = 'Primeiro';
+$labels['last'] = 'Último';
+$labels['previous'] = 'Anterior';
+$labels['next'] = 'Seguinte';
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Ningunha';
 $labels['currpage'] = 'Páxina actual';
+$labels['isread'] = 'Ler';
 $labels['unread'] = 'Non lidas';
 $labels['flagged'] = 'Marcadas';
+$labels['unflagged'] = 'Non marcado';
 $labels['unanswered'] = 'Non respostadas';
 $labels['withattachment'] = 'Con anexo';
 $labels['deleted'] = 'Marcadas como eliminadas';
 $labels['undeleted'] = 'Non borradas';
+$labels['replied'] = 'Respostado';
+$labels['forwarded'] = 'Reenviado';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
@@ -170,6 +179,11 @@ $labels['importmessages'] = 'Importar mensaxes';
 $labels['quota'] = 'Uso de disco';
 $labels['unknown']  = 'descoñecido';
 $labels['unlimited']  = 'ilimitado';
+$labels['quotatype'] = 'Tipo de quota';
+$labels['quotatotal'] = 'Límite';
+$labels['quotaused'] = 'Usado';
+$labels['quotastorage'] = 'Espazo en disco';
+$labels['quotamessage'] = 'Conteo de mensaxes';
 $labels['quicksearch']  = 'Busca rápida';
 $labels['resetsearch']  = 'Restabelecer a pesquisa';
 $labels['searchmod']  = 'Modificadores de pesquisa';
@@ -177,6 +191,10 @@ $labels['msgtext']  = 'Toda a mensaxe';
 $labels['body']  = 'Corpo';
 $labels['type'] = 'Tipo';
 $labels['namex'] = 'Nome';
+$labels['searchscope'] = 'Alcance';
+$labels['currentfolder'] = 'Cartafol actual';
+$labels['subfolders'] = 'Esta cartafol e as súas fillas';
+$labels['allfolders'] = 'Tódalas cartafoles';
 $labels['openinextwin'] = 'Abrir nunha nova xanela';
 $labels['emlsave'] = 'Descargar (.eml)';
 $labels['changeformattext'] = 'Amosar en texto plano';
@@ -192,6 +210,10 @@ $labels['returnreceipt']  = 'Notificación da entrega';
 $labels['dsn']            = 'Notificación do estado de envío (DSN)';
 $labels['mailreplyintro'] = 'O $date, $sender escribiu:';
 $labels['originalmessage'] = 'Mensaxe orixinal';
+$labels['selectimage']    = 'Seleccionar imaxe';
+$labels['addimage']       = 'Engadir imaxe';
+$labels['selectmedia']    = 'Escoller película';
+$labels['addmedia']       = 'Engarid película';
 $labels['editidents']    = 'Modificar identidades';
 $labels['spellcheck']    = 'Ortografía';
 $labels['checkspelling'] = 'Revisar a ortografía';
@@ -202,9 +224,10 @@ $labels['restoremessage'] = 'Restaurar mensaxe?';
 $labels['responses'] = 'Respostas';
 $labels['insertresponse'] = 'Inserir unha resposta';
 $labels['manageresponses'] = 'Xestionar respostas';
-$labels['savenewresponse'] = 'Gardar a nova resposta';
-$labels['editresponses'] = 'Editar respostas';
+$labels['savenewresponse'] = 'Crear nova resposta';
+$labels['addresponse'] = 'Engadir resposta';
 $labels['editresponse'] = 'Editar resposta ';
+$labels['editresponses'] = 'Editar respostas';
 $labels['responsename'] = 'Nome';
 $labels['responsetext'] = 'Texto de resposta';
 $labels['attach'] = 'Anexar';
@@ -213,6 +236,7 @@ $labels['upload'] = 'Cargar';
 $labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close']  = 'Pechar';
 $labels['messageoptions']  = 'Opcións da mensaxe...';
+$labels['togglecomposeoptions'] = 'Conmutar opcións de redacción';
 $labels['low']     = 'Baixa';
 $labels['lowest']  = 'A máis baixa';
 $labels['normal']  = 'Normal';
@@ -287,11 +311,13 @@ $labels['typehomepage']  = 'Páxina principal';
 $labels['typeblog'] = 'Blogue';
 $labels['typeprofile'] = 'Perfil';
 $labels['addfield'] = 'Engadir campo...';
-$labels['addcontact'] = 'Engadir novo contacto';
+$labels['addcontact'] = 'Engadir contacto';
 $labels['editcontact'] = 'Modificar este contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Propiedades do contacto';
+$labels['contactnameandorg'] = 'Nome e organización';
 $labels['personalinfo'] = 'Información persoal';
+$labels['contactphoto'] = 'Foto do contacto';
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Gardar';
@@ -300,7 +326,7 @@ $labels['rename'] = 'Mudar o nome';
 $labels['addphoto'] = 'Engadir';
 $labels['replacephoto'] = 'Substituír';
 $labels['uploadphoto'] = 'Subir foto';
-$labels['newcontact']     = 'Novo contacto';
+$labels['newcontact']     = 'Crear contacto novo';
 $labels['deletecontact']  = 'Eliminar os contactos seleccionados';
 $labels['composeto']      = 'Redactar mensaxe para';
 $labels['contactsfromto'] = 'Contactos do $from ao $to de $count';
@@ -309,10 +335,11 @@ $labels['export']         = 'Exportar';
 $labels['exportall']      = 'Exportar todas';
 $labels['exportsel']      = 'Exportar as seleccionadas';
 $labels['exportvcards']   = 'Exportar os contactos en formato vCard';
-$labels['newcontactgroup'] = 'Crear novo grupo de contactos';
+$labels['newcontactgroup']       = 'Crear novo grupo';
 $labels['grouprename']    = 'Mudar o nome do grupo';
 $labels['groupdelete']    = 'Borrar o grupo';
 $labels['groupremoveselected'] = 'Eliminar do grupo os contactos seleccionados';
+$labels['uponelevel']     = 'Subir un nivel';
 $labels['previouspage']   = 'Amosar o grupo anterior';
 $labels['firstpage']      = 'Amosar o primeiro grupo';
 $labels['nextpage']       = 'Amosar o seguinte grupo';
@@ -339,10 +366,10 @@ $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de utente';
 $labels['editpreferences'] = 'Editar preferencias de utente';
 $labels['identities'] = 'Identidades';
-$labels['manageidentities'] = 'Administrar as identidades desta conta';
-$labels['newidentity'] = 'Nova identidade';
-$labels['newitem'] = 'Novo';
-$labels['edititem'] = 'Editar';
+$labels['manageidentities'] = 'Administrar identidades';
+$labels['newidentity'] = 'Crear identidade nova';
+$labels['addidentity'] = 'Engadir identidad';
+$labels['edititem'] = 'Editar identidade';
 $labels['preferhtml'] = 'Prefiro HTML';
 $labels['defaultcharset'] = 'Xogo de caracteres por omisión';
 $labels['htmlmessage'] = 'Mensaxe HTML';
@@ -400,6 +427,7 @@ $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Conforme ao RFC 2047 (outros)';
 $labels['force7bit'] = 'Usar MIME para codificar caracteres de 8 bits';
 $labels['advancedoptions'] = 'Opcións avanzadas';
+$labels['toggleadvancedoptions'] = 'Amosar opcións avanzadas';
 $labels['focusonnewmessage'] = 'Centrar a xanela do navegador en novas mensaxes';
 $labels['checkallfolders'] = 'Procurar novas mensaxes en todos os cartafoles';
 $labels['displaynext'] = 'Logo de eliminar ou mover unha mensaxe ir á mensaxe seguinte';
@@ -441,14 +469,14 @@ $labels['asattachment'] = 'coma anexo';
 $labels['replyallmode'] = 'Acción dpor defecto do botón [Responder a todos]';
 $labels['replyalldefault'] = 'responder a todos';
 $labels['replyalllist'] = 'responder só para a lista (se for atopada)';
-$labels['folder']  = 'Cartafol';
-$labels['folders']  = 'Cartafoles';
-$labels['foldername']  = 'Nome do cartafol';
-$labels['subscribed']  = 'Subscrito(a)';
+$labels['folder'] = 'Cartafol';
+$labels['folders'] = 'Cartafoles';
+$labels['foldername'] = 'Nome do cartafol';
+$labels['subscribed'] = 'Subscrito(a)';
 $labels['messagecount'] = 'Mensaxes';
-$labels['create']  = 'Crear';
-$labels['createfolder']  = 'Crear un novo cartafol';
-$labels['managefolders']  = 'Xestionar cartafoles';
+$labels['create'] = 'Crear';
+$labels['createfolder'] = 'Crear un novo cartafol';
+$labels['managefolders'] = 'Xestionar cartafoles';
 $labels['specialfolders'] = 'Cartafoles especiais';
 $labels['properties'] = 'Propiedades';
 $labels['folderproperties'] = 'Propiedades do cartafol';
@@ -458,9 +486,9 @@ $labels['info'] = 'Información';
 $labels['getfoldersize'] = 'Preme para calcular o tamaño do cartafol';
 $labels['changesubscription'] = 'Preme para mudar a subscrición';
 $labels['foldertype'] = 'Tipo do cartafol';
-$labels['personalfolder']  = 'Cartafol privado';
-$labels['otherfolder']  = 'Cartafol de outra persoa usuaria';
-$labels['sharedfolder']  = 'Cartafol público';
+$labels['personalfolder'] = 'Cartafol privado';
+$labels['otherfolder'] = 'Cartafol de outra persoa usuaria';
+$labels['sharedfolder'] = 'Cartafol público';
 $labels['sortby'] = 'Ordenar por';
 $labels['sortasc']  = 'Orde ascendente';
 $labels['sortdesc'] = 'Orde descendente';
@@ -493,4 +521,34 @@ $labels['vietnamese'] = 'Vietnamita';
 $labels['japanese'] = 'Xaponés';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinés';
+$labels['arialabeltasknav'] = 'Tarefas da aplicación';
+$labels['arialabelactivetask'] = 'Tarefa activa';
+$labels['arialabelmessagessearchfilter'] = 'Filtro de listaxe de correo';
+$labels['arialabelmailsearchform'] = 'Formulario de busca de mensaxes de correo';
+$labels['arialabelcontactsearchform'] = 'Formulario de busca de contactos';
+$labels['arialabelmessagelist'] = 'Listaxe de mensaxes de correo';
+$labels['arialabelmailpreviewframe'] = 'Previsualización das mensaxes';
+$labels['arialabelmailboxmenu'] = 'Menú das accións de cartafol';
+$labels['arialabellistselectmenu'] = 'Menú de selección de listaxe';
+$labels['arialabelthreadselectmenu'] = 'Menú da listaxe por fíos';
+$labels['arialabelmailimportdialog'] = 'Diálogo de importación de mensaxes';
+$labels['arialabelmessagenav'] = 'Navegación pola mensaxe';
+$labels['arialabelmessagebody'] = 'Corpo da mensaxe';
+$labels['arialabelmessageactions'] = 'Accións da mensaxe';
+$labels['arialabelcontactquicksearch'] = 'Formulario de busca de contactos';
+$labels['arialabelmessageheaders'] = 'Cabeceiras da mensaxe';
+$labels['arialabelforwardingoptions'] = 'Opcións de "Reenviar"';
+$labels['arialabelreplyalloptions'] = 'Opcións de "Respostar a todos"';
+$labels['arialabelmoremessageactions'] = 'Máis accións de mensaxe';
+$labels['arialabelmarkmessagesas'] = 'Marcar as mensaxes seleccionadas coma...';
+$labels['arialabelcomposeoptions'] = 'Opcións de redacción';
+$labels['arialabelattachmentuploadform'] = 'Formulario de subida de anexos';
+$labels['arialabelattachmentpreview'] = 'Previsualizar anexos';
+$labels['arialabelcontactexportoptions'] = 'Opcións do exportado de contactos';
+$labels['arialabelabookgroupoptions'] = 'Opcións de axenda de enderezos/grupos';
+$labels['arialabelpreferencesform'] = 'Formulario de preferencias';
+$labels['arialabelidentityeditfrom'] = 'Formulario de edición de identidade';
+$labels['arialabelresonseeditfrom'] = 'Formulario de edición de resposta';
+$labels['helplistnavigation'] = 'Navegación pola lista con teclado';
+$labels['helplistkeyboardnavcontacts'] = "Enter: Abrir o contacto seleccionado.";
 ?>
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 2e9fc338d..1ce134b48 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'A tú sesión non é válida ou expirou.';
 $messages['storageerror'] = 'Fallou a conexión co servidor IMAP.';
 $messages['servererror'] = 'Erro do servidor!';
 $messages['servererrormsg'] = 'Erro do servidor: $msg';
+$messages['connerror'] = 'Fallou a conexión co servidor!';
 $messages['dberror'] = 'Erro na base de datos!';
+$messages['windowopenerror'] = 'Bloquouse a fiestra emerxente!';
 $messages['requesttimedout'] = 'A petición expirou';
 $messages['errorreadonly'] = 'Non foi posíbel realizar a operación. O cartafol é de só lectura.';
 $messages['errornoperm'] = 'Non foi posíbel realizar a operación. Permiso denegado.';
@@ -32,6 +34,8 @@ $messages['invalidrequest'] = 'Petición non válida! Non se gardou ningún dato
 $messages['invalidhost'] = 'O nome do servidor non é válido.';
 $messages['nomessagesfound'] = 'Non se atoparon mensaxes nesta caixa de correo.';
 $messages['loggedout'] = 'Rematou correctamente a tú sesión. Até logo!';
+$messages['mailboxempty'] = 'O cartafol está baleiro';
+$messages['nomessages'] = 'Non hai mensaxes';
 $messages['refreshing'] = 'A refrescar...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Cargando ficheiro...';
@@ -90,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Atopáronse $nr contactos.';
 $messages['searchnomatch'] = 'A busca non atopou coincidencias.';
 $messages['searching'] = 'Buscando...';
 $messages['checking'] = 'Comprobando...';
+$messages['stillsearching'] = 'Buscando...';
 $messages['nospellerrors'] = 'Non hai erros ortográficos.';
 $messages['folderdeleted'] = 'O cartafol foi eliminado correctamente.';
 $messages['foldersubscribed'] = 'O cartafol subscribiuse correctamente.';
@@ -133,7 +138,7 @@ $messages['importmessagesuccess'] = 'Importadas $nr mensaxes con éxito';
 $messages['importmessageerror'] = 'Fallou a importación! O arquivo subido non é unha mensaxe válida ou un ficheiro de correo';
 $messages['opnotpermitted'] = 'Operación non permitida!';
 $messages['nofromaddress'] = 'Falta o enderezo de correo electrónico na identidade que escolleches.';
-$messages['editorwarning'] = 'Se mudas agora ao editor de texto plano, vas perder todo o formato do texto. Queres continuar?';
+$messages['editorwarning'] = 'Se troca neste intre ao editor de texto plano, vai perder todo o formato do texto. Quere continuar?';
 $messages['httpreceivedencrypterror'] = 'Produciuse un erro fatal de configuración. Contacta coa persoa administradora inmediatamente. <b>Non se enviou a túa mensaxe.</b>';
 $messages['smtpconnerror'] = 'Erro SMTP ($code): Fallou a conexión co servidor.';
 $messages['smtpautherror'] = 'Erro SMTP ($code): Fallou a autenticación.';
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 66c4a26b3..60c2c09a5 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'פעולות נוספות...';
 $labels['more']             = 'עוד';
 $labels['back']             = 'חזרה';
 $labels['options']          = 'אפשרויות';
+$labels['first'] = 'ראשונה';
+$labels['last'] = 'אחרונה';
+$labels['previous'] = 'הקודמת';
+$labels['next'] = 'הבאה';
 $labels['select'] = 'בחירה';
 $labels['all'] = 'הכל';
 $labels['none'] = 'כלום';
 $labels['currpage'] = 'דף נוכחי';
+$labels['isread'] = 'קריאה';
 $labels['unread'] = 'לא נקראו';
 $labels['flagged'] = 'מסומן';
+$labels['unflagged'] = 'לא מדוגלת';
 $labels['unanswered'] = 'לא נענה';
 $labels['withattachment'] = 'עם צרופה';
 $labels['deleted'] = 'נמחק';
 $labels['undeleted'] = 'לא נמחק';
+$labels['replied'] = 'נענתה';
+$labels['forwarded'] = 'קודמה';
 $labels['invert'] = 'היפוך הסימון';
 $labels['filter'] = 'סינון';
 $labels['list'] = 'רשימה';
@@ -164,13 +172,18 @@ $labels['listcolumns'] = 'רשימת עמודות';
 $labels['listsorting'] = 'המיון לפי העמודה';
 $labels['listorder'] = 'סדר מיון';
 $labels['listmode'] = 'אופן הצגת רשימה';
-$labels['folderactions'] = 'פעולות על תיקים';
+$labels['folderactions'] = 'פעולות על תיקיות';
 $labels['compact'] = 'פינוי שטח לא מנוצל';
 $labels['empty'] = 'ריקון';
 $labels['importmessages'] = 'ייבוא הודעות';
 $labels['quota'] = 'ניצול קיבולת';
 $labels['unknown']  = 'לא ידוע';
 $labels['unlimited']  = 'ללא הגבלה';
+$labels['quotatype'] = 'טיפוס קווטה';
+$labels['quotatotal'] = 'הגבלה';
+$labels['quotaused'] = 'בשימוש';
+$labels['quotastorage'] = 'נפח כונן';
+$labels['quotamessage'] = 'ספירת הודעות';
 $labels['quicksearch']  = 'חיפוש מהיר';
 $labels['resetsearch']  = 'ניקוי תיבת החיפוש';
 $labels['searchmod']  = 'מאפייני חיפוש';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'כל ההודעה';
 $labels['body']  = 'גוף ההודעה';
 $labels['type'] = 'סוג';
 $labels['namex'] = 'שם';
+$labels['searchscope'] = 'היקף';
+$labels['currentfolder'] = 'תיקיה נוכחית';
+$labels['subfolders'] = 'תיקיה זו ותת תיקיות';
+$labels['allfolders'] = 'כל התיקיות';
 $labels['openinextwin'] = 'פתיחה בחלון חדש';
 $labels['emlsave'] = 'הורדת הודעה בפורמט  EML';
 $labels['changeformattext'] = 'הצגה בפורמט לא מעוצב';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'אישור קבלה';
 $labels['dsn']            = 'הודעה על מצב המסירה';
 $labels['mailreplyintro'] = ':כתב $sender, $date בתאריך';
 $labels['originalmessage'] = 'הודעה מקורית';
+$labels['selectimage']    = 'בחר תמונה';
+$labels['addimage']       = 'הוסף תמונה';
+$labels['selectmedia']    = 'בחר סרטון';
+$labels['addmedia']       = 'הוסף סרטון';
 $labels['editidents']    = 'עריכת זהויות';
 $labels['spellcheck']    = 'איות';
 $labels['checkspelling'] = 'בדיקת איות';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'לשחזר הודעה?';
 $labels['responses'] = 'תגובות';
 $labels['insertresponse'] = 'הכנסת תגובה';
 $labels['manageresponses'] = 'ניהול תגובות';
-$labels['savenewresponse'] = 'שמירת תגובה חדשה';
-$labels['editresponses'] = 'עריכת תגובות';
+$labels['savenewresponse'] = 'צור מענה חדש';
+$labels['addresponse'] = 'הוסף מענה';
 $labels['editresponse'] = 'עריכת תגובה';
+$labels['editresponses'] = 'עריכת תגובות';
 $labels['responsename'] = 'שם';
 $labels['responsetext'] = 'גוף התגובה';
 $labels['attach'] = 'צירוף';
@@ -214,6 +236,7 @@ $labels['upload'] = 'העלאה';
 $labels['uploadprogress'] = '( $total  מתוך  $current )  $percent';
 $labels['close']  = 'סגירה';
 $labels['messageoptions']  = 'אפשרויות הודעה...';
+$labels['togglecomposeoptions'] = 'בחירה בין הגדרות בסיסיות או מתקדמות של יצירת הודעה';
 $labels['low']     = 'נמוך';
 $labels['lowest']  = 'נמוך ביותר';
 $labels['normal']  = 'רגיל';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'עוזר/ת';
 $labels['spouse'] = 'בן/בת זוג';
 $labels['allfields'] = 'כל השדות';
 $labels['search'] = 'חיפוש';
+$labels['searchresult'] = 'תוצאת חיפוש';
 $labels['advsearch'] = 'חיםוש מתקדם';
 $labels['advanced'] = 'מתקדם';
 $labels['other'] = 'אחר';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'דף הבית';
 $labels['typeblog'] = 'יומן רשת';
 $labels['typeprofile'] = 'פרופיל';
 $labels['addfield'] = 'הוסף שדה';
-$labels['addcontact'] = 'הוספת איש קשר';
+$labels['addcontact'] = 'הוסף איש קשר';
 $labels['editcontact'] = 'עריכת איש קשר';
 $labels['contacts'] = 'אנשי קשר';
 $labels['contactproperties'] = 'מאפייני איש קשר';
+$labels['contactnameandorg'] = 'שם וארגון';
 $labels['personalinfo'] = 'מידע אישי';
+$labels['contactphoto'] = 'תצלום איש קשר';
 $labels['edit']   = 'עריכה';
 $labels['cancel'] = 'ביטול';
 $labels['save']   = 'שמירה';
@@ -301,7 +327,7 @@ $labels['rename'] = 'שינוי שם';
 $labels['addphoto'] = 'הוספה';
 $labels['replacephoto'] = 'החלפה';
 $labels['uploadphoto'] = 'העלאת תמונה';
-$labels['newcontact']     = 'איש קשר חדש';
+$labels['newcontact']     = 'צור איש קשר חדש';
 $labels['deletecontact']  = 'מחיקת אנשי קשר מסומנים';
 $labels['composeto']      = 'יצירת הודעה אל';
 $labels['contactsfromto'] = 'אנשי קשר $from עד $to מתוך $count';
@@ -310,10 +336,12 @@ $labels['export']         = 'ייצוא';
 $labels['exportall']      = 'יצוא של כל הרשומות';
 $labels['exportsel']      = 'צוא של רשומות נבחרות';
 $labels['exportvcards']   = 'ייצוא אנשי קשר בפורמט  vCard';
-$labels['newcontactgroup'] = 'יצירת קבוצה חדשה של אנשי קשר';
+$labels['newcontactgroup']       = 'הוסף קבוצה חדשה';
+$labels['addgroup']       = 'הוספת קבוצה';
 $labels['grouprename']    = 'שינוי שם קבוצה';
 $labels['groupdelete']    = 'מחיקת קבוצה';
 $labels['groupremoveselected'] = 'אנשי הקשר שנבחרו יוסרו מהקבוצה';
+$labels['uponelevel']     = 'רמה אחת מעלה';
 $labels['previouspage']   = 'הצגת הקבוצה הקודמת';
 $labels['firstpage']      = 'הצגת הקבוצה הראשונה';
 $labels['nextpage']       = 'הצגת הקבוצה הבאה';
@@ -342,10 +370,10 @@ $labels['preferences'] = 'העדפות';
 $labels['userpreferences'] = 'העדפות משתמש';
 $labels['editpreferences'] = 'עריכה של העדפות משתמש';
 $labels['identities'] = 'זהויות';
-$labels['manageidentities'] = 'ניהול זהויות לחשבון זה';
-$labels['newidentity'] = 'זהות חדשה';
-$labels['newitem'] = 'רשומה חדשה';
-$labels['edititem'] = 'עריכת רשומה';
+$labels['manageidentities'] = 'נהל זהויות';
+$labels['newidentity'] = 'צור זהות חדשה';
+$labels['addidentity'] = 'הוסף זהות';
+$labels['edititem'] = 'ערוך זהות';
 $labels['preferhtml'] = 'הצגת HTML';
 $labels['defaultcharset'] = 'ברירת מחדל של תווים';
 $labels['htmlmessage'] = 'תוכן HTML';
@@ -392,7 +420,7 @@ $labels['always'] = 'תמיד';
 $labels['showinlineimages'] = 'הצגת תמונות מצורפות בתחתית ההודעה';
 $labels['autosavedraft']  = 'שמירה אוטומטית של טיוטה';
 $labels['everynminutes']  = 'כל $n דקות';
-$labels['refreshinterval']  = 'רענון (בדיקת קיום של הודעות חדשות וכו\')';
+$labels['refreshinterval']  = 'רענון ההתצוגה לשם בדיקת קיום של הודעות חדשות וכדומה';
 $labels['never']  = 'אף פעם';
 $labels['immediately']  = 'מיידית';
 $labels['messagesdisplaying'] = 'הצגת הודעות';
@@ -402,9 +430,11 @@ $labels['2231folding'] = 'תאימות מלאה 2231 תאנדרבירד';
 $labels['miscfolding'] = 'תאימות 2047/2231 אאוטלוק';
 $labels['2047folding'] = 'תאימות מלאה 2047 אחרים';
 $labels['force7bit'] = 'קידוד MIME עבור תווים בעלי 8 ביטים';
+$labels['savelocalstorage'] = "שמירה באיחסון מקומי של הדפדפן (ארעית)";
 $labels['advancedoptions'] = 'הגדרות נוספות';
+$labels['toggleadvancedoptions'] = 'בחירה בין הגדרות בסיסיות או מתקדמות';
 $labels['focusonnewmessage'] = 'מיקוד הסמן על החלון עם ההודעה החדשה';
-$labels['checkallfolders'] = 'בדיקת הודעות חדשות בכל התיקים';
+$labels['checkallfolders'] = 'בדיקת הודעות חדשות בכל התיקיות';
 $labels['displaynext'] = 'מעבר להודעה הבאה לאחר מחיקה או תיוק';
 $labels['defaultfont'] = 'גופן ברירת מחדל להודעה בפורמט HTML';
 $labels['mainoptions'] = 'אפשרויות עיקריות';
@@ -444,26 +474,30 @@ $labels['asattachment'] = 'כצרופה';
 $labels['replyallmode'] = 'ברירת המחדל של כפתור [מענה לכולם]';
 $labels['replyalldefault'] = 'מענה לכולם';
 $labels['replyalllist'] = 'מענה לרשימת תפוצה בלבד (אם קיימת)';
-$labels['folder']  = 'תיק';
-$labels['folders']  = 'תיקיות';
-$labels['foldername']  = 'שם תיק';
-$labels['subscribed']  = 'מנוי';
+$labels['folder'] = 'תיקיה';
+$labels['folders'] = 'תיקיות';
+$labels['foldername'] = 'שם תיקיה';
+$labels['subscribed'] = 'מנוי';
 $labels['messagecount'] = 'הודעות';
-$labels['create']  = 'יצירה';
-$labels['createfolder']  = 'יצירת תיק חדש';
-$labels['managefolders']  = 'ניהול תיקים';
-$labels['specialfolders'] = 'תיקים מיוחדים';
+$labels['create'] = 'יצירה';
+$labels['createfolder'] = 'יצירת תיקיה חדשה';
+$labels['managefolders'] = 'ניהול תיקיות';
+$labels['specialfolders'] = 'תיקיות מיוחדות';
 $labels['properties'] = 'מאפיינים';
-$labels['folderproperties'] = 'מאפייני תיק';
-$labels['parentfolder'] = 'תיק אב';
+$labels['folderproperties'] = 'מאפייני תיקיה';
+$labels['parentfolder'] = 'תיקית אב';
 $labels['location'] = 'מיקום';
 $labels['info'] = 'מידע';
-$labels['getfoldersize'] = 'הקשה להצגה של גודל תיק';
+$labels['getfoldersize'] = 'הקשה להצגה של גודל תיקיה';
 $labels['changesubscription'] = 'הקשה לשינוי הרשמה';
 $labels['foldertype'] = 'סוג תיקיה';
-$labels['personalfolder']  = 'תיקיה פרטית';
-$labels['otherfolder']  = 'תיקית משתמש נוספת';
-$labels['sharedfolder']  = 'תיקיה ציבורית';
+$labels['personalfolder'] = 'תיקיה פרטית';
+$labels['otherfolder'] = 'תיקית משתמש נוספת';
+$labels['sharedfolder'] = 'תיקיה ציבורית';
+$labels['findfolders'] = 'חיפוש תיקיות';
+$labels['namespace.personal'] = 'אישי';
+$labels['namespace.other'] = 'משתמשים אחרים';
+$labels['namespace.shared'] = 'משותף';
 $labels['sortby'] = 'מיון לפי';
 $labels['sortasc']  = 'מיון בסדר עולה';
 $labels['sortdesc'] = 'מיון בסדר יורד';
@@ -496,4 +530,53 @@ $labels['vietnamese'] = 'וויטנאמי';
 $labels['japanese'] = 'יפני';
 $labels['korean'] = 'קוריאני';
 $labels['chinese'] = 'סיני';
+$labels['arialabeltopnav'] = 'בקרת חלון';
+$labels['arialabeltasknav'] = 'משימות יישום';
+$labels['arialabeltoolbar'] = 'סרגל כלים יישום';
+$labels['arialabelactivetask'] = 'משימה פעילה';
+$labels['arialabelmessagessearchfilter'] = 'מסנן של רשימת ההודעות';
+$labels['arialabelmailsearchform'] = 'טופס חיפוש בתוך הודעות';
+$labels['arialabelcontactsearchform'] = 'תבנית חיפוש אנשי קשר';
+$labels['arialabelmailquicksearchbox'] = 'הקשת מילות חיפוש';
+$labels['arialabelquicksearchbox'] = 'קלט חיפוש';
+$labels['arialabelfoldersearchfilter'] = 'מסנן רשימת תיקיות';
+$labels['arialabelfoldersearchform'] = 'מסך חיפוש תיקייה';
+$labels['arialabelfolderlist'] = 'בחירה של תיקית הודעות';
+$labels['arialabelmessagelist'] = 'רשימת הודעות';
+$labels['arialabelmailpreviewframe'] = 'תצוגה מקדמית של הודעה';
+$labels['arialabelmailboxmenu'] = 'תפריט פעולות תפריט';
+$labels['arialabellistselectmenu'] = 'רשימת פריטים לבחירה';
+$labels['arialabelthreadselectmenu'] = 'בחירת פתילים של הודעות מתוך רשימה';
+$labels['arialabelmessagelistoptions'] = 'אפשרויות להצגת הודעות ומיונן';
+$labels['arialabelmailimportdialog'] = 'תהליך ייבוא הודעות';
+$labels['arialabelmessagenav'] = 'ניווט הודעה';
+$labels['arialabelmessagebody'] = 'גוף הודעה';
+$labels['arialabelmessageactions'] = 'פעולות הודעה';
+$labels['arialabelcontactquicksearch'] = 'תבנית חיפוש אנשי קשר';
+$labels['arialabelcontactsearchbox'] = 'קלט חיפוש איש קשר';
+$labels['arialabelmessageheaders'] = 'תקורות הודעה';
+$labels['arialabelforwardingoptions'] = 'אפשרויות העברה';
+$labels['arialabelreplyalloptions'] = 'אפשרויות מענה לכולם';
+$labels['arialabelmoremessageactions'] = 'עוד פעולות הודעה';
+$labels['arialabelmarkmessagesas'] = 'סימון הודעות נבחרות בתור...';
+$labels['arialabelcomposeoptions'] = 'אפשרויות הלחנה';
+$labels['arialabelresponsesmenu'] = 'תפריט של תגובות מוכנות מראש';
+$labels['arialabelattachmentuploadform'] = 'תבנית העלאת תצריף';
+$labels['arialabelattachmentpreview'] = 'תצוגה מקדמית של תצריף';
+$labels['ariasummarycomposecontacts'] = 'רשימה של אנשי קשר וקבוצות שיבחרו כנמענים';
+$labels['arialabelcontactexportoptions'] = 'אפשרויות ייצוא איש קשר';
+$labels['arialabelabookgroupoptions'] = 'אפשרויות קבוצה/פנקס כתובות';
+$labels['arialabelpreferencesform'] = 'תבנית העדפות';
+$labels['arialabelidentityeditfrom'] = 'טופס עריכת זהות';
+$labels['arialabelresonseeditfrom'] = 'טופס עריכת מענה';
+$labels['arialabelsearchterms'] = 'מילות חיםוש';
+$labels['helplistnavigation'] = 'ניווט ברשימה באמצעות לוח המקשים';
+$labels['helplistkeyboardnavigation'] = "חיצים למלעלה/למטה: בחירת שורה/מיקוד בשורה
+מקש רווח: בחירה בשורת המיקוד
+מקש SHIFT+חץ למעלה/למטה: בחירה בשורות נוספות מעל/מתחת לשורה הנוכחית
+מקש CTRL+רווח: הוספה/הסרה של שורה מהקבוצה שנבחרה";
+$labels['helplistkeyboardnavmessages'] = "חץ ימין/שמאל: הרחבה/צימצום של פתיל ההודעות (במצב של הצגת פתילים בלבד)
+ENTER: פתיחה של ההודעה שנבחרה
+DELETE: העברה של ההודעה שנבחרה לפח האשפה";
+$labels['helplistkeyboardnavcontacts'] = "ENTER: פתיחה של איש הקשר שסומן ";
 ?>
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index e6d95aa6d..254ebf216 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'כניסתך למערכת אינה חוקית או
 $messages['storageerror'] = 'הקשר לשרת הדואר נכשל';
 $messages['servererror'] = '! שגיאת שרת';
 $messages['servererrormsg'] = '$msg  שגיאת שרת';
+$messages['connerror'] = 'שגיאת תקשורת עם השרת.';
 $messages['dberror'] = '! שגיאה במסד הנתונים';
+$messages['windowopenerror'] = 'החלון הקופץ נחסם!';
 $messages['requesttimedout'] = 'תם הזמן המוקצב לבקשה';
 $messages['errorreadonly'] = 'לא ניתן לבצע הפעולה כי התיק ניתן לקריאה בלבד';
 $messages['errornoperm'] = 'לא ניתן לבצע הפעולה כי אין הרשאה לבצעה';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'נמצאו $nr אנשי קשר';
 $messages['searchnomatch'] = 'תוצאת החיפוש ריקה';
 $messages['searching'] = 'חיפוש...';
 $messages['checking'] = 'בדיקה...';
+$messages['stillsearching'] = 'עדיין בחיפוש...';
 $messages['nospellerrors'] = 'לא נמצאו שגיאות כתיב';
 $messages['folderdeleted'] = 'התיק נמחק בהצלחה';
 $messages['foldersubscribed'] = 'התיק נרשם בהצלחה';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'יובאו בהצלחה $nr הודעות ';
 $messages['importmessageerror'] = 'היבוא נכשל ! הקובץ שהועלה אינו הודעה או קובץ הודעות במבנה מתאים';
 $messages['opnotpermitted'] = 'פעולה אסורה!';
 $messages['nofromaddress'] = 'לזהות שנבחרה חסרה כתובת דואר';
-$messages['editorwarning'] = 'המעבר לעורך רגיל יגרום לאיבוד את העריכה הקיימת. האם להמשיך?';
+$messages['editorwarning'] = 'החלפת טיפוס עורך עלולה לגרום לאבדן עיצוב טקסט. האם ברצונך להמשיך?';
 $messages['httpreceivedencrypterror'] = 'ארעה שגיאת תצורה חמורה. נא להודיע מייד למנהל/ת המערכת. <B> הודעתך לא תשלח <B>';
 $messages['smtpconnerror'] = 'SMTP ($code): אבד הקשר לשרת';
 $messages['smtpautherror'] = 'SMTP ($code): ההזדהות נכשלה';
diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc
index 0baeb2908..654cde3e6 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -22,6 +22,7 @@ $messages['sessionerror'] = 'Vaša sesija je nevaljala ili istekla.';
 $messages['storageerror'] = 'Neuspješno povezivanje na IMAP poslužitelj.';
 $messages['servererror'] = 'Greška poslužitelja!';
 $messages['servererrormsg'] = 'Greška poslužitelja: $msg';
+$messages['connerror'] = 'Neuspješna veza (Nemoguće doći do poslužitelja)!';
 $messages['dberror'] = 'Greška baze podataka!';
 $messages['requesttimedout'] = 'Zahtjev istekao';
 $messages['errorreadonly'] = 'Nemoguće izvršiti operaciju. Mapa je samo za čitanje.';
@@ -32,6 +33,8 @@ $messages['invalidrequest'] = 'Neispravan zahtjev! Podaci nisu spremljeni.';
 $messages['invalidhost'] = 'Neispravno ime poslužitelja.';
 $messages['nomessagesfound'] = 'Nema poruka u ovom sandučiću.';
 $messages['loggedout'] = 'Uspješno ste se odjavili. Doviđenja!';
+$messages['mailboxempty'] = 'Sandučuć je prazan';
+$messages['nomessages'] = 'Nema poruka';
 $messages['refreshing'] = 'Osvježavanje...';
 $messages['loading'] = 'Učitavanje...';
 $messages['uploading'] = 'Postavljanje datoteke...';
@@ -133,7 +136,6 @@ $messages['importmessagesuccess'] = 'Uspješno uvezeno $nr poruka';
 $messages['importmessageerror'] = 'Uvoz neuspješan! Datoteka nije u formatu poruke ili sandučića';
 $messages['opnotpermitted'] = 'Operacija nije dozvoljena!';
 $messages['nofromaddress'] = 'Nije upisana e-mail adresa u odabrani identitet.';
-$messages['editorwarning'] = 'Prebacivanje u čisti tekstualni uređivač će uzrokovati gubljenje formatiranja teksta. Želite li nastaviti?';
 $messages['httpreceivedencrypterror'] = 'Dogodila se fatalna greška u konfiguraciji. Odmah kontaktirajte administratora. <b>Vaša poruka se ne može poslati.</b>';
 $messages['smtpconnerror'] = 'SMTP greška ($code): Povezivanje na poslužitelj nije uspjelo.';
 $messages['smtpautherror'] = 'SMTP greška ($code): Autentikacija nije uspjela.';
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index fdd43effe..de5ae1be2 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -24,11 +24,11 @@ $labels['logout']   = 'Kijelentkezés';
 $labels['mail']     = 'E-mail';
 $labels['settings'] = 'Beállítások';
 $labels['addressbook'] = 'Címjegyzék';
-$labels['inbox']  = 'Érkezett levelek';
+$labels['inbox']  = 'Érkezettek';
 $labels['drafts'] = 'Piszkozatok';
-$labels['sent']   = 'Küldött levelek';
-$labels['trash']  = 'Törölt elemek';
-$labels['junk']   = 'Kéretlen levelek';
+$labels['sent']   = 'Küldöttek';
+$labels['trash']  = 'Kuka';
+$labels['junk']   = 'Kéretlen';
 $labels['show_real_foldernames'] = 'Az valós nevek megjelenítése a speciális mappáknál.';
 $labels['subject'] = 'Tárgy';
 $labels['from']    = 'Feladó';
@@ -46,17 +46,17 @@ $labels['readstatus'] = 'Olvasott';
 $labels['listoptions'] = 'Üzenetlista beállítások...';
 $labels['mailboxlist'] = 'Mappák';
 $labels['messagesfromto'] = 'Üzenetek: $from - $to / $count';
-$labels['threadsfromto'] = 'Témák ($from - $to, összesen $count)';
+$labels['threadsfromto'] = 'Témák: $from - $to / $count';
 $labels['messagenrof'] = '$nr / $count üzenet';
 $labels['fromtoshort'] = '$from – $to / $count';
 $labels['copy']     = 'Másolás';
 $labels['move']     = 'Áthelyezés';
 $labels['moveto']   = 'Áthelyezés...';
-$labels['copyto']   = 'Másold oda..';
+$labels['copyto']   = 'Másolás..';
 $labels['download'] = 'letöltés';
 $labels['open']     = 'Megnyítás';
 $labels['showattachment'] = 'Megjelenítés';
-$labels['showanyway'] = 'Megjelnités mindenképpen';
+$labels['showanyway'] = 'Megjelnítés mindenképpen';
 $labels['filename'] = 'Fájl neve';
 $labels['filesize'] = 'Fájl mérete';
 $labels['addtoaddressbook'] = 'Hozzáadás a címjegyzékhez';
@@ -101,7 +101,7 @@ $labels['longdec']	= 'December';
 $labels['today'] = 'Ma';
 $labels['refresh']          = 'Frissítés';
 $labels['checkmail']        = 'Új üzenetek ellenőrzése';
-$labels['compose']          = 'Üzenet létrehozása';
+$labels['compose']          = 'Új üzenet';
 $labels['writenewmessage']  = 'Új üzenet';
 $labels['reply']            = 'Válasz';
 $labels['replytomessage']   = 'Válasz';
@@ -128,28 +128,36 @@ $labels['markunread']       = 'Olvasatlanként';
 $labels['markflagged']      = 'Jelöltként';
 $labels['markunflagged']    = 'Jelöletlenként';
 $labels['moreactions']      = 'További műveletek...';
-$labels['more']             = 'Még egy';
+$labels['more']             = 'Még...';
 $labels['back']             = 'Vissza';
 $labels['options']          = 'Beállítások';
+$labels['first'] = 'Első';
+$labels['last'] = 'Utolsó';
+$labels['previous'] = 'Elöző';
+$labels['next'] = 'Következő';
 $labels['select'] = 'Kijelölés';
 $labels['all'] = 'Összes';
 $labels['none'] = 'Nincs';
 $labels['currpage'] = 'Aktuális oldal';
+$labels['isread'] = 'Olvasás';
 $labels['unread'] = 'Olvasatlan';
 $labels['flagged'] = 'Megjelölt';
+$labels['unflagged'] = 'Nem megjelölt';
 $labels['unanswered'] = 'Megválaszolatlan';
 $labels['withattachment'] = 'Csatolmánnyal';
 $labels['deleted'] = 'Törölt';
 $labels['undeleted'] = 'Nem lett törölve';
+$labels['replied'] = 'Megválaszolva';
+$labels['forwarded'] = 'Továbbítva';
 $labels['invert'] = 'Invertálás';
 $labels['filter'] = 'Szűrés';
 $labels['list'] = 'Lista';
-$labels['threads'] = 'Témák';
+$labels['threads'] = 'Téma csoportok';
 $labels['expand-all'] = 'Összes kibontása';
 $labels['expand-unread'] = 'Olvasatlanok kibontása';
 $labels['collapse-all'] = 'Összes összecsukása';
-$labels['threaded'] = 'Téma nézet';
-$labels['autoexpand_threads'] = 'Témák kibontása';
+$labels['threaded'] = 'Témák szerinti csoportosítás';
+$labels['autoexpand_threads'] = 'Témacsoportok kibontása';
 $labels['do_expand'] = 'minden téma';
 $labels['expand_only_unread'] = 'csak ahol van olvasatlan üzenet';
 $labels['fromto'] = 'Feladó/Címzett';
@@ -171,6 +179,10 @@ $labels['importmessages'] = 'Üzenetek importálása';
 $labels['quota'] = 'Helyfoglalás';
 $labels['unknown']  = 'ismeretlen';
 $labels['unlimited']  = 'korlátlan';
+$labels['quotatype'] = 'Kvóta típus';
+$labels['quotaused'] = 'Használt';
+$labels['quotastorage'] = 'Lemez méret';
+$labels['quotamessage'] = 'Üzenet darab';
 $labels['quicksearch']  = 'Gyorskeresés';
 $labels['resetsearch']  = 'Alapállapot';
 $labels['searchmod']  = 'Keresési opciók';
@@ -178,6 +190,10 @@ $labels['msgtext']  = 'Teljes üzenet';
 $labels['body']  = 'Törzs';
 $labels['type'] = 'Típus';
 $labels['namex'] = 'Név';
+$labels['searchscope'] = 'Hatókör';
+$labels['currentfolder'] = 'Aktuális mappa';
+$labels['subfolders'] = 'Ez és az almappák';
+$labels['allfolders'] = 'Minden mappa';
 $labels['openinextwin'] = 'Megnyitás új ablakban';
 $labels['emlsave'] = 'Letöltés (.eml)';
 $labels['changeformattext'] = 'Megjelenítés sima szöveges formátumban';
@@ -193,6 +209,10 @@ $labels['returnreceipt']  = 'Olvasási visszaigazolás';
 $labels['dsn']            = 'Kézbesítési visszaigazolás';
 $labels['mailreplyintro'] = '$date időpontban $sender ezt írta:';
 $labels['originalmessage'] = 'Eredeti üzenet';
+$labels['selectimage']    = 'Kép kijelőlés';
+$labels['addimage']       = 'Kép hozzáadás';
+$labels['selectmedia']    = 'Film kijelölés';
+$labels['addmedia']       = 'Film hozzáadás';
 $labels['editidents']    = 'Azonosítók szerkesztése';
 $labels['spellcheck']    = 'Helyesírás ellenőrzés';
 $labels['checkspelling'] = 'Helyesírás-ellenőrzés';
@@ -203,9 +223,10 @@ $labels['restoremessage'] = 'Üzenet visszaállítás';
 $labels['responses'] = 'Válaszok';
 $labels['insertresponse'] = 'Egy válasz beillesztése';
 $labels['manageresponses'] = 'Válaszok kezelése';
-$labels['savenewresponse'] = 'Új válasz mentése';
-$labels['editresponses'] = 'Válaszok szerkesztése';
+$labels['savenewresponse'] = 'Új válasz létrehozása';
+$labels['addresponse'] = 'Válasz hozzáadása';
 $labels['editresponse'] = 'Válasz szerkesztése';
+$labels['editresponses'] = 'Válaszok szerkesztése';
 $labels['responsename'] = 'Név';
 $labels['responsetext'] = 'Válasz Szöveg';
 $labels['attach'] = 'Csatolás';
@@ -288,11 +309,13 @@ $labels['typehomepage']  = 'Weboldal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Új mező hozzáadása...';
-$labels['addcontact'] = 'Új kapcsolat hozzáadása';
+$labels['addcontact'] = 'Kapcsolat hozzáadása';
 $labels['editcontact'] = 'Kapcsolat szerkesztése';
 $labels['contacts'] = 'Kapcsolatok';
 $labels['contactproperties'] = 'Kapcsolat tulajdonságai';
+$labels['contactnameandorg'] = 'Név és szervezet';
 $labels['personalinfo'] = 'Személyes adatok';
+$labels['contactphoto'] = 'Kapcsolat fotója';
 $labels['edit']   = 'Szerkesztés';
 $labels['cancel'] = 'Mégsem';
 $labels['save']   = 'Mentés';
@@ -310,10 +333,10 @@ $labels['export']         = 'Exportálás';
 $labels['exportall']      = 'Összes exportálása';
 $labels['exportsel']      = 'Kijelöltek exportálása';
 $labels['exportvcards']   = 'Kapcsolatok exportálása vCard formátumban';
-$labels['newcontactgroup'] = 'Új csoport';
 $labels['grouprename']    = 'Csoport átnevezése';
 $labels['groupdelete']    = 'Csoport törlése';
 $labels['groupremoveselected'] = 'A kijelölt partnerek törlése a csopotból';
+$labels['uponelevel']     = 'Egy szintel feljebb';
 $labels['previouspage']   = 'Előző oldal';
 $labels['firstpage']      = 'Első oldal';
 $labels['nextpage']       = 'Következő oldal';
@@ -340,10 +363,8 @@ $labels['preferences'] = 'Beállítások';
 $labels['userpreferences'] = 'Felhasználói beállítások';
 $labels['editpreferences'] = 'Felhasználói beállítások szerkesztése';
 $labels['identities'] = 'Azonosítók';
-$labels['manageidentities'] = 'Hozzáférés azonosítóinak kezelése';
-$labels['newidentity'] = 'Új azonosító';
-$labels['newitem'] = 'Új elem';
-$labels['edititem'] = 'Elem szerkesztése';
+$labels['manageidentities'] = 'Azonosítók kezelése';
+$labels['newidentity'] = 'Új azonosító létrehozása';
 $labels['preferhtml'] = 'HTML megjelenítés';
 $labels['defaultcharset'] = 'Alapértelmezett karakterkódolás';
 $labels['htmlmessage'] = 'HTML üzenet';
@@ -376,8 +397,8 @@ $labels['mailboxview'] = 'Postafiók nézet';
 $labels['mdnrequests'] = 'Olvasási visszaigazolás küldése';
 $labels['askuser'] = 'kérdezzen rá';
 $labels['autosend'] = 'automatikus küldés';
-$labels['autosendknown'] = 'visszaigazolás küldése csak a kapcsolataimnak, egyéb esetben kérdezzen rá';
-$labels['autosendknownignore'] = 'visszaigazolás küldése csak a kapcsolataimnak, egyéb esetben hagyja figyelmen kívül';
+$labels['autosendknown'] = 'küldés csak a címjegyzékben lévő kapcsolataimnak, egyéb esetben kérdezzen rá';
+$labels['autosendknownignore'] = 'küldés csak a címjegyzékben lévő kapcsolataimnak, egyéb esetben nem';
 $labels['ignore'] = 'hagyja figyelmen kívül';
 $labels['readwhendeleted'] = 'Üzenet olvasottként jelölése törléskor';
 $labels['flagfordeletion'] = 'Üzenet törlendőnek jelölése törlés helyett';
@@ -401,9 +422,10 @@ $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (egyéb)';
 $labels['force7bit'] = 'MIME kódolás használata 8 bites karakterekhez';
 $labels['advancedoptions'] = 'Haladó beállítások';
+$labels['toggleadvancedoptions'] = 'Haladó beállítások kapcsolása';
 $labels['focusonnewmessage'] = 'Beérkező új üzenet ablakának fókuszba hozása';
 $labels['checkallfolders'] = 'Új üzenetek ellenőrzése minden mappában';
-$labels['displaynext'] = 'Levél törlése/mozgatása után jelenjen meg a következő üzenet';
+$labels['displaynext'] = 'Levél törlése/áthelyezése után jelenjen meg a következő üzenet';
 $labels['defaultfont'] = 'HTML üzenet alap karakterkészlete';
 $labels['mainoptions'] = 'Általános beállítások';
 $labels['browseroptions'] = 'Böngésző beállításai';
@@ -442,14 +464,14 @@ $labels['asattachment'] = 'csatolmányként';
 $labels['replyallmode'] = 'Alapértelemezett művelete a [Válasz mindenkinek] gombnak';
 $labels['replyalldefault'] = 'válasz mindenkinek';
 $labels['replyalllist'] = 'válasz a csak a levelező listára(ha levelezőlista)';
-$labels['folder']  = 'Mappa';
-$labels['folders']  = 'Mappák';
-$labels['foldername']  = 'Mappa neve';
-$labels['subscribed']  = 'Feliratkozva';
+$labels['folder'] = 'Mappa';
+$labels['folders'] = 'Mappák';
+$labels['foldername'] = 'Mappa neve';
+$labels['subscribed'] = 'Feliratkozva';
 $labels['messagecount'] = 'Üzenet';
-$labels['create']  = 'Létrehozás';
-$labels['createfolder']  = 'Új mappa létrehozása';
-$labels['managefolders']  = 'Mappák kezelése';
+$labels['create'] = 'Létrehozás';
+$labels['createfolder'] = 'Új mappa létrehozása';
+$labels['managefolders'] = 'Mappák kezelése';
 $labels['specialfolders'] = 'Különleges mappák';
 $labels['properties'] = 'Tulajdonságok';
 $labels['folderproperties'] = 'Mappa tulajdonságai';
@@ -459,9 +481,9 @@ $labels['info'] = 'Információk';
 $labels['getfoldersize'] = 'Mappa mérete';
 $labels['changesubscription'] = 'Feliratkozás megváltoztatása';
 $labels['foldertype'] = 'Mappa típusa';
-$labels['personalfolder']  = 'Privát mappa';
-$labels['otherfolder']  = 'Más felhasználó(k) mappája';
-$labels['sharedfolder']  = 'Megosztott mappa';
+$labels['personalfolder'] = 'Privát mappa';
+$labels['otherfolder'] = 'Más felhasználó(k) mappája';
+$labels['sharedfolder'] = 'Megosztott mappa';
 $labels['sortby'] = 'Rendezés';
 $labels['sortasc']  = 'növekvő';
 $labels['sortdesc'] = 'csökkenő';
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index 859f3c6ea..2be6c218f 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -22,17 +22,19 @@ $messages['sessionerror'] = 'Érvénytelen vagy lejárt munkamenet';
 $messages['storageerror'] = 'Nem sikerült csatlakozni az IMAP szerverhez';
 $messages['servererror'] = 'Szerverhiba!';
 $messages['servererrormsg'] = 'Szerverhiba: $msg';
+$messages['connerror'] = 'Kapcsolódási hiba (A kiszolgáló elérése sikertelen)!';
 $messages['dberror'] = 'Adatbázishiba!';
+$messages['windowopenerror'] = 'A felugró ablak blokkolva lett!';
 $messages['requesttimedout'] = 'A kérés túllépte az időkorlátot';
 $messages['errorreadonly'] = 'A műveletet nem sikerült végrehajtani. A mappa írásvédett.';
 $messages['errornoperm'] = 'A műveletet nem sikerült végrehajtani. Hozzáférés megtagadva.';
-$messages['erroroverquota'] = 'A műveletet nem lehetett végrehajtani mivel nincs elég szabad hely a merevlemezen.';
-$messages['erroroverquotadelete'] = 'Nincs elég szabad hely a merevlemezen. A SHIFT+DEL billenytyű kombinációt használd az üzenet törléséhez.';
+$messages['erroroverquota'] = 'A műveletet nem lehetett végrehajtani mivel nincs elég szabad tárhely.';
+$messages['erroroverquotadelete'] = 'Elfogyott a tárhely. A SHIFT+DEL billentyű kombinációval lehet üzeneteket törölni.';
 $messages['invalidrequest'] = 'Érvénytelen kérés! Az adatok nem lettek elmentve.';
 $messages['invalidhost'] = 'Hibás szerver hoszt név';
-$messages['nomessagesfound'] = 'A fiók nem tartalmaz leveleket';
+$messages['nomessagesfound'] = 'A mappa nem tartalmaz üzeneteket';
 $messages['loggedout'] = 'Sikeres kijelentkezés. Viszontlátásra!';
-$messages['mailboxempty'] = 'A postafiók üres';
+$messages['mailboxempty'] = 'A postaláda üres';
 $messages['nomessages'] = 'Nincsenek üzenetek';
 $messages['refreshing'] = 'Frissítés...';
 $messages['loading'] = 'Betöltés...';
@@ -71,7 +73,7 @@ $messages['purgefolderconfirm']  = 'Biztos benne, hogy az összes üzenet törö
 $messages['contactdeleting'] = 'Kapcsolat(ok) törlése...';
 $messages['groupdeleting'] = 'Csoport törlése...';
 $messages['folderdeleting'] = 'Mappa törlése...';
-$messages['foldermoving'] = 'Mappa mozgatása...';
+$messages['foldermoving'] = 'Mappa áthelyezése...';
 $messages['foldersubscribing'] = 'Feliratkozás a mappára...';
 $messages['folderunsubscribing'] = 'Leiratkozás a mappáról...';
 $messages['formincomplete'] = 'Az űrlap hiányosan lett kitöltve';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr találat';
 $messages['searchnomatch'] = 'Nincs találat';
 $messages['searching'] = 'Keresés...';
 $messages['checking'] = 'Ellenőrzés...';
+$messages['stillsearching'] = 'Keresés folyamatban...';
 $messages['nospellerrors'] = 'Nem található helyesírási hiba';
 $messages['folderdeleted'] = 'A mappa sikeresen törölve';
 $messages['foldersubscribed'] = 'Sikerült a mappára feliratkozni';
@@ -104,15 +107,15 @@ $messages['messageopenerror'] = 'A levelek a szerverről nem tölthetők le';
 $messages['fileuploaderror'] = 'Feltöltés sikertelen';
 $messages['filesizeerror'] = 'A feltöltött fájl mérete meghaladja a maximális $size méretet';
 $messages['copysuccess'] = 'Sikeresen átmásolva $nr kapcsolat.';
-$messages['movesuccess'] = 'Sikeresen átmozgatva $nr kapcsolat.';
+$messages['movesuccess'] = '$nr kapcsolat sikeresen áthelyezve.';
 $messages['copyerror'] = 'Nem lehet másolni a kapcsolatokat.';
-$messages['moveerror'] = 'Nem lehet átmozgatni a kapcsolatokat.';
+$messages['moveerror'] = 'Nem lehet áthelyezni a kapcsolatokat.';
 $messages['sourceisreadonly'] = 'Ez a címforrás csak olvasható';
 $messages['errorsavingcontact'] = 'A kapcsolat címe nem menthető';
-$messages['movingmessage'] = 'Üzenet(ek) mozgatása...';
+$messages['movingmessage'] = 'Üzenet(ek) áthelyezése...';
 $messages['copyingmessage'] = 'Üzenet(ek) másolása...';
 $messages['copyingcontact'] = 'Kapcsolat(ok) másolása...';
-$messages['movingcontact'] = 'Kapcsolat(ok) átmozgatása ...';
+$messages['movingcontact'] = 'Kapcsolat(ok) áthelyezése...';
 $messages['deletingmessage'] = 'Üzenet(ek) törlése....';
 $messages['markingmessage'] = 'Üzenet(ek) megjelölése...';
 $messages['addingmember'] = 'Kapcsolat(ok) hozzáadása a csoporthoz...';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Sikeresen importálva $nr üzenet';
 $messages['importmessageerror'] = 'Sikertelen az importálás. A feltőltött file nem értelmezhető üzenetként vagy postafiók (mailbox) fileként.';
 $messages['opnotpermitted'] = 'A művelet nem megengedett!';
 $messages['nofromaddress'] = 'A kiválasztott azonosítónál nincs  email beállítva.';
-$messages['editorwarning'] = 'Az egyszerű szöveges formátumra való váltás az összes formázás elvesztésével jár. Biztosan folytatja?';
+$messages['editorwarning'] = 'A szerkesztő tipusok közötti váltás a szöveg formázásának elveszésével járhat. Biztos szeretnéd folytatni?';
 $messages['httpreceivedencrypterror'] = 'Végzetes konfigurációs hiba történt, azonnal lépjen kapcsolatba az üzemeltetővel. <b>Az üzenet nem küldhető el.</b>';
 $messages['smtpconnerror'] = 'SMTP hiba ($code): Sikertelen kapcsolódás a szerverhez';
 $messages['smtpautherror'] = 'SMTP hiba ($code): Sikertelen bejelentkezés';
@@ -159,7 +162,7 @@ $messages['savedsearchdeleteerror'] = 'Nem sikerült törölni a mentett keresé
 $messages['savedsearchcreated'] = 'Keresés sikeresen mentve';
 $messages['savedsearchcreateerror'] = 'Nem sikerült létrehozni mentett keresést';
 $messages['messagedeleted'] = 'Üzenet(ek) sikeresen törölve';
-$messages['messagemoved'] = 'Üzenet(ek) sikeresen átmozgatva';
+$messages['messagemoved'] = 'Üzenet(ek) sikeresen áthelyezve.';
 $messages['messagecopied'] = 'Üzenet(ek) sikeresen másolva';
 $messages['messagemarked'] = 'Üzenet(ek) sikeresen megjelölve';
 $messages['autocompletechars'] = 'Az automatikus kiegészítéshez legalább $min karakter szükséges';
@@ -170,7 +173,7 @@ $messages['folderupdated'] = 'Mappa sikeresen frissítve';
 $messages['foldercreated'] = 'Mappa sikeresen létrehozva';
 $messages['invalidimageformat'] = 'Érvénytelen képformátum';
 $messages['mispellingsfound'] = 'Az üzenetben helyesírási hibák találhatók';
-$messages['parentnotwritable'] = 'Nem sikerült a mappa létrehozása/mozgatása a kijelölt mappába. Nincs jogosultsága a művelethez!';
+$messages['parentnotwritable'] = 'Nem sikerült a mappa létrehozása/áthelyezése a kijelölt főmappába. Nincs jogosultsága a művelethez!';
 $messages['messagetoobig'] = 'Az üzenetrész túl nagy a feldolgozáshoz.';
 $messages['attachmentvalidationerror'] = 'FIGYELEM! A csatalmány veszélyes lehet, mert a típusa nem egyezik az üzenetben beállított típussal. Amennyiben nem megbizható az üzenet küldője, ne nyissa meg a csatolmányt a böngészőben mert ártalmas lehet a tartalma.<br/><br/><em>Üzenetben beállított tipus: $expected; az érzékelt típus: $detected</em>';
 $messages['noscriptwarning'] = 'FIGYELEM: Ez webmail szolgáltatása igényli a Javascript futtatásának a lehetőségét! Amennyiben használni szeretné, engedélyezze a JavaScript futtatását a böngészőjének a beállatásaiban.';
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index ba851c5d2..d993ab827 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -115,7 +115,6 @@ $messages['importconfirm'] = '$inserted նոր ներկրված հասցեներ
 $messages['importconfirmskipped'] = '<b>Բաց թողնվեց $skipped առկա գրառում</b>';
 $messages['opnotpermitted'] = 'Գործողությունը անթույլատրելի է։';
 $messages['nofromaddress'] = 'Նշված անձը հասցե չունի։';
-$messages['editorwarning'] = 'Դեպի պարզ տեքստի խմբագրիչ անցման դեպքում կկորի տեքստի ձևավորումը։ Շարունակե՞լ։';
 $messages['httpreceivedencrypterror'] = 'Համակարգի լարքի սխալ։ Դիմեք համակարգը սպասարկող անձնակազմին։ <b>Ձեր նամակը ուղարկված չէ։</b>';
 $messages['smtpconnerror'] = 'SMTP սխալ ($code)` Սերվերի հետ կապը ձախողվեց։';
 $messages['smtpautherror'] = 'SMTP սխալ ($code)` Նույնականացումը ձախողվեց։';
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 581428aab..5bddf6737 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -52,6 +52,7 @@ $labels['fromtoshort'] = '$from - $to dari total $count';
 $labels['copy']     = 'Salin';
 $labels['move']     = 'Pindahkan';
 $labels['moveto']   = 'Pindahkan ke...';
+$labels['copyto']   = 'Salin ke';
 $labels['download'] = 'Unduh';
 $labels['open']     = 'Buka';
 $labels['showattachment'] = 'Tampilkan';
@@ -177,6 +178,10 @@ $labels['msgtext']  = 'Seluruh pesan';
 $labels['body']  = 'Badan';
 $labels['type'] = 'Tipe';
 $labels['namex'] = 'Nama';
+$labels['searchscope'] = 'Jangkauan';
+$labels['currentfolder'] = 'Folder sekarang';
+$labels['subfolders'] = 'Ini adalah subfolder';
+$labels['allfolders'] = 'Semua folder';
 $labels['openinextwin'] = 'Buka dalam jendela baru';
 $labels['emlsave'] = 'Unduh (.eml)';
 $labels['changeformattext'] = 'Tampilkan dalam format text biasa';
@@ -197,6 +202,15 @@ $labels['spellcheck']    = 'Ejaan';
 $labels['checkspelling'] = 'Pemeriksaan ejaan';
 $labels['resumeediting'] = 'Lanjutkan menyunting';
 $labels['revertto']      = 'Kembalikan ke';
+$labels['restore'] = 'Kembalikan';
+$labels['restoremessage'] = 'Kembalikan pesan ?';
+$labels['responses'] = 'Respon';
+$labels['insertresponse'] = 'Masukkan respon';
+$labels['manageresponses'] = 'Atur respon';
+$labels['editresponse'] = 'Ubah respon';
+$labels['editresponses'] = 'Ubah respon';
+$labels['responsename'] = 'Nama';
+$labels['responsetext'] = 'Teks respon';
 $labels['attach'] = 'Lampirkan';
 $labels['attachments'] = 'Sisipan';
 $labels['upload'] = 'Unggah';
@@ -277,7 +291,6 @@ $labels['typehomepage']  = 'Laman Web';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Tambah kolom isian';
-$labels['addcontact'] = 'Tambah kontak baru';
 $labels['editcontact'] = 'Ubah kontak';
 $labels['contacts'] = 'Daftar kontak';
 $labels['contactproperties'] = 'Properti kontak';
@@ -290,7 +303,6 @@ $labels['rename'] = 'Ganti nama';
 $labels['addphoto'] = 'Tambah';
 $labels['replacephoto'] = 'Ganti';
 $labels['uploadphoto'] = 'Unggah foto';
-$labels['newcontact']     = 'Buat kartu kontak baru';
 $labels['deletecontact']  = 'Hapus kontak terpilih';
 $labels['composeto']      = 'Tulis surat kepada';
 $labels['contactsfromto'] = 'Kontak $from sampai $to dari total $count';
@@ -299,7 +311,6 @@ $labels['export']         = 'Ekspor';
 $labels['exportall']      = 'Ekspor semua';
 $labels['exportsel']      = 'Ekspor pilihan';
 $labels['exportvcards']   = 'Ekspor kontak dalam format vCard';
-$labels['newcontactgroup'] = 'Buat Grup baru';
 $labels['grouprename']    = 'Ganti nama grup';
 $labels['groupdelete']    = 'Hapus grup';
 $labels['groupremoveselected'] = 'Hapus kontak terpilih dari grup';
@@ -316,7 +327,11 @@ $labels['searchdelete'] = 'Hapus pencarian';
 $labels['import'] = 'Impor';
 $labels['importcontacts'] = 'Impor kontak';
 $labels['importfromfile'] = 'Impor dari berkas:';
+$labels['importtarget'] = 'Tambah kontak ke';
 $labels['importreplace'] = 'Ganti seluruh buku alamat';
+$labels['importgroups'] = 'Impor pengaturan grup';
+$labels['importgroupsall'] = 'Semua (buat grup jika diperlukan)';
+$labels['importgroupsexisting'] = 'Hanya untuk grup yang telah ada';
 $labels['importdesc'] = 'Anda dapat mengunggah kontak dari buku alamat yang telah ada.<br/>Saat ini kami mendukung import alamat dari format data <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> atau CSV (comma-separated).';
 $labels['done'] = 'Selesai';
 $labels['settingsfor'] = 'Pengaturan untuk';
@@ -325,10 +340,6 @@ $labels['preferences'] = 'Pilihan';
 $labels['userpreferences'] = 'Pilihan pengguna';
 $labels['editpreferences'] = 'Ubah pilihan pengguna';
 $labels['identities'] = 'Identitas';
-$labels['manageidentities'] = 'Atur identitas untuk akun ini';
-$labels['newidentity'] = 'Identitas baru';
-$labels['newitem'] = 'Item baru';
-$labels['edititem'] = 'Ubah item';
 $labels['preferhtml'] = 'Lebih suka HTML';
 $labels['defaultcharset'] = 'Default Character';
 $labels['htmlmessage'] = 'Pesan HTML';
@@ -424,14 +435,17 @@ $labels['standardwindows'] = 'Kelola popup sebagai standar window';
 $labels['forwardmode'] = 'Meneruskan pesan';
 $labels['inline'] = 'dalam surat';
 $labels['asattachment'] = 'sebagai sisipan';
-$labels['folder']  = 'Folder';
-$labels['folders']  = 'Semua Folder';
-$labels['foldername']  = 'Nama folder';
-$labels['subscribed']  = 'Subscribed';
+$labels['replyallmode'] = 'Aksi dasar dari tombol [Jawab Semua]';
+$labels['replyalldefault'] = 'jawab ke semua';
+$labels['replyalllist'] = 'jawab hanya ke daftar alamat email (jika ditemukan)';
+$labels['folder'] = 'Folder';
+$labels['folders'] = 'Semua Folder';
+$labels['foldername'] = 'Nama folder';
+$labels['subscribed'] = 'Subscribed';
 $labels['messagecount'] = 'Pesan-pesan';
-$labels['create']  = 'Buat';
-$labels['createfolder']  = 'Buat folder baru';
-$labels['managefolders']  = 'Atur folder';
+$labels['create'] = 'Buat';
+$labels['createfolder'] = 'Buat folder baru';
+$labels['managefolders'] = 'Atur folder';
 $labels['specialfolders'] = 'Folder Khusus';
 $labels['properties'] = 'Atribut';
 $labels['folderproperties'] = 'Atribut folder';
@@ -441,9 +455,9 @@ $labels['info'] = 'Informasi';
 $labels['getfoldersize'] = 'Klik untuk mendapatkan ukuran folder';
 $labels['changesubscription'] = 'Klik untuk mengubah langganan';
 $labels['foldertype'] = 'Jenis folder';
-$labels['personalfolder']  = 'Folder pribadi';
-$labels['otherfolder']  = 'Folder pengguna lain';
-$labels['sharedfolder']  = 'Folder publik';
+$labels['personalfolder'] = 'Folder pribadi';
+$labels['otherfolder'] = 'Folder pengguna lain';
+$labels['sharedfolder'] = 'Folder publik';
 $labels['sortby'] = 'Urut berdasarkan';
 $labels['sortasc']  = 'Urut menaik';
 $labels['sortdesc'] = 'Urut menurun';
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index a78054a20..f5d5b1481 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -22,6 +22,7 @@ $messages['sessionerror'] = 'Session Anda invalid atau kadaluwarsa.';
 $messages['storageerror'] = 'Koneksi ke server penyimpanan gagal';
 $messages['servererror'] = 'Server Error!';
 $messages['servererrormsg'] = 'Server Error: $msg';
+$messages['connerror'] = 'Kesalahan sambungan (Gagal menghubungi server)!';
 $messages['dberror'] = 'Basis data Error!';
 $messages['requesttimedout'] = 'Permintaan melewati batas waktu';
 $messages['errorreadonly'] = 'Tidak bisa melakukan operasi. Folder hanya bisa dibaca.';
@@ -32,6 +33,8 @@ $messages['invalidrequest'] = 'Permintaan tidak valid! Tidak ada data yang tersi
 $messages['invalidhost'] = 'Nama server invalid.';
 $messages['nomessagesfound'] = 'Surat tidak ditemukan di kotak masuk ini';
 $messages['loggedout'] = 'Anda berhasil mengakhiri session. Selamat Tinggal!';
+$messages['mailboxempty'] = 'Kotak masuk kosong';
+$messages['nomessages'] = 'Tidak ada pesan';
 $messages['refreshing'] = 'Menyegarkan...';
 $messages['loading'] = 'Memuat...';
 $messages['uploading'] = 'Menggungah berkas ...';
@@ -43,6 +46,8 @@ $messages['messagesent'] = 'Pesan berhasil dikirim.';
 $messages['savingmessage'] = 'Menyimpan pesan...';
 $messages['messagesaved'] = 'Pesan tersimpan kedalam Konsep';
 $messages['successfullysaved'] = 'Berhasil disimpan';
+$messages['savingresponse'] = 'Meyimpan pesan tanggapan....';
+$messages['deleteresponseconfirm'] = 'Anda yakin ingin menghapus pesan tanggapan ini?';
 $messages['addedsuccessfully'] = 'Kontak berhasil ditambahkan ke buku alamat';
 $messages['contactexists'] = 'Kontak dengan alamat e-mail ini sudah ada.';
 $messages['contactnameexists'] = 'Kontak dengan nama yang sama sudah ada.';
@@ -53,6 +58,8 @@ $messages['contactnotfound'] = 'Kontak yang diminta tidak ditemukan';
 $messages['contactsearchonly'] = 'Masukkan jenis pencarian untuk mencari kontak';
 $messages['sendingfailed'] = 'Gagal mengirim pesan.';
 $messages['senttooquickly'] = 'Mohon tunggu $sec detik sebelum mengirim pesan ini.';
+$messages['errorsavingsent'] = 'Kesalahan ketika menyimpan pesan terkirim.';
+$messages['errorsaving'] = 'Kesalahan terjadi ketika menyimpan.';
 $messages['errormoving'] = 'Pesan tidak bisa dipindahkan';
 $messages['errorcopying'] = 'Pesan tidak dapat disalin';
 $messages['errordeleting'] = 'Pesan tidak bisa dihapus';
@@ -77,6 +84,7 @@ $messages['norecipientwarning'] = 'Tolong masukkan sedikitnya satu penerima';
 $messages['nosubjectwarning']  = '"Judul" kosong. Isi judul sekarang?';
 $messages['nobodywarning'] = 'Kirim pesan ini tanpa teks?';
 $messages['notsentwarning'] = 'Pesan belum terkirim. Buang pesan Anda?';
+$messages['restoresavedcomposedata'] = 'Sebelumnya disimpan tetapi pesan tidak terkirim ditemukan.\n\nJudul: $subject\nDisimpan: $date\n\nAnda yakin mengembalikan pesan ini?';
 $messages['noldapserver'] = 'Tolong pilih server LDAP untuk pencarian';
 $messages['nosearchname'] = 'Tolong masukkan nama kontak atau alamat email';
 $messages['notuploadedwarning'] = 'Proses upload belum selesai. Silahkan tunggu atau batalkan proses upload.';
@@ -85,6 +93,7 @@ $messages['contactsearchsuccessful'] = 'Ditemukan $nr  kontak';
 $messages['searchnomatch'] = 'Pencarian hasilnya nihil';
 $messages['searching'] = 'Mencari...';
 $messages['checking'] = 'Memeriksa...';
+$messages['stillsearching'] = 'Sedang mencari....';
 $messages['nospellerrors'] = 'Tidak ditemukan kesalahan ejaan';
 $messages['folderdeleted'] = 'Folder berhasil dihapus';
 $messages['foldersubscribed'] = 'Folder berhasil dilanggankan';
@@ -128,7 +137,6 @@ $messages['importmessagesuccess'] = 'Berhasil mengimport $nr pesan';
 $messages['importmessageerror'] = 'Gagal mengimport! File yang di upload buka pesan yang valid atau file mailbox';
 $messages['opnotpermitted'] = 'Operasi tidak diperbolehkan!';
 $messages['nofromaddress'] = 'kekurangan alamat e-mail pada identitas terpilih';
-$messages['editorwarning'] = 'Beralih pada editor teks murni akan mengakibatkan semua pemformatan teks hilang. Lanjutkan?';
 $messages['httpreceivedencrypterror'] = 'Terjadi sebuah kesalahan pengaturan fatal. Segera hubungi administrator Anda. <b> Pesan Anda tidak bisa terkirim.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): Koneksi ke server gagal';
 $messages['smtpautherror'] = 'SMTP Error ($code): Otentifikasi gagal';
@@ -139,6 +147,7 @@ $messages['smtperror'] = 'SMTP Error : $msg';
 $messages['emailformaterror'] = 'Alamat e-mail salah: $email';
 $messages['toomanyrecipients'] = 'Terlalu banyak penerima. Batas maksimal penerima adalah $max';
 $messages['maxgroupmembersreached'] = 'Jumlah grup melebihi jumlah maksimum $max';
+$messages['internalerror'] = 'Terjadi kesalahan dari dalam. Silahkan coba kembali.';
 $messages['contactdelerror'] = 'Kontak tidak bisa dihapus';
 $messages['contactdeleted'] = 'Kontak berhasil dihapus';
 $messages['contactrestoreerror'] = 'Tidak bisa mengembalikan kontak yang terhapus.';
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index f0f660d3d..d2b544a4e 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -16,7 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 $labels['welcome']   = 'Benvenuto in $product';
-$labels['username']  = 'Utente';
+$labels['username']  = 'E-mail';
 $labels['password']  = 'Password';
 $labels['server']    = 'Server';
 $labels['login']     = 'Entra';
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Altre operazioni...';
 $labels['more']             = 'Di più';
 $labels['back']             = 'Indietro';
 $labels['options']          = 'Opzioni';
+$labels['first'] = 'Primo';
+$labels['last'] = 'Ultimo';
+$labels['previous'] = 'Precedente';
+$labels['next'] = 'Successivo';
 $labels['select'] = 'Seleziona';
 $labels['all'] = 'Tutti';
 $labels['none'] = 'Nessuno';
 $labels['currpage'] = 'Pagina corrente';
+$labels['isread'] = 'leggi';
 $labels['unread'] = 'Non letti';
 $labels['flagged'] = 'Contrassegnato';
+$labels['unflagged'] = 'Non contrassegnato';
 $labels['unanswered'] = 'Senza risposta';
 $labels['withattachment'] = 'Con allegato';
 $labels['deleted'] = 'Cancellato';
 $labels['undeleted'] = 'Non eliminato';
+$labels['replied'] = 'Risposta';
+$labels['forwarded'] = 'Inoltrata';
 $labels['invert'] = 'Inverti';
 $labels['filter'] = 'Filtra';
 $labels['list'] = 'Elenco';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Importa messaggi';
 $labels['quota'] = 'Spazio utilizzato';
 $labels['unknown']  = 'sconosciuto';
 $labels['unlimited']  = 'illimitato';
+$labels['quotatype'] = 'Tipo di dimensione';
+$labels['quotatotal'] = 'Limite';
+$labels['quotaused'] = 'Utilizzato';
+$labels['quotastorage'] = 'Spazio disco';
+$labels['quotamessage'] = 'Contatore messaggi';
 $labels['quicksearch']  = 'Ricerca veloce';
 $labels['resetsearch']  = 'Annulla ricerca';
 $labels['searchmod']  = 'Ambito di ricerca';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Intero messaggio';
 $labels['body']  = 'Body';
 $labels['type'] = 'Tipo';
 $labels['namex'] = 'Nome';
+$labels['searchscope'] = 'Contesto';
+$labels['currentfolder'] = 'Cartella corrente';
+$labels['subfolders'] = 'Questa e le sottocartelle';
+$labels['allfolders'] = 'Tutte le cartelle';
 $labels['openinextwin'] = 'Apri in una nuova finestra';
 $labels['emlsave'] = 'Scarica (.eml)';
 $labels['changeformattext'] = 'Visualizza nel formato testo semplice';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Ricevuta di ritorno';
 $labels['dsn']            = 'Notifica di consegna';
 $labels['mailreplyintro'] = 'Il $date $sender ha scritto:';
 $labels['originalmessage'] = 'Messaggio originale';
+$labels['selectimage']    = 'Selezione Immagine';
+$labels['addimage']       = 'Aggiungi immagine';
+$labels['selectmedia']    = 'Seleziona video';
+$labels['addmedia']       = 'Aggiungi video';
 $labels['editidents']    = 'Modifica identità';
 $labels['spellcheck']    = 'Controllo ortografico';
 $labels['checkspelling'] = 'Controlla ortografia';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'Ripristinare il messaggio?';
 $labels['responses'] = 'Risposte';
 $labels['insertresponse'] = 'Inserisci una risposta';
 $labels['manageresponses'] = 'Gestione risposte';
-$labels['savenewresponse'] = 'Salva una nuova risposta';
-$labels['editresponses'] = 'Modifica risposte';
+$labels['savenewresponse'] = 'Crea una nuova risposta';
+$labels['addresponse'] = 'Aggiungi risposta';
 $labels['editresponse'] = 'Modifica risposta';
+$labels['editresponses'] = 'Modifica risposte';
 $labels['responsename'] = 'Nome';
 $labels['responsetext'] = 'Testo della Risposta';
 $labels['attach'] = 'Allega';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Aggiungi';
 $labels['uploadprogress'] = '$percent ($current di $total)';
 $labels['close']  = 'Chiudi';
 $labels['messageoptions']  = 'Opzioni messaggi...';
+$labels['togglecomposeoptions'] = 'Passa alla impostazioni di composizione';
 $labels['low']     = 'Bassa';
 $labels['lowest']  = 'Molto bassa';
 $labels['normal']  = 'Normale';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Assistente';
 $labels['spouse'] = 'Coniuge';
 $labels['allfields'] = 'Tutti i campi';
 $labels['search'] = 'Ricerca';
+$labels['searchresult'] = 'Risultati ricerca';
 $labels['advsearch'] = 'Ricerca avanzata';
 $labels['advanced'] = 'Opzioni avanzate';
 $labels['other'] = 'Altro';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Home page';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profilo';
 $labels['addfield'] = 'Aggiungi campo...';
-$labels['addcontact'] = 'Aggiungi contatto alla rubrica';
+$labels['addcontact'] = 'Aggiungi contatto';
 $labels['editcontact'] = 'Modifica contatto';
 $labels['contacts'] = 'Contatti';
 $labels['contactproperties'] = 'Proprietà contatto';
+$labels['contactnameandorg'] = 'Nome e Organizzazione';
 $labels['personalinfo'] = 'Informazioni personali';
+$labels['contactphoto'] = 'Avatar';
 $labels['edit']   = 'Modifica';
 $labels['cancel'] = 'Annulla';
 $labels['save']   = 'Salva';
@@ -310,10 +336,12 @@ $labels['export']         = 'Esporta';
 $labels['exportall']      = 'Esporta tutto';
 $labels['exportsel']      = 'Esporta selezionati';
 $labels['exportvcards']   = 'Esporta i contatti in formato vCard';
-$labels['newcontactgroup'] = 'Crea un nuovo gruppo';
+$labels['newcontactgroup']       = 'Crea un nuovo gruppo';
+$labels['addgroup']       = 'Aggiungi gruppo';
 $labels['grouprename']    = 'Rinomina il gruppo';
 $labels['groupdelete']    = 'Cancella il gruppo';
 $labels['groupremoveselected'] = 'Rimuovi i contatti selezionati dal gruppo';
+$labels['uponelevel']     = 'Sali di un livello';
 $labels['previouspage']   = 'Pagina precedente';
 $labels['firstpage']      = 'Prima pagina';
 $labels['nextpage']       = 'Pagina successiva';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Preferenze';
 $labels['userpreferences'] = 'Preferenze utente';
 $labels['editpreferences'] = 'Modifica le preferenze per l\'utente';
 $labels['identities'] = 'Identità';
-$labels['manageidentities'] = 'Gestisci le identità per questo account';
-$labels['newidentity'] = 'Nuova identità';
-$labels['newitem'] = 'Nuovo elemento';
-$labels['edititem'] = 'Modifica elemento';
+$labels['manageidentities'] = 'Gestisci identità';
+$labels['newidentity'] = 'Crea una nuova identità';
+$labels['addidentity'] = 'Aggiungi identità';
+$labels['edititem'] = 'Modifica identità';
 $labels['preferhtml'] = 'Mostra HTML';
 $labels['defaultcharset'] = 'Set di caratteri predefinito';
 $labels['htmlmessage'] = 'Messaggio HTML';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'RFC 2231 completo (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 completo (altri)';
 $labels['force7bit'] = 'Usa la codifica MIME per i caratteri a 8-bit';
+$labels['savelocalstorage'] = "Salva nell'archiviazione locale del browser (temporaneamente)";
 $labels['advancedoptions'] = 'Opzioni avanzate';
+$labels['toggleadvancedoptions'] = 'Passa alle impostazioni avanzate';
 $labels['focusonnewmessage'] = 'Attiva la finestra del browser all\'arrivo di un nuovo messaggio';
 $labels['checkallfolders'] = 'Controlla tutte le cartelle per la presenza di nuovi messaggi';
 $labels['displaynext'] = 'Dopo aver cancellato/spostato il messaggio mostra quello successivo';
@@ -439,17 +469,17 @@ $labels['standardwindows'] = 'Gestisci i popup come finestre standard';
 $labels['forwardmode'] = 'Inoltro messaggi';
 $labels['inline'] = 'In linea';
 $labels['asattachment'] = 'come allegato';
-$labels['replyallmode'] = 'Azione di defualt del bottone [Reply all]';
+$labels['replyallmode'] = 'Azione predefinita del pulsante [Rispondi a tutti]';
 $labels['replyalldefault'] = 'rispondi a tutti';
 $labels['replyalllist'] = 'rispondi solo alla mailing list (se disponibile)';
-$labels['folder']  = 'Cartella';
-$labels['folders']  = 'Cartelle';
-$labels['foldername']  = 'Nome cartella';
-$labels['subscribed']  = 'Sottoscritta';
+$labels['folder'] = 'Cartella';
+$labels['folders'] = 'Cartelle';
+$labels['foldername'] = 'Nome cartella';
+$labels['subscribed'] = 'Sottoscritta';
 $labels['messagecount'] = 'Messaggi';
-$labels['create']  = 'Crea';
-$labels['createfolder']  = 'Crea nuova cartella';
-$labels['managefolders']  = 'Gestione cartelle';
+$labels['create'] = 'Crea';
+$labels['createfolder'] = 'Crea nuova cartella';
+$labels['managefolders'] = 'Gestione cartelle';
 $labels['specialfolders'] = 'Cartelle Speciali';
 $labels['properties'] = 'Proprietà';
 $labels['folderproperties'] = 'Proprietà cartella';
@@ -459,9 +489,13 @@ $labels['info'] = 'Informazioni';
 $labels['getfoldersize'] = 'Click per la dimensione della cartella';
 $labels['changesubscription'] = 'Click per cambiare sottoscrizione';
 $labels['foldertype'] = 'Tipo di cartella';
-$labels['personalfolder']  = 'Cartella privata';
-$labels['otherfolder']  = 'Cartella di un altro utente';
-$labels['sharedfolder']  = 'Cartella pubblica';
+$labels['personalfolder'] = 'Cartella privata';
+$labels['otherfolder'] = 'Cartella di un altro utente';
+$labels['sharedfolder'] = 'Cartella pubblica';
+$labels['findfolders'] = 'Trova cartelle';
+$labels['namespace.personal'] = 'Personale';
+$labels['namespace.other'] = 'Altri utenti';
+$labels['namespace.shared'] = 'Condivisa';
 $labels['sortby'] = 'Ordina per';
 $labels['sortasc']  = 'Ordinamento crescente';
 $labels['sortdesc'] = 'Ordinamento decrescente';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamita';
 $labels['japanese'] = 'Giapponese';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Cinese';
+$labels['arialabeltopnav'] = 'Controllo finestra';
+$labels['arialabeltasknav'] = 'Attavità dell\'applicazione';
+$labels['arialabeltoolbar'] = 'Barra delle applicazioni';
+$labels['arialabelactivetask'] = 'Attività Attive';
+$labels['arialabelmessagessearchfilter'] = 'Filtro lista delle Email';
+$labels['arialabelmailsearchform'] = 'Modulo ricerca messaggi Email';
+$labels['arialabelcontactsearchform'] = 'Modulo di ricerca contatti';
+$labels['arialabelmailquicksearchbox'] = 'Ricerca Email';
+$labels['arialabelquicksearchbox'] = 'Immissione ricerca';
+$labels['arialabelfoldersearchfilter'] = 'Filtro Cartelle';
+$labels['arialabelfoldersearchform'] = 'Form ricerca cartelle';
+$labels['arialabelfolderlist'] = 'Cartella selezione Email';
+$labels['arialabelmessagelist'] = 'Lista messaggi Email';
+$labels['arialabelmailpreviewframe'] = 'Anteprima messaggio';
+$labels['arialabelmailboxmenu'] = 'Menu azione cartella';
+$labels['arialabellistselectmenu'] = 'Menu lista selezione';
+$labels['arialabelthreadselectmenu'] = 'Finestra elenco menu';
+$labels['arialabelmessagelistoptions'] = 'Visualizzazione della lista dei messaggi e opzioni di ordinamento';
+$labels['arialabelmailimportdialog'] = 'Dialogo importazione messaggio';
+$labels['arialabelmessagenav'] = 'Navigazione messaggio';
+$labels['arialabelmessagebody'] = 'Corpo messaggio';
+$labels['arialabelmessageactions'] = 'Azione messaggi';
+$labels['arialabelcontactquicksearch'] = 'Modulo ricerca contatti';
+$labels['arialabelcontactsearchbox'] = 'Immissione ricerca contatti';
+$labels['arialabelmessageheaders'] = 'Messaggio testata';
+$labels['arialabelforwardingoptions'] = 'Opzioni di Inoltro';
+$labels['arialabelreplyalloptions'] = 'Opzione rispondi a tutti';
+$labels['arialabelmoremessageactions'] = 'Altre azioni del messaggio';
+$labels['arialabelmarkmessagesas'] = 'Contrassegna messaggi selezionati come';
+$labels['arialabelcomposeoptions'] = 'Impostazioni composizione';
+$labels['arialabelresponsesmenu'] = 'Menu di rispose nascoste';
+$labels['arialabelattachmentuploadform'] = 'Allegato caricato da';
+$labels['arialabelattachmentpreview'] = 'Anteprima allegato';
+$labels['ariasummarycomposecontacts'] = 'Elenco dei contatti e gruppi per selezionare come destinatari';
+$labels['arialabelcontactexportoptions'] = 'Impostazioni esportazione contatti';
+$labels['arialabelabookgroupoptions'] = 'Impostazioni Contatti/gruppi';
+$labels['arialabelpreferencesform'] = 'Modulo preferenze';
+$labels['arialabelidentityeditfrom'] = 'Modifica modulo identità';
+$labels['arialabelresonseeditfrom'] = 'Modifica modulo ricezione';
+$labels['arialabelsearchterms'] = 'Ricerca termini';
+$labels['helplistnavigation'] = 'Lista navigazione da tastiera';
+$labels['helplistkeyboardnavigation'] = "Frecce su/giù: Sposta le righe selezionate.
+Spazio: Seleziona fila mirata.
+Shift + su/giù: Seleziona ulteriore fila da sotto e sopra.
+Ctrl + Spazio: Aggiungi fila mirata da selezionato/rimosso a selezionato.";
+$labels['helplistkeyboardnavmessages'] = "Frecce destra/sinistra: espandi/comprimi finestra messaggio (solo in modalità finestra).
+Invio: Aprire il contatto selezionato.
+Cancella: Sposta il messaggio selezionato nel cestino.";
+$labels['helplistkeyboardnavcontacts'] = "Invio: Aprire il contatto selezionato";
 ?>
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index 5d964697b..6d76954c5 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Sessione non valida o scaduta';
 $messages['storageerror'] = 'Impossibile connettersi al server IMAP';
 $messages['servererror'] = 'Errore del server!';
 $messages['servererrormsg'] = 'Errore del server: $msg';
+$messages['connerror'] = 'Errore di connessione (impossibile raggiungere il server)!';
 $messages['dberror'] = 'Errore del database!';
+$messages['windowopenerror'] = 'Windows popup è stato bloccato!';
 $messages['requesttimedout'] = 'Richiesta scaduta';
 $messages['errorreadonly'] = 'Impossibile eseguire l\'operazione. Cartella in sola lettura';
 $messages['errornoperm'] = 'Impossibile eseguire l\'operazione. Permesso negato';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr contatti trovati';
 $messages['searchnomatch'] = 'La ricerca non ha dato nessun risultato';
 $messages['searching'] = 'Ricerca...';
 $messages['checking'] = 'Controllo...';
+$messages['stillsearching'] = 'Ricercando...';
 $messages['nospellerrors'] = 'Nessun errore ortografico trovato';
 $messages['folderdeleted'] = 'Cartella eliminata';
 $messages['foldersubscribed'] = 'Cartella sottoscritta correttamente';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Importati correttamente $nr messaggi';
 $messages['importmessageerror'] = 'Importazione fallita! Il file caricato non è un messaggio o una casella postale valida.';
 $messages['opnotpermitted'] = 'Operazione non consentita!';
 $messages['nofromaddress'] = 'Indirizzo e-mail mancante nell\'identità selezionata';
-$messages['editorwarning'] = 'Passare all\'editor testuale farà perdere tutte le informazioni di formattazione. Sicuro di voler continuare?';
+$messages['editorwarning'] = 'Cambiare editor potrebbe causare la perdita della formattazione. Si desidera continuare lo stesso?';
 $messages['httpreceivedencrypterror'] = 'Fatale errore di configurazione. Per favore contatta l\'amministratore immediatamente. Il tuo messaggio non può essere inviato.';
 $messages['smtpconnerror'] = 'Errore SMTP ($code): Connessione al server fallita';
 $messages['smtpautherror'] = 'Errore SMTP ($code): Autenticazione fallita';
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index e58582e73..0527a20fe 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'その他の操作...';
 $labels['more']             = '続く';
 $labels['back']             = '戻る';
 $labels['options']          = 'オプション';
+$labels['first'] = '最初';
+$labels['last'] = '最後';
+$labels['previous'] = '前';
+$labels['next'] = '次';
 $labels['select'] = '選択';
 $labels['all'] = 'すべて';
 $labels['none'] = 'なし';
 $labels['currpage'] = '現在のページ';
+$labels['isread'] = '既読';
 $labels['unread'] = '未読';
 $labels['flagged'] = 'フラグ付き';
+$labels['unflagged'] = 'フラッグなし';
 $labels['unanswered'] = '未返信';
 $labels['withattachment'] = '添付ファイルあり';
 $labels['deleted'] = '削除済み';
 $labels['undeleted'] = '削除済みでない';
+$labels['replied'] = '返信済み';
+$labels['forwarded'] = '転送済み';
 $labels['invert'] = '反転';
 $labels['filter'] = 'フィルター';
 $labels['list'] = '一覧';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'メッセージをインポート';
 $labels['quota'] = 'ディスクの使用状況';
 $labels['unknown']  = '不明';
 $labels['unlimited']  = '無制限';
+$labels['quotatype'] = 'クォータの種類';
+$labels['quotatotal'] = '限度';
+$labels['quotaused'] = '使用';
+$labels['quotastorage'] = 'ディスク容量';
+$labels['quotamessage'] = 'メッセージ数';
 $labels['quicksearch']  = '高速検索';
 $labels['resetsearch']  = '検索を解除';
 $labels['searchmod']  = '検索の条件';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'メッセージ全体';
 $labels['body']  = '本文';
 $labels['type'] = '種類';
 $labels['namex'] = '名前';
+$labels['searchscope'] = 'スコープ';
+$labels['currentfolder'] = '現在のフォルダー';
+$labels['subfolders'] = 'このフォルダーと下位のフォルダー';
+$labels['allfolders'] = 'すべてのフォルダー';
 $labels['openinextwin'] = '新しいウィンドウで開く';
 $labels['emlsave'] = 'ダウンロード(.eml形式)';
 $labels['changeformattext'] = 'テキスト形式で表示';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = '開封確認';
 $labels['dsn']            = '配送状態通知';
 $labels['mailreplyintro'] = '$date に $sender さんは書きました:';
 $labels['originalmessage'] = '元のメッセージ';
+$labels['selectimage']    = '画像を選択';
+$labels['addimage']       = '画像を追加';
+$labels['selectmedia']    = '動画を選択';
+$labels['addmedia']       = '動画を追加';
 $labels['editidents']    = '識別情報を編集';
 $labels['spellcheck']    = 'スペル';
 $labels['checkspelling'] = 'スペルチェック';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'メッセージを回復しますか?';
 $labels['responses'] = '回答';
 $labels['insertresponse'] = '回答を挿入';
 $labels['manageresponses'] = '回答を管理';
-$labels['savenewresponse'] = '新しい回答を保存';
-$labels['editresponses'] = '回答を編集';
+$labels['savenewresponse'] = '新しい回答を作成';
+$labels['addresponse'] = '回答を追加';
 $labels['editresponse'] = '回答を編集';
+$labels['editresponses'] = '回答を編集';
 $labels['responsename'] = '名前';
 $labels['responsetext'] = '回答の文章';
 $labels['attach'] = '添付';
@@ -214,6 +236,7 @@ $labels['upload'] = 'アップロード';
 $labels['uploadprogress'] = '$percent ($current / $total)';
 $labels['close']  = '閉じる';
 $labels['messageoptions']  = 'メッセージのオプション...';
+$labels['togglecomposeoptions'] = '作成のオプションを切り替え';
 $labels['low']     = '低';
 $labels['lowest']  = '最低';
 $labels['normal']  = '通常';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'アシスタント';
 $labels['spouse'] = '配偶者';
 $labels['allfields'] = 'すべての項目';
 $labels['search'] = '検索';
+$labels['searchresult'] = '検索の結果';
 $labels['advsearch'] = '高度な検索';
 $labels['advanced'] = '高度';
 $labels['other'] = 'その他';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'ホームページ';
 $labels['typeblog'] = 'ブログ';
 $labels['typeprofile'] = 'プロフィール';
 $labels['addfield'] = '項目を追加...';
-$labels['addcontact'] = '新しい連絡先を追加';
+$labels['addcontact'] = '連絡先を追加';
 $labels['editcontact'] = '連絡先を編集';
 $labels['contacts'] = '連絡先';
 $labels['contactproperties'] = '連絡先の属性';
+$labels['contactnameandorg'] = '名前と組織';
 $labels['personalinfo'] = '個人情報';
+$labels['contactphoto'] = '連絡先の写真';
 $labels['edit']   = '編集';
 $labels['cancel'] = '取り消し';
 $labels['save']   = '保存';
@@ -301,7 +327,7 @@ $labels['rename'] = '名前を変更';
 $labels['addphoto'] = '追加';
 $labels['replacephoto'] = '置き換え';
 $labels['uploadphoto'] = '写真をアップロード';
-$labels['newcontact']     = '新しい連絡先カードを作成';
+$labels['newcontact']     = '新しい連絡先を作成';
 $labels['deletecontact']  = '選択した連絡先を削除';
 $labels['composeto']      = 'この連絡先宛にメッセージを作成';
 $labels['contactsfromto'] = '$count件の連絡先の$from件目から$to件目';
@@ -310,10 +336,12 @@ $labels['export']         = 'エクスポート';
 $labels['exportall']      = 'すべてエクスポート';
 $labels['exportsel']      = '選択した連絡先をエクスポート';
 $labels['exportvcards']   = 'vCard形式でエクスポート';
-$labels['newcontactgroup'] = '連絡先グループを新しく作成';
+$labels['newcontactgroup']       = '新しいグループを作成';
+$labels['addgroup']       = 'グループを追加';
 $labels['grouprename']    = 'グループ名を変更';
 $labels['groupdelete']    = 'グループを削除';
 $labels['groupremoveselected'] = '選択した連絡先をグループから削除';
+$labels['uponelevel']     = '1つ上のレベル';
 $labels['previouspage']   = '前のページを表示';
 $labels['firstpage']      = '最初のページを表示';
 $labels['nextpage']       = '次のページを表示';
@@ -340,10 +368,10 @@ $labels['preferences'] = '設定';
 $labels['userpreferences'] = 'ユーザー設定';
 $labels['editpreferences'] = 'ユーザー設定を変更';
 $labels['identities'] = '識別情報';
-$labels['manageidentities'] = 'このアカウントの識別情報を管理';
-$labels['newidentity'] = '新しい識別情報';
-$labels['newitem'] = '新しい項目';
-$labels['edititem'] = '項目の編集';
+$labels['manageidentities'] = '識別情報を管理';
+$labels['newidentity'] = '新しい識別情報を作成';
+$labels['addidentity'] = '識別情報を追加';
+$labels['edititem'] = '識別情報を編集';
 $labels['preferhtml'] = 'HTMLを表示';
 $labels['defaultcharset'] = '初期設定の文字セット';
 $labels['htmlmessage'] = 'HTMLメッセージ';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'RFC 2231に完全準拠(Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231(MS Outlook)';
 $labels['2047folding'] = 'RFC 2047に完全準拠(その他)';
 $labels['force7bit'] = '8ビット文字列にMIMEエンコードを使用';
+$labels['savelocalstorage'] = "ブラウザのローカルストレージに(一時的に)保存";
 $labels['advancedoptions'] = '高度な設定';
+$labels['toggleadvancedoptions'] = '詳細なオプションの表示を切り替え';
 $labels['focusonnewmessage'] = '新しいメッセージが届いたらブラウザーをアクティブ';
 $labels['checkallfolders'] = 'すべてのフォルダーで新着メールを表示';
 $labels['displaynext'] = 'メッセージを削除や移動した後で次のメッセージを表示';
@@ -442,14 +472,14 @@ $labels['asattachment'] = '添付ファイル';
 $labels['replyallmode'] = '「全員に返信」ボタンの既定の動作';
 $labels['replyalldefault'] = '全員に返信';
 $labels['replyalllist'] = 'メーリングリスト(とわかれば)だけに返信';
-$labels['folder']  = 'フォルダー';
-$labels['folders']  = 'フォルダー';
-$labels['foldername']  = 'フォルダー名';
-$labels['subscribed']  = '購読済み';
+$labels['folder'] = 'フォルダー';
+$labels['folders'] = 'フォルダー';
+$labels['foldername'] = 'フォルダー名';
+$labels['subscribed'] = '購読済み';
 $labels['messagecount'] = 'メッセージ';
-$labels['create']  = '作成';
-$labels['createfolder']  = '新しいフォルダーを作成';
-$labels['managefolders']  = 'フォルダーを管理';
+$labels['create'] = '作成';
+$labels['createfolder'] = '新しいフォルダーを作成';
+$labels['managefolders'] = 'フォルダーを管理';
 $labels['specialfolders'] = '特殊なフォルダー';
 $labels['properties'] = '属性';
 $labels['folderproperties'] = 'フォルダーの属性';
@@ -459,9 +489,13 @@ $labels['info'] = '情報';
 $labels['getfoldersize'] = 'クリックしてフォルダーの大きさを取得';
 $labels['changesubscription'] = 'クリックして購読状態を変更';
 $labels['foldertype'] = 'フォルダーの種類';
-$labels['personalfolder']  = '個人フォルダー';
-$labels['otherfolder']  = '他のユーザーのフォルダー';
-$labels['sharedfolder']  = '公開フォルダー';
+$labels['personalfolder'] = '個人フォルダー';
+$labels['otherfolder'] = '他のユーザーのフォルダー';
+$labels['sharedfolder'] = '公開フォルダー';
+$labels['findfolders'] = 'フォルダーを探す';
+$labels['namespace.personal'] = '個人';
+$labels['namespace.other'] = '他のユーザー';
+$labels['namespace.shared'] = '共有した';
 $labels['sortby'] = '並べ替え';
 $labels['sortasc']  = '昇順で並べ替え';
 $labels['sortdesc'] = '降順で並べ替え';
@@ -494,4 +528,34 @@ $labels['vietnamese'] = 'ベトナム語';
 $labels['japanese'] = '日本語';
 $labels['korean'] = '韓国語';
 $labels['chinese'] = '中国語';
+$labels['arialabeltopnav'] = 'ウィンドウ制御';
+$labels['arialabeltasknav'] = 'アプリケーションのタスク';
+$labels['arialabeltoolbar'] = 'アプリケーションのツールバー';
+$labels['arialabelactivetask'] = '活動中のタスク';
+$labels['arialabelmessagessearchfilter'] = '電子メールの一覧のフィルター';
+$labels['arialabelmailsearchform'] = '電子メールの検索欄';
+$labels['arialabelcontactsearchform'] = '連絡先の検索欄';
+$labels['arialabelmailquicksearchbox'] = '電子メールの検索を入力';
+$labels['arialabelquicksearchbox'] = '検索を入力';
+$labels['arialabelfoldersearchfilter'] = 'フォルダーの一覧のフィルター';
+$labels['arialabelfoldersearchform'] = 'フォルダーの検索欄';
+$labels['arialabelfolderlist'] = '電子メールのフォルダーの選択';
+$labels['arialabelmessagelist'] = '電子メールのメッセージの一覧';
+$labels['arialabelmailpreviewframe'] = 'メッセージのプレビュー';
+$labels['arialabelmailboxmenu'] = 'フォルダーの操作メニュー';
+$labels['arialabellistselectmenu'] = '一覧の選択メニュー';
+$labels['arialabelthreadselectmenu'] = 'スレッドの一覧メニュー';
+$labels['arialabelmessagelistoptions'] = 'メッセージの一覧の表示と並べ替えのオプション';
+$labels['arialabelmailimportdialog'] = 'メッセージを取り込むダイアログ';
+$labels['arialabelmessagenav'] = 'メッセージのナビゲーション';
+$labels['arialabelmessagebody'] = 'メッセージの本文';
+$labels['arialabelmessageactions'] = 'メッセージの操作';
+$labels['arialabelcontactquicksearch'] = '連絡先の検索欄';
+$labels['arialabelcontactsearchbox'] = '連絡先を入力';
+$labels['arialabelmessageheaders'] = 'メッセージのヘッダー';
+$labels['arialabelforwardingoptions'] = '転送のオプション';
+$labels['arialabelreplyalloptions'] = '全員に返信のオプション';
+$labels['arialabelmoremessageactions'] = 'さらにメッセージを操作';
+$labels['arialabelmarkmessagesas'] = '選択したメッセージに次のマーク...';
+$labels['arialabelcomposeoptions'] = '作成のオプション';
 ?>
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index 1babab7a3..806dbc48d 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'セッションが正しくないか期限が切れ
 $messages['storageerror'] = 'IMAP サーバーへの接続に失敗しました。';
 $messages['servererror'] = 'サーバーでエラーです!';
 $messages['servererrormsg'] = 'サーバーエラー: $msg';
+$messages['connerror'] = '接続エラー(サーバーに到達できません)!';
 $messages['dberror'] = 'データベースのエラーです!';
+$messages['windowopenerror'] = 'ポップアップウィンドウがブロックされました!';
 $messages['requesttimedout'] = 'リクエストのタイムアウト';
 $messages['errorreadonly'] = '操作を実行できませんでした。フォルダーは読み込み専用です。';
 $messages['errornoperm'] = '操作を実行できませんでした。権限がありません。';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr件の連絡先が見つかりまし�
 $messages['searchnomatch'] = '一致するものが見つかりませんでした。';
 $messages['searching'] = '検索中...';
 $messages['checking'] = '確認中...';
+$messages['stillsearching'] = 'さらに検索中...';
 $messages['nospellerrors'] = 'スペルミスは見つかりませんでした。';
 $messages['folderdeleted'] = 'フォルダーを削除しました。';
 $messages['foldersubscribed'] = 'フォルダーを購読しました。';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = '$nr件のメッセージをインポート�
 $messages['importmessageerror'] = 'インポートできませんでした!  アップロードしたファイルは有効なメッセージやメールボックスのファイルではありません。';
 $messages['opnotpermitted'] = '許可されていない操作です。';
 $messages['nofromaddress'] = '選択している識別情報に電子メールアドレスが抜けています。';
-$messages['editorwarning'] = 'テキストエディターに切り替えると、すべての書式はなくなります。本当に続けますか?';
+$messages['editorwarning'] = 'エディターの種類を切り替えるとテキストの書式を失うかもしれません。本当に続けますか?';
 $messages['httpreceivedencrypterror'] = '致命的な設定エラーが発生しました。システム管理者に至急連絡してください。<b>メッセージを送信できません。</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): サーバーへの接続に失敗しました。';
 $messages['smtpautherror'] = 'SMTP Error ($code): 認証に失敗しました。';
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index b0ef05373..4bcc8c782 100644
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -91,7 +91,6 @@ $messages['importwait'] = 'გთხოვთ მოიცადოთ, მი�
 $messages['importconfirm'] = '<b>წარმატებით დასრულდა $inserted კონტაქტების შემოტანა, $skipped არსებულის გამოტოვება</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = 'ოპერაცია შეზღუდულია';
 $messages['nofromaddress'] = 'ელ–ფოსტის მისამართი გამოტოვებულია';
-$messages['editorwarning'] = 'რედაქტორის გადართვა ტექსტურ რეჟიმში გამოიწვევს არსებული ტექსტის ფორმატის დაკარგვას. გსურთ გაგრძელება?';
 $messages['httpreceivedencrypterror'] = 'სერვერზე მოხდა შეცდომა. დაუყონებლივ დაუკავშირდით ადმინისტრატორს. <b>თქვენი შეტყობინება შესაძლოა ვერ გაიგზავნა.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): სერვერთან დაკავშირება ვერ მოხერხდა';
 $messages['smtpautherror'] = 'SMTP Error ($code): ავტორიზაციის შეცდომა';
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index fdb43166d..09db808f6 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -27,12 +27,12 @@ $labels['addressbook'] = '주소록';
 $labels['inbox']  = '받은 편지함';
 $labels['drafts'] = '임시 보관함';
 $labels['sent']   = '보낸 편지함';
-$labels['trash']  = '휴지통';
+$labels['trash']  = '지운 편지함';
 $labels['junk']   = '스팸 편지함';
-$labels['show_real_foldernames'] = '특별 폴더에서 실제 이름 보이기';
+$labels['show_real_foldernames'] = '특수 폴더에서 실제 이름 표시';
 $labels['subject'] = '제목';
 $labels['from']    = '보내는 사람';
-$labels['sender']  = '발신인';
+$labels['sender']  = '발송자';
 $labels['to']      = '받는 사람';
 $labels['cc']      = '참조';
 $labels['bcc']     = '숨은 참조';
@@ -40,8 +40,8 @@ $labels['replyto'] = '회신 주소';
 $labels['followupto'] = '전달';
 $labels['date']    = '날짜';
 $labels['size']    = '크기';
-$labels['priority'] = '우선순위';
-$labels['organization'] = '기관';
+$labels['priority'] = '우선 순위';
+$labels['organization'] = '조직';
 $labels['readstatus'] = '읽음 상태';
 $labels['listoptions'] = '목록 옵션...';
 $labels['mailboxlist'] = '폴더';
@@ -51,12 +51,12 @@ $labels['messagenrof'] = '총 $count개 중  $nr 번째 메시지';
 $labels['fromtoshort'] = '총 $count개 중 $from 번째 - $to 번째';
 $labels['copy']     = '복사';
 $labels['move']     = '이동';
-$labels['moveto']   = '이동할 위치...';
-$labels['copyto']   = '복사 위치...';
+$labels['moveto']   = '다음 위치로 이동...';
+$labels['copyto']   = '다음 위치로 복사...';
 $labels['download'] = '다운로드';
 $labels['open']     = '열기';
 $labels['showattachment'] = '보기';
-$labels['showanyway'] = '그래도 항상 보기';
+$labels['showanyway'] = '그래도 항상 표시';
 $labels['filename'] = '파일명';
 $labels['filesize'] = '파일 크기';
 $labels['addtoaddressbook'] = '주소록에 추가';
@@ -100,12 +100,12 @@ $labels['longnov']	= '11월';
 $labels['longdec']	= '12월';
 $labels['today'] = '오늘';
 $labels['refresh']          = '새로 고침';
-$labels['checkmail']        = '새 메시지 확인';
-$labels['compose']          = '메시지 작성';
-$labels['writenewmessage']  = '새 메시지 생성';
+$labels['checkmail']        = '새로운 메시지 확인';
+$labels['compose']          = '작성';
+$labels['writenewmessage']  = '새로운 메시지 생성';
 $labels['reply']            = '회신';
-$labels['replytomessage']   = '발신인에게 회신';
-$labels['replytoallmessage'] = '목록 또는 발신인 및 모든 수신인에게 회신';
+$labels['replytomessage']   = '발송자에게 회신';
+$labels['replytoallmessage'] = '목록 또는 발송자 및 모든 수신자에게 회신';
 $labels['replyall']         = '전체 회신';
 $labels['replylist']        = '회신 목록';
 $labels['forward']          = '전달';
@@ -113,64 +113,77 @@ $labels['forwardinline']    = '본문 내용으로 전달';
 $labels['forwardattachment'] = '첨부파일로 전달';
 $labels['forwardmessage']   = '메시지 전달';
 $labels['deletemessage']    = '메시지 삭제';
-$labels['movemessagetotrash'] = '메시지를 휴지통으로 이동';
+$labels['movemessagetotrash'] = '메시지를 지운 편지함으로 이동';
 $labels['printmessage']     = '이 메시지 인쇄';
 $labels['previousmessage']  = '이전 메시지 보기';
-$labels['firstmessage']     = '처음 메시지 표시';
-$labels['nextmessage']      = '다음 메시지 표시';
-$labels['lastmessage']      = '마지막 메시지 표시';
+$labels['firstmessage']     = '처음 메시지 보기';
+$labels['nextmessage']      = '다음 메시지 보기';
+$labels['lastmessage']      = '마지막 메시지 보기';
 $labels['backtolist']       = '메일 목록으로 돌아가기';
 $labels['viewsource']       = '소스 보기';
 $labels['mark']             = '표시';
-$labels['markmessages']     = '메시지 표시하기';
+$labels['markmessages']     = '메시지 표시';
 $labels['markread']         = '읽음으로 표시';
 $labels['markunread']       = '읽지 않음으로 표시';
-$labels['markflagged']      = '깃발로 표시됨으로 표시';
-$labels['markunflagged']    = '깃발로 표시되지 않음으로 표시';
+$labels['markflagged']      = '깃발 추가';
+$labels['markunflagged']    = '깃발 제거';
 $labels['moreactions']      = '추가 동작...';
-$labels['more']             = '더보기';
+$labels['more']             = '더 보기';
 $labels['back']             = '뒤로';
 $labels['options']          = '옵션';
+$labels['first'] = '처음';
+$labels['last'] = '마지막';
+$labels['previous'] = '이전';
+$labels['next'] = '다음';
 $labels['select'] = '선택';
 $labels['all'] = '모두';
 $labels['none'] = '없음';
 $labels['currpage'] = '현재 페이지';
+$labels['isread'] = '읽음';
 $labels['unread'] = '읽지 않음';
-$labels['flagged'] = '깃발로 표시됨';
-$labels['unanswered'] = '답장하지 않음';
+$labels['flagged'] = '깃발 표시 있음';
+$labels['unflagged'] = '깃발 표시 없음';
+$labels['unanswered'] = '답변하지 않음';
 $labels['withattachment'] = '첨부파일 포함';
 $labels['deleted'] = '삭제됨';
 $labels['undeleted'] = '삭제되지 않음';
+$labels['replied'] = '회신됨';
+$labels['forwarded'] = '전달됨';
 $labels['invert'] = '반전';
 $labels['filter'] = '필터';
 $labels['list'] = '목록';
 $labels['threads'] = '스레드';
-$labels['expand-all'] = '모두 확장';
-$labels['expand-unread'] = '읽지 않은 메시지 확장';
+$labels['expand-all'] = '모두 펼치기';
+$labels['expand-unread'] = '읽지 않은 메시지 펼치기';
 $labels['collapse-all'] = '모두 접기';
-$labels['threaded'] = '스레드화됨';
-$labels['autoexpand_threads'] = '메시지 스레드 확장';
+$labels['threaded'] = '스레드로 표시함';
+$labels['autoexpand_threads'] = '메시지 스레드 펼치기';
 $labels['do_expand'] = '모든 스레드';
 $labels['expand_only_unread'] = '읽지 않은 메시지에만 적용';
 $labels['fromto'] = '보내는 사람/받는 사람';
-$labels['flag'] = '깃발로 표시';
+$labels['flag'] = '깃발 추가';
 $labels['attachment'] = '첨부파일';
 $labels['nonesort'] = '없음';
-$labels['sentdate'] = '발신일';
-$labels['arrival'] = '도착일';
+$labels['sentdate'] = '보낸 날짜';
+$labels['arrival'] = '받은 날짜';
 $labels['asc'] = '오름차순';
 $labels['desc'] = '내림차순';
-$labels['listcolumns'] = '열 목록 보기';
+$labels['listcolumns'] = '열 목록 표시';
 $labels['listsorting'] = '열 정렬';
-$labels['listorder'] = '정렬 순서';
-$labels['listmode'] = '화면 모드 목록 보기';
-$labels['folderactions'] = '폴더 명령';
-$labels['compact'] = '간단하게';
-$labels['empty'] = '비어 있음';
+$labels['listorder'] = '정렬 기준';
+$labels['listmode'] = '화면 모드 목록 표시';
+$labels['folderactions'] = '폴더 동작...';
+$labels['compact'] = '압축하기';
+$labels['empty'] = '비우기';
 $labels['importmessages'] = '메시지 가져오기';
 $labels['quota'] = '디스크 사용량';
 $labels['unknown']  = '알 수 없음';
-$labels['unlimited']  = '제한 없음';
+$labels['unlimited']  = '무제한';
+$labels['quotatype'] = '용량 제한 유형';
+$labels['quotatotal'] = '제한';
+$labels['quotaused'] = '사용됨';
+$labels['quotastorage'] = '디스크 공간';
+$labels['quotamessage'] = '메시지 계수';
 $labels['quicksearch']  = '빠른 검색';
 $labels['resetsearch']  = '검색 재설정';
 $labels['searchmod']  = '수정자 검색';
@@ -178,8 +191,12 @@ $labels['msgtext']  = '전체 메시지';
 $labels['body']  = '본문';
 $labels['type'] = '유형';
 $labels['namex'] = '이름';
+$labels['searchscope'] = '범위';
+$labels['currentfolder'] = '현재 폴더';
+$labels['subfolders'] = '이 폴더 및 하위 폴더';
+$labels['allfolders'] = '모든 폴더';
 $labels['openinextwin'] = '새 창에서 열기';
-$labels['emlsave'] = '다운로드(.eml)';
+$labels['emlsave'] = '다운로드 (.eml)';
 $labels['changeformattext'] = '메시지를 평문 형식으로 표시';
 $labels['changeformathtml'] = 'HTML 형식으로 표시';
 $labels['editasnew']      = '새 메시지로 편집';
@@ -192,40 +209,46 @@ $labels['editortype']     = '편집기 유형';
 $labels['returnreceipt']  = '수신 확인';
 $labels['dsn']            = '전송 상태 알림';
 $labels['mailreplyintro'] = '$date에 $sender이(가) 작성한 내용:';
-$labels['originalmessage'] = '원본 메세지';
+$labels['originalmessage'] = '원본 메시지';
+$labels['selectimage']    = '이미지 선택';
+$labels['addimage']       = '이미지 추가';
+$labels['selectmedia']    = '동영상 선택';
+$labels['addmedia']       = '동영상 추가';
 $labels['editidents']    = '신원 편집';
 $labels['spellcheck']    = '맞춤법';
-$labels['checkspelling'] = '맞춤법 검사하기';
-$labels['resumeediting'] = '편집 계속하기';
+$labels['checkspelling'] = '맞춤법 검사';
+$labels['resumeediting'] = '이어서 편집';
 $labels['revertto']      = '돌아가기';
 $labels['restore'] = '복구';
 $labels['restoremessage'] = '메시지를 복구할까요?';
 $labels['responses'] = '응답';
 $labels['insertresponse'] = '응답 삽입';
 $labels['manageresponses'] = '응답 관리';
-$labels['savenewresponse'] = '새로운 응답 저장';
-$labels['editresponses'] = '응답 편집';
+$labels['savenewresponse'] = '새 응답 생성';
+$labels['addresponse'] = '응답 추가';
 $labels['editresponse'] = '응답 편집';
+$labels['editresponses'] = '응답 편집';
 $labels['responsename'] = '이름';
 $labels['responsetext'] = '응답 텍스트';
 $labels['attach'] = '첨부';
 $labels['attachments'] = '첨부파일';
 $labels['upload'] = '업로드';
-$labels['uploadprogress'] = '$percent ($total개 중 $current개)';
+$labels['uploadprogress'] = '$percent (전체 $total 중 $current)';
 $labels['close']  = '닫기';
 $labels['messageoptions']  = '메시지 옵션...';
+$labels['togglecomposeoptions'] = '구성 옵션 표시/숨기기';
 $labels['low']     = '낮음';
 $labels['lowest']  = '가장 낮음';
 $labels['normal']  = '보통';
 $labels['high']    = '높음';
 $labels['highest'] = '가장 높음';
 $labels['nosubject']  = '(제목 없음)';
-$labels['showimages'] = '이미지 보기';
-$labels['alwaysshow'] = '$sender에서 수신된 이미지 항상 보기';
+$labels['showimages'] = '이미지 표시';
+$labels['alwaysshow'] = '$sender이(가) 보낸 이미지 항상 표시';
 $labels['isdraft']    = '이것은 작성 중인 메시지입니다.';
 $labels['andnmore']   = '$nr 더 보기...';
-$labels['togglemoreheaders'] = '메시지 헤더 더 보기';
-$labels['togglefullheaders'] = '원 메시지 헤더 표시/숨기기';
+$labels['togglemoreheaders'] = '메시지 머리글 더 보기';
+$labels['togglefullheaders'] = '원 메시지 머리글 표시/숨기기';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '일반 텍스트';
 $labels['savesentmessagein'] = '보낸 메시지를 다음 위치에 저장';
@@ -235,25 +258,25 @@ $labels['addcc'] = '참조 추가';
 $labels['addbcc'] = '숨은 참조 추가';
 $labels['addreplyto'] = '회신 주소 추가';
 $labels['addfollowupto'] = '전달 추가';
-$labels['mdnrequest'] = '이 메시지의 발신인이 사용자가 이 메시지를 읽었을 때 읽음 확인을 요청했습니다. 발신인에게 알리시겠습니까?';
+$labels['mdnrequest'] = '이 메시지의 발송자가 사용자가 이 메시지를 읽었을 때 읽음 확인을 요청했습니다. 발송자에게 알리시겠습니까?';
 $labels['receiptread'] = '수신 확인(읽음)';
 $labels['yourmessage'] = '이것은 사용자의 메시지에 대한 수신 확인입니다.';
-$labels['receiptnote'] = '참고: 이 수신 확인은 이 메시지가 수신인의 컴퓨터에 표시되었다는 것만을 의미합니다. 수신인이 메시지 내용을 읽었거나 이해했다는 보장은 없습니다.';
+$labels['receiptnote'] = '참고: 이 수신 확인은 이 메시지가 수신자의 컴퓨터에 표시되었다는 것만을 의미합니다. 수신자가 메시지 내용을 읽었거나 이해했다는 보장은 없습니다.';
 $labels['name']         = '표시명';
 $labels['firstname']    = '이름';
 $labels['surname']      = '성';
-$labels['middlename']   = '가운데 이름';
+$labels['middlename']   = '중간 이름';
 $labels['nameprefix']   = '접두사';
 $labels['namesuffix']   = '접미사';
 $labels['nickname']     = '별칭';
-$labels['jobtitle']     = '직위';
+$labels['jobtitle']     = '직책';
 $labels['department']   = '부서';
 $labels['gender']       = '성별';
-$labels['maidenname']   = '결혼 전 성';
+$labels['maidenname']   = '결혼 전의 성';
 $labels['email']        = '이메일';
 $labels['phone']        = '전화';
 $labels['address']      = '주소';
-$labels['street']       = '나머지 주소';
+$labels['street']       = '도로명';
 $labels['locality']     = '시/구/군';
 $labels['zipcode']      = '우편번호';
 $labels['region']       = '시/도';
@@ -270,6 +293,7 @@ $labels['assistant'] = '비서';
 $labels['spouse'] = '배우자';
 $labels['allfields'] = '모든 항목';
 $labels['search'] = '검색';
+$labels['searchresult'] = '검색 결과';
 $labels['advsearch'] = '고급 검색';
 $labels['advanced'] = '고급';
 $labels['other'] = '기타';
@@ -280,7 +304,7 @@ $labels['typemobile']  = '휴대전화';
 $labels['typemain']  = '대표';
 $labels['typehomefax']  = '자택 팩스';
 $labels['typeworkfax']  = '직장 팩스';
-$labels['typecar']  = '자동차';
+$labels['typecar']  = '차량';
 $labels['typepager']  = '호출기';
 $labels['typevideo']  = '동영상';
 $labels['typeassistant']  = '비서';
@@ -288,20 +312,22 @@ $labels['typehomepage']  = '홈페이지';
 $labels['typeblog'] = '블로그';
 $labels['typeprofile'] = '자기소개';
 $labels['addfield'] = '필드 추가..';
-$labels['addcontact'] = '새 연락처 추가';
+$labels['addcontact'] = '연락처 추가';
 $labels['editcontact'] = '연락처 편집';
 $labels['contacts'] = '연락처';
 $labels['contactproperties'] = '연락처 속성';
+$labels['contactnameandorg'] = '상호 및 조직';
 $labels['personalinfo'] = '개인 정보';
+$labels['contactphoto'] = '연락처 사진';
 $labels['edit']   = '편집';
 $labels['cancel'] = '취소';
 $labels['save']   = '저장';
 $labels['delete'] = '삭제';
 $labels['rename'] = '이름 변경';
 $labels['addphoto'] = '추가';
-$labels['replacephoto'] = '바꾸기';
+$labels['replacephoto'] = '변경';
 $labels['uploadphoto'] = '사진 업로드';
-$labels['newcontact']     = '새 연락처 카드 생성';
+$labels['newcontact']     = '새로운 연락처 생성';
 $labels['deletecontact']  = '선택한 연락처 삭제';
 $labels['composeto']      = '메일 작성 대상';
 $labels['contactsfromto'] = '총 $count개의 연락처 중 $from 번째부터 $to 번째 까지';
@@ -310,24 +336,26 @@ $labels['export']         = '내보내기';
 $labels['exportall']      = '모두 내보내기';
 $labels['exportsel']      = '선택한 항목 내보내기';
 $labels['exportvcards']   = '연락처를 vCard 형식으로 내보내기';
-$labels['newcontactgroup'] = '새 연락처 그룹 생성';
+$labels['newcontactgroup']       = '새 그룹 생성';
+$labels['addgroup']       = '그룹 추가';
 $labels['grouprename']    = '그룹명 변경';
 $labels['groupdelete']    = '그룹 삭제';
-$labels['groupremoveselected'] = '그룹에서 선택한 연락처 제거';
+$labels['groupremoveselected'] = '선택한 연락처를 그룹에서 제거';
+$labels['uponelevel']     = '한 단계 상위 이동';
 $labels['previouspage']   = '이전 페이지 보기';
 $labels['firstpage']      = '처음 페이지 보기';
 $labels['nextpage']       = '다음 페이지 보기';
 $labels['lastpage']       = '마지막 페이지 보기';
 $labels['group'] = '그룹';
 $labels['groups'] = '그룹';
-$labels['listgroup'] = '그룹 구성원 목록 보기';
+$labels['listgroup'] = '그룹 구성원 목록 표시';
 $labels['personaladrbook'] = '개인 주소';
 $labels['searchsave'] = '검색 저장';
 $labels['searchdelete'] = '검색 삭제';
 $labels['import'] = '가져오기';
 $labels['importcontacts'] = '연락처 가져오기';
 $labels['importfromfile'] = '파일에서 가져오기:';
-$labels['importtarget'] = '연락처 추가 위치';
+$labels['importtarget'] = '연락처를 추가할 위치';
 $labels['importreplace'] = '전체 주소록을 바꾸기';
 $labels['importgroups'] = '그룹 할당 가져오기';
 $labels['importgroupsall'] = '전체 (필요에 따라 그룹 생성)';
@@ -340,10 +368,10 @@ $labels['preferences'] = '환경설정';
 $labels['userpreferences'] = '사용자 환경설정';
 $labels['editpreferences'] = '사용자 환경설정 편집';
 $labels['identities'] = '신원';
-$labels['manageidentities'] = '이 계정의 신원 관리';
-$labels['newidentity'] = '새 신원';
-$labels['newitem'] = '새 항목';
-$labels['edititem'] = '항목 편집';
+$labels['manageidentities'] = '신원 관리';
+$labels['newidentity'] = '새로운 신원 생성';
+$labels['addidentity'] = '신원 추가';
+$labels['edititem'] = '신원 편집';
 $labels['preferhtml'] = 'HTML 표시';
 $labels['defaultcharset'] = '기본 인코딩';
 $labels['htmlmessage'] = 'HTML 메시지';
@@ -351,12 +379,12 @@ $labels['messagepart'] = '부분';
 $labels['digitalsig'] = '디지털 서명';
 $labels['dateformat'] = '날짜 형식';
 $labels['timeformat'] = '시간 형식';
-$labels['prettydate'] = '간결한 날짜';
-$labels['setdefault']  = '기본 설정';
+$labels['prettydate'] = '요일 및 시간으로 날짜 표시';
+$labels['setdefault']  = '기본 값으로 설정';
 $labels['autodetect']  = '자동';
 $labels['language']  = '언어';
 $labels['timezone']  = '시간대';
-$labels['pagesize']  = '페이지당 행 수';
+$labels['pagesize']  = '페이지당 행 개수';
 $labels['signature'] = '서명';
 $labels['dstactive']  = '일광 절약 시간';
 $labels['showinextwin'] = '메시지를 새 창에서 열기';
@@ -365,42 +393,44 @@ $labels['htmleditor'] = 'HTML 메시지 작성';
 $labels['htmlonreply'] = 'HTML 메시지 회신 시';
 $labels['htmlonreplyandforward'] = '전달 또는 HTML 메시지 회신 시';
 $labels['htmlsignature'] = 'HTML 서명';
-$labels['showemail'] = '이메일 주소를 표시 이름과 함께 보기';
-$labels['previewpane'] = '미리보기 창 보기';
+$labels['showemail'] = '이메일 주소를 표시 이름과 함께 표시';
+$labels['previewpane'] = '미리 보기 창 보기';
 $labels['skin'] = '인터페이스 스킨';
 $labels['logoutclear'] = '로그아웃할 때 휴지통 비우기';
 $labels['logoutcompact'] = '로그아웃할 때 받은 편지함 압축하기';
 $labels['uisettings'] = '사용자 인터페이스';
 $labels['serversettings'] = '서버 설정';
 $labels['mailboxview'] = '편지함 화면';
-$labels['mdnrequests'] = '수신 확인 요청 시';
+$labels['mdnrequests'] = '읽음 확인 요청 시';
 $labels['askuser'] = '사용자에게 물어봄';
-$labels['autosend'] = '수신 확인 보내기';
-$labels['autosendknown'] = '내 연락처에 수신 확인 요청을 보냄, 아닐 경우 물어봄';
-$labels['autosendknownignore'] = '내 연락처에 수신 확인 요청을 보냄, 아닐 경우 무시함';
-$labels['ignore'] = '무시함';
+$labels['autosend'] = '읽음 확인 요청';
+$labels['autosendknown'] = '내 연락처에 읽음 확인을 요청하고, 내 연락처가 아닐 경우 물어봄';
+$labels['autosendknownignore'] = '내 연락처에 읽음 확인을 요청하고, 내 연락처가 아닐 경우 무시함';
+$labels['ignore'] = '무시';
 $labels['readwhendeleted'] = '삭제 시 메시지를 읽음으로 표시';
-$labels['flagfordeletion'] = '삭제 대신 삭제 대상 메시지를 깃발로 표시';
-$labels['skipdeleted'] = '삭제된 메시지 보지 않기';
-$labels['deletealways'] = '메시지를 휴지통으로 이동하는 작업에 실패할 경우 삭제';
-$labels['deletejunk'] = '스팸 메일함에 있는 메시지를 바로 삭제';
-$labels['showremoteimages'] = '본문 내용의 원격 이미지 표시';
-$labels['fromknownsenders'] = '알려진 발신인으로부터 받은 메시지만';
+$labels['flagfordeletion'] = '삭제 대신 삭제 대상 메시지에 깃발 추가';
+$labels['skipdeleted'] = '삭제된 메시지 숨기기';
+$labels['deletealways'] = '지운 편지함으로 메시지 이동이 실패할 경우, 삭제';
+$labels['deletejunk'] = '스팸 메일함에 있는 메시지를 직접 삭제';
+$labels['showremoteimages'] = '본문에 원격 이미지 표시';
+$labels['fromknownsenders'] = '알려진 발송자로부터 받은 메시지만';
 $labels['always'] = '항상';
 $labels['showinlineimages'] = '메시지 하단에 첨부 이미지 표시';
 $labels['autosavedraft']  = '작성 중인 메시지를 자동으로 저장';
-$labels['everynminutes']  = '매 $n분 마다';
-$labels['refreshinterval']  = '새로 고침 (새 메시지 확인, 기타 등등)';
+$labels['everynminutes']  = '$n분 마다';
+$labels['refreshinterval']  = '새로 고침 (새로운 메시지 확인, 기타 등등)';
 $labels['never']  = '하지 않음';
 $labels['immediately']  = '즉시';
-$labels['messagesdisplaying'] = '메시지 보기';
+$labels['messagesdisplaying'] = '메시지 표시';
 $labels['messagescomposition'] = '메시지 작성';
 $labels['mimeparamfolding'] = '첨부파일명';
 $labels['2231folding'] = 'Full RFC 2231 (선더버드)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS 아웃룩)';
 $labels['2047folding'] = 'Full RFC 2047 (기타)';
 $labels['force7bit'] = '8-bit 문자에 MIME 인코딩 사용';
+$labels['savelocalstorage'] = "브라우저의 로컬 저장소에 저장 (임시)";
 $labels['advancedoptions'] = '고급 옵션';
+$labels['toggleadvancedoptions'] = '고급 옵션 표시/숨기기';
 $labels['focusonnewmessage'] = '새 메시지가 있을 경우 브라우저 창으로 포커스 이동';
 $labels['checkallfolders'] = '모든 폴더에서 새 메시지 확인';
 $labels['displaynext'] = '메시지 삭제/이동 후 다음 메시지 표시';
@@ -409,24 +439,24 @@ $labels['mainoptions'] = '주요 옵션';
 $labels['browseroptions'] = '브라우저 옵션';
 $labels['section'] = '섹션';
 $labels['maintenance'] = '유지관리';
-$labels['newmessage'] = '새 메시지';
+$labels['newmessage'] = '새로운 메시지';
 $labels['signatureoptions'] = '서명 옵션';
 $labels['whenreplying'] = '회신 시';
 $labels['replyempty'] = '원문 메시지를 인용하지 않음';
-$labels['replytopposting'] = '새 메시지를 인용문 상단에서 시작';
-$labels['replybottomposting'] = '새 메시지를 인용문 하단에서 시작';
+$labels['replytopposting'] = '새로운 메시지를 인용문 상단에서 시작';
+$labels['replybottomposting'] = '새로운 메시지를 인용문 하단에서 시작';
 $labels['replyremovesignature'] = '회신 시 메시지에서 원문 서명을 제거';
-$labels['autoaddsignature'] = '서명 자동으로 추가';
+$labels['autoaddsignature'] = '서명을 자동으로 추가';
 $labels['newmessageonly'] = '새로운 메시지에만';
 $labels['replyandforwardonly'] = '회신 및 전달 시에만';
 $labels['insertsignature'] = '서명 삽입';
 $labels['previewpanemarkread']  = '미리 본 메시지를 읽음으로 표시';
 $labels['afternseconds']  = '$n초 후';
-$labels['reqmdn'] = '수신 확인을 항상 요청';
+$labels['reqmdn'] = '읽음 확인을 항상 요청';
 $labels['reqdsn'] = '전송 상태 알림을 항상 요청';
 $labels['replysamefolder'] = ' 회신 메시지를 회신 대상 메시지의 폴더로 이동';
 $labels['defaultabook'] = '기본 주소록';
-$labels['autocompletesingle'] = '자동완성에서 대체 이메일 주소를 건너뜀';
+$labels['autocompletesingle'] = '자동 완성에서 대체 이메일 주소를 건너뜀';
 $labels['listnamedisplay'] = '연락처 정렬 방식';
 $labels['spellcheckbeforesend'] = '메시지를 보내기 전에 맞춤법 검사';
 $labels['spellcheckoptions'] = '맞춤법 검사 옵션';
@@ -441,15 +471,15 @@ $labels['inline'] = '본문 내용으로';
 $labels['asattachment'] = '첨부파일로';
 $labels['replyallmode'] = '[전체 회신] 버튼의 기본 동작';
 $labels['replyalldefault'] = '전체 회신';
-$labels['replyalllist'] = '발송목록에만 회신(찾았을 경우)';
-$labels['folder']  = '폴더';
-$labels['folders']  = '폴더';
-$labels['foldername']  = '폴더명';
-$labels['subscribed']  = '구독함';
+$labels['replyalllist'] = '발송 목록에만 회신(찾았을 경우)';
+$labels['folder'] = '폴더';
+$labels['folders'] = '폴더';
+$labels['foldername'] = '폴더명';
+$labels['subscribed'] = '구독함';
 $labels['messagecount'] = '메시지';
-$labels['create']  = '생성';
-$labels['createfolder']  = '새 폴더 생성';
-$labels['managefolders']  = '폴더 관리';
+$labels['create'] = '생성';
+$labels['createfolder'] = '새 폴더 생성';
+$labels['managefolders'] = '폴더 관리';
 $labels['specialfolders'] = '특수 폴더';
 $labels['properties'] = '속성';
 $labels['folderproperties'] = '폴더 속성';
@@ -459,9 +489,13 @@ $labels['info'] = '정보';
 $labels['getfoldersize'] = '폴더 크기를 확인하려면 클릭하세요';
 $labels['changesubscription'] = '구독을 변경하려면 클릭하세요';
 $labels['foldertype'] = '폴더 유형';
-$labels['personalfolder']  = '개인 폴더';
-$labels['otherfolder']  = '다른 사용자의 폴더';
-$labels['sharedfolder']  = '공유 폴더';
+$labels['personalfolder'] = '개인 폴더';
+$labels['otherfolder'] = '다른 사용자의 폴더';
+$labels['sharedfolder'] = '공유 폴더';
+$labels['findfolders'] = '폴더 찾기';
+$labels['namespace.personal'] = '개인';
+$labels['namespace.other'] = '기타 사용자';
+$labels['namespace.shared'] = '공유됨';
 $labels['sortby'] = '정렬 방식';
 $labels['sortasc']  = '오름차순으로 정렬';
 $labels['sortdesc'] = '내림차순으로 정렬';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = '베트남어';
 $labels['japanese'] = '일본어';
 $labels['korean'] = '한국어';
 $labels['chinese'] = '중국어';
+$labels['arialabeltopnav'] = '창 제어';
+$labels['arialabeltasknav'] = '응용 프로그램 작업';
+$labels['arialabeltoolbar'] = '응용 프로그램 툴바';
+$labels['arialabelactivetask'] = '활성화된 작업';
+$labels['arialabelmessagessearchfilter'] = '이메일 목록 필터';
+$labels['arialabelmailsearchform'] = '이메일 메시지 검색 양식';
+$labels['arialabelcontactsearchform'] = '연락처 검색 양식';
+$labels['arialabelmailquicksearchbox'] = '이메일 검색 입력';
+$labels['arialabelquicksearchbox'] = '검색 입력';
+$labels['arialabelfoldersearchfilter'] = '폴더 목록 필터';
+$labels['arialabelfoldersearchform'] = '폴터 검색 양식';
+$labels['arialabelfolderlist'] = '이메일 폴더 선택';
+$labels['arialabelmessagelist'] = '이메일 메시지 목록';
+$labels['arialabelmailpreviewframe'] = '메시지 미리 보기';
+$labels['arialabelmailboxmenu'] = '폴더 동작 메뉴';
+$labels['arialabellistselectmenu'] = '목록 선택 메뉴';
+$labels['arialabelthreadselectmenu'] = '스레드 목록 메뉴';
+$labels['arialabelmessagelistoptions'] = '메시지 목록 표시 및 정렬 옵션';
+$labels['arialabelmailimportdialog'] = '메시지 가져오기 대화';
+$labels['arialabelmessagenav'] = '메시지 탐색';
+$labels['arialabelmessagebody'] = '메시지 본문';
+$labels['arialabelmessageactions'] = '메시지 동작';
+$labels['arialabelcontactquicksearch'] = '연락처 검색 양식';
+$labels['arialabelcontactsearchbox'] = '연락처 검색 입력';
+$labels['arialabelmessageheaders'] = '메시지 머리글';
+$labels['arialabelforwardingoptions'] = '전달 옵션';
+$labels['arialabelreplyalloptions'] = '전체 회신 옵션';
+$labels['arialabelmoremessageactions'] = '추가 메시지 동작';
+$labels['arialabelmarkmessagesas'] = '선택한 메시지를 다음으로 표시..';
+$labels['arialabelcomposeoptions'] = '작성 옵션';
+$labels['arialabelresponsesmenu'] = '저장된 응답 메뉴';
+$labels['arialabelattachmentuploadform'] = '첨부파일 업로드 양식';
+$labels['arialabelattachmentpreview'] = '첨부파일 미리 보기';
+$labels['ariasummarycomposecontacts'] = '수신자로 선택할 연락처 및 그룹 목록';
+$labels['arialabelcontactexportoptions'] = '연락처 내보내기 옵션';
+$labels['arialabelabookgroupoptions'] = '주소록/그룹 옵션';
+$labels['arialabelpreferencesform'] = '환경 설정 양식';
+$labels['arialabelidentityeditfrom'] = '신원 편집 양식';
+$labels['arialabelresonseeditfrom'] = '응답 편집 양식';
+$labels['arialabelsearchterms'] = '검색 용어';
+$labels['helplistnavigation'] = '목록 키보드 탐색';
+$labels['helplistkeyboardnavigation'] = "상/하 화살표: 행 포커스/선택 이동
+Space: 포커스된 행 선택
+Shift + 상/하 화살표: 위/아래 행을 추가적으로 선택
+Ctrl + Space: 포커스된 행을 선택/제거 대상 선택에서 추가";
+$labels['helplistkeyboardnavmessages'] = "상/하 화살표: 메시지 스레드 펼치기/접기(오직 타래글 모드에서)
+Enter: 선택한/포커스된 메시지 열기
+Delete: 선택한 메시지를 지운 편지함으로 이동";
+$labels['helplistkeyboardnavcontacts'] = "Enter: 선택한/포커스된 연락처 열기";
 ?>
diff --git a/program/localization/ko_KR/messages.inc b/program/localization/ko_KR/messages.inc
index 3c7060c59..a7add0903 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -15,164 +15,167 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-$messages['errortitle']  = '오류가 발생하였음!';
-$messages['loginfailed']  = '로그인이 실패하였습니다.';
-$messages['cookiesdisabled'] = '브라우저가 쿠키를 지원하지 않습니다.';
-$messages['sessionerror'] = '세션이 유효하지 않거나 종료되었습니다.';
-$messages['storageerror'] = 'IMAP 서버 연결 실패';
+$messages['errortitle']  = '오류가 발생했습니다!';
+$messages['loginfailed']  = '로그인이 실패했습니다.';
+$messages['cookiesdisabled'] = '브라우저가 쿠키를 허용하지 않습니다.';
+$messages['sessionerror'] = '세션이 유효하지 않거나 만료되었습니다.';
+$messages['storageerror'] = '저장소 서버에 연결을 실패했습니다.';
 $messages['servererror'] = '서버 오류!';
 $messages['servererrormsg'] = '서버 오류: $msg';
+$messages['connerror'] = '연결 오류(서버 접속 실패)!';
 $messages['dberror'] = '데이터베이스 오류!';
-$messages['requesttimedout'] = '요청 시간 초과';
-$messages['errorreadonly'] = '명령을 수행할 수 없습니다. 읽기 전용 폴더임.';
-$messages['errornoperm'] = '명령을 수행할 수 없습니다. 권한이 거부됨.';
-$messages['erroroverquota'] = '작업을 수행할 수 없음. 여유 디스크 공간이 없음.';
-$messages['erroroverquotadelete'] = '여유 디스크 공간이 없음. SHIFT-DEL을 이용하여 메시지를 삭제하십시오.';
-$messages['invalidrequest'] = '잘못된 요청! 데이터가 저장되지 않았음.';
+$messages['windowopenerror'] = '팝업 창이 차단되었습니다!';
+$messages['requesttimedout'] = '요청 시간을 초과함';
+$messages['errorreadonly'] = '작업을 수행할 수 없습니다. 폴더가 읽기 전용입니다.';
+$messages['errornoperm'] = '작업을 수행할 수 없습니다. 권한이 거부되었습니다.';
+$messages['erroroverquota'] = '작업을 수행할 수 없습니다. 여유 디스크 공간이 없습니다.';
+$messages['erroroverquotadelete'] = '여유 디스크 공간이 없습니다. SHIFT-DEL을 이용하여 메시지를 삭제하세요.';
+$messages['invalidrequest'] = '잘못된 요청입니다! 데이터가 저장되지 않았습니다.';
 $messages['invalidhost'] = '잘못된 서버 이름입니다.';
-$messages['nomessagesfound'] = '이 메일함에서 메일을 찾지 못했음.';
-$messages['loggedout'] = '세션을 성공적으로 종료하였습니다. 안녕히 가세요!';
-$messages['mailboxempty'] = '메일함이 비어있음';
+$messages['nomessagesfound'] = '이 편지함에서 메시지를 발견하지 못했습니다.';
+$messages['loggedout'] = '세션을 성공적으로 종료했습니다. 안녕히 가세요!';
+$messages['mailboxempty'] = '편지함이 비어있음';
 $messages['nomessages'] = '메시지가 없음';
 $messages['refreshing'] = '새로 고치는 중 ...';
 $messages['loading'] = '불러오는 중...';
 $messages['uploading'] = '파일을 업로드하는 중...';
 $messages['uploadingmany'] = '파일을 업로드하는 중...';
 $messages['loadingdata'] = '데이터를 불러오는 중...';
-$messages['checkingmail'] = '새 메시지를 확인하는 중...';
+$messages['checkingmail'] = '새로운 메시지를 확인하는 중...';
 $messages['sendingmessage'] = '메시지를 보내는 중...';
 $messages['messagesent'] = '메시지를 성공적으로 보냈습니다.';
 $messages['savingmessage'] = '메시지를 저장하는 중...';
 $messages['messagesaved'] = '메시지가 임시 보관함에 저장되었습니다.';
-$messages['successfullysaved'] = '성공적으로 저장됨.';
+$messages['successfullysaved'] = '성공적으로 저장되었습니다.';
 $messages['savingresponse'] = '응답 문구를 저장하는 중...';
 $messages['deleteresponseconfirm'] = '정말로 이 응답 문구를 삭제하시겠습니까?';
 $messages['addedsuccessfully'] = '연락처가 주소록에 성공적으로 추가되었습니다.';
 $messages['contactexists'] = '연락처에 동일한 이메일 주소가 이미 존재합니다.';
 $messages['contactnameexists'] = '연락처에 동일한 이름이 이미 존재합니다.';
-$messages['blockedimages'] = '보안을 위해, 이 메시지의 외부 이미지를 차단하였습니다.';
+$messages['blockedimages'] = '개인 정보 보호를 위해, 이 메시지의 외부 이미지가 차단되었습니다.';
 $messages['encryptedmessage'] = '이것은 암호화된 메시지며 표시할 수 없습니다. 죄송합니다!';
-$messages['nocontactsfound'] = '연락처를 찾을 수 없었음.';
+$messages['nocontactsfound'] = '연락처를 발견하지 못했습니다.';
 $messages['contactnotfound'] = '요청한 연락처를 찾을 수 없었습니다.';
 $messages['contactsearchonly'] = '연락처를 찾기 위해 일부 검색용어를 입력하세요.';
-$messages['sendingfailed'] = '메시지 보내기를 실패하였음.';
-$messages['senttooquickly'] = '이 메시지를 보내기 전에 $sec초 동안 기다리세요.';
-$messages['errorsavingsent'] = '보낸 메시지를 저장하는 중 오류가 발생하였음.';
-$messages['errorsaving'] = '저장하는 중 오류가 발생하였음.';
-$messages['errormoving'] = '메시지를 이동할 수 없었음.';
-$messages['errorcopying'] = '메시지를 복사할 수 없었음.';
-$messages['errordeleting'] = '메시지를 삭제할 수 없었음.';
-$messages['errormarking'] = '메시지를 표시할 수 없었음.';
+$messages['sendingfailed'] = '메시지 발송을 실패했습니다.';
+$messages['senttooquickly'] = '이 메시지를 보내기 전에 $sec초 동안 기다려주세요.';
+$messages['errorsavingsent'] = '보낸 메시지를 저장하는 도중 오류가 발생했습니다.';
+$messages['errorsaving'] = '저장하는 동안 오류가 발생했습니다.';
+$messages['errormoving'] = '메시지를 이동할 수 없었습니다.';
+$messages['errorcopying'] = '메시지를 복사할 수 없었습니다.';
+$messages['errordeleting'] = '메시지를 삭제할 수 없었습니다.';
+$messages['errormarking'] = '메시지를 표시할 수 없었습니다.';
 $messages['deletecontactconfirm']  = '정말 선택한 연락처를 삭제하시겠습니까?';
 $messages['deletegroupconfirm']  = '정말로 선택한 그룹을 삭제하시겠습니까?';
 $messages['deletemessagesconfirm'] = '정말로 선택한 메시지를 삭제하시겠습니까?';
 $messages['deletefolderconfirm']  = '정말로 이 폴더를 삭제하시겠습니까?';
 $messages['purgefolderconfirm']  = '정말로 이 폴더의 모든 메시지를 삭제하시겠습니까?';
-$messages['contactdeleting'] = '연락처 삭제 중...';
-$messages['groupdeleting'] = '그룹 삭제 중...';
+$messages['contactdeleting'] = '연락처를 삭제하는 중...';
+$messages['groupdeleting'] = '그룹을 삭제하는 중...';
 $messages['folderdeleting'] = '폴더를 삭제하는 중...';
 $messages['foldermoving'] = '폴더를 이동하는 중...';
 $messages['foldersubscribing'] = '폴더를 구독하는 중...';
-$messages['folderunsubscribing'] = '폴더의 구독을 취소하는 중...';
-$messages['formincomplete'] = '양식을 완전히 작성되지 않았습니다.';
-$messages['noemailwarning'] = '유효한 이메일 주소를 입력하시기 바랍니다.';
-$messages['nonamewarning']  = '이름을 입력하시기 바랍니다.';
-$messages['nopagesizewarning'] = '페이지 크기를 입력하시기 바랍니다.';
-$messages['nosenderwarning'] = '발신인 이메일 주소를 입력하시기 바랍니다.';
-$messages['norecipientwarning'] = '최소 한 명 이상의 수신인을 입력하시기 바랍니다.';
+$messages['folderunsubscribing'] = '폴더 구독을 취소하는 중...';
+$messages['formincomplete'] = '양식이 완전히 작성되지 않았습니다.';
+$messages['noemailwarning'] = '유효한 이메일 주소를 입력해주세요.';
+$messages['nonamewarning']  = '이름을 입력해주세요.';
+$messages['nopagesizewarning'] = '페이지 크기를 입력해주세요.';
+$messages['nosenderwarning'] = '발송자 이메일 주소를 입력해주세요.';
+$messages['norecipientwarning'] = '한 명 이상의 수신자를 입력해주세요.';
 $messages['nosubjectwarning']  = '"제목" 필드가 비어있습니다. 지금 입력하시겠습니까?';
-$messages['nobodywarning'] = '텍스트가 없는 메시지를 보내시겠습니까?';
+$messages['nobodywarning'] = '내용 없는 메시지를 보내시겠습니까?';
 $messages['notsentwarning'] = '메시지를 보내지 못했습니다. 메시지를 폐기하시겠습니까?';
-$messages['restoresavedcomposedata'] = '이전에 작성했지만 보내지 않은 메시지를 찾았습니다.\n\nSubject: $subject\nSaved: $date\n\n이 메시지를 복구하시겠습니까?';
-$messages['noldapserver'] = '검색할 LDAP 서버를 선택하시기 바랍니다.';
-$messages['nosearchname'] = '연락처명이나 이메일 주소를 입력하시기 바랍니다.';
-$messages['notuploadedwarning'] = '아직 모든 첨부가 업로드되지 않았습니다. 기다리거나 업로드를 취소하시기 바랍니다.';
-$messages['searchsuccessful'] = '$nr개의 메시지를 찾았음.';
-$messages['contactsearchsuccessful'] = '$nr개의 연락처를 찾았음.';
-$messages['searchnomatch'] = '검색이 일치 항목을 찾지 못함.';
-$messages['searching'] = '검색 중...';
-$messages['checking'] = '확인 중...';
-$messages['nospellerrors'] = '맞춤법 오류를 찾지 못했음.';
-$messages['folderdeleted'] = '폴더를 성공적으로 삭제함.';
-$messages['foldersubscribed'] = '폴더를 성공적으로 구독함.';
-$messages['folderunsubscribed'] = '폴더를 성공적으로 구독 취소함.';
+$messages['restoresavedcomposedata'] = '이전에 작성했으나 보내지 않은 메시지가 발견됐습니다.\n\nSubject: $subject\nSaved: $date\n\n이 메시지를 복구하시겠습니까?';
+$messages['noldapserver'] = '검색할 LDAP 서버를 선택해주세요.';
+$messages['nosearchname'] = '연락처명이나 이메일 주소를 입력해주세요.';
+$messages['notuploadedwarning'] = '아직 모든 첨부가 업로드되지 않았습니다. 기다리거나 업로드를 취소해주세요.';
+$messages['searchsuccessful'] = '$nr개의 메시지를 찾았습니다.';
+$messages['contactsearchsuccessful'] = '$nr개의 연락처를 찾았습니다.';
+$messages['searchnomatch'] = '검색이 일치하는 항목을 발견하지 못했습니다.';
+$messages['searching'] = '검색하는 중...';
+$messages['checking'] = '확인하는 중...';
+$messages['stillsearching'] = '아직도 검색하는 중...';
+$messages['nospellerrors'] = '맞춤법 오류가 발견되지 않았습니다.';
+$messages['folderdeleted'] = '폴더가 성공적으로 삭제되었습니다.';
+$messages['foldersubscribed'] = '폴더를 성공적으로 구독했습니다.';
+$messages['folderunsubscribed'] = '폴더 구독을 성공적으로 취소했습니다.';
 $messages['folderpurged'] = '폴더를 성공적으로 비웠습니다.';
-$messages['folderexpunged'] = '폴더를 성공적으로 압축하였습니다.';
-$messages['deletedsuccessfully'] = '성공적으로 삭제함.';
-$messages['converting'] = '서식 설정 삭제 중...';
-$messages['messageopenerror'] = '서버에서 메시지를 불러올 수 없었음.';
-$messages['fileuploaderror'] = '파일 업로드를 실패함.';
-$messages['filesizeerror'] = '업로드된 파일이 최대 크기인 $size를 초과하였습니다.';
+$messages['folderexpunged'] = '폴더가 성공적으로 압축되었습니다.';
+$messages['deletedsuccessfully'] = '성공적으로 삭제되었습니다.';
+$messages['converting'] = '서식 설정 삭제하는 중...';
+$messages['messageopenerror'] = '서버에서 메시지를 불러올 수 없었습니다.';
+$messages['fileuploaderror'] = '파일 업로드를 실패했습니다.';
+$messages['filesizeerror'] = '업로드한 파일이 최대 크기인 $size를 초과했습니다.';
 $messages['copysuccess'] = '$nr개의 연락처를 성공적으로 복사함';
-$messages['movesuccess'] = '$nr개의 연락처를 성공적으로 이동함';
-$messages['copyerror'] = '전체 연락처를 복사할 수 없없음';
-$messages['moveerror'] = '전체 연락처를 이동할 수 없었음';
-$messages['sourceisreadonly'] = '이 주소의 소스는 읽기 전용입니다.';
-$messages['errorsavingcontact'] = '연락처의 주소를 저장할 수 없었음.';
+$messages['movesuccess'] = '$nr개의 연락처가 성공적으로 이동되었습니다.';
+$messages['copyerror'] = '모든 연락처를 복사할 수 없었습니다.';
+$messages['moveerror'] = '모든 연락처를 이동할 수 없었습니다.';
+$messages['sourceisreadonly'] = '이 주소 소스는 읽기 전용입니다.';
+$messages['errorsavingcontact'] = '연락처 주소를 저장할 수 없었습니다.';
 $messages['movingmessage'] = '메시지를 이동하는 중...';
-$messages['copyingmessage'] = '메시지 복사하는 중...';
-$messages['copyingcontact'] = '연락처 복사하는 중...';
-$messages['movingcontact'] = '연락처 이동 중...';
-$messages['deletingmessage'] = '메시지 삭제하는 중...';
-$messages['markingmessage'] = '메시지에 표시하는 중...';
-$messages['addingmember'] = '그룹에 연락처를 추가하는 중...';
-$messages['removingmember'] = '그룹에서 연락처를 삭제하는 중...';
-$messages['receiptsent'] = '읽음 확인을 성공적으로 보냈음.';
-$messages['errorsendingreceipt'] = '읽음 확인을 보낼 수 없었음.';
-$messages['deleteidentityconfirm'] = '이 항목을 정말로 삭제 하시겠습니까?';
-$messages['nodeletelastidentity'] = '이 신원은 마지막 하나이므로 삭제할 수 없습니다.';
+$messages['copyingmessage'] = '메시지를 복사하는 중...';
+$messages['copyingcontact'] = '연락처를 복사하는 중...';
+$messages['movingcontact'] = '연락처를 이동하는 중...';
+$messages['deletingmessage'] = '메시지를 삭제하는 중...';
+$messages['markingmessage'] = '메시지를 표시하는 중...';
+$messages['addingmember'] = '연락처를 그룹에 추가하는 중...';
+$messages['removingmember'] = '연락처를 그룹에서 삭제하는 중...';
+$messages['receiptsent'] = '읽음 확인을 성공적으로 보냈습니다.';
+$messages['errorsendingreceipt'] = '읽음 확인을 보낼 수 없었습니다.';
+$messages['deleteidentityconfirm'] = '이 항목을 정말로 삭제하시겠습니까?';
+$messages['nodeletelastidentity'] = '이 신원 밖에 남지 않아 삭제할 수 없습니다.';
 $messages['forbiddencharacter'] = '폴더명에 금지된 문자가 포함되어 있습니다.';
-$messages['selectimportfile'] = '업로드할 파일을 선택해주시기 바랍니다.';
-$messages['addresswriterror'] = '선택된 주소록은 쓰기가 불가능합니다.';
-$messages['contactaddedtogroup'] = '이 그룹에 연락처를 성공적으로 추가함.';
-$messages['contactremovedfromgroup'] = '이 그룹에서 연락처를 성공적으로 제거함.';
-$messages['nogroupassignmentschanged'] = '그룹 할당이 변경되지 않았음.';
-$messages['importwait'] = '가져오는 중, 기다려주시기 바랍니다...';
-$messages['importformaterror'] = '가져오기를 실패함! 업로드된 파일은 유효하지 않은 가져오기 데이터 파일입니다.';
-$messages['importconfirm'] = '<b>$inserted 연락처를 성공적으로 가져옴<b>';
-$messages['importconfirmskipped'] = '<b>기존 기재사항인 $skipped을(를) 건너뜀</b>';
+$messages['selectimportfile'] = '업로드할 파일을 선택해주세요.';
+$messages['addresswriterror'] = '선택한 주소록은 쓰기가 불가능합니다.';
+$messages['contactaddedtogroup'] = '연락처가 이 그룹에 성공적으로 추가되었습니다.';
+$messages['contactremovedfromgroup'] = '연락처가 이 그룹에서 성공적으로 제거되었습니다.';
+$messages['nogroupassignmentschanged'] = '그룹 할당이 변경되지 않았습니다.';
+$messages['importwait'] = '가져오는 중입니다, 기다려주세요...';
+$messages['importformaterror'] = '가져오기를 실패했습니다! 업로드한 파일은 잘못된 가져오기 데이터 파일입니다.';
+$messages['importconfirm'] = '<b>$inserted개의 연락처를 성공적으로 가져옴<b>';
+$messages['importconfirmskipped'] = '<b>$skipped개의 기존 입력내용을  건너뜀</b>';
 $messages['importmessagesuccess'] = '$nr개의 메시지를 성공적으로 가져옴';
-$messages['importmessageerror'] = '가져오기 실패! 업로드된 파일은 유효하지 않은 메시지 또는 메일함 파일임';
-$messages['opnotpermitted'] = '작업이 허가되지 않았음!';
-$messages['nofromaddress'] = '선택된 신원에 이메일 주소 가 누락됨.';
-$messages['editorwarning'] = '일반 텍스트 편집기로 바꾸면 모든 텍스트 서식이 사라집니다. 계속하시겠습니까?';
-$messages['httpreceivedencrypterror'] = '치명적인 구성 오류가 발생하였습니다. 즉시 관리자에게 연락하세요.
-<b>메시지를 전송할 수 없습니다.</b>';
-$messages['smtpconnerror'] = 'SMTP 오류 ($code): 서버와의 연결을 실패함.';
-$messages['smtpautherror'] = 'SMTP 에러 ($code): 인증을 실패함.';
-$messages['smtpfromerror'] = 'SMTP 오류 ($code): 발신인을 "$from" ($msg)로 설정하는데 실패함.';
-$messages['smtptoerror'] = 'SMTP 오류 ($code): 수신인을 "$to" ($msg)에 추가하는데 실패함.';
-$messages['smtprecipientserror'] = 'SMTP 오류: 수신인 목록을 분석(parse)할 수 없음.';
+$messages['importmessageerror'] = '가져오기를 실패했습니다! 업로드한 파일은 잘못된 메시지 또는 메일함 파일입니다.';
+$messages['opnotpermitted'] = '작업이 허용되지 않습니다!';
+$messages['nofromaddress'] = '선택한 신원에 이메일 주소가 누락되었습니다.';
+$messages['editorwarning'] = '편집기 유형을 전환하면 텍스트 서식을 잃게 될 수도 있습니다. 계속하시겠습니까?';
+$messages['httpreceivedencrypterror'] = '치명적인 구성 오류가 발생했습니다. 즉시 관리자에게 연락하세요.
+<b>메시지를 보낼 수 없습니다.</b>';
+$messages['smtpconnerror'] = 'SMTP 오류 ($code): 서버와의 연결을 실패했습니다.';
+$messages['smtpautherror'] = 'SMTP 오류 ($code): 인증을 실패했습니다.';
+$messages['smtpfromerror'] = 'SMTP 오류 ($code): 발송자를 "$from" ($msg) (으)로 설정하는데 실패했습니다.';
+$messages['smtptoerror'] = 'SMTP 오류 ($code): 수신자를 "$to" ($msg)에 추가하는데 실패했습니다.';
+$messages['smtprecipientserror'] = 'SMTP 오류: 수신자 목록을 구문 분석할 수 없습니다.';
 $messages['smtperror'] = 'SMTP 오류: $msg';
-$messages['emailformaterror'] = '유효하지 않은 이메일 주소: $email';
-$messages['toomanyrecipients'] = '수신인이 너무 많음. 수신인 수를 $max명으로 줄이십시오.';
-$messages['maxgroupmembersreached'] = '그룹 구성원의 수가 최대 인원인 $max명을 초과합니다.';
-$messages['internalerror'] = '내부 오류가 발생하였음. 다시 시도하십시오.';
-$messages['contactdelerror'] = '연락처를 삭제할 수 없었음.';
-$messages['contactdeleted'] = '연락처가 성공적으로 삭제됨.';
-$messages['contactrestoreerror'] = '삭제된 연락처를 복구할 수 없었음.';
-$messages['contactrestored'] = '연락처가 성공적으로 복구됨.';
-$messages['groupdeleted'] = '그룹이 성공적으로 삭제됨.';
-$messages['grouprenamed'] = '그룹명이 성공적으로 변경됨.';
-$messages['groupcreated'] = '그룹이 성공적으로 생성됨.';
-$messages['savedsearchdeleted'] = '저장된 검색이 성공적으로 삭제됨.';
-$messages['savedsearchdeleteerror'] = '저장된 검색을 삭제할 수 없었음.';
-$messages['savedsearchcreated'] = '저장된 검색이 성공적으로 생성됨.';
-$messages['savedsearchcreateerror'] = '저장된 검색을 생성할 수 없었음.';
-$messages['messagedeleted'] = '메시지가 성공적으로 삭제됨.';
-$messages['messagemoved'] = '메시지가 성공적으로 이동됨.';
-$messages['messagecopied'] = '메시지가 성공적으로 복사됨.';
-$messages['messagemarked'] = '메시지에 성공적으로 표시됨.';
-$messages['autocompletechars'] = '자동 완성을 위해서 적어도 $min개의 문자를 입력하세요.';
-$messages['autocompletemore'] = '더 많은 일치하는 항목을 찾았음. 더 많은 문자를 입력해주십시오.';
+$messages['emailformaterror'] = '잘못된 이메일 주소: $email';
+$messages['toomanyrecipients'] = '수신자가 너무 많습니다. 수신자 인원을 $max명으로 줄이세요.';
+$messages['maxgroupmembersreached'] = '그룹 구성원이 최대 인원인 $max명을 초과합니다.';
+$messages['internalerror'] = '내부 오류가 발생했습니다. 다시 시도해주세요.';
+$messages['contactdelerror'] = '연락처를 삭제할 수 없었습니다.';
+$messages['contactdeleted'] = '연락처가 성공적으로 삭제되었습니다.';
+$messages['contactrestoreerror'] = '삭제한 연락처를 복구할 수 없었습니다.';
+$messages['contactrestored'] = '연락처가 성공적으로 복구되었습니다.';
+$messages['groupdeleted'] = '그룹이 성공적으로 삭제되었습니다.';
+$messages['grouprenamed'] = '그룹명이 성공적으로 변경되었습니다.';
+$messages['groupcreated'] = '그룹이 성공적으로 생성되었습니다.';
+$messages['savedsearchdeleted'] = '저장된 검색이 성공적으로 삭제되었습니다.';
+$messages['savedsearchdeleteerror'] = '저장된 검색을 삭제할 수 없었습니다.';
+$messages['savedsearchcreated'] = '저장된 검색이 성공적으로 생성되었습니다.';
+$messages['savedsearchcreateerror'] = '저장된 검색을생성할 수 없었습니다.';
+$messages['messagedeleted'] = '메시지가 성공적으로 삭제되었습니다.';
+$messages['messagemoved'] = '메시지가 성공적으로 이동되었습니다.';
+$messages['messagecopied'] = '메시지가 성공적으로 복사되었습니다.';
+$messages['messagemarked'] = '메시지가 성공적으로 표시되었습니다.';
+$messages['autocompletechars'] = '자동 완성을 위해 $min개 이상의 문자를 입력하세요.';
+$messages['autocompletemore'] = '더 많은 일치하는 입력내용을 찾았습니다. 더 많은 문자를 입력해주세요.';
 $messages['namecannotbeempty'] = '이름을 비워둘 수 없습니다.';
 $messages['nametoolong'] = '이름이 너무 깁니다.';
-$messages['folderupdated'] = '폴더가 성공적으로 업데이트됨.';
-$messages['foldercreated'] = '폴더가 성공적으로 생성됨.';
-$messages['invalidimageformat'] = '유효한 이미지 형식이 아님.';
-$messages['mispellingsfound'] = '메시지에서 맞춤법 오류가 감지되었음.';
-$messages['parentnotwritable'] = '선택한 상위 폴더에 폴더를 생성/이동할 수 없음. 접근 권한이 없음.';
+$messages['folderupdated'] = '폴더가 성공적으로 업데이트되었습니다.';
+$messages['foldercreated'] = '폴더가 성공적으로 생성되었습니다.';
+$messages['invalidimageformat'] = '올바른 이미지 형식이 아닙니다.';
+$messages['mispellingsfound'] = '메시지에서 맞춤법 오류가 감지되었습니다.';
+$messages['parentnotwritable'] = '선택한 상위 폴더로 폴더를 생성/이동할 수 없습니다. 접근 권한이 없습니다.';
 $messages['messagetoobig'] = '메시지 부분이 처리하기에는 너무 큽니다.';
-$messages['attachmentvalidationerror'] = '경고! 이 첨부 파일의 유형이 메시지에서 선언된 유형과 일치하지 않기 때문에 의심됩니다. 발신인을 신뢰할 수 없을 경우, 악성 코드를 포함할 수도 있기 때문에 브라우저에서 열지 않는 것이 좋습니다. <br/><br/><em> 예상한 유형: $expected; 발견된 유형: $found</ em>';
-$messages['noscriptwarning'] = '경고: 이 웹 메일 서비스는 자바스크립트가 필요합니다! 이 기능을 사용하시려면 자바스크립트를 브라우저 설정에서 활성화하시기 바랍니다.';
+$messages['attachmentvalidationerror'] = '경고! 이 첨부파일의 유형이 메시지에서 보고한 유형과 일치하지 않기 때문에 의심됩니다. 발송자를 신뢰할 수 없을 경우, 메시지가 악성 코드를 포함할 수도 있기 때문에 브라우저에서 열지 않는 것이 좋습니다. <br/><br/><em> 예상한 유형: $expected; 발견한 유형: $detected</ em>';
+$messages['noscriptwarning'] = '경고: 이 웹메일 서비스는 자바스크립트가 필요합니다! 이 기능을 사용하려면 브라우저 설정에서 자바스크립트를 활성화해주세요.';
 ?>
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index c88b52d46..f0b0f9caf 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-$labels['welcome']   = 'Bixêr hatî $product \'ê';
+$labels['welcome']   = 'Bi xêr hatî $product\'ê';
 $labels['username']  = 'Bikarhêner';
 $labels['password']  = 'Nasnav';
 $labels['server']    = 'Pêşkêşkar';
@@ -29,8 +29,10 @@ $labels['drafts'] = 'Hilanînî';
 $labels['sent']   = 'Şandî';
 $labels['trash']  = 'Çop';
 $labels['junk']   = 'Biikêrnehatî';
+$labels['show_real_foldernames'] = 'Ji bo dosyeyên taybet navên rast bide nîşan';
 $labels['subject'] = 'Mijar';
 $labels['from']    = 'Şandyar';
+$labels['sender']  = 'Şandyar';
 $labels['to']      = 'Standyar';
 $labels['cc']      = 'Kopiya Karbon';
 $labels['bcc']     = 'Kopiya karbon a Veşartî';
@@ -39,12 +41,19 @@ $labels['date']    = 'Dîrok';
 $labels['size']    = 'Mezinahî';
 $labels['priority'] = 'Girîngî';
 $labels['organization'] = 'Sazî';
+$labels['readstatus'] = 'Rewşê bixwîne';
+$labels['listoptions'] = 'Vebijêrk tên rêzkirin...';
 $labels['mailboxlist'] = 'Peldank';
 $labels['messagesfromto'] = 'Peyam $count ên di navbera $from - $to';
 $labels['messagenrof'] = '$nr a peyama $count';
 $labels['copy']     = 'Kopiya Karbon';
+$labels['move']     = 'Bibe';
 $labels['moveto']   = 'bibe...';
-$labels['download'] = 'daxe';
+$labels['copyto']   = 'Kopyayek çêke li ser ...';
+$labels['download'] = 'Daxîne';
+$labels['open']     = 'Veke';
+$labels['showattachment'] = 'Bide nîşan';
+$labels['showanyway'] = 'Her çawa be nîşan bide';
 $labels['filename'] = 'Navê pelê';
 $labels['filesize'] = 'Mezinahiya pelê';
 $labels['addtoaddressbook'] = 'Têxe lênûska navnîşanan';
@@ -62,12 +71,41 @@ $labels['wednesday'] = 'Çarşem';
 $labels['thursday']  = 'Pêncşem';
 $labels['friday']    = 'În';
 $labels['saturday']  = 'Şemî';
+$labels['jan']	= 'Çile';
+$labels['feb']	= 'Reş';
+$labels['mar']	= 'Adar';
+$labels['apr']	= 'Avr';
+$labels['may']	= 'Gul';
+$labels['jun']	= 'Pûş';
+$labels['jul'] 	= 'Tîr';
+$labels['aug']	= 'Gel';
+$labels['sep']	= 'Rez';
+$labels['oct']	= 'Cotm';
+$labels['nov']	= 'Serm';
+$labels['dec']	= 'Berf';
+$labels['longjan']	= 'Rêbendan';
+$labels['longfeb']	= 'Reşemî';
+$labels['longmar']	= 'Adar';
+$labels['longapr']	= 'Avrêl';
+$labels['longmay']	= 'Gulan';
+$labels['longjun']	= 'Pûşper';
+$labels['longjul']	= 'Tîrmeh';
+$labels['longaug']	= 'Tebax';
+$labels['longsep']	= 'Rezber';
+$labels['longoct']	= 'Kewçêr';
+$labels['longnov']	= 'Sermawez';
+$labels['longdec']	= 'Berfanbar';
 $labels['today'] = 'Îro';
+$labels['refresh']          = 'Tezekirin';
 $labels['checkmail']        = 'Li peyamên nû venihêre';
 $labels['compose']          = 'Peyamekê biafirîne';
 $labels['writenewmessage']  = 'Peyameke nû biafirîne';
+$labels['reply']            = 'Bersivê bide';
 $labels['replytomessage']   = 'Bersivê bide peyamê';
 $labels['replytoallmessage'] = 'Bersivê ji bo hemû kesên ku ev peyan standine bişîne';
+$labels['replyall']         = 'Hemûyan bibersivîne';
+$labels['replylist']        = 'Lîsteyê bibersivîne';
+$labels['forward']          = 'Pêşde';
 $labels['forwardmessage']   = 'Bersivê bide peyamê';
 $labels['deletemessage']    = 'Peyamê jê bibe';
 $labels['movemessagetotrash'] = 'Peyamê dake çopê';
@@ -78,27 +116,73 @@ $labels['nextmessage']      = 'Peyama di rêzê de nîşan bide';
 $labels['lastmessage']      = 'Peyama dawî nîşan bide';
 $labels['backtolist']       = 'Vegere lîsteya peyaman';
 $labels['viewsource']       = 'Çavkaniyê nîşan bide';
+$labels['mark']             = 'Nîşan bike';
 $labels['markmessages']     = 'Peyamê nîşan bike';
 $labels['markread']         = 'Wekî xwendî';
 $labels['markunread']       = 'Wekî nexwendî';
+$labels['moreactions']      = 'Bêhtir tevger...';
+$labels['more']             = 'Bêhtir';
+$labels['back']             = 'Paşve';
+$labels['options']          = 'Vebijêrk';
+$labels['first'] = 'Pêşîn';
+$labels['last'] = 'Dawîn';
+$labels['previous'] = 'Pêşde';
+$labels['next'] = 'Piştde';
 $labels['select'] = 'Hilbijêre';
 $labels['all'] = 'Hemû';
 $labels['none'] = 'Ne yek jî';
+$labels['currpage'] = 'Rûpela niha';
+$labels['isread'] = 'Bixwîne';
 $labels['unread'] = 'Nexwendî';
+$labels['flagged'] = 'Bialakirî';
+$labels['unflagged'] = 'Nealakirî';
+$labels['unanswered'] = 'Bersivnedayî';
+$labels['withattachment'] = 'Bi pêvek';
+$labels['deleted'] = 'Jêbirî';
+$labels['undeleted'] = 'Nê jêbirî';
+$labels['replied'] = 'Bersivdayî';
+$labels['filter'] = 'Parzûn';
+$labels['list'] = 'Lîste';
+$labels['fromto'] = 'Ji/Jê re';
+$labels['flag'] = 'Ala';
+$labels['attachment'] = 'Pêvek';
 $labels['nonesort'] = 'Ne yek jî';
+$labels['sentdate'] = 'Dema şandinê';
+$labels['arrival'] = 'Dema hatinê';
+$labels['asc'] = 'ber bi jor ve';
+$labels['desc'] = 'ber bi jêr ve';
+$labels['listcolumns'] = 'Stûnan lîste bike';
 $labels['compact'] = 'Kompakt';
 $labels['empty'] = 'Vala Bike';
 $labels['quota'] = 'Bikaranîna dîskê';
 $labels['unknown']  = 'nayê zanîn';
 $labels['unlimited']  = 'bêsînor';
+$labels['quotastorage'] = 'Valahiya dîskê';
+$labels['quotamessage'] = 'Hejmara peyaman';
 $labels['quicksearch']  = 'Lêgerîna bilez';
 $labels['resetsearch']  = 'Lêgerînê reset bike';
+$labels['msgtext']  = 'Hemû peyam';
+$labels['type'] = 'Cûre';
+$labels['namex'] = 'Nav';
+$labels['currentfolder'] = 'Dosyeya niha';
+$labels['subfolders'] = 'Ev û bindosye';
+$labels['allfolders'] = 'Hemû dosye';
+$labels['openinextwin'] = 'Di pencereyeke nû de veke';
+$labels['emlsave'] = 'Daxîne (.eml)';
+$labels['editasnew']      = 'Wek nû sererast bike';
+$labels['send']           = 'Bişîne';
 $labels['sendmessage']    = 'Peyamê niha bişîne';
 $labels['savemessage']    = 'Hilîne';
 $labels['addattachment']  = 'Pelekê lê zêde bike';
 $labels['charset']        = 'Curetîp';
 $labels['editortype']     = 'Cureyê serastkat';
 $labels['returnreceipt']  = 'Rapora Vegerînê';
+$labels['mailreplyintro'] = 'Di $date de, şandyar nivîsî:';
+$labels['originalmessage'] = 'Peyama orîjînal';
+$labels['selectimage']    = 'Wêne bibijêre';
+$labels['addimage']       = 'Wêne tev bike';
+$labels['selectmedia']    = 'Fîlmekê bibijêre';
+$labels['addmedia']       = 'Fîlmekê tev bike';
 $labels['checkspelling'] = 'Kontrola rastnivîsê';
 $labels['resumeediting'] = 'Serastkirinê bidomîne';
 $labels['revertto']      = 'Şûnde bîne';
@@ -114,46 +198,96 @@ $labels['nosubject']  = '(bê mijar)';
 $labels['showimages'] = 'Xuyakirina wêneyan';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Deqa tazî';
+$labels['dontsave'] = 'tomar neke';
 $labels['addcc'] = 'Cc Têxê';
 $labels['addbcc'] = 'Bcc Têxê';
 $labels['addreplyto'] = 'Bibersivîne têxê';
-$labels['mdnrequest'] = 'Şandyara/ê vê peyamê xwest dema ku te peyam vekir, jê re hişyarî here. Dixwazî jê re hişyarî here?';
+$labels['mdnrequest'] = 'Şandyarê/a vê peyamê xwest dema ku tu vê peyamê bixwînî ew were agahdarkirin. Tu dixwazî wî/ê agahdar bikî?';
 $labels['receiptread'] = 'Rapora Vegerînê (xwendî)';
 $labels['yourmessage'] = 'Ev rapora vegerîna peyama te ye';
 $labels['receiptnote'] = 'Nîşe: Ev dide zanîn ka peyama te şand hat xwendin an na. Naveroka peyamê bi mîgogerî nayê zanîn.';
 $labels['name']         = 'Navê xuya dibe';
 $labels['firstname']    = 'Nav';
 $labels['surname']      = 'Paşnav';
+$labels['nameprefix']   = 'Pêşgir';
+$labels['namesuffix']   = 'Paşgir';
+$labels['nickname']     = 'Nûçik';
+$labels['department']   = 'Beş';
+$labels['gender']       = 'Zayend';
 $labels['email']        = 'E-Peyam';
-$labels['addcontact'] = 'Têkiliyeke nû têxê';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Navnîşan';
+$labels['street']       = 'Kolan';
+$labels['locality']     = 'Bajar';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'Eyalet';
+$labels['country']      = 'Welat';
+$labels['birthday']     = 'Rojbûn';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Nîşegel';
+$labels['male']   = 'mêr';
+$labels['female'] = 'jin';
+$labels['manager'] = 'Birêvebir';
+$labels['assistant'] = 'Alîkar';
+$labels['search'] = 'Lêgerîn';
+$labels['searchresult'] = 'Encama lêgerînê';
+$labels['advsearch'] = 'Lêgerîna pêşketî';
+$labels['advanced'] = 'Pêşketî';
+$labels['other'] = 'A din';
+$labels['typehome']   = 'Mal';
+$labels['typework']   = 'Kar';
+$labels['typeother']  = 'A din';
+$labels['typemobile']  = 'Mobîl';
+$labels['typemain']  = 'Sereke';
+$labels['typecar']  = 'Otomobîl';
+$labels['typevideo']  = 'Bînûdeng';
+$labels['typeassistant']  = 'Alîkar';
+$labels['typehomepage']  = 'Malper';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Berg';
 $labels['editcontact'] = 'Têkiliyê serast bike';
+$labels['contactnameandorg'] = 'Nav û rêxistin';
+$labels['personalinfo'] = 'Agahiyên kesane';
 $labels['edit']   = 'Serast bike';
 $labels['cancel'] = 'Betal';
 $labels['save']   = 'Tomar bike';
 $labels['delete'] = 'Jê Bibe';
-$labels['newcontact']     = 'kardeke nû a têkiliyê biafirîne';
+$labels['rename'] = 'Dîsa navek lê bike';
+$labels['addphoto'] = 'Tev bike';
+$labels['replacephoto'] = 'Dîsa bi cih bike';
+$labels['uploadphoto'] = 'Fotoyek bar bike';
 $labels['deletecontact']  = 'Têkiliyên hilbijartî jê bibe';
 $labels['composeto']      = 'Ji têkiliya hilbijartî re peyam bişîne';
 $labels['contactsfromto'] = 'Têkiliyên $count ên di navbera $from - $to de';
 $labels['print']          = 'çap bike';
 $labels['export']         = 'Derxe';
+$labels['newcontactgroup']       = 'Komeke nû çêke';
+$labels['addgroup']       = 'Komek tev bike';
+$labels['grouprename']    = 'Dîsa navekî li komê bike';
+$labels['groupdelete']    = 'Komê rake';
+$labels['uponelevel']     = 'Astek jor';
 $labels['previouspage']   = 'Seta berê nîşan bide';
 $labels['firstpage']      = 'Seta yekemîn nîşan bide';
 $labels['nextpage']       = 'Seta di rêzê de nîşan bide';
 $labels['lastpage']       = 'Seta dawî nîşan bide';
+$labels['group'] = 'Kom';
 $labels['groups'] = 'Kom';
 $labels['personaladrbook'] = 'Navnîşanên Takekesî';
+$labels['searchsave'] = 'Lêgerînê tomar bike';
+$labels['searchdelete'] = 'Lêgerînê jê bibe';
+$labels['import'] = 'Derhîne';
+$labels['done'] = 'Qediya';
 $labels['settingsfor'] = 'Mîheng ji bo';
+$labels['about'] = 'Derbar';
 $labels['preferences'] = 'Vebijêrk';
 $labels['userpreferences'] = 'Vebijêrkên bikarhêner';
 $labels['editpreferences'] = 'Vebijêrkên bikarhêner serast bike';
 $labels['identities'] = 'Nasname';
-$labels['manageidentities'] = 'Nasnameyên vê hesabê serast bike';
-$labels['newidentity'] = 'Nasnameya nû';
-$labels['newitem'] = 'Parçeya nû';
-$labels['edititem'] = 'Parçeyê serast bike';
 $labels['preferhtml'] = 'Wekî HTML nîşan bide';
 $labels['htmlmessage'] = 'Peyama HTML';
+$labels['messagepart'] = 'Parçe';
+$labels['digitalsig'] = 'Îmzeya Dîjîtal';
 $labels['prettydate'] = 'Kurtenivîsa Dîrokê';
 $labels['setdefault']  = 'Wekî standard tomar bike';
 $labels['language']  = 'Ziman';
@@ -164,16 +298,21 @@ $labels['dstactive']  = 'Demjimêra havînî';
 $labels['htmleditor'] = 'Peyameke HTML biafirîne';
 $labels['htmlsignature'] = 'Şanenava HTML';
 $labels['previewpane'] = 'Panela berê nîşan bide';
+$labels['askuser'] = 'bipirse min';
+$labels['skipdeleted'] = 'Peyamên jêbirî nîşan nede';
+$labels['always'] = 'Her tim';
 $labels['autosavedraft']  = 'Xweber hilîne';
+$labels['everynminutes']  = 'Her $n saniye(yan)';
 $labels['never']  = 'qet';
-$labels['folder']  = 'Peldank';
-$labels['folders']  = 'Peldank';
-$labels['foldername']  = 'Navê peldankê';
-$labels['subscribed']  = 'Ni şanenav';
+$labels['immediately']  = 'a niha';
+$labels['folder'] = 'Peldank';
+$labels['folders'] = 'Peldank';
+$labels['foldername'] = 'Navê peldankê';
+$labels['subscribed'] = 'Ni şanenav';
 $labels['messagecount'] = 'Peyam';
-$labels['create']  = 'Biafirîne';
-$labels['createfolder']  = 'Peldankeke nû biafirîne';
-$labels['managefolders']  = 'Rêveberiya peldankan';
+$labels['create'] = 'Biafirîne';
+$labels['createfolder'] = 'Peldankeke nû biafirîne';
+$labels['managefolders'] = 'Rêveberiya peldankan';
 $labels['sortby'] = 'Şêweyê rêzkirinê';
 $labels['sortasc']  = 'Wekî zêde dibe';
 $labels['sortdesc'] = 'Wekî kêm dibe';
diff --git a/program/localization/ku/messages.inc b/program/localization/ku/messages.inc
index 95d33d78f..06fd4ea5c 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -15,13 +15,19 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
+$messages['errortitle']  = 'Çewtiyek pêk hat!';
 $messages['loginfailed']  = 'Têketin têk çû';
 $messages['cookiesdisabled'] = 'Geroka te destûrê nade çerezan';
 $messages['sessionerror'] = 'Danişîna te çewt e an jî bi dawî bûye';
 $messages['storageerror'] = 'Girêdana pêşkêşkara IMAP têk çû';
 $messages['nomessagesfound'] = 'Di vê peyamdankê de tu peyam nehat dîtin';
 $messages['loggedout'] = 'Te danişînî bi dawî anî. Oxir be!';
+$messages['mailboxempty'] = 'Cihê peyamên hatî vala ye';
+$messages['nomessages'] = 'Peyam nîn in';
+$messages['refreshing'] = 'Tê tezekirin...';
 $messages['loading'] = 'Tê barkirin...';
+$messages['uploading'] = 'Pel tê barkirin...';
+$messages['uploadingmany'] = 'Pel tên barkirin...';
 $messages['loadingdata'] = 'Dane tên barkirin...';
 $messages['checkingmail'] = 'Li peyamên nû vedinihêre...';
 $messages['sendingmessage'] = 'Peyamê dişîne...';
@@ -29,6 +35,8 @@ $messages['messagesent'] = 'Peyam hate şandin';
 $messages['savingmessage'] = 'Peyam tê hilanîn...';
 $messages['messagesaved'] = 'Peyam di Hilanînî de hat hilanîn';
 $messages['successfullysaved'] = 'Hat hilanîn';
+$messages['savingresponse'] = 'Bersiva nivîsê tê tomarkirin...';
+$messages['deleteresponseconfirm'] = 'Tu bi rastî dixwazî vê nivîsa bersivê jê bibî?';
 $messages['addedsuccessfully'] = 'Têkilî li navnîşanan hat zêdekirin';
 $messages['contactexists'] = 'Têkiliyeke bi vê navnîşanê jixwe heye';
 $messages['blockedimages'] = 'Ji bo ewlekariya te wêneyên cuda yên vê peyamê hatin astenkirin.';
@@ -36,12 +44,17 @@ $messages['encryptedmessage'] = 'Ev peyamenek şîfrekirî ye, bibore, nayê vek
 $messages['nocontactsfound'] = 'Tu têkiliyek nehat dîtin';
 $messages['contactnotfound'] = 'Têkiliya dihat xwestin nehat dîtin';
 $messages['sendingfailed'] = 'Peyam nehat şandin';
+$messages['senttooquickly'] = 'Ji kerema xwe, bo $ saniyek saniye(yan) bisekine beriya şandina vê peyamê.';
+$messages['errorsaving'] = 'Wextê tomarkirinê çewtiyek çêbû. ';
 $messages['errormoving'] = 'Ciyê peyamê nehat guherandin';
 $messages['errordeleting'] = 'Peyam nehat jêbirin';
 $messages['deletecontactconfirm']  = 'Ji dil dixwazî têkiliya/ên nîşankirî jê bibî?';
 $messages['deletemessagesconfirm'] = 'Ji dil dixwazî peya/ên nîşankirî jê bibî?';
 $messages['deletefolderconfirm']  = 'Ji dil dixwazî vê peldankê jê bibî?';
 $messages['purgefolderconfirm']  = 'Ji dil dixwazî hemû peyamên di vê peldankê de jê bibî?';
+$messages['groupdeleting'] = 'Kom tê rakirin...';
+$messages['folderdeleting'] = 'Dosye tê rakirin...';
+$messages['foldermoving'] = 'Dosye tê kêşandin...';
 $messages['formincomplete'] = 'Form bi temamî nehat tijekirin';
 $messages['noemailwarning'] = 'Tika ye, navnîşaneke rast têkevê';
 $messages['nonamewarning']  = 'Tika ye, navekî têkevê';
@@ -56,8 +69,10 @@ $messages['searchsuccessful'] = '$nr peyam hat(in) dîtin';
 $messages['searchnomatch'] = 'Di lêgerînê de tu tişt nehat dîtin';
 $messages['searching'] = 'Digere...';
 $messages['checking'] = 'Vedinihêre...';
+$messages['stillsearching'] = 'Hin lê digere...';
 $messages['nospellerrors'] = 'Tu şaşiyeke rastnivîsê nehat dîtin';
 $messages['folderdeleted'] = 'Peldank hat jêbirin';
+$messages['folderpurged'] = 'Dosye bi serkeftin hat valakirin.';
 $messages['deletedsuccessfully'] = 'Hat jêbirin';
 $messages['converting'] = 'Formatkirin ji peyamê tê birin...';
 $messages['messageopenerror'] = 'Peyam ji pêşkêşkar nehat barkirin';
@@ -66,7 +81,10 @@ $messages['filesizeerror'] = 'Pel pir mezin e. Herî zêde divê $size be';
 $messages['sourceisreadonly'] = 'Çavkaniya vê navnîşanê tenê-xwendin e';
 $messages['errorsavingcontact'] = 'Navnîşana têkiliyê nehat barkirin';
 $messages['movingmessage'] = 'Ciyê peyamê tê guhertin...';
+$messages['copyingmessage'] = 'Peyam(gel) tên kopîkirin... ';
+$messages['deletingmessage'] = 'Peyam(gel) tê jêbirin...';
 $messages['receiptsent'] = 'Rapora şandina serkeftî';
 $messages['errorsendingreceipt'] = 'Rapor nehat şandin';
 $messages['nodeletelastidentity'] = 'Nikarî vê nasnameyê jê bibî. Ew ya dawî ye.';
+$messages['groupcreated'] = 'Kom bi serkeftin hat afirandin.';
 ?>
diff --git a/program/localization/ku_IQ/labels.inc b/program/localization/ku_IQ/labels.inc
new file mode 100644
index 000000000..787fd4a3d
--- /dev/null
+++ b/program/localization/ku_IQ/labels.inc
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/<lang>/labels.inc                                        |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
+*/
+$labels['welcome']   = 'بەخێربێیت بۆ $product';
+$labels['username']  = 'ناوی بەکارهێنەر';
+$labels['password']  = 'تێپەڕەوشە';
+$labels['login']     = 'چوونەژوورەوە';
+$labels['logout']   = 'دەرچوون';
+$labels['settings'] = 'ڕێکخستنەکان';
+$labels['inbox']  = 'هاتوو';
+$labels['sent']   = 'نێردراو';
+$labels['subject'] = 'ناونیشان';
+$labels['from']    = 'لە';
+$labels['to']      = 'بۆ';
+$labels['date']    = 'بەروار';
+$labels['size']    = 'قەبارە';
+$labels['readstatus'] = 'ڕەوشی خوێندنەوە';
+$labels['listoptions'] = 'لیستی هەڵبژاردەکان';
+$labels['mailboxlist'] = 'بوخچەکان';
+$labels['copy']     = 'لەبەرگرتنەوە';
+$labels['move']     = 'گواستنەوە';
+$labels['moveto']   = 'گواستنەوە بۆ';
+$labels['copyto']   = 'گواستنەوە بۆ...';
+$labels['download'] = 'داگرتن';
+$labels['open']     = 'کردنەوە';
+$labels['showattachment'] = 'پیشاندان';
+$labels['filename'] = 'ناوی پەڕگە';
+$labels['filesize'] = 'قەبارەی پەڕگە';
+$labels['reply']            = 'وەڵامدانەوە';
+$labels['options']          = 'هەڵبژاردەکان';
+$labels['first'] = 'یەکەم';
+$labels['last'] = 'کۆتایی';
+$labels['previous'] = 'پێشتر';
+$labels['next'] = 'دواتر';
+$labels['select'] = 'هەڵبژاردن';
+$labels['all'] = 'هەمووی';
+$labels['none'] = 'هیچ';
+$labels['currpage'] = 'پەڕی ئێستا';
+$labels['list'] = 'لیست';
+$labels['fromto'] = 'لە/بۆ';
+$labels['attachment'] = 'هاوپێچ';
+$labels['nonesort'] = 'هیچ';
+$labels['sentdate'] = 'بەرواری ناردن';
+$labels['arrival'] = 'بەرواری گەیشتن';
+$labels['empty'] = 'بەتاڵ';
+$labels['unknown']  = 'نەناسراو';
+$labels['unlimited']  = 'بێ سنوور';
+$labels['quotatotal'] = 'سنوور';
+$labels['quotaused'] = 'بەکارهاتوو';
+$labels['allfolders'] = 'هەموو بوخچەکان';
+$labels['send']           = 'ناردن';
+$labels['responsename'] = 'ناو';
+$labels['attach'] = 'هاوپێچ';
+$labels['attachments'] = 'هاوپێچەکان';
+$labels['upload'] = 'بارکردن';
+$labels['close']  = 'داخستن';
+$labels['nickname']     = 'نازناو';
+$labels['jobtitle']     = 'ناونیشانی کار';
+$labels['department']   = 'بەش';
+$labels['gender']       = 'ڕەگەز';
+$labels['phone']        = 'تەلەفۆن';
+$labels['address']      = 'ناونیشان';
+$labels['street']       = 'شەقام';
+$labels['locality']     = 'شار';
+$labels['country']      = 'وڵات';
+$labels['birthday']     = 'ڕۆژی لەدایکبوون';
+$labels['website']      = 'ماڵپەڕ';
+$labels['notes'] = 'تێبینییەکان';
+$labels['male']   = 'نێر';
+$labels['female'] = 'مێ';
+$labels['manager'] = 'بەڕێوەبەر';
+$labels['allfields'] = 'هەموو خانەکان';
+$labels['search'] = 'گەڕان';
+$labels['searchresult'] = 'ئەنجامی گەڕان';
+$labels['advsearch'] = 'گەڕانی پێشکەوتوو';
+$labels['advanced'] = 'پێشکەوتوو';
+$labels['typehome']   = 'ماڵ';
+$labels['typework']   = 'کار';
+$labels['typemobile']  = 'مۆبایل';
+$labels['typemain']  = 'سەرەکی';
+?>
diff --git a/program/localization/ku_IQ/messages.inc b/program/localization/ku_IQ/messages.inc
new file mode 100644
index 000000000..e5b90a438
--- /dev/null
+++ b/program/localization/ku_IQ/messages.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/<lang>/messages.inc                                      |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
+*/
+$messages['errortitle']  = 'هەڵەیەک ڕوویدا!';
+$messages['loginfailed']  = 'چوونەژوورەوە سەرکەوتوو نەبوو.';
+?>
diff --git a/program/localization/lb_LU/messages.inc b/program/localization/lb_LU/messages.inc
index 41dada829..560d0091f 100644
--- a/program/localization/lb_LU/messages.inc
+++ b/program/localization/lb_LU/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Deng Sessioun ass ongëlteg oder verfall.';
 $messages['storageerror'] = 'D\'Verbindung mam Späicher-Server ass feelgeschloen.';
 $messages['servererror'] = 'Server-Feeler!';
 $messages['servererrormsg'] = 'Server-Feeler: $msg';
+$messages['connerror'] = 'Connectiouns-Feeler (De Server konnt net erreecht ginn)!';
 $messages['dberror'] = 'Datebank-Feeler!';
+$messages['windowopenerror'] = 'D\'Popup-Fënster gouf blockéiert!';
 $messages['requesttimedout'] = 'D\'Ufro huet ze laang gedauert';
 $messages['errorreadonly'] = 'D\'Operatioun kann net ofgeschloss ginn. Den Dossier ass schreifgeschützt.';
 $messages['errornoperm'] = 'D\'Operatioun kann net ofgeschloss ginn. Zougrëff verweigert.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr Kontakter fonnt.';
 $messages['searchnomatch'] = 'D\'Sich huet keng Treffer bruecht.';
 $messages['searching'] = 'Sichen...';
 $messages['checking'] = 'Kontrolléieren...';
+$messages['stillsearching'] = 'D\'Sich leeft nach...';
 $messages['nospellerrors'] = 'Et goufe keng Schreiffeeler fonnt.';
 $messages['folderdeleted'] = 'Dossier erfollegräich geläscht.';
 $messages['foldersubscribed'] = 'Dossier erfollegräich abonnéiert.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Erfollegräich $nr Messagen importéiert';
 $messages['importmessageerror'] = 'Import feelgeschloen! Den eropgeluedene Fichier ass kee gëltege Message oder kee Mailbox-Fichier.';
 $messages['opnotpermitted'] = 'Operatioun net zougelooss!';
 $messages['nofromaddress'] = 'An der ausgewieltener Identitéit feelt d\'E-Mail-Adress.';
-$messages['editorwarning'] = 'Bei engem Wiessel op den Text-Editor ginn all d\'Formatéierunge verluer. Wëlls du sécher weidermaachen?';
+$messages['editorwarning'] = 'Den Editor-Typ ze wiessele kann de Verloscht vun Textformatéierunge verursaachen. Wëlls du weidermaachen?';
 $messages['httpreceivedencrypterror'] = 'E fatale Konfiguratiouns-Feeler ass opgetrueden. Kontaktéier w.e.gl. den Administrator esou séier ewéi méiglech. <b>Däi Message kann net geschéckt ginn.</b> ';
 $messages['smtpconnerror'] = 'SMTP-Feeler ($code): Et konnt keng Verbindung mam Server hirgestallt ginn.';
 $messages['smtpautherror'] = 'SMTP-Feeler ($code): Authentifizéierung feelgeschloen.';
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 63194f275..6866fd1cd 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -52,6 +52,7 @@ $labels['fromtoshort'] = '$from – $to iš $count';
 $labels['copy']     = 'Kopijuoti';
 $labels['move']     = 'Perkelti';
 $labels['moveto']   = 'Perkelti į…';
+$labels['copyto']   = 'Kopijuoti į...';
 $labels['download'] = 'Parsisiųsti';
 $labels['open']     = 'Atverti';
 $labels['showattachment'] = 'Rodyti';
@@ -130,16 +131,24 @@ $labels['moreactions']      = 'Kiti veiksmai…';
 $labels['more']             = 'Kita';
 $labels['back']             = 'Grįžti';
 $labels['options']          = 'Nuostatos';
+$labels['first'] = 'Pirmas';
+$labels['last'] = 'Paskutinis';
+$labels['previous'] = 'Ankstesnis';
+$labels['next'] = 'Sekantis';
 $labels['select'] = 'Pažymėti';
 $labels['all'] = 'visus';
-$labels['none'] = 'Nerūšiuoti';
+$labels['none'] = 'Nieko';
 $labels['currpage'] = 'matomus šiame puslapyje';
+$labels['isread'] = 'Skaityti';
 $labels['unread'] = 'neskaitytus';
 $labels['flagged'] = 'su gairele';
+$labels['unflagged'] = 'Nepažymėti vėliavėle';
 $labels['unanswered'] = 'neatsakytus';
 $labels['withattachment'] = 'Su priedu';
 $labels['deleted'] = 'pašalintus';
 $labels['undeleted'] = 'Neištrintas';
+$labels['replied'] = 'Atsakytieji';
+$labels['forwarded'] = 'Persiųstieji';
 $labels['invert'] = 'invertuoti';
 $labels['filter'] = 'Rodyti';
 $labels['list'] = 'Sąrašas';
@@ -170,6 +179,11 @@ $labels['importmessages'] = 'Importuoti laiškus';
 $labels['quota'] = 'Disko naudojimas';
 $labels['unknown']  = 'nežinomas';
 $labels['unlimited']  = 'neribotas';
+$labels['quotatype'] = 'Kvotos tipas';
+$labels['quotatotal'] = 'Limitas';
+$labels['quotaused'] = 'Išnaudota';
+$labels['quotastorage'] = 'Disko talpa';
+$labels['quotamessage'] = 'Laiškų skaičius';
 $labels['quicksearch']  = 'Sparčioji paieška';
 $labels['resetsearch']  = 'Atšaukti paiešką';
 $labels['searchmod']  = 'Paieškos modifikatoriai';
@@ -177,6 +191,10 @@ $labels['msgtext']  = 'Visas laiškas';
 $labels['body']  = 'Laiško tekstas';
 $labels['type'] = 'Tipas';
 $labels['namex'] = 'Vardas';
+$labels['searchscope'] = 'Sritis';
+$labels['currentfolder'] = 'Šis aplankas';
+$labels['subfolders'] = 'Šis ir poaplankiai';
+$labels['allfolders'] = 'Visi aplankai';
 $labels['openinextwin'] = 'Atverti naujame lange';
 $labels['emlsave'] = 'Parsisiųsti (.eml)';
 $labels['changeformattext'] = 'Rodyti grynojo teksto formatu';
@@ -192,17 +210,24 @@ $labels['returnreceipt']  = 'Prašyti pristatymo pažymos';
 $labels['dsn']            = 'Laiško pristatymo pažyma';
 $labels['mailreplyintro'] = '$date, $sender rašė:';
 $labels['originalmessage'] = 'Originalus laiškas';
+$labels['selectimage']    = 'Pažymėti paveikslą';
+$labels['addimage']       = 'Pridėti paveikslą';
+$labels['selectmedia']    = 'Pažymėti vaizdo įrašą';
+$labels['addmedia']       = 'Pridėti vaizdo įrašą';
 $labels['editidents']    = 'Tvarkyti tapatybes';
 $labels['spellcheck']    = 'Tikrinti rašybą';
 $labels['checkspelling'] = 'Tikrinti rašybą';
 $labels['resumeediting'] = 'Tęsti redagavimą';
 $labels['revertto']      = 'Atstatyti į';
+$labels['restore'] = 'Atkurti';
+$labels['restoremessage'] = 'Atkurti pranešimus?';
 $labels['responses'] = 'Atsakymai';
 $labels['insertresponse'] = 'Įterpti atsakymą';
 $labels['manageresponses'] = 'Tvarkyti atsakymus';
-$labels['savenewresponse'] = 'Įrašyti naują atsakymą';
-$labels['editresponses'] = 'Taisyti atsakymus';
+$labels['savenewresponse'] = 'Kurti naują atsakymą';
+$labels['addresponse'] = 'Pridėti atsakymą';
 $labels['editresponse'] = 'Taisyti atsakymą';
+$labels['editresponses'] = 'Taisyti atsakymus';
 $labels['responsename'] = 'Pavadinimas';
 $labels['responsetext'] = 'Atsakymo tekstas';
 $labels['attach'] = 'Pridėti failą';
@@ -211,6 +236,7 @@ $labels['upload'] = 'Įkelti';
 $labels['uploadprogress'] = '$percent ($current iš $total)';
 $labels['close']  = 'Užverti';
 $labels['messageoptions']  = 'Laiško savybės…';
+$labels['togglecomposeoptions'] = 'Rodyti/slėpti nustatymus';
 $labels['low']     = 'Žemas';
 $labels['lowest']  = 'Žemiausias';
 $labels['normal']  = 'Normalus';
@@ -289,7 +315,9 @@ $labels['addcontact'] = 'Pridėti adresatą';
 $labels['editcontact'] = 'Taisyti adresatą';
 $labels['contacts'] = 'Adresatai';
 $labels['contactproperties'] = 'Adresato savybės';
+$labels['contactnameandorg'] = 'Vardas ir organizacija';
 $labels['personalinfo'] = 'Asmeniniai duomenys';
+$labels['contactphoto'] = 'Adresato nuotrauka';
 $labels['edit']   = 'Redaguoti';
 $labels['cancel'] = 'Atsisakyti';
 $labels['save']   = 'Įrašyti';
@@ -307,10 +335,11 @@ $labels['export']         = 'Eksportuoti';
 $labels['exportall']      = 'Eksportuoti visus';
 $labels['exportsel']      = 'Eksportuoti pažymėtus';
 $labels['exportvcards']   = 'Eksportuoti adresatus  „vCard“ formatu';
-$labels['newcontactgroup'] = 'Kurti adresatų grupę';
+$labels['newcontactgroup']       = 'Kurti naują grupę';
 $labels['grouprename']    = 'Pervardinti grupę';
 $labels['groupdelete']    = 'Pašalinti grupę';
 $labels['groupremoveselected'] = 'Pašalinti pažymėtus adresatus iš grupės';
+$labels['uponelevel']     = 'Į viršų per vieną';
 $labels['previouspage']   = 'Rodyti ankstesnį puslapį';
 $labels['firstpage']      = 'Rodyti pirmąjį puslapį';
 $labels['nextpage']       = 'Rodyti tolesnį puslapį';
@@ -337,10 +366,10 @@ $labels['preferences'] = 'Nuostatos';
 $labels['userpreferences'] = 'Naudotojo nuostatos';
 $labels['editpreferences'] = 'Keisti naudotojo nuostatas';
 $labels['identities'] = 'Tapatybės';
-$labels['manageidentities'] = 'Tvarkyti šios paskyros tapatybes';
-$labels['newidentity'] = 'Nauja tapatybė';
-$labels['newitem'] = 'Naujas elementas';
-$labels['edititem'] = 'Redaguoti elementą';
+$labels['manageidentities'] = 'Tvarkyti tapatybes';
+$labels['newidentity'] = 'Sukurti naują tapatybę';
+$labels['addidentity'] = 'Pridėti tapatybę';
+$labels['edititem'] = 'Tvarkyti tapatybę';
 $labels['preferhtml'] = 'Rodyti HTML';
 $labels['defaultcharset'] = 'Numatytoji koduotė';
 $labels['htmlmessage'] = 'HTML laiškas';
@@ -398,6 +427,7 @@ $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'visiškas RFC 2047 (kitos programos)';
 $labels['force7bit'] = 'Naudoti MIME kodavimą 8 bitų simboliams';
 $labels['advancedoptions'] = 'Papildomos nuostatos';
+$labels['toggleadvancedoptions'] = 'Rodyti/slėpti papildomus nustatymus';
 $labels['focusonnewmessage'] = 'Fokusuoti naršyklės langą gavus naują laišką';
 $labels['checkallfolders'] = 'Naujų laiškų ieškoti visuose aplankuose';
 $labels['displaynext'] = 'Rodyti pranešimą pašalinus/perkėlus laišką';
@@ -439,14 +469,14 @@ $labels['asattachment'] = 'kaip priedas';
 $labels['replyallmode'] = 'Numatytasis mygtuko „Atsakyti visiems“ veiksmas';
 $labels['replyalldefault'] = 'atsakyti visiems';
 $labels['replyalllist'] = 'atsakyti el. pašto grupei (jei aptikta)';
-$labels['folder']  = 'Aplankas';
-$labels['folders']  = 'Aplankai';
-$labels['foldername']  = 'Aplanko vardas';
-$labels['subscribed']  = 'Užsakytas';
+$labels['folder'] = 'Aplankas';
+$labels['folders'] = 'Aplankai';
+$labels['foldername'] = 'Aplanko vardas';
+$labels['subscribed'] = 'Užsakytas';
 $labels['messagecount'] = 'Laiškai';
-$labels['create']  = 'Sukurti';
-$labels['createfolder']  = 'Sukurti naują aplanką';
-$labels['managefolders']  = 'Tvarkyti aplankus';
+$labels['create'] = 'Sukurti';
+$labels['createfolder'] = 'Sukurti naują aplanką';
+$labels['managefolders'] = 'Tvarkyti aplankus';
 $labels['specialfolders'] = 'Specialieji aplankai';
 $labels['properties'] = 'Savybės';
 $labels['folderproperties'] = 'Aplanko savybės';
@@ -456,9 +486,13 @@ $labels['info'] = 'Informacija';
 $labels['getfoldersize'] = 'Spustelėkite, norėdami sužinoti aplanko dydį';
 $labels['changesubscription'] = 'Spustelėkite, norėdami keisti prenumeratos nuostatas';
 $labels['foldertype'] = 'Aplanko tipas';
-$labels['personalfolder']  = 'Asmeninis aplankas';
-$labels['otherfolder']  = 'Kito naudotojo aplankas';
-$labels['sharedfolder']  = 'Viešas aplankas';
+$labels['personalfolder'] = 'Asmeninis aplankas';
+$labels['otherfolder'] = 'Kito naudotojo aplankas';
+$labels['sharedfolder'] = 'Viešas aplankas';
+$labels['findfolders'] = 'Ieškoti aplankų';
+$labels['namespace.personal'] = 'Asmeninis';
+$labels['namespace.other'] = 'Kito naudotojo';
+$labels['namespace.shared'] = 'Bendrinamas';
 $labels['sortby'] = 'Rikiuoti pagal';
 $labels['sortasc']  = 'Rikiuoti didėjančiai';
 $labels['sortdesc'] = 'Rikiuoti mažėjančiai';
@@ -491,4 +525,53 @@ $labels['vietnamese'] = 'Vietnamiečių';
 $labels['japanese'] = 'Japonų';
 $labels['korean'] = 'Korėjiečių';
 $labels['chinese'] = 'Kinų';
+$labels['arialabeltopnav'] = 'Lango valdymas';
+$labels['arialabeltasknav'] = 'Aplikacijos užduotys';
+$labels['arialabeltoolbar'] = 'Aplikacijos įrankių juosta';
+$labels['arialabelactivetask'] = 'Aktyvi užduotis';
+$labels['arialabelmessagessearchfilter'] = 'Laiškų sąrašo filtras';
+$labels['arialabelmailsearchform'] = 'El. laiško paieškos forma';
+$labels['arialabelcontactsearchform'] = 'Adresatų paieškos forma';
+$labels['arialabelmailquicksearchbox'] = 'El. pašto paieškos įvestis';
+$labels['arialabelquicksearchbox'] = 'Paieškos įvestis';
+$labels['arialabelfoldersearchfilter'] = 'Aplankų sąrašo filtras';
+$labels['arialabelfoldersearchform'] = 'Aplanko paieškos forma';
+$labels['arialabelfolderlist'] = 'Laiškų aplanko pasirinkimas';
+$labels['arialabelmessagelist'] = 'Elektroninių laiškų sąrašas';
+$labels['arialabelmailpreviewframe'] = 'Laiško peržiūra';
+$labels['arialabelmailboxmenu'] = 'Veiksmų su aplankais meniu';
+$labels['arialabellistselectmenu'] = 'Sąrašo pasirinkimo meniu';
+$labels['arialabelthreadselectmenu'] = 'Gijų sąrašo meniu';
+$labels['arialabelmessagelistoptions'] = 'Laiškų rodymo ir rikiavimo nustatymai';
+$labels['arialabelmailimportdialog'] = 'Laiškų importavimo dialogas';
+$labels['arialabelmessagenav'] = 'Navigacija tarp laiškų';
+$labels['arialabelmessagebody'] = 'Laiško turinys';
+$labels['arialabelmessageactions'] = 'Veiksmai su laišku';
+$labels['arialabelcontactquicksearch'] = 'Adresatų paieškos forma';
+$labels['arialabelcontactsearchbox'] = 'Kontaktų paieškos įvestis';
+$labels['arialabelmessageheaders'] = 'Laiško antraštės';
+$labels['arialabelforwardingoptions'] = 'Persiuntimo nustatymai';
+$labels['arialabelreplyalloptions'] = 'Atsakyti visiems nustatymai';
+$labels['arialabelmoremessageactions'] = 'Daugiau laiškų veiksmų';
+$labels['arialabelmarkmessagesas'] = 'Pažymėti pasirinktus laiškus kaip...';
+$labels['arialabelcomposeoptions'] = 'Laiško kūrimo nustatymai';
+$labels['arialabelresponsesmenu'] = 'Atsakymų meniu';
+$labels['arialabelattachmentuploadform'] = 'Priedo įkėlimo forma';
+$labels['arialabelattachmentpreview'] = 'Priedo peržiūra';
+$labels['ariasummarycomposecontacts'] = 'Sąrašas adresatų ir grupių, kuriuos galima pasirinkti kaip gavėją';
+$labels['arialabelcontactexportoptions'] = 'Adresatų eksportavimo nustymai';
+$labels['arialabelabookgroupoptions'] = 'Adresų knygos/grupių nustatymai';
+$labels['arialabelpreferencesform'] = 'Nustatymų forma';
+$labels['arialabelidentityeditfrom'] = 'Tapatybės redagavimo forma';
+$labels['arialabelresonseeditfrom'] = 'Atsakymo redagavimo forma';
+$labels['arialabelsearchterms'] = 'Paieškos žodžiai';
+$labels['helplistnavigation'] = 'Navigacija klaviatūra sąraše';
+$labels['helplistkeyboardnavigation'] = "Rodyklė aukštyn / žemyn: fokusuoti / pasirinkti kitą eilutę.
+Tarpas: pasirinkti sufokusuoą eilutę.
+Lyg2 + rodyklė aukštyn / žemyn: pasirinkti papildomą eilutę viršuje / apačioje.
+Vald + tarpas: įtraukti sufokusuotą eilutę į pasirinktų sąrašą / pašalinti ją iš jo.";
+$labels['helplistkeyboardnavmessages'] = "Rodyklė dešinėn / kairėn: išskleisti / suskleisti laiškų giją (esant gijų veiksenoje).
+Įvesti: atverti pasirinktą / sufokusuotą laišką.
+Šalinti: perkelti pasirinktus laiškus į Šiukšlinę.";
+$labels['helplistkeyboardnavcontacts'] = "Enter: Atidaryti pasirinktą adresatą";
 ?>
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index d45bdeb5e..0759d152e 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Jūsų sesija negaliojanti.';
 $messages['storageerror'] = 'Nepavyko prisijungti prie IMAP serverio.';
 $messages['servererror'] = 'Serverio klaida!';
 $messages['servererrormsg'] = 'Serverio klaida: $msg';
+$messages['connerror'] = 'Ryšio klaida (nepavyko susijungti su serveriu)!';
 $messages['dberror'] = 'Duomenų bazės klaida!';
+$messages['windowopenerror'] = 'Buvo užblokuotas iššokantis langas!';
 $messages['requesttimedout'] = 'Baigėsi užklausai skirtas laikas';
 $messages['errorreadonly'] = 'Nepavyko atlikti veiksmo – aplankas prieinamas tik skaitymui.';
 $messages['errornoperm'] = 'Nepavyko atlikti veiksmo – nepakanka teisių.';
@@ -32,6 +34,8 @@ $messages['invalidrequest'] = 'Netinkama užklausa! Duomenys neišsaugoti.';
 $messages['invalidhost'] = 'Negalimas serverio vardas.';
 $messages['nomessagesfound'] = 'Šioje pašto dėžutėje laiškų nėra.';
 $messages['loggedout'] = 'Jūs sėkmingai atsijungėte. Iki kito karto!';
+$messages['mailboxempty'] = 'Pašto dėžutė tuščia.';
+$messages['nomessages'] = 'Laiškų nėra';
 $messages['refreshing'] = 'Atnaujinama…';
 $messages['loading'] = 'Įkeliama…';
 $messages['uploading'] = 'Įkeliamas failas…';
@@ -81,6 +85,7 @@ $messages['norecipientwarning'] = 'Prašom įvesti bent vieną gavėją.';
 $messages['nosubjectwarning']  = 'Temos laukelis tuščias. Ar norite temą įvesti dabar?';
 $messages['nobodywarning'] = 'Išsiųsti šį laišką be teksto?';
 $messages['notsentwarning'] = 'Laiškas neišsiųstas. Ar jūs tikrai norite jo atsikratyti?';
+$messages['restoresavedcomposedata'] = 'Buvo rastas anksčiau pradėtas rašyti, bet neišsiųstas laiškas.\n\nTema:$subject\nIšsaugotas: $date\n\nAr norite šį laišką atkurti?';
 $messages['noldapserver'] = 'Prašome pasirinkti LDAP serverį paieškai.';
 $messages['nosearchname'] = 'Prašom įvesti vardą arba el. pašto adresą.';
 $messages['notuploadedwarning'] = 'Įkelti dar ne visi priedai. Prašom palaukti arba atšaukti jų įkėlimą.';
@@ -89,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Rasta adresatų: $nr.';
 $messages['searchnomatch'] = 'Paiešką atitinkančių rezultatų nėra.';
 $messages['searching'] = 'Ieškoma…';
 $messages['checking'] = 'Tikrinama…';
+$messages['stillsearching'] = 'Dar ieškoma...';
 $messages['nospellerrors'] = 'Rašybos klaidų nerasta.';
 $messages['folderdeleted'] = 'Aplankas sėkmingai pašalintas.';
 $messages['foldersubscribed'] = 'Aplankas sėkmingai užprenumeruotas.';
@@ -132,7 +138,7 @@ $messages['importmessagesuccess'] = 'Importuota laiškų: $nr';
 $messages['importmessageerror'] = 'Importas nepavyko! Įkeltasis failas nėra tinkamas importavimui laiško arba pašto dėžutės failas';
 $messages['opnotpermitted'] = 'Veiksmas neleistinas!';
 $messages['nofromaddress'] = 'Nenurodytas pasirinktosios tapatybės el. pašto adresas.';
-$messages['editorwarning'] = 'Pereinant į grynojo teksto redagavimą, visas laiško formatavimas bus prarastas. Ar tęsti?';
+$messages['editorwarning'] = 'Keičiant redaktorių gali būti prarastas teksto formatavimas. Ar norite tęsti?';
 $messages['httpreceivedencrypterror'] = 'Įvyko lemtinga konfigūracijos klaida. Nedelsiant susisiekite su administratoriumi. <b>Jūsų laiškas negali būti išsiųstas.</b>';
 $messages['smtpconnerror'] = 'SMTP klaida ($code): nepavyko prisijungti prie serverio.';
 $messages['smtpautherror'] = 'SMTP klaida ($code): nepavyko autentikuotis.';
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index 185d75180..1a46f0465 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -131,10 +131,15 @@ $labels['moreactions']      = 'Papildus darbības...';
 $labels['more']             = 'Vairāk';
 $labels['back']             = 'Atpakaļ';
 $labels['options']          = 'Opcijas';
+$labels['first'] = 'Pirmā';
+$labels['last'] = 'Pēdējā';
+$labels['previous'] = 'Iepriekšējā';
+$labels['next'] = 'Nākošā';
 $labels['select'] = 'Atzīmēt';
 $labels['all'] = 'Visas';
 $labels['none'] = 'Nevienu';
 $labels['currpage'] = 'Pašreizējā lapa';
+$labels['isread'] = 'Lasīt';
 $labels['unread'] = 'Nelasītās';
 $labels['flagged'] = 'Atzīmētās';
 $labels['unanswered'] = 'Neatbildētās';
@@ -171,6 +176,10 @@ $labels['importmessages'] = 'Importēt vēstules';
 $labels['quota'] = 'Kvota';
 $labels['unknown']  = 'nezināms';
 $labels['unlimited']  = 'neierobežots';
+$labels['quotatype'] = 'Kvotas tips';
+$labels['quotaused'] = 'Izlietots';
+$labels['quotastorage'] = 'Kvota';
+$labels['quotamessage'] = 'Vēstuļu skaits';
 $labels['quicksearch']  = 'Ārtā meklēšana';
 $labels['resetsearch']  = 'Atstatīt meklēšanu';
 $labels['searchmod']  = 'Meklēšanas modifikatori:';
@@ -178,6 +187,9 @@ $labels['msgtext']  = 'Visā vēstulē';
 $labels['body']  = 'Pamatteksts';
 $labels['type'] = 'Tips';
 $labels['namex'] = 'Vārds';
+$labels['currentfolder'] = 'Pašreizējā mape';
+$labels['subfolders'] = 'Šī un apakšmapes';
+$labels['allfolders'] = 'Visas mapes';
 $labels['openinextwin'] = 'Atvērt jaunā logā';
 $labels['emlsave'] = 'lejupielādēt (.eml)';
 $labels['changeformattext'] = 'Rādīt kā neformatētu tekstu';
@@ -193,6 +205,8 @@ $labels['returnreceipt']  = 'Saņemšanas apstiprinājums';
 $labels['dsn']            = 'Piegādes atskaite';
 $labels['mailreplyintro'] = '$sender @ $date rakstīja:';
 $labels['originalmessage'] = 'Sākotnējā vēstule';
+$labels['selectimage']    = 'Atzīmēt attēlu';
+$labels['addimage']       = 'Pievienot attēlu';
 $labels['editidents']    = 'Rediģēt identitātes';
 $labels['spellcheck']    = 'Izrunāt';
 $labels['checkspelling'] = 'Pārbaudīt pareizrakstību';
@@ -203,9 +217,10 @@ $labels['restoremessage'] = 'Atjaunot vēstuli?';
 $labels['responses'] = 'Atbildes';
 $labels['insertresponse'] = 'Ievietot atbildi';
 $labels['manageresponses'] = 'Pārvaldīt atbildes';
-$labels['savenewresponse'] = 'Saglabāt jauno atbildi';
-$labels['editresponses'] = 'Rediģēt atbildes';
+$labels['savenewresponse'] = 'Izveidot jaunu atbildi';
+$labels['addresponse'] = 'Pievienot atbildi';
 $labels['editresponse'] = 'Rediģēt atbildi';
+$labels['editresponses'] = 'Rediģēt atbildes';
 $labels['responsename'] = 'Vārds';
 $labels['responsetext'] = 'Atbildes teksts';
 $labels['attach'] = 'Pievienot';
@@ -288,11 +303,13 @@ $labels['typehomepage']  = 'Mājaslapa';
 $labels['typeblog'] = 'Blogs';
 $labels['typeprofile'] = 'Profils';
 $labels['addfield'] = 'Pievienot lauku...';
-$labels['addcontact'] = 'Pievienot jaunu kontaktu';
+$labels['addcontact'] = 'Pievienot kontaktu';
 $labels['editcontact'] = 'Rediģēt kontaktu';
 $labels['contacts'] = 'Kontakti';
 $labels['contactproperties'] = 'Kontakta īpašības';
+$labels['contactnameandorg'] = 'Vārds un organizācija';
 $labels['personalinfo'] = 'Personīgā informācija';
+$labels['contactphoto'] = 'Kontakta attēls';
 $labels['edit']   = 'Rediģēt';
 $labels['cancel'] = 'Atcelt';
 $labels['save']   = 'Saglabāt';
@@ -310,7 +327,7 @@ $labels['export']         = 'Eksportēt';
 $labels['exportall']      = 'Eksportēt visu';
 $labels['exportsel']      = 'Eksportēt atzīmēto';
 $labels['exportvcards']   = 'Eksportēt kontaktus vCard formātā';
-$labels['newcontactgroup'] = 'Izveidot jaunu kontaktu grupu';
+$labels['newcontactgroup']       = 'Izveidot jaunu grupu';
 $labels['grouprename']    = 'Pārdēvēt grupu';
 $labels['groupdelete']    = 'Izdzēst grupu';
 $labels['groupremoveselected'] = 'Dzēst atzīmētos kontaktus no grupas';
@@ -341,9 +358,9 @@ $labels['userpreferences'] = 'Lietotāja iestatījumi';
 $labels['editpreferences'] = 'Rediģēt iestatījumus';
 $labels['identities'] = 'Identitātes';
 $labels['manageidentities'] = 'Rediģēt identitātes';
-$labels['newidentity'] = 'Jauna identitāte';
-$labels['newitem'] = 'Jauns';
-$labels['edititem'] = 'Rediģēt';
+$labels['newidentity'] = 'Izveidot jaunu identitāti';
+$labels['addidentity'] = 'Pievienot identitāti';
+$labels['edititem'] = 'Rediģēt identitāti';
 $labels['preferhtml'] = 'Rādīt HTML formatētās vēstules';
 $labels['defaultcharset'] = 'Noklusētā rakstzīmju kopa';
 $labels['htmlmessage'] = 'HTML formatēta vēstule';
@@ -442,14 +459,14 @@ $labels['asattachment'] = 'kā pielikumu';
 $labels['replyallmode'] = '[Atbildēt visiem] pogas noklusētā darbība';
 $labels['replyalldefault'] = 'atbildēt visiem';
 $labels['replyalllist'] = 'atbildēt tikai sarakstei (ja tāda tiek atrasta)';
-$labels['folder']  = 'Mapi';
-$labels['folders']  = 'Mapes';
-$labels['foldername']  = 'Mapes nosaukums';
-$labels['subscribed']  = 'Abonēta';
+$labels['folder'] = 'Mapi';
+$labels['folders'] = 'Mapes';
+$labels['foldername'] = 'Mapes nosaukums';
+$labels['subscribed'] = 'Abonēta';
 $labels['messagecount'] = 'Vēstules';
-$labels['create']  = 'Izveidot';
-$labels['createfolder']  = 'Izveidot jaunu mapi';
-$labels['managefolders']  = 'Rediģēt mapes';
+$labels['create'] = 'Izveidot';
+$labels['createfolder'] = 'Izveidot jaunu mapi';
+$labels['managefolders'] = 'Rediģēt mapes';
 $labels['specialfolders'] = 'Īpašās mapes';
 $labels['properties'] = 'Īpašības';
 $labels['folderproperties'] = 'Mapes īpašības';
@@ -459,9 +476,9 @@ $labels['info'] = 'Informācija';
 $labels['getfoldersize'] = 'Uzklikšķiniet, lai uzzinātu mapes izmēru';
 $labels['changesubscription'] = 'Uzklikšķiniet, lai mainītu abonēšanas iestatījumus';
 $labels['foldertype'] = 'Mapes tips';
-$labels['personalfolder']  = 'Privāta mape';
-$labels['otherfolder']  = 'Cita lietotāja mape';
-$labels['sharedfolder']  = 'Publiska mape';
+$labels['personalfolder'] = 'Privāta mape';
+$labels['otherfolder'] = 'Cita lietotāja mape';
+$labels['sharedfolder'] = 'Publiska mape';
 $labels['sortby'] = 'Kārtot pēc';
 $labels['sortasc']  = 'Kārtot augošā secībā';
 $labels['sortdesc'] = 'Kārtot dilstošā secībā';
@@ -494,4 +511,12 @@ $labels['vietnamese'] = 'Vjetnamiešu';
 $labels['japanese'] = 'Japāņu';
 $labels['korean'] = 'Korejiešu';
 $labels['chinese'] = 'Ķīniešu';
+$labels['arialabelactivetask'] = 'Aktīvā darbība';
+$labels['arialabelmailpreviewframe'] = 'Ziņojuma priekšskats';
+$labels['arialabelforwardingoptions'] = 'Pārsūtīšanas iestatījumi';
+$labels['arialabelreplyalloptions'] = 'Atbildēt-visiem iestatījumi';
+$labels['arialabelmoremessageactions'] = 'Citas darbības ar vēstulēm';
+$labels['arialabelmarkmessagesas'] = 'Atzīmēt norādītās vēstules kā ...';
+$labels['arialabelattachmentuploadform'] = 'Pielikuma augšupielādes forma';
+$labels['arialabelattachmentpreview'] = 'Pielikuma priekšskats';
 ?>
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index 6f1622c16..91290df71 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Jūsu sessija ir beigusies.';
 $messages['storageerror'] = 'Neizdevās pieslēgties IMAP serverim';
 $messages['servererror'] = 'Servera kļūda!';
 $messages['servererrormsg'] = 'Servera kļūda: $msg';
+$messages['connerror'] = 'Savienojuma kļūda - nav iespējams pieslēgties serverim!';
 $messages['dberror'] = 'Datubāzes kļūda!';
+$messages['windowopenerror'] = 'Izlēcošais logs tika bloķēts!';
 $messages['requesttimedout'] = 'Pieprasījumam iestājās noilgums';
 $messages['errorreadonly'] = 'Neizdevās veikt darbību: mape ir tikai lasāma (read only)';
 $messages['errornoperm'] = 'Neizdevās veikt darbību: piekļuve liegta';
@@ -32,6 +34,8 @@ $messages['invalidrequest'] = 'Nederīgs pieprasījums! Dati netika saglabāti .
 $messages['invalidhost'] = 'Nederīgs servera nosaukums';
 $messages['nomessagesfound'] = 'Šajā pastkastē nav vēstuļu';
 $messages['loggedout'] = 'Jūs esat veiksmīgi atslēdzies no sistēmas. Uz redzēšanos!';
+$messages['mailboxempty'] = 'Pastkaste ir tukša';
+$messages['nomessages'] = 'Nav nevienas vēstules';
 $messages['refreshing'] = 'Atjauno...';
 $messages['loading'] = 'Notiek ielāde...';
 $messages['uploading'] = 'Augšupielāde failu...';
@@ -90,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Atrasti $nr kontakti';
 $messages['searchnomatch'] = 'Meklējot nekas netika atrasts';
 $messages['searching'] = 'Meklē...';
 $messages['checking'] = 'Pārbauda...';
+$messages['stillsearching'] = 'Joprojām meklē ...';
 $messages['nospellerrors'] = 'Pareizrakstības kļūdas netika atrastas';
 $messages['folderdeleted'] = 'Mape veiksmīgi izdzēsta';
 $messages['foldersubscribed'] = 'Mape veiksmīgi pieslēgta.';
@@ -133,7 +138,7 @@ $messages['importmessagesuccess'] = 'Veiksmīgi ieimportētas $nr vēstules';
 $messages['importmessageerror'] = 'Importēšanas kļūda! Augšupielādētā datne satur nekorektus datus';
 $messages['opnotpermitted'] = 'Darbība nav atļauta!';
 $messages['nofromaddress'] = 'Izvēlētajai identitātei nav norādīta e-pasta adrese.';
-$messages['editorwarning'] = 'Pārslēdzoties uz vienkāršotu teksta redaktoru, tiks pazaudēts esošais teksta formatējums. Vai tiešām vēlaties turpināt?';
+$messages['editorwarning'] = 'Pārslēdzot redaktora veidus var tikt pazaudēts teksta formatējums. Vai turpināt?';
 $messages['httpreceivedencrypterror'] = 'Notika kritiska kļūme. Lūdzu nekavējoties sazinieties ar Jūsu administratoru. <b>Jūsu vēstuli nosūtīt nav iespējams.</b>';
 $messages['smtpconnerror'] = 'SMTP kļūme ($code): Neizdevās pieslēgties serverim';
 $messages['smtpautherror'] = 'SMTP kļūda ($code): Neizdevās autorizēties.';
diff --git a/program/localization/mk_MK/messages.inc b/program/localization/mk_MK/messages.inc
index c8e29dfe9..3a03429ba 100644
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -15,11 +15,16 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
+$messages['errortitle']  = 'Настана грешка!';
 $messages['loginfailed']  = 'Најавата не успеа';
 $messages['cookiesdisabled'] = 'Вашиот прелистувач не прифаќа колачиња';
 $messages['sessionerror'] = 'Сесијата е неважечка или е истечена';
 $messages['storageerror'] = 'Поврзувањето со IMAP не успеа';
 $messages['servererror'] = 'Грешка во серверот!';
+$messages['servererrormsg'] = 'Грешка со серверот: $msg';
+$messages['connerror'] = 'Грешка со конекција (Неуспешно конектирање со серверот)!';
+$messages['dberror'] = 'Грешка со датабазата!';
+$messages['windowopenerror'] = 'Popup прозорецот беше блокиран!';
 $messages['invalidrequest'] = 'Неважечко барање! Податоците не се зачувани.';
 $messages['nomessagesfound'] = 'Немате писма во ова сандаче';
 $messages['loggedout'] = 'Успешно се одјавивте. Ви благодариме и довидување!';
@@ -85,7 +90,6 @@ $messages['importwait'] = 'Убезувам,, почекајте...';
 $messages['importconfirm'] = '<b>Успешно се увезени $inserted имиња, $skipped веќе постојат и се прескокнати</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = 'Операцијата не е дозволена';
 $messages['nofromaddress'] = 'Не е внесена е-пошта во одберениот идентитет';
-$messages['editorwarning'] = 'Префрлањето на уредникот на обичен текст ќе резултира со губење на целото форматирање на текстот. Дали сакате да продолжите?';
 $messages['httpreceivedencrypterror'] = 'Се појави фатална конфигурациска грешка. Веднаш контактирајте го администраторот. <b>Вашето писмо не мож.</b>';
 $messages['smtpconnerror'] = 'SMTP грешка ($code): Не успеав да се поврзам со серверот';
 $messages['smtpautherror'] = 'SMTP грешка: Не успееа потврдувањето';
diff --git a/program/localization/ml_IN/labels.inc b/program/localization/ml_IN/labels.inc
index 395893afb..f188e1e8f 100644
--- a/program/localization/ml_IN/labels.inc
+++ b/program/localization/ml_IN/labels.inc
@@ -245,12 +245,12 @@ $labels['newmessageonly'] = 'പുതിയ സന്ദേശം മാത്�
 $labels['afternseconds']  = '$n നിമിഷങ്ങള്‍ കഴിഞ്ഞു്';
 $labels['spellcheckignorenums'] = 'അക്കങ്ങള്‍ ഉള്ള വാക്കുകളെ അവഗണിക്കുക';
 $labels['addtodict'] = 'നിഘണ്ടുവില്‍ ചേര്‍ക്കുക';
-$labels['folders']  = 'ഫോള്‍ഡറുകള്‍';
+$labels['folders'] = 'ഫോള്‍ഡറുകള്‍';
 $labels['properties'] = 'സവിശേഷതകള്‍';
 $labels['info'] = 'വിവരം';
 $labels['getfoldersize'] = 'അറയുടെ വലുപ്പം അരിയാന്‍ ക്ലിക്ക് ചെയ്യുക';
-$labels['personalfolder']  = 'സ്വകാര്യ അറ';
-$labels['sharedfolder']  = 'പൊതു - അറ';
+$labels['personalfolder'] = 'സ്വകാര്യ അറ';
+$labels['sharedfolder'] = 'പൊതു - അറ';
 $labels['support'] = 'സഹായം തേടുക';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/ml_IN/messages.inc b/program/localization/ml_IN/messages.inc
index 5d6d9f011..9d6b40bd5 100644
--- a/program/localization/ml_IN/messages.inc
+++ b/program/localization/ml_IN/messages.inc
@@ -15,10 +15,24 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-$messages['cookiesdisabled'] = 'തങ്കളുടെ ബ്രവു്സര്‍ കുക്കീസ് സ്വീകരിക്കുന്നതല്ല';
-$messages['servererror'] = 'സര്‍വര്‍ പിഴവ് !';
-$messages['errornoperm'] = 'പ്രവര്‍ത്തനം തടസപ്പെട്ടു . അനുമതി നിഷേധിക്കപെട്ടിരിക്കുന്നു';
-$messages['invalidrequest'] = 'അസാധുവായ അപേക്ഷ ! ഒരു രേഖയും സൂക്ഷിച്ചിട്ടില്ല';
+$messages['errortitle']  = 'ഒരു പിഴവ് സംഭവിച്ചിരിക്കുന്നു';
+$messages['loginfailed']  = 'പ്രവേശനം പരാജയപ്പെട്ടിയിക്കുന്നു';
+$messages['cookiesdisabled'] = 'താങ്കളുടെ ബ്രൗസർ കുക്കികൾ സ്വീകരിക്കുന്നതല്ല';
+$messages['sessionerror'] = 'താങ്കളുടെ സെഷൻ അസാധുവാണ് അല്ലെങ്കിൽ കാലഹരണപ്പെട്ടിരിക്കുന്നു';
+$messages['storageerror'] = 'സൂക്ഷിക്കുന്നതിനുള്ള സെർവറുമായി ബന്ധിപ്പിക്കാൻ സാധിച്ചില്ല';
+$messages['servererror'] = 'സെർവർ പിഴവ്!';
+$messages['servererrormsg'] = 'സെർവർ പിഴവ്: $msg';
+$messages['connerror'] = 'ബന്ധിപ്പിക്കുന്നതിൽ പിഴവ് (സെർവറിൽ എത്താനായില്ല)!';
+$messages['dberror'] = 'ഡാറ്റാബേസ് പിഴവ്';
+$messages['windowopenerror'] = 'പോപ്പപ്പ് ജാലകം തടയപ്പെട്ടിരുന്നു';
+$messages['requesttimedout'] = 'അപേക്ഷയുടെ കാലാവധി കഴിഞ്ഞു';
+$messages['errorreadonly'] = 'പ്രവൃത്തി നടത്താനായില്ല. ഫോൾഡർ വായിക്കാൻ മാത്രമുള്ളതാണ്';
+$messages['errornoperm'] = 'പ്രവര്‍ത്തനം നടത്താനായില്ല . അനുമതി നിഷേധിക്കപെട്ടിരിക്കുന്നു.';
+$messages['erroroverquota'] = 'പ്രവര്‍ത്തനം നടത്താനായില്ല . ഡിസ്കിൽ സ്ഥലമില്ല.';
+$messages['erroroverquotadelete'] = 'ഡിസ്കിൽ സ്ഥലമില്ല. ഒരു സന്ദേശം നീക്കം ചെയ്യാൻ SHIFT+DEL ഉപയോഗിക്കുക';
+$messages['invalidrequest'] = 'അസാധുവായ അപേക്ഷ ! ഒരു ഡാറ്റയും സൂക്ഷിച്ചിട്ടില്ല.';
+$messages['invalidhost'] = 'അസാധുവായ സെർവർ നാമം';
+$messages['nomessagesfound'] = 'ഈ മെയിൽബോക്സിൽ സന്ദേശമൊന്നും കണ്ടെത്തിയില്ല';
 $messages['loading'] = 'തുറക്കുന്നു...';
 $messages['checkingmail'] = 'പുതിയ സന്ദേസങ്ങള്‍കുവേണ്ടി തിരയുന്നു...';
 $messages['sendingmessage'] = 'സന്ദേശം അയക്കുന്നു...';
diff --git a/program/localization/mr_IN/messages.inc b/program/localization/mr_IN/messages.inc
index 2685f4826..5793c24b5 100644
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -99,7 +99,6 @@ $messages['importwait'] = 'आयात करत आहे, कृपया व
 $messages['importconfirm'] = '<b>$inserted पत्ते यशस्वीरित्या आयात केल, $skipped आधिच असलेल्या नोंदी केल्या नाहीत</b>:<p><em>$names</em></p>';
 $messages['opnotpermitted'] = 'ही क्रिया करण्यास परवानगी नाही.';
 $messages['nofromaddress'] = 'निवडलेल्या खात्यात इमेल पत्ता दिलेला नाही.';
-$messages['editorwarning'] = 'टेक्स्ट संपादन निवडल्यास संदेशाचे दृष्य स्वरुप बदलून जाईल. तुम्हाला असेच करायचे आहे ना?';
 $messages['httpreceivedencrypterror'] = 'हानीकारक चूक झाली. व्‍यवस्‍थापकाशी तात्‍काळ संपर्क साधा. <b> तुमचा संदेश पाठवला नाही </b>';
 $messages['smtpconnerror'] = 'SMTP चूक ($code): सर्व्‍हरशी संपर्क साधता येत नाही';
 $messages['smtpautherror'] = 'SMTP चूक ($code): ओळख पटवता येत नाही';
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index c2a489714..47394f374 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -135,7 +135,6 @@ $messages['importmessagesuccess'] = 'Kopierte $nr meldinger';
 $messages['importmessageerror'] = 'Importeringen var mislykket! Den opplastede filen er ikke en gyldig melding, eller er ikke kompatibel med meldingssystemet.';
 $messages['opnotpermitted'] = 'Handling ikke tillatt!';
 $messages['nofromaddress'] = 'E-postadresse mangler i valgt identitet';
-$messages['editorwarning'] = 'Ved å bytte format til ren tekst vil all tekstformatering gå tapt. Ønsker du å fortsette?';
 $messages['httpreceivedencrypterror'] = 'En uopprettelig feil oppsto. Vennligst kontakt systemansvarlig umiddelbart. <b>Din melding kunne ikke sendes.</b>';
 $messages['smtpconnerror'] = 'SMTP-feil ($code): Klarte ikke koble til server';
 $messages['smtpautherror'] = 'SMTP-feil ($code): Pålogging feilet';
diff --git a/program/localization/nl_BE/messages.inc b/program/localization/nl_BE/messages.inc
index ac6c17b6e..e96ce799a 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -119,7 +119,6 @@ $messages['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol ge�
 $messages['importconfirmskipped'] = '<b>$skipped bestaande contactpersonen overgeslagen</b>';
 $messages['opnotpermitted'] = 'Deze actie is niet toegestaan!';
 $messages['nofromaddress'] = 'De geselecteerde identiteit bevat geen emailadres.';
-$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): Authenticatie mislukt.';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index e4f4794b6..4e56656dd 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Meer acties...';
 $labels['more']             = 'Meer';
 $labels['back']             = 'Terug';
 $labels['options']          = 'Opties';
+$labels['first'] = 'Eerste';
+$labels['last'] = 'Laatste';
+$labels['previous'] = 'Vorige';
+$labels['next'] = 'Volgende';
 $labels['select'] = 'Selecteer';
 $labels['all'] = 'Allemaal';
 $labels['none'] = 'Geen';
 $labels['currpage'] = 'Huidige pagina';
+$labels['isread'] = 'Gelezen';
 $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Gemarkeerd';
+$labels['unflagged'] = 'Ongemarkeerd';
 $labels['unanswered'] = 'Onbeantwoord';
 $labels['withattachment'] = 'Met bijlage';
 $labels['deleted'] = 'Verwijderd';
 $labels['undeleted'] = 'Niet verwijderd';
+$labels['replied'] = 'Beantwoord';
+$labels['forwarded'] = 'Doorgestuurd';
 $labels['invert'] = 'Selectie omkeren';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lijst';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Berichten importeren';
 $labels['quota'] = 'Opslagverbruik';
 $labels['unknown']  = 'onbekend';
 $labels['unlimited']  = 'onbeperkt';
+$labels['quotatype'] = 'Soort quotum';
+$labels['quotatotal'] = 'Limiet';
+$labels['quotaused'] = 'Gebruikt';
+$labels['quotastorage'] = 'Schijfruimte';
+$labels['quotamessage'] = 'Aantal berichten';
 $labels['quicksearch']  = 'Snel zoeken';
 $labels['resetsearch']  = 'Wis zoekopdracht';
 $labels['searchmod']  = 'Zoekopties';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Gehele bericht';
 $labels['body']  = 'Inhoud';
 $labels['type'] = 'Type';
 $labels['namex'] = 'Naam';
+$labels['searchscope'] = 'Zoekbereik';
+$labels['currentfolder'] = 'Huidige map';
+$labels['subfolders'] = 'Deze en onderliggende mappen';
+$labels['allfolders'] = 'Alle mappen';
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
 $labels['changeformattext'] = 'Weergeven als platte tekst';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Ontvangstbevestiging';
 $labels['dsn']            = 'Afleveringsbericht (DSN)';
 $labels['mailreplyintro'] = '$sender schreef op $date:';
 $labels['originalmessage'] = 'Oorspronkelijke bericht';
+$labels['selectimage']    = 'Selecteer afbeelding';
+$labels['addimage']       = 'Afbeelding toevoegen';
+$labels['selectmedia']    = 'Video selecteren';
+$labels['addmedia']       = 'Film toevoegen';
 $labels['editidents']    = 'Identiteiten bewerken';
 $labels['spellcheck']    = 'Spelling';
 $labels['checkspelling'] = 'Controleer spelling';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'Bericht herstellen?';
 $labels['responses'] = 'Reacties';
 $labels['insertresponse'] = 'Reactie invoegen';
 $labels['manageresponses'] = 'Reacties beheren';
-$labels['savenewresponse'] = 'Nieuwe reactie opslaan';
-$labels['editresponses'] = 'Bewerk reactie';
+$labels['savenewresponse'] = 'Nieuw antwoord aanmaken';
+$labels['addresponse'] = 'Antwoord toevoegen';
 $labels['editresponse'] = 'Bewerk reactie';
+$labels['editresponses'] = 'Bewerk reactie';
 $labels['responsename'] = 'Naam';
 $labels['responsetext'] = 'Reactie';
 $labels['attach'] = 'Bijvoegen';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Toevoegen';
 $labels['uploadprogress'] = '$percent ($current van $total)';
 $labels['close']  = 'Sluit';
 $labels['messageoptions']  = 'Berichtopties...';
+$labels['togglecomposeoptions'] = 'Wissel opties voor opstellen';
 $labels['low']     = 'Laag';
 $labels['lowest']  = 'Laagste';
 $labels['normal']  = 'Normaal';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Assistent';
 $labels['spouse'] = 'Echtgenoot';
 $labels['allfields'] = 'Alle velden';
 $labels['search'] = 'Zoeken';
+$labels['searchresult'] = 'Zoekresultaat';
 $labels['advsearch'] = 'Geavanceerd zoeken';
 $labels['advanced'] = 'Geavanceerd';
 $labels['other'] = 'Anders';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Website';
 $labels['typeblog'] = 'Weblog';
 $labels['typeprofile'] = 'Profiel';
 $labels['addfield'] = 'Veld toevoegen...';
-$labels['addcontact'] = 'Nieuwe contactpersoon toevoegen';
+$labels['addcontact'] = 'Contact toevoegen';
 $labels['editcontact'] = 'Contactpersoon wijzigen';
 $labels['contacts'] = 'Contactpersonen';
 $labels['contactproperties'] = 'Gegevens van contactpersoon';
+$labels['contactnameandorg'] = 'Naam en organisatie';
 $labels['personalinfo'] = 'Persoonlijke informatie';
+$labels['contactphoto'] = 'Contactfoto';
 $labels['edit']   = 'Wijzig';
 $labels['cancel'] = 'Annuleren';
 $labels['save']   = 'Opslaan';
@@ -301,7 +327,7 @@ $labels['rename'] = 'Hernoemen';
 $labels['addphoto'] = 'Toevoegen';
 $labels['replacephoto'] = 'Vervangen';
 $labels['uploadphoto'] = 'Foto uploaden';
-$labels['newcontact']     = 'Voeg een nieuwe contactpersoon toe';
+$labels['newcontact']     = 'Nieuw contact aanmaken';
 $labels['deletecontact']  = 'Verwijder geselecteerde contactpersonen';
 $labels['composeto']      = 'Stuur een bericht naar';
 $labels['contactsfromto'] = 'Contactpersonen $from t/m $to van $count';
@@ -310,10 +336,12 @@ $labels['export']         = 'Exporteren';
 $labels['exportall']      = 'Alles exporteren';
 $labels['exportsel']      = 'Selectie exporteren';
 $labels['exportvcards']   = 'Exporteer contactpersonen in vCard-formaat';
-$labels['newcontactgroup'] = 'Maak een nieuwe contactgroep';
+$labels['newcontactgroup']       = 'Nieuwe groep maken';
+$labels['addgroup']       = 'Groep toevoegen';
 $labels['grouprename']    = 'Groep hernoemen';
 $labels['groupdelete']    = 'Groep verwijderen';
 $labels['groupremoveselected'] = 'Verwijder geselecteerde contactpersonen van groep';
+$labels['uponelevel']     = 'Een niveau omhoog';
 $labels['previouspage']   = 'Vorige pagina';
 $labels['firstpage']      = 'Eerste pagina';
 $labels['nextpage']       = 'Volgende pagina';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Instellingen';
 $labels['userpreferences'] = 'Gebruikersinstellingen';
 $labels['editpreferences'] = 'Wijzig gebruikersinstellingen';
 $labels['identities'] = 'Identiteiten';
-$labels['manageidentities'] = 'Beheer identiteiten voor dit account';
-$labels['newidentity'] = 'Identiteit toevoegen';
-$labels['newitem'] = 'Nieuw item';
-$labels['edititem'] = 'Wijzig item';
+$labels['manageidentities'] = 'Identiteiten beheren';
+$labels['newidentity'] = 'Nieuwe identiteit';
+$labels['addidentity'] = 'Identiteit toevoegen';
+$labels['edititem'] = 'Identiteit bewerken';
 $labels['preferhtml'] = 'Toon berichten in HTML-opmaak';
 $labels['defaultcharset'] = 'Standaard tekenset';
 $labels['htmlmessage'] = 'HTML-bericht';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'Volledig RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Volledig RFC 2047 (andere)';
 $labels['force7bit'] = 'Gebruik MIME-codering voor 8-bit karakters';
+$labels['savelocalstorage'] = "Opslaan in de lokale opslag van de browser (tijdelijk)";
 $labels['advancedoptions'] = 'Geavanceerde opties';
+$labels['toggleadvancedoptions'] = 'Geavanceerde opties inschakelen';
 $labels['focusonnewmessage'] = 'Focus browserscherm bij nieuw bericht';
 $labels['checkallfolders'] = 'In alle mappen op nieuwe berichten controleren';
 $labels['displaynext'] = 'Ga naar volgend bericht na verwijderen of verplaatsen';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'als bijlage';
 $labels['replyallmode'] = 'Standaardactie van [Beantwoord iedereen]-knop';
 $labels['replyalldefault'] = 'iedereen beantwoorden';
 $labels['replyalllist'] = 'alleen maillijst beantwoorden (indien gevonden)';
-$labels['folder']  = 'Map';
-$labels['folders']  = 'Mappen';
-$labels['foldername']  = 'Mapnaam';
-$labels['subscribed']  = 'Geabonneerd';
+$labels['folder'] = 'Map';
+$labels['folders'] = 'Mappen';
+$labels['foldername'] = 'Mapnaam';
+$labels['subscribed'] = 'Geabonneerd';
 $labels['messagecount'] = 'Berichten';
-$labels['create']  = 'Nieuw';
-$labels['createfolder']  = 'Nieuwe map maken';
-$labels['managefolders']  = 'Beheer mappen';
+$labels['create'] = 'Nieuw';
+$labels['createfolder'] = 'Nieuwe map maken';
+$labels['managefolders'] = 'Beheer mappen';
 $labels['specialfolders'] = 'Speciale mappen';
 $labels['properties'] = 'Eigenschappen';
 $labels['folderproperties'] = 'Mapeigenschappen';
@@ -459,9 +489,13 @@ $labels['info'] = 'Informatie';
 $labels['getfoldersize'] = 'Klik om de omvang van de map te berekenen';
 $labels['changesubscription'] = 'Klik om abonnering te wijzigen';
 $labels['foldertype'] = 'Maptype';
-$labels['personalfolder']  = 'Privémap';
-$labels['otherfolder']  = 'Map van andere gebruiker';
-$labels['sharedfolder']  = 'Publieke map';
+$labels['personalfolder'] = 'Privémap';
+$labels['otherfolder'] = 'Map van andere gebruiker';
+$labels['sharedfolder'] = 'Publieke map';
+$labels['findfolders'] = 'Zoek mappen';
+$labels['namespace.personal'] = 'Persoonlijk';
+$labels['namespace.other'] = 'Andere gebruikers';
+$labels['namespace.shared'] = 'Gedeeld';
 $labels['sortby'] = 'Sorteer op';
 $labels['sortasc']  = 'Sorteer oplopend';
 $labels['sortdesc'] = 'Sorteer aflopend';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamees';
 $labels['japanese'] = 'Japans';
 $labels['korean'] = 'Koreaans';
 $labels['chinese'] = 'Chinees';
+$labels['arialabeltopnav'] = 'Vensterinstellingen';
+$labels['arialabeltasknav'] = 'Applicatietaken';
+$labels['arialabeltoolbar'] = 'Applicatiewerkbalk';
+$labels['arialabelactivetask'] = 'Actieve taak';
+$labels['arialabelmessagessearchfilter'] = 'Filter voor e-maillijst';
+$labels['arialabelmailsearchform'] = 'Formulier voor berichten zoeken';
+$labels['arialabelcontactsearchform'] = 'Zoekformulier voor contacten';
+$labels['arialabelmailquicksearchbox'] = 'Zoekinvoer voor e-mail';
+$labels['arialabelquicksearchbox'] = 'Zoekinvoer';
+$labels['arialabelfoldersearchfilter'] = 'Zoekfilter voor mappenlijst';
+$labels['arialabelfoldersearchform'] = 'Zoekformulier voor mappen';
+$labels['arialabelfolderlist'] = 'Selectie van e-mailmap';
+$labels['arialabelmessagelist'] = 'Lijst van e-mailberichten';
+$labels['arialabelmailpreviewframe'] = 'Berichtweergave';
+$labels['arialabelmailboxmenu'] = 'Menu voor mapacties';
+$labels['arialabellistselectmenu'] = 'Menu voor lijstselectie';
+$labels['arialabelthreadselectmenu'] = 'Menu voor conversatie-overzicht';
+$labels['arialabelmessagelistoptions'] = 'Weergave- en sorteeropties voor berichtenlijst';
+$labels['arialabelmailimportdialog'] = 'Dialoogvenster voor berichten importeren';
+$labels['arialabelmessagenav'] = 'Berichtnavigatie';
+$labels['arialabelmessagebody'] = 'Berichtinhoud';
+$labels['arialabelmessageactions'] = 'Berichtacties';
+$labels['arialabelcontactquicksearch'] = 'Zoekformulier voor contacten';
+$labels['arialabelcontactsearchbox'] = 'Zoekinvoer voor contacten';
+$labels['arialabelmessageheaders'] = 'Berichtheaders';
+$labels['arialabelforwardingoptions'] = 'Opties voor doorsturen';
+$labels['arialabelreplyalloptions'] = 'Opties voor iedereen beantwoorden';
+$labels['arialabelmoremessageactions'] = 'Meer berichtacties';
+$labels['arialabelmarkmessagesas'] = 'Geselecteerde berichten markeren als...';
+$labels['arialabelcomposeoptions'] = 'Opties voor opstellen';
+$labels['arialabelresponsesmenu'] = 'Menu voor standaardreacties';
+$labels['arialabelattachmentuploadform'] = 'Uploadformulier voor bijlagen';
+$labels['arialabelattachmentpreview'] = 'Voorbeeldweergave van bijlagen';
+$labels['ariasummarycomposecontacts'] = 'Lijst van contacten en groepen om als ontvanger te selecteren';
+$labels['arialabelcontactexportoptions'] = 'Opties voor contacten exporteren';
+$labels['arialabelabookgroupoptions'] = 'Adresboek-/groepopties';
+$labels['arialabelpreferencesform'] = 'Formulier voor instellingen';
+$labels['arialabelidentityeditfrom'] = 'Formulier voor identiteit bewerken';
+$labels['arialabelresonseeditfrom'] = 'Formulier voor bewerken antwoord';
+$labels['arialabelsearchterms'] = 'Zoekwoorden';
+$labels['helplistnavigation'] = 'Overzicht met sneltoetsen';
+$labels['helplistkeyboardnavigation'] = "Pijl omhoog/omlaag: Verander actieve rij of selectie.
+Spatiebalk: Selecteer actieve rij.
+Shift + omhoog/omlaag: Selecteer aanvullende rij boven/onder.
+Ctrl + spatiebalk: Voeg actieve rij toe aan selectie of verwijder van selectie.";
+$labels['helplistkeyboardnavmessages'] = "Pijl links/rechts: conversaties in- of uitklappen (alleen in conversatiemodus).
+Enter: Open geselecteerd of actief bericht.
+Delete: Verwijder geselecteerde berichten naar Prullenbak.";
+$labels['helplistkeyboardnavcontacts'] = "Enter: Open geselecteerd of actief contact.";
 ?>
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 2595c2259..1dba3e8cd 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Uw sessie is verlopen of ongeldig.';
 $messages['storageerror'] = 'Verbinding met IMAP-server mislukt.';
 $messages['servererror'] = 'Serverfout!';
 $messages['servererrormsg'] = 'Serverfout: $msg';
+$messages['connerror'] = 'Verbindingsfout! (Kon de server niet bereiken)';
 $messages['dberror'] = 'Databasefout!';
+$messages['windowopenerror'] = 'Het popup-venster werd geblokkeerd!';
 $messages['requesttimedout'] = 'Verzoek duurde te lang';
 $messages['errorreadonly'] = 'De bewerking kan niet uitgevoerd worden. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Niet in staat om de bewerking uit te voeren. Toestemming geweigerd.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr contactpersonen gevonden.';
 $messages['searchnomatch'] = 'Zoekopdracht heeft geen resultaten opgeleverd.';
 $messages['searching'] = 'Zoeken...';
 $messages['checking'] = 'Controleren...';
+$messages['stillsearching'] = 'Nog aan het zoeken...';
 $messages['nospellerrors'] = 'Geen spelfouten gevonden.';
 $messages['folderdeleted'] = 'Map succesvol verwijderd.';
 $messages['foldersubscribed'] = 'Succesvol geabonneerd op map.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = '$nr berichten succesvol geïmporteerd';
 $messages['importmessageerror'] = 'Importeren mislukt! Het verstuurde bestand is geen geldig bericht of mailboxbestand';
 $messages['opnotpermitted'] = 'Deze bewerking is niet toegestaan!';
 $messages['nofromaddress'] = 'Het e-mailadres ontbreekt in de geselecteerde identiteit.';
-$messages['editorwarning'] = 'Door het overschakelen naar de platte-tekstverwerker gaat alle opmaak verloren. Weet u zeker dat u verder wilt gaan?';
+$messages['editorwarning'] = 'Door te wisselen van type tekstverwerker kan er opmaak verloren gaan. Weet u zeker dat u verder wilt gaan?';
 $messages['httpreceivedencrypterror'] = 'Er is een onherstelbare configuratiefout 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): Authenticatie mislukt.';
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index 867c73887..df8f01abc 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -119,7 +119,6 @@ $messages['importconfirm'] = '<b>Importerte $inserted kontaktar</b>';
 $messages['importconfirmskipped'] = '<b>Hoppa over $skipped oppføringar som fanst frå før</b>';
 $messages['opnotpermitted'] = 'Ulovleg operasjon.';
 $messages['nofromaddress'] = 'Manglar e-postadresse i denne identiteten.';
-$messages['editorwarning'] = 'Å byta til rein tekst vil fjerna all tekstformateringa. Vil du halda fram?';
 $messages['httpreceivedencrypterror'] = 'En uopprettelig feil oppstod knytta til innstillingane. Kontakt systemansvarleg umiddelbart. <b>Meldinga kunne ikkje sendast.</b>';
 $messages['smtpconnerror'] = 'SMTP-feil ($code): Tilkopling til tenar feila.';
 $messages['smtpautherror'] = 'SMTP-feil ($code): Autentisering feila.';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 741306b5c..3d4a6c5e8 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -74,9 +74,9 @@ $labels['wednesday'] = 'Środa';
 $labels['thursday']  = 'Czwartek';
 $labels['friday']    = 'Piątek';
 $labels['saturday']  = 'Sobota';
-$labels['jan']	= 'sty';
-$labels['feb']	= 'lut';
-$labels['mar']	= 'mar';
+$labels['jan']	= 'Sty';
+$labels['feb']	= 'Lut';
+$labels['mar']	= 'Mar';
 $labels['apr']	= 'Kwi';
 $labels['may']	= 'Maj';
 $labels['jun']	= 'Cze';
@@ -90,7 +90,7 @@ $labels['longjan']	= 'styczeń';
 $labels['longfeb']	= 'luty';
 $labels['longmar']	= 'marzec';
 $labels['longapr']	= 'kwiecień';
-$labels['longmay']	= 'Maj';
+$labels['longmay']	= 'maj';
 $labels['longjun']	= 'czerwiec';
 $labels['longjul']	= 'lipiec';
 $labels['longaug']	= 'sierpień';
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Więcej akcji...';
 $labels['more']             = 'Więcej';
 $labels['back']             = 'Wstecz';
 $labels['options']          = 'Ustawienia';
+$labels['first'] = 'Pierwsza';
+$labels['last'] = 'Ostatnia';
+$labels['previous'] = 'Poprzednia';
+$labels['next'] = 'Następna';
 $labels['select'] = 'Zaznacz';
 $labels['all'] = 'Wszystkie';
 $labels['none'] = 'Brak';
 $labels['currpage'] = 'Bieżąca strona';
+$labels['isread'] = 'Przeczytane';
 $labels['unread'] = 'Nieprzeczytane';
 $labels['flagged'] = 'Oznaczone';
+$labels['unflagged'] = 'Nieoznaczone';
 $labels['unanswered'] = 'Bez odpowiedzi';
 $labels['withattachment'] = 'Z załącznikiem';
 $labels['deleted'] = 'Usunięte';
 $labels['undeleted'] = 'Nieusunięte';
+$labels['replied'] = 'Odpowiedziana';
+$labels['forwarded'] = 'Przekazane';
 $labels['invert'] = 'Odwróć';
 $labels['filter'] = 'Filtr';
 $labels['list'] = 'Lista';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Import wiadomości';
 $labels['quota'] = 'Użyte miejsce';
 $labels['unknown']  = 'nieznane';
 $labels['unlimited']  = 'bez limitu';
+$labels['quotatype'] = 'Typ limitu';
+$labels['quotatotal'] = 'Ograniczenie';
+$labels['quotaused'] = 'Używany';
+$labels['quotastorage'] = 'Przestrzeń dyskowa';
+$labels['quotamessage'] = 'Ilość wiadomości';
 $labels['quicksearch']  = 'Szybkie wyszukiwanie';
 $labels['resetsearch']  = 'Wyczyść filtr';
 $labels['searchmod']  = 'Parametry wyszukiwania';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Cała wiadomość';
 $labels['body']  = 'Treść';
 $labels['type'] = 'Typ';
 $labels['namex'] = 'Nazwa';
+$labels['searchscope'] = 'Zakres';
+$labels['currentfolder'] = 'Bieżący folder';
+$labels['subfolders'] = 'Ten in podfoldery';
+$labels['allfolders'] = 'Wszystkie foldery';
 $labels['openinextwin'] = 'Otwórz w nowym oknie';
 $labels['emlsave'] = 'Pobierz (.eml)';
 $labels['changeformattext'] = 'Wyświetl w formacie tekstowym';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Potwierdzenie odbioru';
 $labels['dsn']            = 'Status dostarczenia (DSN)';
 $labels['mailreplyintro'] = 'W dniu $date, $sender napisał(a):';
 $labels['originalmessage'] = 'Wiadomość oryginalna';
+$labels['selectimage']    = 'Wybierz obraz';
+$labels['addimage']       = 'Dodaj obraz';
+$labels['selectmedia']    = 'Wybierz film';
+$labels['addmedia']       = 'Dodaj film';
 $labels['editidents']    = 'Edytuj tożsamości';
 $labels['spellcheck']    = 'Pisownia';
 $labels['checkspelling'] = 'Sprawdź pisownię';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'Przyrócić wiadomość?';
 $labels['responses'] = 'Odpowiedzi';
 $labels['insertresponse'] = 'Wstaw odpowiedź';
 $labels['manageresponses'] = 'Zarządzaj odpowiedziami';
-$labels['savenewresponse'] = 'Zapisz nową odpowiedź';
-$labels['editresponses'] = 'Edytuj odpowiedzi';
+$labels['savenewresponse'] = 'Utwórz nową odpowiedź';
+$labels['addresponse'] = 'Dodaj odpowiedź';
 $labels['editresponse'] = 'Edytuj odpowiedź';
+$labels['editresponses'] = 'Edytuj odpowiedzi';
 $labels['responsename'] = 'Nazwa';
 $labels['responsetext'] = 'Tekst odpowiedzi';
 $labels['attach'] = 'Załącz';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Prześlij';
 $labels['uploadprogress'] = '$percent ($current z $total)';
 $labels['close']  = 'Zamknij';
 $labels['messageoptions']  = 'Opcje wiadomości...';
+$labels['togglecomposeoptions'] = 'Przestaw opcje kompozycji';
 $labels['low']     = 'Bardzo niski';
 $labels['lowest']  = 'Niski';
 $labels['normal']  = 'Normalny';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Asystent';
 $labels['spouse'] = 'Małżonek';
 $labels['allfields'] = 'Wszystkie pola';
 $labels['search'] = 'Szukaj';
+$labels['searchresult'] = 'Wyniki wyszukiwania';
 $labels['advsearch'] = 'Wyszukiwanie zaawansowane';
 $labels['advanced'] = 'Zaawansowane';
 $labels['other'] = 'Inne';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Strona domowa';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Dodaj pole...';
-$labels['addcontact'] = 'Dodaj nowy kontakt do książki adresowej';
+$labels['addcontact'] = 'Dodaj kontakt';
 $labels['editcontact'] = 'Edytuj kontakt';
 $labels['contacts'] = 'Kontakty';
 $labels['contactproperties'] = 'Właściwości';
+$labels['contactnameandorg'] = 'Nazwa i organizacja';
 $labels['personalinfo'] = 'Informacje osobiste';
+$labels['contactphoto'] = 'Zdjęcie kontaktu';
 $labels['edit']   = 'Edytuj';
 $labels['cancel'] = 'Anuluj';
 $labels['save']   = 'Zapisz';
@@ -310,10 +336,12 @@ $labels['export']         = 'Eksportuj';
 $labels['exportall']      = 'Eksportuj wszystkie';
 $labels['exportsel']      = 'Eksportuj zaznaczone';
 $labels['exportvcards']   = 'Eksport kontaktów w formacie vCard';
-$labels['newcontactgroup'] = 'Utwórz nową grupę';
+$labels['newcontactgroup']       = 'Utwórz nową grupę';
+$labels['addgroup']       = 'Dodaj grupę';
 $labels['grouprename']    = 'Zmień nazwę grupy';
 $labels['groupdelete']    = 'Usuń grupę';
 $labels['groupremoveselected'] = 'Usuń wybrane kontakty z grupy';
+$labels['uponelevel']     = 'Jeden poziom w górę';
 $labels['previouspage']   = 'Poprzednia strona';
 $labels['firstpage']      = 'Pierwsza strona';
 $labels['nextpage']       = 'Następna strona';
@@ -332,7 +360,7 @@ $labels['importreplace'] = 'Zastąp całą książkę adresową';
 $labels['importgroups'] = 'Importuj powiązania z grupami';
 $labels['importgroupsall'] = 'Wszystkie (utwórz grupy jeśli potrzeba)';
 $labels['importgroupsexisting'] = 'Tylko do isniejących grup';
-$labels['importdesc'] = 'Import kontaktów z isniejącej książki adresowej.<br/>Obecnie obsługiwany jest import w formacie <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> lub CSV (pola oddzielone przecinkiem).';
+$labels['importdesc'] = 'Import kontaktów z istniejącej książki adresowej.<br/>Obecnie obsługiwany jest import w formacie <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> lub CSV (pola oddzielone przecinkiem).';
 $labels['done'] = 'Wykonane';
 $labels['settingsfor'] = 'Ustawienia dla';
 $labels['about'] = 'O programie';
@@ -341,9 +369,9 @@ $labels['userpreferences'] = 'Preferencje użytkownika';
 $labels['editpreferences'] = 'Edytuj preferencje';
 $labels['identities'] = 'Tożsamości';
 $labels['manageidentities'] = 'Zarządzaj tożsamościami';
-$labels['newidentity'] = 'Nowa tożsamość';
-$labels['newitem'] = 'Nowy';
-$labels['edititem'] = 'Edytuj';
+$labels['newidentity'] = 'Utwórz nową tożsamość';
+$labels['addidentity'] = 'Dodaj tożsamość';
+$labels['edititem'] = 'Edytuj tożsamości';
 $labels['preferhtml'] = 'Domyślny HTML';
 $labels['defaultcharset'] = 'Domyślny zestaw znaków';
 $labels['htmlmessage'] = 'Wiadomość HTML';
@@ -378,7 +406,7 @@ $labels['askuser'] = 'pytaj mnie';
 $labels['autosend'] = 'wyślij potwierdzenie';
 $labels['autosendknown'] = 'wyślij potwierdzenie tylko do moich kontaktów, pytaj o pozostałe';
 $labels['autosendknownignore'] = 'wyślij potwierdzenie tylko do moich kontaktów, pozostałe ignoruj';
-$labels['ignore'] = 'ignoruj';
+$labels['ignore'] = 'Ignoruj';
 $labels['readwhendeleted'] = 'Podczas usuwania oznacz wiadomość jako przeczytaną';
 $labels['flagfordeletion'] = 'Oznacz wiadomość do usunięcia zamiast ją usuwać';
 $labels['skipdeleted'] = 'Ukryj wiadomości oznaczone do usunięcia';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 (przestarzałe)';
 $labels['force7bit'] = 'Używaj kodowania MIME dla znaków 8-bitowych';
+$labels['savelocalstorage'] = "Zapisz w lokalnej bazie przeglądarki (tymczasowo)";
 $labels['advancedoptions'] = 'Opcje zaawansowane';
+$labels['toggleadvancedoptions'] = 'Pokaż/ukryj opcje zaawansowane';
 $labels['focusonnewmessage'] = 'Informuj przeglądarkę o nowej wiadomości';
 $labels['checkallfolders'] = 'Sprawdzaj czy nadeszły nowe wiadomości we wszystkich folderach';
 $labels['displaynext'] = 'Po usunięciu/przeniesieniu wiadomości wyświetl następną';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'jako załącznik';
 $labels['replyallmode'] = 'Domyśla akcja przycisku [Odpowiedz wszystkim]';
 $labels['replyalldefault'] = 'odpowiedz wszystkim';
 $labels['replyalllist'] = 'odpowiedz tylko do listy mailingowej (jeśli wykryto)';
-$labels['folder']  = 'Folder';
-$labels['folders']  = 'Foldery';
-$labels['foldername']  = 'Nazwa folderu';
-$labels['subscribed']  = 'Zasubskrybowany';
+$labels['folder'] = 'Folder';
+$labels['folders'] = 'Foldery';
+$labels['foldername'] = 'Nazwa folderu';
+$labels['subscribed'] = 'Zasubskrybowany';
 $labels['messagecount'] = 'Wiadomości';
-$labels['create']  = 'Utwórz';
-$labels['createfolder']  = 'Utwórz nowy folder';
-$labels['managefolders']  = 'Zarządzaj folderami';
+$labels['create'] = 'Utwórz';
+$labels['createfolder'] = 'Utwórz nowy folder';
+$labels['managefolders'] = 'Zarządzaj folderami';
 $labels['specialfolders'] = 'Foldery specjalne';
 $labels['properties'] = 'Właściwości';
 $labels['folderproperties'] = 'Właściwości folderu';
@@ -459,9 +489,13 @@ $labels['info'] = 'Informacje';
 $labels['getfoldersize'] = 'Kliknij aby pobrać rozmiar folderu';
 $labels['changesubscription'] = 'Kliknij aby zmienić subskrypcję';
 $labels['foldertype'] = 'Typ folderu';
-$labels['personalfolder']  = 'Folder prywatny';
-$labels['otherfolder']  = 'Folder innego użytkownika';
-$labels['sharedfolder']  = 'Folder współdzielony';
+$labels['personalfolder'] = 'Folder prywatny';
+$labels['otherfolder'] = 'Folder innego użytkownika';
+$labels['sharedfolder'] = 'Folder współdzielony';
+$labels['findfolders'] = 'Szukaj folderów';
+$labels['namespace.personal'] = 'Osobiste';
+$labels['namespace.other'] = 'Innych użytkowników';
+$labels['namespace.shared'] = 'Współdzielone';
 $labels['sortby'] = 'Sortuj wg';
 $labels['sortasc']  = 'Rosnąco';
 $labels['sortdesc'] = 'Malejąco';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'wietnamski';
 $labels['japanese'] = 'japoński';
 $labels['korean'] = 'koreański';
 $labels['chinese'] = 'chiński';
+$labels['arialabeltopnav'] = 'Kontrolki okna';
+$labels['arialabeltasknav'] = 'Zadania aplikacji';
+$labels['arialabeltoolbar'] = 'Narzędzia aplikacji';
+$labels['arialabelactivetask'] = 'Aktywne zadanie';
+$labels['arialabelmessagessearchfilter'] = 'Filtr listy wiadomości';
+$labels['arialabelmailsearchform'] = 'Formularz wyszukiwania wiadomości';
+$labels['arialabelcontactsearchform'] = 'Formularz wyszukiwania kontaktów';
+$labels['arialabelmailquicksearchbox'] = 'Wejście danych wyszukiwania';
+$labels['arialabelquicksearchbox'] = 'Wejście danych wyszukiwania';
+$labels['arialabelfoldersearchfilter'] = 'Filtr listy folderów';
+$labels['arialabelfoldersearchform'] = 'Formularz wyszukiwania folderów';
+$labels['arialabelfolderlist'] = 'Wybór folderu';
+$labels['arialabelmessagelist'] = 'Lista wiadomości e-mail';
+$labels['arialabelmailpreviewframe'] = 'Podgląd wiadomości';
+$labels['arialabelmailboxmenu'] = 'Menu akcji folderów';
+$labels['arialabellistselectmenu'] = 'Menu zaznaczenia listy';
+$labels['arialabelthreadselectmenu'] = 'Menu wątków listy';
+$labels['arialabelmessagelistoptions'] = 'Opcje wyświetlania i sortowania listy';
+$labels['arialabelmailimportdialog'] = 'Dialog importu wiadomości';
+$labels['arialabelmessagenav'] = 'Nawigacja wiadomości';
+$labels['arialabelmessagebody'] = 'Treść wiadomości';
+$labels['arialabelmessageactions'] = 'Akcje wiadomości';
+$labels['arialabelcontactquicksearch'] = 'Formularz wyszukiwania kontaktów';
+$labels['arialabelcontactsearchbox'] = 'Wejście danych wyszukiwania';
+$labels['arialabelmessageheaders'] = 'Nagłówki wiadomości';
+$labels['arialabelforwardingoptions'] = 'Opcje przekazywania wiadomości';
+$labels['arialabelreplyalloptions'] = 'Opcje odpowiedzi do wszystkich';
+$labels['arialabelmoremessageactions'] = 'Więcej akcji';
+$labels['arialabelmarkmessagesas'] = 'Oznacz wybrane wiadomości jako...';
+$labels['arialabelcomposeoptions'] = 'Opcje kompozycji';
+$labels['arialabelresponsesmenu'] = 'Menu zapisanych odpowiedzi';
+$labels['arialabelattachmentuploadform'] = 'Formularz wysyłania załączników';
+$labels['arialabelattachmentpreview'] = 'Podgląd załącznika';
+$labels['ariasummarycomposecontacts'] = 'Lista wyboru kontaktów/grup jako odbiorców';
+$labels['arialabelcontactexportoptions'] = 'Opcje eksportu kontaktów';
+$labels['arialabelabookgroupoptions'] = 'Opcje książki adresowej i grup';
+$labels['arialabelpreferencesform'] = 'Formularz ustawień';
+$labels['arialabelidentityeditfrom'] = 'Formularz edycji tożsamości';
+$labels['arialabelresonseeditfrom'] = 'Formularz edycji odpowiedzi';
+$labels['arialabelsearchterms'] = 'Szukana fraza';
+$labels['helplistnavigation'] = 'Obsługa listy przy pomocy klawiatury';
+$labels['helplistkeyboardnavigation'] = "Strzałki góra/dół: Oznaczanie/poruszanie się po wierszach.
+Spacja: Wybór bieżącego wiersza.
+SHIFT + góra/dół: Oznaczenie dodatkowych wierszy.
+CTRL + Spacja: Zaznaczenie/odznaczenie bieżącego wiersza.";
+$labels['helplistkeyboardnavmessages'] = "Strzałki prawo/lewo: Rozwiniecie/zwinięcie wątku (w trybie wątkowania).
+ENTER: Otwarcie bieżącej wiadomości.
+DELETE: Usunięcie/Przeniesienie wiadomości do Kosza.";
+$labels['helplistkeyboardnavcontacts'] = "ENTER: Otwarcie bieżącego kontaktu.";
 ?>
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index fd4583c83..9a31ffa4a 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Błąd sesji bądź sesja wygasła!';
 $messages['storageerror'] = 'Błąd połączenia z serwerem!';
 $messages['servererror'] = 'Błąd serwera!';
 $messages['servererrormsg'] = 'Błąd serwera: $msg';
+$messages['connerror'] = 'Błąd połączenia (brak odpowiedzi serwera)!';
 $messages['dberror'] = 'Błąd bazy danych!';
+$messages['windowopenerror'] = 'Wyskakujące okno zostało zablokowane!';
 $messages['requesttimedout'] = 'Upłynął limit czasu żądania';
 $messages['errorreadonly'] = 'Nie można wykonać operacji. Folder tylko do odczytu.';
 $messages['errornoperm'] = 'Nie można wykonać operacji. Brak uprawnień.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Znaleziono $nr kontaktów.';
 $messages['searchnomatch'] = 'Nic nie znaleziono.';
 $messages['searching'] = 'Wyszukiwanie...';
 $messages['checking'] = 'Sprawdzanie...';
+$messages['stillsearching'] = 'Dalsze wyszukiwanie...';
 $messages['nospellerrors'] = 'Nie znaleziono błędów w pisowni.';
 $messages['folderdeleted'] = 'Folder został pomyślnie usunięty.';
 $messages['foldersubscribed'] = 'Folder został pomyślnie zasubskrybowany.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Pomyślnie zaimportowano następującą lic
 $messages['importmessageerror'] = 'Import nieudany! Wgrywany plik nie jest poprawną wiadomością lub plikiem skrzynki pocztowej';
 $messages['opnotpermitted'] = 'Niedozwolona operacja!';
 $messages['nofromaddress'] = 'Brak adresu e-mail w wybranej tożsamości.';
-$messages['editorwarning'] = 'Zmiana edytora spowoduje utratę formatowania tekstu. Czy jesteś pewien, że chcesz to zrobić?';
+$messages['editorwarning'] = 'Zmiana typu editora może spowodować utratę formatowania. Czy chcesz kontynuować?';
 $messages['httpreceivedencrypterror'] = 'Wystąpił błąd krytyczny. Skontaktuj się z administratorem. <b>Nie można wysłać wiadomości.</b>';
 $messages['smtpconnerror'] = 'Błąd SMTP ($code): Nie można nawiązać połączenia z serwerem.';
 $messages['smtpautherror'] = 'Błąd SMTP ($code): Uwierzytelnianie nie powiodło się.';
diff --git a/program/localization/ps/messages.inc b/program/localization/ps/messages.inc
index 606e59c0f..6ceecc2dd 100644
--- a/program/localization/ps/messages.inc
+++ b/program/localization/ps/messages.inc
@@ -80,5 +80,4 @@ $messages['importwait'] = 'نقلوي...صبر وکړئ';
 $messages['importconfirm'] = '<b>په بشپړه توګه نقل شو $اړيکلوري داخل شول, $شته تيرشوي انټاير څخه تيرشول</b>:<p><em>$نومونه</em></p>';
 $messages['opnotpermitted'] = 'چار اجازه نه لري';
 $messages['nofromaddress'] = 'په ټاکل شوي پيژندنه کې برېښناليک پتې له لاسه ورکړي';
-$messages['editorwarning'] = 'که د متن بڼو له منځه تللو ګواښ وي نو د متن سمون پرانيزئ. غواړئ چې دوام ورکړئ';
 ?>
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index e5aececc9..949249977 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -125,22 +125,30 @@ $labels['mark']             = 'Marcar';
 $labels['markmessages']     = 'Marcar mensagens';
 $labels['markread']         = 'Como lidas';
 $labels['markunread']       = 'Como não lidas';
-$labels['markflagged']      = 'Como sinalizadas';
-$labels['markunflagged']    = 'Como não sinalizadas';
+$labels['markflagged']      = 'Como sinalizada(s)';
+$labels['markunflagged']    = 'Como não sinalizada(s)';
 $labels['moreactions']      = 'Mais ações...';
 $labels['more']             = 'Mais';
 $labels['back']             = 'Voltar';
 $labels['options']          = 'Opções';
+$labels['first'] = 'Primeiro';
+$labels['last'] = 'Último';
+$labels['previous'] = 'Anterior';
+$labels['next'] = 'Próximo';
 $labels['select'] = 'Selecionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhuma';
 $labels['currpage'] = 'Página atual';
+$labels['isread'] = 'Lido';
 $labels['unread'] = 'Não lidas';
-$labels['flagged'] = 'Marcadas';
+$labels['flagged'] = 'Sinalizada(s)';
+$labels['unflagged'] = 'Não Sinalizada';
 $labels['unanswered'] = 'Não respondidas';
 $labels['withattachment'] = 'Com anexo';
 $labels['deleted'] = 'Excluídas';
 $labels['undeleted'] = 'Não excluídas';
+$labels['replied'] = 'Respondido';
+$labels['forwarded'] = 'Encaminhado';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Importar mensagens';
 $labels['quota'] = 'Uso de disco';
 $labels['unknown']  = 'desconhecido';
 $labels['unlimited']  = 'ilimitado';
+$labels['quotatype'] = 'Tipo de quota';
+$labels['quotatotal'] = 'Limite';
+$labels['quotaused'] = 'Usado';
+$labels['quotastorage'] = 'Espaço em disco';
+$labels['quotamessage'] = 'Quantidade de mensagens';
 $labels['quicksearch']  = 'Pesquisa rápida';
 $labels['resetsearch']  = 'Limpar pesquisa';
 $labels['searchmod']  = 'Opções da pesquisa';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Mensagem inteira';
 $labels['body']  = 'Conteúdo';
 $labels['type'] = 'Tipo';
 $labels['namex'] = 'Nome';
+$labels['searchscope'] = 'Escopo';
+$labels['currentfolder'] = 'Pasta atual';
+$labels['subfolders'] = 'Esta e subpastas';
+$labels['allfolders'] = 'Todas pastas';
 $labels['openinextwin'] = 'Abrir em nova janela';
 $labels['emlsave'] = 'Baixar (formato .eml)';
 $labels['changeformattext'] = 'Exibir em formato de texto simples';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Confirmação de recebimento';
 $labels['dsn']            = 'Recibo de entrega';
 $labels['mailreplyintro'] = 'Em $date, $sender escreveu:';
 $labels['originalmessage'] = 'Mensagem original';
+$labels['selectimage']    = 'Selecionar imagem';
+$labels['addimage']       = 'Adicionar imagem';
+$labels['selectmedia']    = 'Selecionar vídeo';
+$labels['addmedia']       = 'Adicionar vídeo';
 $labels['editidents']    = 'Editar identidades';
 $labels['spellcheck']    = 'Revisar';
 $labels['checkspelling'] = 'Verificar ortografia';
@@ -203,17 +224,19 @@ $labels['restoremessage'] = 'Restaurar mensagem?';
 $labels['responses'] = 'Respostas';
 $labels['insertresponse'] = 'Inserir uma resposta';
 $labels['manageresponses'] = 'Gerenciar respostas';
-$labels['savenewresponse'] = 'Salvar nova resposta';
-$labels['editresponses'] = 'Editar respostas';
-$labels['editresponse'] = 'Editar resposta';
+$labels['savenewresponse'] = 'Criar nova resposta pré-configurada';
+$labels['addresponse'] = 'Adicionar resposta pré-configurada';
+$labels['editresponse'] = 'Editar resposta pré-configurada';
+$labels['editresponses'] = 'Editar respostas pré-configuradas';
 $labels['responsename'] = 'Nome';
-$labels['responsetext'] = 'Texto da resposta';
+$labels['responsetext'] = 'Texto da resposta pré-configurada';
 $labels['attach'] = 'Anexar';
 $labels['attachments'] = 'Anexos';
 $labels['upload'] = 'Enviar arquivo';
 $labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close']  = 'Fechar';
 $labels['messageoptions']  = 'Opções da mensagem...';
+$labels['togglecomposeoptions'] = 'Exibir opções de composição da mensagem';
 $labels['low']     = 'Baixa';
 $labels['lowest']  = 'Mais baixa';
 $labels['normal']  = 'Normal';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Assistente';
 $labels['spouse'] = 'Cônjuge';
 $labels['allfields'] = 'Todos os campos';
 $labels['search'] = 'Pesquisar';
+$labels['searchresult'] = 'Resultado da pesquisa';
 $labels['advsearch'] = 'Pesquisa Avançada';
 $labels['advanced'] = 'Avançado';
 $labels['other'] = 'Outro';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Página pessoal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
 $labels['addfield'] = 'Adicionar campo...';
-$labels['addcontact'] = 'Adicionar novo contato';
+$labels['addcontact'] = 'Adicionar contato';
 $labels['editcontact'] = 'Editar contato';
 $labels['contacts'] = 'Contatos';
 $labels['contactproperties'] = 'Propriedades do contato';
+$labels['contactnameandorg'] = 'Nome e Organização';
 $labels['personalinfo'] = 'Informações pessoais';
+$labels['contactphoto'] = 'Foto do contato';
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Salvar';
@@ -301,7 +327,7 @@ $labels['rename'] = 'Renomear';
 $labels['addphoto'] = 'Adicionar';
 $labels['replacephoto'] = 'Substituir';
 $labels['uploadphoto'] = 'Enviar foto';
-$labels['newcontact']     = 'Criar novo contato';
+$labels['newcontact']     = 'Adicionar novo contato';
 $labels['deletecontact']  = 'Exclui os contatos selecionados';
 $labels['composeto']      = 'Compor mensagem para';
 $labels['contactsfromto'] = 'Contatos $from - $to de $count';
@@ -310,10 +336,12 @@ $labels['export']         = 'Exportar';
 $labels['exportall']      = 'Exportar todos';
 $labels['exportsel']      = 'Exportar selecionados';
 $labels['exportvcards']   = 'Exportar os contatos em formato vCard';
-$labels['newcontactgroup'] = 'Criar novo grupo de contatos';
+$labels['newcontactgroup']       = 'Criar novo grupo';
+$labels['addgroup']       = 'Adicionar grupo';
 $labels['grouprename']    = 'Renomear grupo';
 $labels['groupdelete']    = 'Excluir grupo';
 $labels['groupremoveselected'] = 'Remover os contatos selecionados do grupo';
+$labels['uponelevel']     = 'Subir um nível';
 $labels['previouspage']   = 'Página Anterior';
 $labels['firstpage']      = 'Primeira Página';
 $labels['nextpage']       = 'Próxima Página';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Preferências';
 $labels['userpreferences'] = 'Preferências do usuário';
 $labels['editpreferences'] = 'Editar preferências do usuário';
 $labels['identities'] = 'Identidades';
-$labels['manageidentities'] = 'Gerenciar identidades desta conta';
-$labels['newidentity'] = 'Nova identidade';
-$labels['newitem'] = 'Novo item';
-$labels['edititem'] = 'Editar item';
+$labels['manageidentities'] = 'Gerenciar identidades';
+$labels['newidentity'] = 'Criar nova identidade';
+$labels['addidentity'] = 'Adicionar identidade';
+$labels['edititem'] = 'Editar identidade';
 $labels['preferhtml'] = 'Exibir em HTML';
 $labels['defaultcharset'] = 'Conjunto padrão de caracteres';
 $labels['htmlmessage'] = 'Mensagem HTML';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'RFC 2231 Integral (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 Integral (outro)';
 $labels['force7bit'] = 'Usar codificação MIME para caracteres 8-bit';
+$labels['savelocalstorage'] = "Salvar no armazenamento local do navegador (temporariamente)";
 $labels['advancedoptions'] = 'Opções avançadas';
+$labels['toggleadvancedoptions'] = 'Ativar opções avançadas';
 $labels['focusonnewmessage'] = 'Focar janela do navegador ao receber nova mensagem';
 $labels['checkallfolders'] = 'Verificar se há novas mensagens em todas as pastas';
 $labels['displaynext'] = 'Exibir a mensagem seguinte após excluir/mover uma mensagem';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'como anexo';
 $labels['replyallmode'] = 'Ação padrão do botão [Responder a todos]';
 $labels['replyalldefault'] = 'responder a todos';
 $labels['replyalllist'] = 'responder somente à lista de discussão (se identificada)';
-$labels['folder']  = 'Pasta';
-$labels['folders']  = 'Pastas';
-$labels['foldername']  = 'Nome da pasta';
-$labels['subscribed']  = 'Inscrito';
+$labels['folder'] = 'Pasta';
+$labels['folders'] = 'Pastas';
+$labels['foldername'] = 'Nome da pasta';
+$labels['subscribed'] = 'Inscrito';
 $labels['messagecount'] = 'Mensagens';
-$labels['create']  = 'Criar';
-$labels['createfolder']  = 'Criar nova pasta';
-$labels['managefolders']  = 'Gerenciar pastas';
+$labels['create'] = 'Criar';
+$labels['createfolder'] = 'Criar nova pasta';
+$labels['managefolders'] = 'Gerenciar pastas';
 $labels['specialfolders'] = 'Pastas de sistema';
 $labels['properties'] = 'Propriedades';
 $labels['folderproperties'] = 'Propriedades da pasta';
@@ -459,9 +489,13 @@ $labels['info'] = 'Informação';
 $labels['getfoldersize'] = 'Exibir o tamanho da pasta';
 $labels['changesubscription'] = 'Clique para ativar/desativar';
 $labels['foldertype'] = 'Tipo de Pasta';
-$labels['personalfolder']  = 'Pasta Particular';
-$labels['otherfolder']  = 'Pasta de outro Usuário';
-$labels['sharedfolder']  = 'Pasta Pública';
+$labels['personalfolder'] = 'Pasta Particular';
+$labels['otherfolder'] = 'Pasta de outro Usuário';
+$labels['sharedfolder'] = 'Pasta Pública';
+$labels['findfolders'] = 'Pesquisar pastas';
+$labels['namespace.personal'] = 'Pessoal';
+$labels['namespace.other'] = 'Outros usuários';
+$labels['namespace.shared'] = 'Compartilhada';
 $labels['sortby'] = 'Ordenar por';
 $labels['sortasc']  = 'Ascendente';
 $labels['sortdesc'] = 'Descendente';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamita';
 $labels['japanese'] = 'Japonês';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinês';
+$labels['arialabeltopnav'] = 'Controle da janela';
+$labels['arialabeltasknav'] = 'Tarefas do sistema';
+$labels['arialabeltoolbar'] = 'Barra de ferramentas do sistema';
+$labels['arialabelactivetask'] = 'Tarefa ativa';
+$labels['arialabelmessagessearchfilter'] = 'Filtros da listagem de e-mails';
+$labels['arialabelmailsearchform'] = 'Formulário de pesquisa de e-mails';
+$labels['arialabelcontactsearchform'] = 'Formulário de pesquisa de contatos';
+$labels['arialabelmailquicksearchbox'] = 'Campo de pesquisa de e-mails';
+$labels['arialabelquicksearchbox'] = 'Campo de pesquisa';
+$labels['arialabelfoldersearchfilter'] = 'Filtros da listagem de pastas';
+$labels['arialabelfoldersearchform'] = 'Formulário de pesquisa de pastas';
+$labels['arialabelfolderlist'] = 'Seleção de pastas de e-mail';
+$labels['arialabelmessagelist'] = 'Listagem dos e-mails';
+$labels['arialabelmailpreviewframe'] = 'Pré-visualização de mensagem';
+$labels['arialabelmailboxmenu'] = 'Menu de ações da pasta';
+$labels['arialabellistselectmenu'] = 'Menu de seleção de mensagens';
+$labels['arialabelthreadselectmenu'] = 'Menu de listagem por assunto';
+$labels['arialabelmessagelistoptions'] = 'Listagem dos e-mails e opções de ordenação';
+$labels['arialabelmailimportdialog'] = 'Janela de importação de mensagens';
+$labels['arialabelmessagenav'] = 'Navegação das mensagens';
+$labels['arialabelmessagebody'] = 'Corpo da Mensagem';
+$labels['arialabelmessageactions'] = 'Ações para as mensagens';
+$labels['arialabelcontactquicksearch'] = 'Formulário de pesquisa de contatos';
+$labels['arialabelcontactsearchbox'] = 'Campo de pesquisa de contatos';
+$labels['arialabelmessageheaders'] = 'Cabeçalhos da mensagem';
+$labels['arialabelforwardingoptions'] = 'Opções de encaminhamento';
+$labels['arialabelreplyalloptions'] = 'Opções de responder a todos';
+$labels['arialabelmoremessageactions'] = 'Mais ações para as mensagens';
+$labels['arialabelmarkmessagesas'] = 'Marcar a mensagem selecionada como...';
+$labels['arialabelcomposeoptions'] = 'Opções para compor a mensagem';
+$labels['arialabelresponsesmenu'] = 'Menu de respostas pré-configuradas';
+$labels['arialabelattachmentuploadform'] = 'Formulário de upload de anexos';
+$labels['arialabelattachmentpreview'] = 'Pré-visualização de anexos';
+$labels['ariasummarycomposecontacts'] = 'Lista de contatos e grupos para selecionar como destinatários';
+$labels['arialabelcontactexportoptions'] = 'Opções de exportação dos contatos';
+$labels['arialabelabookgroupoptions'] = 'Opções de catálogo de endereços/grupos';
+$labels['arialabelpreferencesform'] = 'Formulário de preferências';
+$labels['arialabelidentityeditfrom'] = 'Formulário de edição de identidade';
+$labels['arialabelresonseeditfrom'] = 'Formulário de edição de resposta';
+$labels['arialabelsearchterms'] = 'Termos de pesquisa';
+$labels['helplistnavigation'] = 'Lista de navegação pelo teclado';
+$labels['helplistkeyboardnavigation'] = "Setas para cima/baixo: Move o foco/seleção da linha.
+Espaço: Seleciona a linha em foco.
+Shift + seta para cima/baixo: Seleciona linhas adicionais acima/abaixo.
+Ctrl + Espaço: Adiciona linha em foco à seleção/remove da seleção.";
+$labels['helplistkeyboardnavmessages'] = "Setas para direita/esquerda: expande/recolhe agrupamento do assunto (somente com modo de agrupamento por assunto ativo).
+Enter: Abre a mensagem selecionada/em foco.
+Delete: Move a mensagem selecionada para a Lixeira.";
+$labels['helplistkeyboardnavcontacts'] = "Enter: Abre o contato selecionado";
 ?>
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index 0fcb27ff7..93d4f5f71 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -17,12 +17,14 @@
 */
 $messages['errortitle']  = 'Ocorreu um erro!';
 $messages['loginfailed']  = 'Falha no login';
-$messages['cookiesdisabled'] = 'Seu navegador não aceita cookies';
+$messages['cookiesdisabled'] = 'Seu navegador não aceita cookies.';
 $messages['sessionerror'] = 'A sessão do seu navegador é inválida ou expirou';
 $messages['storageerror'] = 'Falha na conexão com o servidor. Verifique se informou os dados corretamente.';
 $messages['servererror'] = 'Erro no Servidor!';
 $messages['servererrormsg'] = 'Erro no Servidor: $msg';
+$messages['connerror'] = 'Erro de conexão (Falha na comunicação com o servidor)!';
 $messages['dberror'] = 'Erro no banco de dados!';
+$messages['windowopenerror'] = 'A janela popup foi bloqueada!';
 $messages['requesttimedout'] = 'Tempo da requisição esgotado';
 $messages['errorreadonly'] = 'Não foi possível realizar a operação. Pasta somente leitura';
 $messages['errornoperm'] = 'Não foi possível realizar a operação. Acesso negado';
@@ -45,8 +47,8 @@ $messages['messagesent'] = 'Mensagem enviada com sucesso';
 $messages['savingmessage'] = 'Salvando Mensagem...';
 $messages['messagesaved'] = 'Mensagem salva em Rascunhos';
 $messages['successfullysaved'] = 'Salvo com sucesso';
-$messages['savingresponse'] = 'Salvando texto de resposta...';
-$messages['deleteresponseconfirm'] = 'Você realmente deseja apagar este texto de resposta?';
+$messages['savingresponse'] = 'Salvando resposta pré-definida...';
+$messages['deleteresponseconfirm'] = 'Você realmente deseja apagar esta resposta pré-definida?';
 $messages['addedsuccessfully'] = 'Contato incluído com sucesso no catálogo de endereços.';
 $messages['contactexists'] = 'Já existe um contato com esse mesmo e-mail.';
 $messages['contactnameexists'] = 'Já existe um contato com o mesmo nome.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr contatos encontrados.';
 $messages['searchnomatch'] = 'A pesquisa não encontrou resultados';
 $messages['searching'] = 'Pesquisando...';
 $messages['checking'] = 'Verificando...';
+$messages['stillsearching'] = 'Ainda procurando...';
 $messages['nospellerrors'] = 'Nenhum erro ortográfico encontrado';
 $messages['folderdeleted'] = 'Pasta excluída com sucesso';
 $messages['foldersubscribed'] = 'Pasta ativada com sucesso';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Importação de $nr mensagens com sucesso';
 $messages['importmessageerror'] = 'Falha na importação! O arquivo enviado não é uma mensagem ou caixa postal válida';
 $messages['opnotpermitted'] = 'Operação não permitida!';
 $messages['nofromaddress'] = 'Falta o e-mail na identidade selecionada.';
-$messages['editorwarning'] = 'Mudar para o editor de texto simples elimina toda a formatação de texto. Deseja continuar?';
+$messages['editorwarning'] = 'A mudança do tipo de editor pode causar perda de formatação do texto. Deseja continuar?';
 $messages['httpreceivedencrypterror'] = 'Ocorreu um erro de configuração. Informe ao administrador do sistema imediatamente. <b>Sua mensagem não pode ser enviada.</b>';
 $messages['smtpconnerror'] = 'Erro SMTP ($code): Conexão ao servidor falhou.';
 $messages['smtpautherror'] = 'Erro SMTP ($code): Falha na autenticação.';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 457a308f2..5ef82f0e2 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Mais acções...';
 $labels['more']             = 'Mais';
 $labels['back']             = 'Voltar';
 $labels['options']          = 'Opções';
+$labels['first'] = 'Primeiro';
+$labels['last'] = 'Último';
+$labels['previous'] = 'Anterior';
+$labels['next'] = 'Seguinte';
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhum';
 $labels['currpage'] = 'Página actual';
+$labels['isread'] = 'Ler';
 $labels['unread'] = 'Não lidas';
 $labels['flagged'] = 'Sinalizadas';
+$labels['unflagged'] = 'Não sinalizado';
 $labels['unanswered'] = 'Não respondidas';
 $labels['withattachment'] = 'Com anexo';
 $labels['deleted'] = 'Eliminadas';
 $labels['undeleted'] = 'Não eliminada';
+$labels['replied'] = 'Respondido';
+$labels['forwarded'] = 'Reencaminhado';
 $labels['invert'] = 'Inverter selecção';
 $labels['filter'] = 'Filtro';
 $labels['list'] = 'Em lista';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Importar mensagens';
 $labels['quota'] = 'Espaço utilizado';
 $labels['unknown']  = 'desconhecido';
 $labels['unlimited']  = 'ilimitado';
+$labels['quotatype'] = 'Tipo de cota';
+$labels['quotatotal'] = 'Limite';
+$labels['quotaused'] = 'Usado';
+$labels['quotastorage'] = 'Espaço em disco';
+$labels['quotamessage'] = 'Numero de mensagens';
 $labels['quicksearch']  = 'Pesquisa rápida';
 $labels['resetsearch']  = 'Limpar pesquisa';
 $labels['searchmod']  = 'Pesquisar em';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Mensagem completa';
 $labels['body']  = 'Corpo';
 $labels['type'] = 'Tipo';
 $labels['namex'] = 'Nome';
+$labels['searchscope'] = 'Âmbito';
+$labels['currentfolder'] = 'Pasta actual';
+$labels['subfolders'] = 'Esta pasta e subpastas';
+$labels['allfolders'] = 'Todas as pastas';
 $labels['openinextwin'] = 'Abrir numa nova janela';
 $labels['emlsave'] = 'Guardar como (.eml)';
 $labels['changeformattext'] = 'Mostrar em formato de texto simples';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Recibo de leitura';
 $labels['dsn']            = 'Recibo de entrega';
 $labels['mailreplyintro'] = 'Em $date, $sender escreveu:';
 $labels['originalmessage'] = 'Mensagem Original';
+$labels['selectimage']    = 'Seleccionar imagem';
+$labels['addimage']       = 'Adicionar imagem';
+$labels['selectmedia']    = 'Seleccionar filme';
+$labels['addmedia']       = 'Adicionar filme';
 $labels['editidents']    = 'Editar entidades';
 $labels['spellcheck']    = 'Corrector Ortográfico';
 $labels['checkspelling'] = 'Verificar ortografia';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'Restaurar mensagem?';
 $labels['responses'] = 'Respostas';
 $labels['insertresponse'] = 'Insira uma resposta';
 $labels['manageresponses'] = 'Gerir respostas';
-$labels['savenewresponse'] = 'Gravar nova resposta';
-$labels['editresponses'] = 'Editar respostas';
+$labels['savenewresponse'] = 'Criar nova resposta';
+$labels['addresponse'] = 'Adicionar resposta';
 $labels['editresponse'] = 'Editar resposta';
+$labels['editresponses'] = 'Editar respostas';
 $labels['responsename'] = 'Nome';
 $labels['responsetext'] = 'Texto da resposta';
 $labels['attach'] = 'Anexar';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Carregar';
 $labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close']  = 'Fechar';
 $labels['messageoptions']  = 'Opções de mensagens...';
+$labels['togglecomposeoptions'] = 'Alternar opções de composição';
 $labels['low']     = 'Baixa';
 $labels['lowest']  = 'Muito baixa';
 $labels['normal']  = 'Normal';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Assistente';
 $labels['spouse'] = 'Cônjuge';
 $labels['allfields'] = 'Todos os campos';
 $labels['search'] = 'Pesquisar';
+$labels['searchresult'] = 'Resultado da pesquisa';
 $labels['advsearch'] = 'Pesquisa avançada';
 $labels['advanced'] = 'Pesquisa avançada';
 $labels['other'] = 'Outro';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Página Inicial';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
 $labels['addfield'] = 'Adicionar campo...';
-$labels['addcontact'] = 'Criar novo contacto';
+$labels['addcontact'] = 'Adicionar contacto';
 $labels['editcontact'] = 'Editar contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Dados do contacto';
+$labels['contactnameandorg'] = 'Nome da Organização';
 $labels['personalinfo'] = 'Informação pessoal';
+$labels['contactphoto'] = 'Foto do contacto';
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
@@ -310,10 +336,12 @@ $labels['export']         = 'Exportar';
 $labels['exportall']      = 'Exportar todos';
 $labels['exportsel']      = 'Exportar selecionados';
 $labels['exportvcards']   = 'Exportar contactos no formato vCard';
-$labels['newcontactgroup'] = 'Criar novo grupo de contactos';
+$labels['newcontactgroup']       = 'Criar novo grupo';
+$labels['addgroup']       = 'Adicionar grupo';
 $labels['grouprename']    = 'Renomear grupo';
 $labels['groupdelete']    = 'Eliminar grupo';
 $labels['groupremoveselected'] = 'Remover o(s) contacto(s) seleccionado(s) do grupo';
+$labels['uponelevel']     = 'Um nível acima';
 $labels['previouspage']   = 'Página anterior';
 $labels['firstpage']      = 'Primeira página';
 $labels['nextpage']       = 'Página seguinte';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Preferências';
 $labels['userpreferences'] = 'Preferências do utilizador';
 $labels['editpreferences'] = 'Editar preferências do utilizador';
 $labels['identities'] = 'Identidades';
-$labels['manageidentities'] = 'Gerir identidades para esta conta';
-$labels['newidentity'] = 'Nova identidade';
-$labels['newitem'] = 'Novo item';
-$labels['edititem'] = 'Editar item';
+$labels['manageidentities'] = 'Gerir identidades';
+$labels['newidentity'] = 'Criar nova identidade';
+$labels['addidentity'] = 'Adicionar identidade';
+$labels['edititem'] = 'Editar identidade';
 $labels['preferhtml'] = 'Mostrar mensagens em HTML';
 $labels['defaultcharset'] = 'Conjunto de caracteres predefinido';
 $labels['htmlmessage'] = 'Mensagem em HTML';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'Total RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Total RFC 2047 (outro)';
 $labels['force7bit'] = 'Usar codificação MIME para caracteres de 8 bits';
+$labels['savelocalstorage'] = "Guardado no armazenamento local do navegador (temporariamente)";
 $labels['advancedoptions'] = 'Opções avançadas';
+$labels['toggleadvancedoptions'] = 'Alternar opções de avançadas';
 $labels['focusonnewmessage'] = 'Activar a janela do navegador na nova mensagem';
 $labels['checkallfolders'] = 'Verificar por novas mensagens em todas as pastas';
 $labels['displaynext'] = 'Depois de mover/eliminar uma mensagem, mostrar a próxima mensagem';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'como anexo';
 $labels['replyallmode'] = 'Ação predefinida do botão [Responder a todos]';
 $labels['replyalldefault'] = 'responder a todos';
 $labels['replyalllist'] = 'responder só à lista de discussão (se identificada)';
-$labels['folder']  = 'Pasta';
-$labels['folders']  = 'Pastas';
-$labels['foldername']  = 'Nome da pasta';
-$labels['subscribed']  = 'Subscrita';
+$labels['folder'] = 'Pasta';
+$labels['folders'] = 'Pastas';
+$labels['foldername'] = 'Nome da pasta';
+$labels['subscribed'] = 'Subscrita';
 $labels['messagecount'] = 'Mensagens';
-$labels['create']  = 'Criar';
-$labels['createfolder']  = 'Criar nova pasta';
-$labels['managefolders']  = 'Gerir pastas';
+$labels['create'] = 'Criar';
+$labels['createfolder'] = 'Criar nova pasta';
+$labels['managefolders'] = 'Gerir pastas';
 $labels['specialfolders'] = 'Pastas especiais (predefinidas)';
 $labels['properties'] = 'Propriedades';
 $labels['folderproperties'] = 'Propriedades da pasta';
@@ -459,9 +489,13 @@ $labels['info'] = 'Informação';
 $labels['getfoldersize'] = 'Clique para obter o tamanho da pasta';
 $labels['changesubscription'] = 'Clique para alterar a subscrição';
 $labels['foldertype'] = 'Tipo de pasta';
-$labels['personalfolder']  = 'Pasta privada';
-$labels['otherfolder']  = 'Outro tipo de pasta';
-$labels['sharedfolder']  = 'Pasta pública';
+$labels['personalfolder'] = 'Pasta privada';
+$labels['otherfolder'] = 'Outro tipo de pasta';
+$labels['sharedfolder'] = 'Pasta pública';
+$labels['findfolders'] = 'Localizar pastas';
+$labels['namespace.personal'] = 'Pessoal';
+$labels['namespace.other'] = 'Outros utilizadores';
+$labels['namespace.shared'] = 'Partilhado';
 $labels['sortby'] = 'Ordenar por';
 $labels['sortasc']  = 'Ordenação Ascendente';
 $labels['sortdesc'] = 'Ordenação Descendente';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamita';
 $labels['japanese'] = 'Japonês';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinês';
+$labels['arialabeltopnav'] = 'Controlo de janela';
+$labels['arialabeltasknav'] = 'Tarefas da aplicação';
+$labels['arialabeltoolbar'] = 'Barra de ferramentas da aplicação';
+$labels['arialabelactivetask'] = 'Tarefa activa';
+$labels['arialabelmessagessearchfilter'] = 'Filtro da listagem de email';
+$labels['arialabelmailsearchform'] = 'Formulário de pesquisa email';
+$labels['arialabelcontactsearchform'] = 'Formulário de pesquisa de contactos';
+$labels['arialabelmailquicksearchbox'] = 'Entrada da pesquisa de email';
+$labels['arialabelquicksearchbox'] = 'Entrada da pesquisa';
+$labels['arialabelfoldersearchfilter'] = 'Lista de filtro de pasta';
+$labels['arialabelfoldersearchform'] = 'Formulário de pesquisa de pasta';
+$labels['arialabelfolderlist'] = 'Selecção de pasta de email';
+$labels['arialabelmessagelist'] = 'Listagem de mensagens de email';
+$labels['arialabelmailpreviewframe'] = 'Pré-visualizar mensagem';
+$labels['arialabelmailboxmenu'] = 'Menu de acções de pasta';
+$labels['arialabellistselectmenu'] = 'Menu de selecção de lista';
+$labels['arialabelthreadselectmenu'] = 'Menu de listagem de tópicos';
+$labels['arialabelmessagelistoptions'] = 'Visualização da lista de mensagens e opções de ordenação';
+$labels['arialabelmailimportdialog'] = 'Janela de importação de mensagens';
+$labels['arialabelmessagenav'] = 'Navegação nas mensagens';
+$labels['arialabelmessagebody'] = 'Corpo da mensagem';
+$labels['arialabelmessageactions'] = 'Acções de mensagem';
+$labels['arialabelcontactquicksearch'] = 'Formulário de pesquisa de contactos';
+$labels['arialabelcontactsearchbox'] = 'Entrada da pesquisa de contacto';
+$labels['arialabelmessageheaders'] = 'Cabeçalhos da mensagem';
+$labels['arialabelforwardingoptions'] = 'Opções de reencaminhamento';
+$labels['arialabelreplyalloptions'] = 'Opções de responder a todos';
+$labels['arialabelmoremessageactions'] = 'Mais acções de mensagens';
+$labels['arialabelmarkmessagesas'] = 'Marcar mensagens seleccionadas como...';
+$labels['arialabelcomposeoptions'] = 'Opções de composição';
+$labels['arialabelresponsesmenu'] = 'Menu de respostas tipo';
+$labels['arialabelattachmentuploadform'] = 'Formulário de envio de anexos';
+$labels['arialabelattachmentpreview'] = 'Pré-visualização de anexos';
+$labels['ariasummarycomposecontacts'] = 'Lista de contactos e grupos para seleccionar como destinatários';
+$labels['arialabelcontactexportoptions'] = 'Opções de exportação de contacto';
+$labels['arialabelabookgroupoptions'] = 'Opções do livro de endereços/grupos';
+$labels['arialabelpreferencesform'] = 'Formulário de preferências';
+$labels['arialabelidentityeditfrom'] = 'Formulário de edição de identidade';
+$labels['arialabelresonseeditfrom'] = 'Formulário de edição de resposta';
+$labels['arialabelsearchterms'] = 'Termos de pesquisa';
+$labels['helplistnavigation'] = 'Lista de teclas de navegação';
+$labels['helplistkeyboardnavigation'] = "Setas cima/baixo: Move linha de realce/selecção.
+Espaço: Selecciona linha realçada.
+Shift + cima/baixo: Selecciona linha adicional acima/abaixo.
+Ctrl + Espaço: Adiciona linha realçada à selecção/remove da selecção.";
+$labels['helplistkeyboardnavmessages'] = "Setas direita/esquerda: Expande/recolhe tópicos de mensagens (só no modo de tópicos).
+Enter: Abre a mensagem seleccionada/realçada.
+Delete: Move as mensagens seleccionadas para a Reciclagem.";
+$labels['helplistkeyboardnavcontacts'] = "Enter: Abre o contacto seleccionado/realçado. ";
 ?>
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index a6618d33e..553eadd2e 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'A sua sessão é inválida ou expirou.';
 $messages['storageerror'] = 'A ligação ao servidor IMAP falhou';
 $messages['servererror'] = 'Erro do Servidor!';
 $messages['servererrormsg'] = 'Erro do Servidor: $msg';
+$messages['connerror'] = 'Erro de ligação (Não foi possível alcançar o servidor)!';
 $messages['dberror'] = 'Erro na base de dados!';
+$messages['windowopenerror'] = 'A janela pop-up foi bloqueada!';
 $messages['requesttimedout'] = 'A solicitação expirou';
 $messages['errorreadonly'] = 'Não foi possível efectuar a operação. A pasta é só de leitura.';
 $messages['errornoperm'] = 'Não tem permissões para efectuar esta operação.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr contactos encontrados.';
 $messages['searchnomatch'] = 'A pesquisa não devolveu resultados';
 $messages['searching'] = 'A pesquisar...';
 $messages['checking'] = 'A verificar...';
+$messages['stillsearching'] = 'Ainda a procurar...';
 $messages['nospellerrors'] = 'Não foi encontrado nenhum erro ortográfico';
 $messages['folderdeleted'] = 'Pasta eliminada com sucesso';
 $messages['foldersubscribed'] = 'Subscrição da pasta concluída com sucesso';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = '$nr mensagens importadas com sucesso';
 $messages['importmessageerror'] = 'A importação falhou! O ficheiro carregado não é um arquivo de caixa de correio ou ficheiro de mensagem válido.';
 $messages['opnotpermitted'] = 'Operação não permitida';
 $messages['nofromaddress'] = 'Falta o endereço de e-mail na identidade seleccionada';
-$messages['editorwarning'] = 'Ao mudar para o editor Plain Text vai perder toda a formação de texto. Deseja continuar?';
+$messages['editorwarning'] = 'Alterar o tipo de editor pode causar a perda da formatação do texto. Deseja continuar?';
 $messages['httpreceivedencrypterror'] = 'Ocorreu um erro fatal de configuração. Contacte o seu Administrador imediatamente. <b>A sua mensagem não pôde ser enviada.</b>';
 $messages['smtpconnerror'] = 'Erro SMTP ($code): A ligação ao servidor falhou.';
 $messages['smtpautherror'] = 'Erro SMTP ($code): A autenticação falhou.';
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index d17364d95..c28e67289 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Sesiunea dumneavoastră este invalidă sau a expira
 $messages['storageerror'] = 'Conectarea la serverul IMAP a eşuat';
 $messages['servererror'] = 'Eroare de server!';
 $messages['servererrormsg'] = 'Eroare Server: $msg';
+$messages['connerror'] = 'Eroare de conexiune (Serverul nu a fost găsit)!';
 $messages['dberror'] = 'Eroare bază de date!';
+$messages['windowopenerror'] = 'Fereastra nouă a fost blocată!';
 $messages['requesttimedout'] = 'Timpul alocat cererii a expirat';
 $messages['errorreadonly'] = 'Nu se poate efectua operaţiunea. Dosarul este disponibil doar pentru citire.';
 $messages['errornoperm'] = 'Nu se poate efectua operaţiunea. Acces interzis.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr contact(e) găsit(e).';
 $messages['searchnomatch'] = 'Căutarea nu a returnat niciun rezultat';
 $messages['searching'] = 'Se caută...';
 $messages['checking'] = 'Se verifică...';
+$messages['stillsearching'] = 'Se caută...';
 $messages['nospellerrors'] = 'Nu s-a găsit nicio greşeală de ortografie';
 $messages['folderdeleted'] = 'Dosarul a fost şters cu succes';
 $messages['foldersubscribed'] = 'Dosarul a fost abonat cu succes.';
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 6df06a56b..144eb7f22 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -131,16 +131,23 @@ $labels['moreactions']      = 'Дополнительные действия...'
 $labels['more']             = 'Еще';
 $labels['back']             = 'Назад';
 $labels['options']          = 'Параметры';
+$labels['first'] = 'Первое';
+$labels['last'] = 'Последнее';
+$labels['previous'] = 'Предыдущее';
+$labels['next'] = 'Следующее';
 $labels['select'] = 'Выбрать';
 $labels['all'] = 'Все';
 $labels['none'] = 'Отсутствует';
 $labels['currpage'] = 'Текущая страница';
+$labels['isread'] = 'Прочтенные';
 $labels['unread'] = 'Непрочитанные';
 $labels['flagged'] = 'Помеченные';
+$labels['unflagged'] = 'Не помеченные';
 $labels['unanswered'] = 'Неотвеченные';
 $labels['withattachment'] = 'С вложением';
 $labels['deleted'] = 'Удаленные';
 $labels['undeleted'] = 'Не удаленные';
+$labels['forwarded'] = 'Пересланные';
 $labels['invert'] = 'Инвертировать';
 $labels['filter'] = 'Фильтр';
 $labels['list'] = 'Список';
@@ -171,6 +178,11 @@ $labels['importmessages'] = 'Импорт сообщений';
 $labels['quota'] = 'Квота';
 $labels['unknown']  = 'неизвестно';
 $labels['unlimited']  = 'без ограничений';
+$labels['quotatype'] = 'Тип квоты';
+$labels['quotatotal'] = 'Лимит';
+$labels['quotaused'] = 'Использовано';
+$labels['quotastorage'] = 'Дисковое пространство';
+$labels['quotamessage'] = 'Количество сообщений';
 $labels['quicksearch']  = 'Быстрый поиск';
 $labels['resetsearch']  = 'Сброс';
 $labels['searchmod']  = 'Варианты поиска';
@@ -178,6 +190,10 @@ $labels['msgtext']  = 'Всё сообщение';
 $labels['body']  = 'Тело письма';
 $labels['type'] = 'Тип';
 $labels['namex'] = 'Имя';
+$labels['searchscope'] = 'Область';
+$labels['currentfolder'] = 'Текущая папка';
+$labels['subfolders'] = 'Эта и вложенные папки';
+$labels['allfolders'] = 'Все папки';
 $labels['openinextwin'] = 'Открыть в новом окне';
 $labels['emlsave'] = 'Сохранить (.eml)';
 $labels['changeformattext'] = 'Показать в формате обычного текста';
@@ -193,6 +209,10 @@ $labels['returnreceipt']  = 'Запрос ответа';
 $labels['dsn']            = 'Уведомление о состоянии доставки';
 $labels['mailreplyintro'] = '$sender писал $date:';
 $labels['originalmessage'] = 'Исходное сообщение';
+$labels['selectimage']    = 'Выбрать изображение';
+$labels['addimage']       = 'Добавить изображение';
+$labels['selectmedia']    = 'Выбрать видео';
+$labels['addmedia']       = 'Добавить видео';
 $labels['editidents']    = 'Изменить данные';
 $labels['spellcheck']    = 'Орфография';
 $labels['checkspelling'] = 'Проверить орфографию';
@@ -203,9 +223,10 @@ $labels['restoremessage'] = 'Восстановить сообщение?';
 $labels['responses'] = 'Ответы';
 $labels['insertresponse'] = 'Вставить ответ';
 $labels['manageresponses'] = 'Управление ответами';
-$labels['savenewresponse'] = 'Сохранить новый ответ';
-$labels['editresponses'] = 'Редактировать ответы';
+$labels['savenewresponse'] = 'Создать новый ответ';
+$labels['addresponse'] = 'Добавить ответ';
 $labels['editresponse'] = 'Редактировать ответ';
+$labels['editresponses'] = 'Редактировать ответы';
 $labels['responsename'] = 'Название';
 $labels['responsetext'] = 'Текста ответа';
 $labels['attach'] = 'Вложить';
@@ -270,6 +291,7 @@ $labels['assistant'] = 'Помощник';
 $labels['spouse'] = 'Супруг';
 $labels['allfields'] = 'Все поля';
 $labels['search'] = 'Поиск';
+$labels['searchresult'] = 'Результаты поиска';
 $labels['advsearch'] = 'Расширенный поиск';
 $labels['advanced'] = 'Дополнительно';
 $labels['other'] = 'Другое';
@@ -288,11 +310,13 @@ $labels['typehomepage']  = 'Домашняя страница';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профиль';
 $labels['addfield'] = 'Добавить поле...';
-$labels['addcontact'] = 'Добавить  новый контакт';
+$labels['addcontact'] = 'Добавить контакт';
 $labels['editcontact'] = 'Редактировать контакт';
 $labels['contacts'] = 'Контакты';
 $labels['contactproperties'] = 'Свойства контакта';
+$labels['contactnameandorg'] = 'Имя и организация';
 $labels['personalinfo'] = 'Личная информация';
+$labels['contactphoto'] = 'Фото контакта';
 $labels['edit']   = 'Правка';
 $labels['cancel'] = 'Отмена';
 $labels['save']   = 'Сохранить';
@@ -310,10 +334,12 @@ $labels['export']         = 'Экспорт';
 $labels['exportall']      = 'Экспортировать все';
 $labels['exportsel']      = 'Экспортировать выделенные';
 $labels['exportvcards']   = 'Экспортировать контакты в формате vCard';
-$labels['newcontactgroup'] = 'Создать группу контактов';
+$labels['newcontactgroup']       = 'Создать новую группу';
+$labels['addgroup']       = 'Добавить группу';
 $labels['grouprename']    = 'Переименовать группу';
 $labels['groupdelete']    = 'Удалить группу';
 $labels['groupremoveselected'] = 'Удалить выбранные контакты из группы';
+$labels['uponelevel']     = 'Вверх на уровень';
 $labels['previouspage']   = 'Показать предыдущую страницу';
 $labels['firstpage']      = 'Показать первую страницу';
 $labels['nextpage']       = 'Показать следующую страницу';
@@ -341,9 +367,9 @@ $labels['userpreferences'] = 'Настройки пользователя';
 $labels['editpreferences'] = 'Редактировать настройки пользователя';
 $labels['identities'] = 'Профили';
 $labels['manageidentities'] = 'Управление профилями';
-$labels['newidentity'] = 'Новый профиль';
-$labels['newitem'] = 'Новый';
-$labels['edititem'] = 'Правка';
+$labels['newidentity'] = 'Создать новый профиль';
+$labels['addidentity'] = 'Добавить профиль';
+$labels['edititem'] = 'Изменить профиль';
 $labels['preferhtml'] = 'Предпочитать HTML';
 $labels['defaultcharset'] = 'Набор символов по-умолчанию';
 $labels['htmlmessage'] = 'Сообщение HTML';
@@ -442,14 +468,14 @@ $labels['asattachment'] = 'как вложение';
 $labels['replyallmode'] = 'Действие по умолчанию кнопки [Ответить всем]';
 $labels['replyalldefault'] = 'ответить всем';
 $labels['replyalllist'] = 'ответить только в список рассылки (если найден)';
-$labels['folder']  = 'Папка';
-$labels['folders']  = 'Папки';
-$labels['foldername']  = 'Имя папки';
-$labels['subscribed']  = 'Подписан';
+$labels['folder'] = 'Папка';
+$labels['folders'] = 'Папки';
+$labels['foldername'] = 'Имя папки';
+$labels['subscribed'] = 'Подписан';
 $labels['messagecount'] = 'Сообщения';
-$labels['create']  = 'Создать';
-$labels['createfolder']  = 'Создать новую папку';
-$labels['managefolders']  = 'Управление папками';
+$labels['create'] = 'Создать';
+$labels['createfolder'] = 'Создать новую папку';
+$labels['managefolders'] = 'Управление папками';
 $labels['specialfolders'] = 'Особые папки';
 $labels['properties'] = 'Свойства';
 $labels['folderproperties'] = 'Свойства папки';
@@ -459,9 +485,12 @@ $labels['info'] = 'Информация';
 $labels['getfoldersize'] = 'Показать размер папки';
 $labels['changesubscription'] = 'Изменить подписку';
 $labels['foldertype'] = 'Тип каталога';
-$labels['personalfolder']  = 'Приватный каталог';
-$labels['otherfolder']  = 'Каталог другого пользователя';
-$labels['sharedfolder']  = 'Совместный каталог';
+$labels['personalfolder'] = 'Приватный каталог';
+$labels['otherfolder'] = 'Каталог другого пользователя';
+$labels['sharedfolder'] = 'Совместный каталог';
+$labels['findfolders'] = 'Найти папки';
+$labels['namespace.personal'] = 'Персональные';
+$labels['namespace.other'] = 'Других пользователей';
 $labels['sortby'] = 'Сортировать по';
 $labels['sortasc']  = 'Возрастанию';
 $labels['sortdesc'] = 'Убыванию';
@@ -494,4 +523,17 @@ $labels['vietnamese'] = 'Вьетнамский';
 $labels['japanese'] = 'Японский';
 $labels['korean'] = 'Корейский';
 $labels['chinese'] = 'Китайский';
+$labels['arialabeltopnav'] = 'Управление окном';
+$labels['arialabelactivetask'] = 'Активная задача';
+$labels['arialabelcontactsearchform'] = 'Форма поиска контактов';
+$labels['arialabelmailpreviewframe'] = 'Предпросмотр сообщений';
+$labels['arialabelmailimportdialog'] = 'Диалог импорта сообщения';
+$labels['arialabelmessagebody'] = 'Тело сообщения';
+$labels['arialabelcontactquicksearch'] = 'Форма поиска контактов';
+$labels['arialabelmessageheaders'] = 'Заголовки сообщений';
+$labels['arialabelforwardingoptions'] = 'Опции пересылки';
+$labels['arialabelmoremessageactions'] = 'Дополнительные действия с сообщением';
+$labels['arialabelmarkmessagesas'] = 'Отметить выделенные сообщения как...';
+$labels['arialabelattachmentpreview'] = 'Предпросмотр вложений';
+$labels['arialabelcontactexportoptions'] = 'Параметры экспорта контактов';
 ?>
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index 8dfbe3df8..c556f3d65 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Ваша сессия устарела.';
 $messages['storageerror'] = 'Неудачное соединение с IMAP сервером';
 $messages['servererror'] = 'Ошибка сервера!';
 $messages['servererrormsg'] = 'Ошибка сервера: $msg';
+$messages['connerror'] = 'Ошибка соединения (Сбой подключения к серверу)!';
 $messages['dberror'] = 'Ошибка базы данных!';
+$messages['windowopenerror'] = 'Всплывающее окно было заблокировано!';
 $messages['requesttimedout'] = 'Превышено время ожидания запроса';
 $messages['errorreadonly'] = 'Невозможно выполнить операцию. Папка доступна только для чтения.';
 $messages['errornoperm'] = 'Невозможно выполнить операцию. Доступ запрещён.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr контактов найдено.';
 $messages['searchnomatch'] = 'Ничего не найдено.';
 $messages['searching'] = 'Поиск...';
 $messages['checking'] = 'Проверка...';
+$messages['stillsearching'] = 'Поиск...';
 $messages['nospellerrors'] = 'Орфографических ошибок не найдено.';
 $messages['folderdeleted'] = 'Папка удалена.';
 $messages['foldersubscribed'] = 'Папка подписана';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = '$nr сообщений успешно им�
 $messages['importmessageerror'] = 'Сбой импорта! Загруженный файл не является файлом сообщения или почтового ящика';
 $messages['opnotpermitted'] = 'Действие запрещено!';
 $messages['nofromaddress'] = 'В выбранном профиле не хватает адреса электронной почты.';
-$messages['editorwarning'] = 'При переключении в редактор простого текста все форматирование будет потеряно. Продолжить?';
+$messages['editorwarning'] = 'Переключение типа редактора может привести к потере  форматирования текста. Продолжить?';
 $messages['httpreceivedencrypterror'] = 'На сервере возникла неизбежная ошибка. Срочно свяжитесь с Вашим администратором. <b>Ваше сообщение не может быть отправлено.</b>';
 $messages['smtpconnerror'] = 'SMTP ошибка ($code): Сбой соединения с сервером.';
 $messages['smtpautherror'] = 'SMTP ошибка ($code): Ошибка авторизации.';
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 630869bea..3c35527f5 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Viac akcií...';
 $labels['more']             = 'Viac';
 $labels['back']             = 'Dozadu';
 $labels['options']          = 'Možnosti';
+$labels['first'] = 'Prvá/prvý';
+$labels['last'] = 'Posledná/-ý';
+$labels['previous'] = 'Predchádzajúca/-i';
+$labels['next'] = 'Ďalšia/-í';
 $labels['select'] = 'Výber';
 $labels['all'] = 'Všetko';
 $labels['none'] = 'Nič';
 $labels['currpage'] = 'Aktuálna stránka';
+$labels['isread'] = 'Prečítané';
 $labels['unread'] = 'Neprečítané';
 $labels['flagged'] = 'Označené značkou';
+$labels['unflagged'] = 'Neoznačené značkou';
 $labels['unanswered'] = 'Bez odpovede';
 $labels['withattachment'] = 'S prílohou';
 $labels['deleted'] = 'Vymazané';
 $labels['undeleted'] = 'Nevymazané';
+$labels['replied'] = 'Odpovedané';
+$labels['forwarded'] = 'Preposlané';
 $labels['invert'] = 'Obrátiť';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Zoznam';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Importovať správy';
 $labels['quota'] = 'Úložné miesto';
 $labels['unknown']  = 'neznáme';
 $labels['unlimited']  = 'neobmedzené';
+$labels['quotatype'] = 'Typ kvóty';
+$labels['quotatotal'] = 'Limit';
+$labels['quotaused'] = 'Použité';
+$labels['quotastorage'] = 'Priestor na disku';
+$labels['quotamessage'] = 'Počet správ';
 $labels['quicksearch']  = 'Rýchle vyhľadávanie';
 $labels['resetsearch']  = 'Reset vyhľadávania';
 $labels['searchmod']  = 'Zmeniť kritériá vyhľadávania';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Celá správa';
 $labels['body']  = 'Telo (obsah)';
 $labels['type'] = 'Typ';
 $labels['namex'] = 'Meno';
+$labels['searchscope'] = 'Rozsah';
+$labels['currentfolder'] = 'Aktuálny priečinok';
+$labels['subfolders'] = 'Tento a podpriečinky';
+$labels['allfolders'] = 'Všetky priečinky';
 $labels['openinextwin'] = 'Otvoriť v novom okne';
 $labels['emlsave'] = 'Stiahnuť (.eml)';
 $labels['changeformattext'] = 'Zobraziť vo formáte čistého textu';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Potvrdenie o doručení';
 $labels['dsn']            = 'Oznámenie o stave doručenia';
 $labels['mailreplyintro'] = 'Dňa $date $sender napísal(a):';
 $labels['originalmessage'] = 'Pôvodná správa';
+$labels['selectimage']    = 'Vybrať obrázok';
+$labels['addimage']       = 'Pridať obrázok';
+$labels['selectmedia']    = 'Vybrať film';
+$labels['addmedia']       = 'Pridať film';
 $labels['editidents']    = 'Upraviť identitu odosielateľa';
 $labels['spellcheck']    = 'Pravopis';
 $labels['checkspelling'] = 'Skontrolovať pravopis';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'Obnoviť správu?';
 $labels['responses'] = 'Odpovede';
 $labels['insertresponse'] = 'Vložiť odpoveď';
 $labels['manageresponses'] = 'Spravovať odpovede';
-$labels['savenewresponse'] = 'Uložiť novú odpoveď';
-$labels['editresponses'] = 'Upraviť odpovede';
+$labels['savenewresponse'] = 'Vytvoriť novú odpoveď';
+$labels['addresponse'] = 'Pridať odpoveď';
 $labels['editresponse'] = 'Upraviť odpoveď';
+$labels['editresponses'] = 'Upraviť odpovede';
 $labels['responsename'] = 'Meno';
 $labels['responsetext'] = 'Text odpovede';
 $labels['attach'] = 'Priložiť';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Nahrať';
 $labels['uploadprogress'] = '$percent ($current z $total)';
 $labels['close']  = 'Zatvoriť';
 $labels['messageoptions']  = 'Nastavenia správy...';
+$labels['togglecomposeoptions'] = 'Prepnúť možnosti kompozície';
 $labels['low']     = 'Nízka';
 $labels['lowest']  = 'Najnižšia';
 $labels['normal']  = 'Normálna';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Asistent';
 $labels['spouse'] = 'Partner/ka';
 $labels['allfields'] = 'Všetky polia';
 $labels['search'] = 'Hľadať';
+$labels['searchresult'] = 'Výsledok vyhľadávania';
 $labels['advsearch'] = 'Rozšírené vyhľadávanie';
 $labels['advanced'] = 'Rozšírené';
 $labels['other'] = 'Ostatné';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Domovská stránka';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Pridať pole...';
-$labels['addcontact'] = 'Pridať nový kontakt';
+$labels['addcontact'] = 'Pridať kontakt';
 $labels['editcontact'] = 'Upraviť kontakt';
 $labels['contacts'] = 'Kontakty';
 $labels['contactproperties'] = 'Vlastnosti kontaktu';
+$labels['contactnameandorg'] = 'Názov a organizácia';
 $labels['personalinfo'] = 'Osobné informácie';
+$labels['contactphoto'] = 'Fotografia kontaktu';
 $labels['edit']   = 'Upraviť';
 $labels['cancel'] = 'Zrušiť';
 $labels['save']   = 'Uložiť';
@@ -310,10 +336,12 @@ $labels['export']         = 'Exportovať';
 $labels['exportall']      = 'Exportovať všetko';
 $labels['exportsel']      = 'Exportovať vybrané';
 $labels['exportvcards']   = 'Exportovať kontakty vo formáte vCard';
-$labels['newcontactgroup'] = 'Vytvoriť novú skupinu kontaktov';
+$labels['newcontactgroup']       = 'Vytvoriť novú skupinu';
+$labels['addgroup']       = 'Pridať skupinu';
 $labels['grouprename']    = 'Premenovať skupinu';
 $labels['groupdelete']    = 'Vymazať skupinu';
 $labels['groupremoveselected'] = 'Odstrániť vybrané kontakty zo skupiny';
+$labels['uponelevel']     = 'O jednu úroveň nahor';
 $labels['previouspage']   = 'Zobraziť predchádzajúcu stranu';
 $labels['firstpage']      = 'Zobraziť prvú stranu';
 $labels['nextpage']       = 'Zobraziť nasledujúcu stranu';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Nastavenia';
 $labels['userpreferences'] = 'Používateľské nastavenia';
 $labels['editpreferences'] = 'Upraviť používateľské nastavenia';
 $labels['identities'] = 'Identity';
-$labels['manageidentities'] = 'Spravovať identity pre tento účet';
-$labels['newidentity'] = 'Nová identita';
-$labels['newitem'] = 'Nová položka';
-$labels['edititem'] = 'Upraviť položku';
+$labels['manageidentities'] = 'Spravovať identity';
+$labels['newidentity'] = 'Vytvoriť novú identitu';
+$labels['addidentity'] = 'Pridať identitu';
+$labels['edititem'] = 'Upraviť identitu';
 $labels['preferhtml'] = 'Zobraziť HTML';
 $labels['defaultcharset'] = 'Predvolené kódovanie';
 $labels['htmlmessage'] = 'HTML správa';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'Úplné RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Úplné RFC 2047 (iné)';
 $labels['force7bit'] = 'Použiť kódovanie MIME pre 8-bitové znaky';
+$labels['savelocalstorage'] = "Uložiť v lokálnom úložisku prehliadača (dočasne)";
 $labels['advancedoptions'] = 'Rozšírené nastavenia';
+$labels['toggleadvancedoptions'] = 'Prepnúť pokročilé nastavenia';
 $labels['focusonnewmessage'] = 'Aktivovať okno prehliadača pri novej správe';
 $labels['checkallfolders'] = 'Kontrolovať nové správy vo všetkých priečinkoch';
 $labels['displaynext'] = 'Zobraziť ďalšiu správu po vymazaní/presunutí správy';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'ako príloha';
 $labels['replyallmode'] = 'Predvolená akcia pre tlačidlo [Odpovedať všetkým]';
 $labels['replyalldefault'] = 'odpovedať všetkým';
 $labels['replyalllist'] = 'odpovedať len do mailing-listu (ak bol nájdený)';
-$labels['folder']  = 'Priečinok';
-$labels['folders']  = 'Priečinky';
-$labels['foldername']  = 'Názov priečinka';
-$labels['subscribed']  = 'Odber aktívny';
+$labels['folder'] = 'Priečinok';
+$labels['folders'] = 'Priečinky';
+$labels['foldername'] = 'Názov priečinka';
+$labels['subscribed'] = 'Odber aktívny';
 $labels['messagecount'] = 'Správy';
-$labels['create']  = 'Vytvoriť';
-$labels['createfolder']  = 'Vytvoriť nový priečinok';
-$labels['managefolders']  = 'Spravovať priečinky';
+$labels['create'] = 'Vytvoriť';
+$labels['createfolder'] = 'Vytvoriť nový priečinok';
+$labels['managefolders'] = 'Spravovať priečinky';
 $labels['specialfolders'] = 'Špeciálne priečinky';
 $labels['properties'] = 'Vlastnosti';
 $labels['folderproperties'] = 'Vlastnosti priečinka';
@@ -459,9 +489,13 @@ $labels['info'] = 'Informácia';
 $labels['getfoldersize'] = 'Na zistenie veľkosti priečinka kliknite sem';
 $labels['changesubscription'] = 'Na zmenu odberu kliknite sem';
 $labels['foldertype'] = 'Typ priečinka';
-$labels['personalfolder']  = 'Súkromný priečinok';
-$labels['otherfolder']  = 'Iné priečinky používateľa';
-$labels['sharedfolder']  = 'Verejný priečinok';
+$labels['personalfolder'] = 'Súkromný priečinok';
+$labels['otherfolder'] = 'Iné priečinky používateľa';
+$labels['sharedfolder'] = 'Verejný priečinok';
+$labels['findfolders'] = 'Hľadať priečinky';
+$labels['namespace.personal'] = 'Osobné';
+$labels['namespace.other'] = 'Iní používatelia';
+$labels['namespace.shared'] = 'Zdieľané';
 $labels['sortby'] = 'Zoradiť podľa';
 $labels['sortasc']  = 'Zoradiť vzostupne';
 $labels['sortdesc'] = 'Zoradiť zostupne';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamčina';
 $labels['japanese'] = 'Japonsky';
 $labels['korean'] = 'Kórejsky';
 $labels['chinese'] = 'Čínsky';
+$labels['arialabeltopnav'] = 'Ovládanie okna';
+$labels['arialabeltasknav'] = 'Úlohy aplikácie';
+$labels['arialabeltoolbar'] = 'Panel nástrojov aplikácie';
+$labels['arialabelactivetask'] = 'Aktívna úloha';
+$labels['arialabelmessagessearchfilter'] = 'Filter zoznamu e-mailov';
+$labels['arialabelmailsearchform'] = 'Formulár pre vyhľadanie e-mailu';
+$labels['arialabelcontactsearchform'] = 'Formulár pre vyhľadávanie kontaktov';
+$labels['arialabelmailquicksearchbox'] = 'Vstup pre vyhľadávanie e-mailu';
+$labels['arialabelquicksearchbox'] = 'Vstup pre vyhľadávanie';
+$labels['arialabelfoldersearchfilter'] = 'Filter pre zoznam priečinkov';
+$labels['arialabelfoldersearchform'] = 'Formulár pre vyhľadávanie priečinkov';
+$labels['arialabelfolderlist'] = 'Výber priečinka s e-mailovými správami';
+$labels['arialabelmessagelist'] = 'Zoznam e-mailových správ';
+$labels['arialabelmailpreviewframe'] = 'Náhľad správy';
+$labels['arialabelmailboxmenu'] = 'Menu akcií pre priečinok';
+$labels['arialabellistselectmenu'] = 'Menu pre výber zoznamu';
+$labels['arialabelthreadselectmenu'] = 'Menu pre zoznam vlákien';
+$labels['arialabelmessagelistoptions'] = 'Nastavenia zobrazenia a triedenia zoznamu správ';
+$labels['arialabelmailimportdialog'] = 'Dialóg pre import správy';
+$labels['arialabelmessagenav'] = 'Navigácia správy';
+$labels['arialabelmessagebody'] = 'Telo správy';
+$labels['arialabelmessageactions'] = 'Akcie správy';
+$labels['arialabelcontactquicksearch'] = 'Formulár pre vyhľadanie kontaktov';
+$labels['arialabelcontactsearchbox'] = 'Vstup pre vyhľadávanie kontaktov';
+$labels['arialabelmessageheaders'] = 'Hlavičky správ';
+$labels['arialabelforwardingoptions'] = 'Nastavenia preposielania';
+$labels['arialabelreplyalloptions'] = 'Nastavenia pre „Odpovedať všetkým“';
+$labels['arialabelmoremessageactions'] = 'Viac akcií so správou';
+$labels['arialabelmarkmessagesas'] = 'Označiť vybrané správy ako';
+$labels['arialabelcomposeoptions'] = 'Nastavenia kompozície';
+$labels['arialabelresponsesmenu'] = 'Menu pre preddefinované odpovede';
+$labels['arialabelattachmentuploadform'] = 'Formulár pre odoslanie prílohy';
+$labels['arialabelattachmentpreview'] = 'Náhľad prílohy';
+$labels['ariasummarycomposecontacts'] = 'Zoznam kontaktov a skupín pre výber príjemcov';
+$labels['arialabelcontactexportoptions'] = 'Nastavenia exportu kontaktov';
+$labels['arialabelabookgroupoptions'] = 'Nastavenia adresára/skupiny';
+$labels['arialabelpreferencesform'] = 'Formulár s nastaveniami';
+$labels['arialabelidentityeditfrom'] = 'Formulár pre úpravu identity';
+$labels['arialabelresonseeditfrom'] = 'Formulár pre úpravu odpovede';
+$labels['arialabelsearchterms'] = 'Vyhľadávanie položiek';
+$labels['helplistnavigation'] = 'Zoznam navigovania pomocou klávesnice';
+$labels['helplistkeyboardnavigation'] = "Šípky nahor/nadol: presunúť zvýraznenie/výber.
+Medzerník: vybrať zvýraznený riadok.
+Shift + nahor/nadol: vybrať ďalší riadok hore/dole.
+Ctrl + medzerník: pridať zvýraznený riadok do výberu/odstrániť ho z výberu.";
+$labels['helplistkeyboardnavmessages'] = "Šípky doprava/doľava: rozbaliť/zbaliť vlákno správy (len v režime pre vlákna).
+Enter: otvoriť vybranú/zvýraznenú správu.
+Delete: presunúť vybrané správy do koša.";
+$labels['helplistkeyboardnavcontacts'] = "Enter: Otvoriť vybraný/zvýraznený kontakt.";
 ?>
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index d5cf323db..5fd6d997b 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Vaša relácia nie je platná alebo vypršala jej p
 $messages['storageerror'] = 'Nepodarilo sa spojiť s úložným serverom.';
 $messages['servererror'] = 'Chyba servera!';
 $messages['servererrormsg'] = 'Chyba servera: $msg';
+$messages['connerror'] = 'Chyba pri pripájaní (nepodarilo sa spojiť so serverom)!';
 $messages['dberror'] = 'Chyba databázy!';
+$messages['windowopenerror'] = 'Bolo zablokované vyskakovacie okno!';
 $messages['requesttimedout'] = 'Čas na vykonanie požiadavky uplynul';
 $messages['errorreadonly'] = 'Akciu nemožno vykonať. Priečinok je určený len na čítanie.';
 $messages['errornoperm'] = 'Akciu nemožno vykonať. Prístup bol odmietnutý.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = 'Nájdené kontakty: $nr.';
 $messages['searchnomatch'] = 'Hľadaný výraz sa nenašiel.';
 $messages['searching'] = 'Vyhľadáva sa...';
 $messages['checking'] = 'Kontroluje sa...';
+$messages['stillsearching'] = 'Vyhľadávanie stále prebieha...';
 $messages['nospellerrors'] = 'Pri kontrole pravopisu neboli nájdené chyby.';
 $messages['folderdeleted'] = 'Priečinok bol úspešne vymazaný.';
 $messages['foldersubscribed'] = 'Prihlásenie k priečinku bolo úspešné.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = 'Počet úspešne naimportovaných správ: $
 $messages['importmessageerror'] = 'Importovanie bolo neúspešné! Odoslaný súbor nie je platným súborom pre importovanie';
 $messages['opnotpermitted'] = 'Táto operácia nie je povolená!';
 $messages['nofromaddress'] = 'Pri vybranej identite chýba e-mailová adresa.';
-$messages['editorwarning'] = 'Prepnutie na editor čistého textu spôsobí stratu formátovania. Naozaj chcete pokračovať?';
+$messages['editorwarning'] = 'Prepnutie druhu editora môže spôsobiť stratu formátovania. Naozaj chcete pokračovať?';
 $messages['httpreceivedencrypterror'] = 'Vyskytla sa vážna chyba v konfigurácii. Ihneď kontaktujte administrátora. <b>Vašu správu nemožno odoslať.</b>';
 $messages['smtpconnerror'] = 'Chyba SMTP ($code): Neúspešné pripojenie k serveru.';
 $messages['smtpautherror'] = 'Chyba SMTP ($code): Neúspešná autentifikácia.';
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index fa822a728..41cb3cc23 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -125,13 +125,11 @@ $labels['name']         = 'Emri që thirret';
 $labels['firstname']    = 'Emri';
 $labels['surname']      = 'Mbiemri';
 $labels['email']        = 'E-Mail';
-$labels['addcontact'] = 'Shto një kontakt të ri';
 $labels['editcontact'] = 'Ndrysho kontaktin';
 $labels['edit']   = 'Ndrysho';
 $labels['cancel'] = 'Anullo';
 $labels['save']   = 'Ruaj';
 $labels['delete'] = 'Fshi';
-$labels['newcontact']     = 'Krijo nje kartë të re kontakti';
 $labels['deletecontact']  = 'Fshi kontaktet e zgjedhura';
 $labels['composeto']      = 'Shkruaj email për';
 $labels['contactsfromto'] = 'Kontaktet $from në $to nga $count';
@@ -148,10 +146,6 @@ $labels['preferences'] = 'Preferencat';
 $labels['userpreferences'] = 'Preferencat e përdoruesit';
 $labels['editpreferences'] = 'Ndrysho preferencat e përdoruesit';
 $labels['identities'] = 'Identitetet';
-$labels['manageidentities'] = 'Manaxho identitetet per këtë llogari';
-$labels['newidentity'] = 'Identitet i ri';
-$labels['newitem'] = 'Element i ri';
-$labels['edititem'] = 'Ndrysho element';
 $labels['preferhtml'] = 'Shfaq HTML';
 $labels['htmlmessage'] = 'Mesazh HTML';
 $labels['prettydate'] = 'Data të këndshme';
@@ -166,14 +160,14 @@ $labels['htmlsignature'] = 'Nënshkrimi HTML';
 $labels['previewpane'] = 'Shiko si duket';
 $labels['autosavedraft']  = 'Ruaje automatikisht si draft';
 $labels['never']  = 'kurrë';
-$labels['folder']  = 'Kutia';
-$labels['folders']  = 'Kutitë';
-$labels['foldername']  = 'Emër kutie';
-$labels['subscribed']  = 'Regjistruar';
+$labels['folder'] = 'Kutia';
+$labels['folders'] = 'Kutitë';
+$labels['foldername'] = 'Emër kutie';
+$labels['subscribed'] = 'Regjistruar';
 $labels['messagecount'] = 'Mesazhe';
-$labels['create']  = 'Krijo';
-$labels['createfolder']  = 'Krijo kuti të re';
-$labels['managefolders']  = 'Sistemo kutitë';
+$labels['create'] = 'Krijo';
+$labels['createfolder'] = 'Krijo kuti të re';
+$labels['managefolders'] = 'Sistemo kutitë';
 $labels['sortby'] = 'Rradhit sipas';
 $labels['sortasc']  = 'Rradhitje rritëse';
 $labels['sortdesc'] = 'Rradhitje zbritëse';
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index 2d4efc408..cb25321e2 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -119,7 +119,6 @@ $messages['importconfirm'] = '<b>Успешно увезжени $inserted ко�
 $messages['importconfirmskipped'] = '<b>Прескочени $skipped постојећи уноси </b>';
 $messages['opnotpermitted'] = 'Операција није дозвољена!';
 $messages['nofromaddress'] = 'Недостаје имејл адреса у изабраном налогу';
-$messages['editorwarning'] = 'Пребацивање на обичан текст едитор ће изазвати губитак целог форматирања. Да ли желите да наставите?';
 $messages['httpreceivedencrypterror'] = 'Фатална грешка у конфигурацији. Контактирајте одмах Вашег администратора. <b>Ваша порука не може бити послата.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): Конекција на сервер није успела';
 $messages['smtpautherror'] = 'SMTP Error ($code): Аутентификација неуспешна';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 6b7765269..a8feb674a 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Fler åtgärder...';
 $labels['more']             = 'Fler';
 $labels['back']             = 'Tillbaka';
 $labels['options']          = 'Alternativ';
+$labels['first'] = 'Första';
+$labels['last'] = 'Sista';
+$labels['previous'] = 'Föregående';
+$labels['next'] = 'Nästa';
 $labels['select'] = 'Välj';
 $labels['all'] = 'Alla';
 $labels['none'] = 'Ingen';
 $labels['currpage'] = 'Sida';
+$labels['isread'] = 'Läst';
 $labels['unread'] = 'Olästa';
 $labels['flagged'] = 'Flaggade';
+$labels['unflagged'] = 'Inte flaggat';
 $labels['unanswered'] = 'Obesvarade';
 $labels['withattachment'] = 'Med bilaga';
 $labels['deleted'] = 'Borttagna';
 $labels['undeleted'] = 'Inte borttagna';
+$labels['replied'] = 'Besvarat';
+$labels['forwarded'] = 'Vidarebefordrat';
 $labels['invert'] = 'Invertera';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lista';
@@ -171,6 +179,11 @@ $labels['importmessages'] = 'Importera meddelanden';
 $labels['quota'] = 'Diskutrymme';
 $labels['unknown']  = 'okänt';
 $labels['unlimited']  = 'obegränsat';
+$labels['quotatype'] = 'Typ av kvot';
+$labels['quotatotal'] = 'Gräns';
+$labels['quotaused'] = 'Utnyttjad';
+$labels['quotastorage'] = 'Storlek';
+$labels['quotamessage'] = 'Antal meddelanden';
 $labels['quicksearch']  = 'Snabbsök';
 $labels['resetsearch']  = 'Återställ sökning';
 $labels['searchmod']  = 'Sökalternativ';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Hela meddelandet';
 $labels['body']  = 'Innehåll';
 $labels['type'] = 'Typ';
 $labels['namex'] = 'Namn';
+$labels['searchscope'] = 'Omfattning';
+$labels['currentfolder'] = 'Nuvarande katalog';
+$labels['subfolders'] = 'Denna och underkataloger';
+$labels['allfolders'] = 'Samtliga kataloger';
 $labels['openinextwin'] = 'Öppna i nytt fönster';
 $labels['emlsave'] = 'Spara (.eml)';
 $labels['changeformattext'] = 'Visa i text-format';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Mottagarkvitto';
 $labels['dsn']            = 'Leveransstatusmeddelande';
 $labels['mailreplyintro'] = '$date skrev $sender:';
 $labels['originalmessage'] = 'Ursprungligt meddelande';
+$labels['selectimage']    = 'Välj bild';
+$labels['addimage']       = 'Lägg till bild';
+$labels['selectmedia']    = 'Välj film';
+$labels['addmedia']       = 'Lägg till film';
 $labels['editidents']    = 'Ändra identiteter';
 $labels['spellcheck']    = 'Rättstava';
 $labels['checkspelling'] = 'Kontrollera stavning';
@@ -203,10 +224,11 @@ $labels['restoremessage'] = 'Återskapa meddelande?';
 $labels['responses'] = 'Responser';
 $labels['insertresponse'] = 'Infoga respons';
 $labels['manageresponses'] = 'Hantera responser';
-$labels['savenewresponse'] = 'Spara ny respons';
-$labels['editresponses'] = 'Ändra responser';
+$labels['savenewresponse'] = 'Ny respons';
+$labels['addresponse'] = 'Lägg till respons';
 $labels['editresponse'] = 'Ändra respons';
-$labels['responsename'] = 'Namn';
+$labels['editresponses'] = 'Ändra responser';
+$labels['responsename'] = 'Responsnamn';
 $labels['responsetext'] = 'Responstext';
 $labels['attach'] = 'Bifoga';
 $labels['attachments'] = 'Bilagor';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Bifoga';
 $labels['uploadprogress'] = '$percent ($current av $total)';
 $labels['close']  = 'Stäng';
 $labels['messageoptions']  = 'Meddelandealternativ...';
+$labels['togglecomposeoptions'] = 'Växla skapandeinställningar';
 $labels['low']     = 'Låg';
 $labels['lowest']  = 'Lägst';
 $labels['normal']  = 'Normal';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Assistent';
 $labels['spouse'] = 'Make/Maka';
 $labels['allfields'] = 'Alla fält';
 $labels['search'] = 'Sök';
+$labels['searchresult'] = 'Sökresultat';
 $labels['advsearch'] = 'Avancerad sökning';
 $labels['advanced'] = 'Avancerad';
 $labels['other'] = 'Annat';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Webbsida';
 $labels['typeblog'] = 'Blogg';
 $labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Lägg till fält...';
-$labels['addcontact'] = 'Lägg till ny kontakt';
+$labels['addcontact'] = 'Lägg till kontakt';
 $labels['editcontact'] = 'Ändra kontakt';
 $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Kontaktegenskaper';
+$labels['contactnameandorg'] = 'Namn och organisation';
 $labels['personalinfo'] = 'Personlig information';
+$labels['contactphoto'] = 'Kontaktfoto';
 $labels['edit']   = 'Redigera';
 $labels['cancel'] = 'Avbryt';
 $labels['save']   = 'Spara';
@@ -310,10 +336,12 @@ $labels['export']         = 'Exportera';
 $labels['exportall']      = 'Exportera alla';
 $labels['exportsel']      = 'Exportera markerade';
 $labels['exportvcards']   = 'Exportera kontakter';
-$labels['newcontactgroup'] = 'Ny kontaktgrupp';
+$labels['newcontactgroup']       = 'Ny grupp';
+$labels['addgroup']       = 'Lägg till grupp';
 $labels['grouprename']    = 'Ändra gruppnamn';
 $labels['groupdelete']    = 'Ta bort grupp';
 $labels['groupremoveselected'] = 'Ta bort markerade kontakter från gruppen';
+$labels['uponelevel']     = 'Upp en nivå';
 $labels['previouspage']   = 'Visa föregående sida';
 $labels['firstpage']      = 'Visa första sidan';
 $labels['nextpage']       = 'Visa nästa sida';
@@ -342,8 +370,8 @@ $labels['editpreferences'] = 'Ändra användarinställningar';
 $labels['identities'] = 'Identiteter';
 $labels['manageidentities'] = 'Hantera identiteter';
 $labels['newidentity'] = 'Ny identitet';
-$labels['newitem'] = 'Ny information';
-$labels['edititem'] = 'Ändra information';
+$labels['addidentity'] = 'Lägg till identitet';
+$labels['edititem'] = 'Ändra identitet';
 $labels['preferhtml'] = 'Visa meddelanden i HTML-format';
 $labels['defaultcharset'] = 'Förvald teckenkodning';
 $labels['htmlmessage'] = 'HTML-meddelande';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (övriga)';
 $labels['force7bit'] = 'Använd MIME-kodning för tecken med 8-bitar';
+$labels['savelocalstorage'] = "Spara lokalt (tillfälligt)";
 $labels['advancedoptions'] = 'Avancerade inställningar';
+$labels['toggleadvancedoptions'] = 'Växla avancerade inställningar';
 $labels['focusonnewmessage'] = 'Fokusera webbläsarens fönster vid nytt meddelande';
 $labels['checkallfolders'] = 'Genomsök samtliga kataloger efter nya meddelanden';
 $labels['displaynext'] = 'Visa nästa meddelande efter borttagning/flyttning av meddelande';
@@ -442,14 +472,14 @@ $labels['asattachment'] = 'Bilaga';
 $labels['replyallmode'] = 'Standardfunktion för knappen Svara alla';
 $labels['replyalldefault'] = 'Svara alla';
 $labels['replyalllist'] = 'Svara endast lista (i förekommande fall)';
-$labels['folder']  = 'Katalog';
-$labels['folders']  = 'Kataloger';
-$labels['foldername']  = 'Katalognamn';
-$labels['subscribed']  = 'Prenumererad';
+$labels['folder'] = 'Katalog';
+$labels['folders'] = 'Kataloger';
+$labels['foldername'] = 'Katalognamn';
+$labels['subscribed'] = 'Prenumererad';
 $labels['messagecount'] = 'Meddelanden';
-$labels['create']  = 'Skapa';
-$labels['createfolder']  = 'Ny katalog';
-$labels['managefolders']  = 'Hantera kataloger';
+$labels['create'] = 'Skapa';
+$labels['createfolder'] = 'Ny katalog';
+$labels['managefolders'] = 'Hantera kataloger';
 $labels['specialfolders'] = 'Speciella kataloger';
 $labels['properties'] = 'Egenskaper';
 $labels['folderproperties'] = 'Katalogegenskaper';
@@ -459,9 +489,13 @@ $labels['info'] = 'Information';
 $labels['getfoldersize'] = 'Beräkna katalogstorlek';
 $labels['changesubscription'] = 'Klicka för att ändra prenumeration';
 $labels['foldertype'] = 'Katalogtyp';
-$labels['personalfolder']  = 'Privat katalog';
-$labels['otherfolder']  = 'Annan användares katalog';
-$labels['sharedfolder']  = 'Publik katalog';
+$labels['personalfolder'] = 'Privat katalog';
+$labels['otherfolder'] = 'Annan användares katalog';
+$labels['sharedfolder'] = 'Publik katalog';
+$labels['findfolders'] = 'Hitta kataloger';
+$labels['namespace.personal'] = 'Personliga';
+$labels['namespace.other'] = 'Andra användares';
+$labels['namespace.shared'] = 'Delade';
 $labels['sortby'] = 'Sortera på';
 $labels['sortasc']  = 'Sortera stigande';
 $labels['sortdesc'] = 'Sortera fallande';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamesisk';
 $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
+$labels['arialabeltopnav'] = 'Fönsterkontroll';
+$labels['arialabeltasknav'] = 'Programuppgifter';
+$labels['arialabeltoolbar'] = 'Programmets verktygslist';
+$labels['arialabelactivetask'] = 'Aktiv uppgift';
+$labels['arialabelmessagessearchfilter'] = 'Meddelandelistningsfilter';
+$labels['arialabelmailsearchform'] = 'Sökformulär för meddelande';
+$labels['arialabelcontactsearchform'] = 'Sökformulär för kontakter';
+$labels['arialabelmailquicksearchbox'] = 'Meddelandesökfält';
+$labels['arialabelquicksearchbox'] = 'Sökfält';
+$labels['arialabelfoldersearchfilter'] = 'Kataloglistningsfilter';
+$labels['arialabelfoldersearchform'] = 'Sökformulär för kataloger';
+$labels['arialabelfolderlist'] = 'Markering av meddelandekatalog';
+$labels['arialabelmessagelist'] = 'Meddelandelistning';
+$labels['arialabelmailpreviewframe'] = 'Förhandsvisning av meddelande';
+$labels['arialabelmailboxmenu'] = 'Kataloghanteringsmeny';
+$labels['arialabellistselectmenu'] = 'Listmarkeringsmeny';
+$labels['arialabelthreadselectmenu'] = 'Trådlistningsmeny';
+$labels['arialabelmessagelistoptions'] = 'Alternativ för visning och sortering av meddelandelista';
+$labels['arialabelmailimportdialog'] = 'Dialog för import av meddelande';
+$labels['arialabelmessagenav'] = 'Meddelandenavigering';
+$labels['arialabelmessagebody'] = 'Meddelandeinnehåll';
+$labels['arialabelmessageactions'] = 'Meddelandehantering';
+$labels['arialabelcontactquicksearch'] = 'Sökformulär för kontakter';
+$labels['arialabelcontactsearchbox'] = 'Kontaktsökfält';
+$labels['arialabelmessageheaders'] = 'Meddelandehuvuden';
+$labels['arialabelforwardingoptions'] = 'Alternativ för vidarebefordran';
+$labels['arialabelreplyalloptions'] = 'Alternativ för svara alla';
+$labels['arialabelmoremessageactions'] = 'Ytterligare meddelandehantering';
+$labels['arialabelmarkmessagesas'] = 'Märk markerat meddelande som...';
+$labels['arialabelcomposeoptions'] = 'Skapandeinställningar';
+$labels['arialabelresponsesmenu'] = 'Responsmeny';
+$labels['arialabelattachmentuploadform'] = 'Uppladdningsformulär för bilaga';
+$labels['arialabelattachmentpreview'] = 'Förhandsvisning av bilaga';
+$labels['ariasummarycomposecontacts'] = 'Lista med kontakter och grupper att använda som mottagare';
+$labels['arialabelcontactexportoptions'] = 'Exportalternativ för kontakter';
+$labels['arialabelabookgroupoptions'] = 'Alternativ för adressbok/kontaktgrupp';
+$labels['arialabelpreferencesform'] = 'Inställningsformulär';
+$labels['arialabelidentityeditfrom'] = 'Ändringsformulär för identitet';
+$labels['arialabelresonseeditfrom'] = 'Ändringsformulär för respons';
+$labels['arialabelsearchterms'] = 'Sökord';
+$labels['helplistnavigation'] = 'Listnavigering';
+$labels['helplistkeyboardnavigation'] = "Piltangent upp/ner: Flytta radfokus/radmarkering.
+Mellanslag: Välj fokuserad rad.
+Shift + upp/ner: Välj ytterligare rad över/under.
+Ctrl + mellanslag: Lägg till/ta bort fokuserad rad i markering.";
+$labels['helplistkeyboardnavmessages'] = "Piltangent höger/vänster: visa/göm meddelandetråd (endast i trådvisningsläge).
+Retur: Öppna markerat/fokuserat meddelande.
+Backsteg: Flytta markerat meddelande till Papperskorg.";
+$labels['helplistkeyboardnavcontacts'] = "Retur: Öppna markerad/fokuserad kontakt.";
 ?>
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 7efc08013..ae2b1e9ca 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -19,10 +19,12 @@ $messages['errortitle']  = 'Ett fel uppstod!';
 $messages['loginfailed']  = 'Inloggningen misslyckades';
 $messages['cookiesdisabled'] = 'Din webbläsare accepterar inte cookies';
 $messages['sessionerror'] = 'Din inloggning är felaktig eller har gått ut';
-$messages['storageerror'] = 'Anslutning till IMAP-servern misslyckades';
+$messages['storageerror'] = 'Anslutning till lagringsservern misslyckades.';
 $messages['servererror'] = 'Serverfel!';
 $messages['servererrormsg'] = 'Serverfel: $msg';
+$messages['connerror'] = 'Anslutningsfel (misslyckades att kontakta servern)!';
 $messages['dberror'] = 'Databasfel!';
+$messages['windowopenerror'] = 'Popup-fönstret blockerades!';
 $messages['requesttimedout'] = 'Begäran tog för lång tid';
 $messages['errorreadonly'] = 'Åtgärden kunde inte utföras. Katalogen är skrivskyddad.';
 $messages['errornoperm'] = 'Åtgärden kunde inte utföras. Otillräcklig befogenhet.';
@@ -92,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr kontakter hittades.';
 $messages['searchnomatch'] = 'Sökningen gav inget resultat.';
 $messages['searching'] = 'Söker...';
 $messages['checking'] = 'Kontrollerar...';
+$messages['stillsearching'] = 'Söker fortfarande...';
 $messages['nospellerrors'] = 'Inget stavfel hittades.';
 $messages['folderdeleted'] = 'Katalogen togs bort.';
 $messages['foldersubscribed'] = 'Prenumeration på katalog startad.';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = '$nr meddelanden har importerats';
 $messages['importmessageerror'] = 'Importen misslyckades! Filen är inte ett giltigt meddelande eller en brevlåda';
 $messages['opnotpermitted'] = 'Otillåten operation!';
 $messages['nofromaddress'] = 'Adress saknas i den valda identiteten.';
-$messages['editorwarning'] = 'Genom att växla till text-läge går formateringen förlorad. Vill du fortsätta?';
+$messages['editorwarning'] = 'Genom att byta textredigerare kan formateringen av texten gå förlorad. Vill du fortsätta?';
 $messages['httpreceivedencrypterror'] = 'Ett irreparabelt fel har uppstått. Kontakta administratören omgående. <b>Meddelandet kan inte skickas.</b>';
 $messages['smtpconnerror'] = 'SMTP-fel ($code): Anslutning till servern misslyckades.';
 $messages['smtpautherror'] = 'SMTP-fel ($code): Inloggningen misslyckades.';
diff --git a/program/localization/ta_IN/messages.inc b/program/localization/ta_IN/messages.inc
index 0da63d2af..3514e384c 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -15,14 +15,17 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
+$messages['errortitle']  = 'பிழை ஏற்பட்டது!';
 $messages['loginfailed']  = 'நுழைவு தோல்வியடைந்தது';
 $messages['cookiesdisabled'] = 'உங்கள் உலாவி நினைவிகளை அனுமதிப்பதில்லை';
 $messages['sessionerror'] = 'உங்கள் அமர்வு செல்லாது அல்லது முடிவுற்றது';
 $messages['storageerror'] = 'IMAP சேவையகத்திற்கான இணைப்பு தோல்வியடைந்தது';
 $messages['servererror'] = 'சேவையக பிழை!';
+$messages['servererrormsg'] = 'சேவையக பிழை: $msg';
 $messages['invalidrequest'] = 'செல்லாத வேண்டுகோள்! எந்த தரவும் சேமிக்கப்படவில்லை.';
 $messages['nomessagesfound'] = 'இந்த தபால் பெட்டியில் எந்த தரவும் சேமிக்கப்படவில்லை';
 $messages['loggedout'] = 'நீங்கள் அமர்வை வெற்றிகரமாக முடித்தீர்கள். வணக்கம்';
+$messages['mailboxempty'] = 'தபால் பெட்டி காலியாக உள்ளது';
 $messages['loading'] = 'ஏற்றுகிறது...';
 $messages['uploading'] = 'கோப்பை ஏற்றுகிறது...';
 $messages['loadingdata'] = 'தரவை ஏற்றுகிறது...';
@@ -85,7 +88,6 @@ $messages['importwait'] = 'ஏற்றுகிறது, தயவு செ�
 $messages['importconfirm'] = '<b>வெற்றிகரமாக $inserted தொடர்புகள் ஏற்றப்பட்டது, ஏற்கனவே உள்ள $skipped தொடர்புகள் தவிர்க்கப்பட்டது</b>: <p><em>$names</em></p>';
 $messages['opnotpermitted'] = 'பணி அனுமதிக்கப்படவில்லை!';
 $messages['nofromaddress'] = 'நீங்கள் தேர்ந்தெடுத்த அடையாளத்தில் மின்னஞ்சல் இல்லை';
-$messages['editorwarning'] = 'எளிய உரை திருத்திக்கு மாறுவதன் மூலம் எல்லா உரை வடிவங்களும் தொலைந்து போகக் கூடும். தொடர விரும்புகிறீர்களா ?';
 $messages['httpreceivedencrypterror'] = 'அமைப்பில் பெரிய பிழை ஏற்பட்டது. உங்கள் நிர்வாகியை உடனே தொடர்பு கொள்ளவும். <b>உங்கள் செய்தியை அனுப்ப முடியாது.</b>';
 $messages['smtpconnerror'] = 'SMTP பிழை ($code): சேவையகத்தின் இணைப்பு தோல்வியடைந்தது';
 $messages['smtpautherror'] = 'SMTP பிழை ($code): நம்பகத்தன்மை தோல்வியடைந்தது';
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index 99122ccad..d7780c276 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -131,16 +131,24 @@ $labels['moreactions']      = 'Diğer İşlemler';
 $labels['more']             = 'Daha Fazla';
 $labels['back']             = 'Geri';
 $labels['options']          = 'Seçenekler';
+$labels['first'] = 'İlk';
+$labels['last'] = 'Son';
+$labels['previous'] = 'Önceki';
+$labels['next'] = 'Sonraki';
 $labels['select'] = 'Seç';
 $labels['all'] = 'Hepsini';
 $labels['none'] = 'Yok';
 $labels['currpage'] = 'Şimdiki sayfa';
+$labels['isread'] = 'Oku';
 $labels['unread'] = 'Okunmamışları';
 $labels['flagged'] = 'İşaretlenmişleri';
+$labels['unflagged'] = 'İşaretlenmedi';
 $labels['unanswered'] = 'Yanıtlanmamışları';
 $labels['withattachment'] = 'Eklenti ile';
 $labels['deleted'] = 'Silinmişleri';
 $labels['undeleted'] = 'Silinmemiş';
+$labels['replied'] = 'Cevaplandı';
+$labels['forwarded'] = 'Yönlendirildi';
 $labels['invert'] = 'Seçimi Tersine Çevir';
 $labels['filter'] = 'Göster';
 $labels['list'] = 'Liste';
@@ -165,12 +173,17 @@ $labels['listsorting'] = 'Sıralama sütunu';
 $labels['listorder'] = 'Sıralama düzeni';
 $labels['listmode'] = 'Liste görünümü';
 $labels['folderactions'] = 'Klasör eylemleri...';
-$labels['compact'] = 'Sıklaştır';
+$labels['compact'] = 'Sıkıştır';
 $labels['empty'] = 'Boşalt';
 $labels['importmessages'] = 'Mesajları içe aktar';
 $labels['quota'] = 'Disk kullanımı';
 $labels['unknown']  = 'bilinmeyen';
 $labels['unlimited']  = 'sınırsız';
+$labels['quotatype'] = 'Kota tipi';
+$labels['quotatotal'] = 'Limit';
+$labels['quotaused'] = 'Kullanılan';
+$labels['quotastorage'] = 'Disk boyutu';
+$labels['quotamessage'] = 'Mesaj Sayısı';
 $labels['quicksearch']  = 'Hızlı arama';
 $labels['resetsearch']  = 'Aramayı bitir';
 $labels['searchmod']  = 'Arama detayları';
@@ -178,6 +191,10 @@ $labels['msgtext']  = 'Tüm posta gövdesi';
 $labels['body']  = 'Gövde';
 $labels['type'] = 'Tip';
 $labels['namex'] = 'Ad';
+$labels['searchscope'] = 'Kapsam';
+$labels['currentfolder'] = 'Mevcut klasör';
+$labels['subfolders'] = 'Bu ve alt klasörler';
+$labels['allfolders'] = 'Tüm klasörler';
 $labels['openinextwin'] = 'Yeni pencerede aç';
 $labels['emlsave'] = 'İndir (.eml)';
 $labels['changeformattext'] = 'Düz yazı formatında göster';
@@ -193,6 +210,10 @@ $labels['returnreceipt']  = 'Alındı onayı';
 $labels['dsn']            = 'Teslimat durumu bildirisi';
 $labels['mailreplyintro'] = '$date, $sender yazmış:';
 $labels['originalmessage'] = 'Özgün ileti';
+$labels['selectimage']    = 'Resim seç';
+$labels['addimage']       = 'Resim ekle';
+$labels['selectmedia']    = 'Video seç';
+$labels['addmedia']       = 'Video ekle';
 $labels['editidents']    = 'Kimlikleri düzenle';
 $labels['spellcheck']    = 'Yazım denetimi';
 $labels['checkspelling'] = 'Yazım denetimi yap';
@@ -203,9 +224,10 @@ $labels['restoremessage'] = 'Mesajı geri yükle?';
 $labels['responses'] = 'Yanıtlar';
 $labels['insertresponse'] = 'Yanıt ekle';
 $labels['manageresponses'] = 'Yanıtları yönet';
-$labels['savenewresponse'] = 'Yeni yanıt kaydet';
-$labels['editresponses'] = 'Yanıtları düzenle';
+$labels['savenewresponse'] = 'Yeni cevaplama oluştur';
+$labels['addresponse'] = 'Cevaplama ekle';
 $labels['editresponse'] = 'Yanıtı düzenle';
+$labels['editresponses'] = 'Yanıtları düzenle';
 $labels['responsename'] = 'Ad';
 $labels['responsetext'] = 'Yanıt metni';
 $labels['attach'] = 'Ekle';
@@ -214,6 +236,7 @@ $labels['upload'] = 'Yükle';
 $labels['uploadprogress'] = '$percent ($current / $total)';
 $labels['close']  = 'Kapat';
 $labels['messageoptions']  = 'İleti seçenekleri...';
+$labels['togglecomposeoptions'] = 'Kompozisyon seçeneklerini göster/gizle';
 $labels['low']     = 'Düşük';
 $labels['lowest']  = 'En Düşük';
 $labels['normal']  = 'Normal';
@@ -239,7 +262,7 @@ $labels['mdnrequest'] = 'Bu postayı gönderen kişi, postayı okuduğunuza dair
 $labels['receiptread'] = 'Alındı Onayı (okundu)';
 $labels['yourmessage'] = 'Bu, postanız için alındı onayıdır';
 $labels['receiptnote'] = 'Not: Bu alındı onayı sadece postanızın alıcının bilgisayarında gösterildiğini belirtir. Alıcının posta içeriğini okuduğunu veya anladığını garantilemez.';
-$labels['name']         = 'Görüntülenen isim';
+$labels['name']         = 'Görünen Ad';
 $labels['firstname']    = 'Ad';
 $labels['surname']      = 'Soyad';
 $labels['middlename']   = 'Göbek adı';
@@ -270,6 +293,7 @@ $labels['assistant'] = 'Asistan';
 $labels['spouse'] = 'Eş';
 $labels['allfields'] = 'Tüm alanlar';
 $labels['search'] = 'Ara';
+$labels['searchresult'] = 'Arama sonucu';
 $labels['advsearch'] = 'Gelişmiş ara';
 $labels['advanced'] = 'Gelişmiş';
 $labels['other'] = 'Diğer';
@@ -288,11 +312,13 @@ $labels['typehomepage']  = 'Ev sayfası';
 $labels['typeblog'] = 'Günlük';
 $labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Alan ekle...';
-$labels['addcontact'] = 'Adres defterine ekle';
+$labels['addcontact'] = 'Kişi ekle';
 $labels['editcontact'] = 'Kişiyi düzenle';
 $labels['contacts'] = 'Kişiler';
 $labels['contactproperties'] = 'Kişi özellikleri';
+$labels['contactnameandorg'] = 'İsim ve Kuruluş';
 $labels['personalinfo'] = 'Kişisel bilgiler';
+$labels['contactphoto'] = 'Kişi fotografı';
 $labels['edit']   = 'Düzenle';
 $labels['cancel'] = 'İptal';
 $labels['save']   = 'Kaydet';
@@ -301,7 +327,7 @@ $labels['rename'] = 'Yeniden adlandır';
 $labels['addphoto'] = 'Ekle';
 $labels['replacephoto'] = 'Değiştir';
 $labels['uploadphoto'] = 'Fotoğraf yükle';
-$labels['newcontact']     = 'Yeni adres kartı ekle';
+$labels['newcontact']     = 'Yeni kişi oluştur';
 $labels['deletecontact']  = 'Seçili kişileri sil';
 $labels['composeto']      = 'Seçili kişiye posta gönder';
 $labels['contactsfromto'] = 'Kişiler: $from - $to , Toplam: $count';
@@ -310,10 +336,12 @@ $labels['export']         = 'Dışa aktar';
 $labels['exportall']      = 'Hepsini dışa aktar';
 $labels['exportsel']      = 'Seçileni dışa aktar';
 $labels['exportvcards']   = 'vCard olarak dışa aktar';
-$labels['newcontactgroup'] = 'Yeni kişi grubu oluştur';
+$labels['newcontactgroup']       = 'Yeni grup oluştur';
+$labels['addgroup']       = 'Grup ekle';
 $labels['grouprename']    = 'Grubu yeniden adlandır';
 $labels['groupdelete']    = 'Grubu sil';
 $labels['groupremoveselected'] = 'Seçili kişileri gruptan sil';
+$labels['uponelevel']     = 'Bir seviye yukarı';
 $labels['previouspage']   = 'Öncekileri göster';
 $labels['firstpage']      = 'İlkini göster';
 $labels['nextpage']       = 'Sonrakileri göster';
@@ -340,10 +368,10 @@ $labels['preferences'] = 'Tercihler';
 $labels['userpreferences'] = 'Kullanıcı tercihleri';
 $labels['editpreferences'] = 'Kullanıcı tercihlerini düzenle';
 $labels['identities'] = 'Kimlikler';
-$labels['manageidentities'] = 'Bu hesap için kimlikleri düzenle';
-$labels['newidentity'] = 'Yeni kimlik';
-$labels['newitem'] = 'Yeni öğe';
-$labels['edititem'] = 'Öğe düzenle';
+$labels['manageidentities'] = 'Kimlikleri yönet';
+$labels['newidentity'] = 'Yeni kimlik oluştur';
+$labels['addidentity'] = 'Kimlik ekle';
+$labels['edititem'] = 'Kimlik düzenle';
 $labels['preferhtml'] = 'HTML görüntüle';
 $labels['defaultcharset'] = 'Varsayılan Karakter Kümesi';
 $labels['htmlmessage'] = 'HTML Posta';
@@ -365,11 +393,11 @@ $labels['htmleditor'] = 'HTML postaları oluştur';
 $labels['htmlonreply'] = 'sadece HTML postaları yanıtlarken';
 $labels['htmlonreplyandforward'] = 'HTML biçimindeki posta yanıtlandığında veye iletildiğinde';
 $labels['htmlsignature'] = 'HTML imza';
-$labels['showemail'] = 'Eposta adresini görünüm ismi ile görüntüle';
+$labels['showemail'] = 'E-posta adresini görünüm ismi ile görüntüle';
 $labels['previewpane'] = 'Önizleme panelini göster';
 $labels['skin'] = 'Arayüz görünümü';
 $labels['logoutclear'] = 'Oturumu kapatınca Çöpü temizle';
-$labels['logoutcompact'] = 'Oturumu kapatınca Gelen Kutusunu sıklaştır';
+$labels['logoutcompact'] = 'Oturumu kapatınca Gelen Kutusunu sıkıştır';
 $labels['uisettings'] = 'Kullanıcı Arayüzü';
 $labels['serversettings'] = 'Sunucu Ayarları';
 $labels['mailboxview'] = 'Posta Kutusu Görünümü';
@@ -400,7 +428,9 @@ $labels['2231folding'] = 'Tam RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Tam RFC 2047 (diğer)';
 $labels['force7bit'] = '8 bitlik karakterler için MIME kodlaması kullan';
+$labels['savelocalstorage'] = "Tarayıcının yerel disk alanına kaydet(geçiçi olarak)";
 $labels['advancedoptions'] = 'Gelişmiş seçenekler';
+$labels['toggleadvancedoptions'] = 'İleri seviye seçeneklerini göster/gizle';
 $labels['focusonnewmessage'] = 'Yeni posta geldiğinde web tarayıcı penceresine odaklan.';
 $labels['checkallfolders'] = 'Tüm klasörlerdeki yeni postaları denetle';
 $labels['displaynext'] = 'Posta silindikten/taşındıktan sonra sıradaki postayı göster';
@@ -435,33 +465,37 @@ $labels['spellcheckignorenums'] = 'İçinde rakam geçen kelimleri göz ardı et
 $labels['spellcheckignorecaps'] = 'Tümü büyük harf olan kelimleri göz ardı et';
 $labels['addtodict'] = 'Sözlüğe Ekle';
 $labels['mailtoprotohandler'] = 'mailto: bağlantıları için protokol işleyici kayıt et';
-$labels['standardwindows'] = 'Popup pencerelerini standart pencere olarak yönet';
+$labels['standardwindows'] = 'Açılır pencereleri standart pencere olarak yönet';
 $labels['forwardmode'] = 'Posta yönlendirme';
 $labels['inline'] = 'postanın içinde';
 $labels['asattachment'] = 'ek olarak';
 $labels['replyallmode'] = '[Tümünü yanıtla] düğmesinin varsayılan eylemi';
 $labels['replyalldefault'] = 'Hepsini yanıtla';
 $labels['replyalllist'] = 'Sadece postalama listesindekileri yanıtla (eğer varsa)';
-$labels['folder']  = 'Klasör';
-$labels['folders']  = 'Klasörler';
-$labels['foldername']  = 'Klasör Adı';
-$labels['subscribed']  = 'Abonelik';
+$labels['folder'] = 'Klasör';
+$labels['folders'] = 'Klasörler';
+$labels['foldername'] = 'Klasör adı';
+$labels['subscribed'] = 'Abonelik';
 $labels['messagecount'] = 'Postalar';
-$labels['create']  = 'Oluştur';
-$labels['createfolder']  = 'Yeni Klasör Oluştur';
-$labels['managefolders']  = 'Klasörleri Düzenle';
+$labels['create'] = 'Oluştur';
+$labels['createfolder'] = 'Yeni klasör oluştur';
+$labels['managefolders'] = 'Klasörleri düzenle';
 $labels['specialfolders'] = 'Özel Klasörler';
 $labels['properties'] = 'Özellikler';
-$labels['folderproperties'] = 'Klasör Özellikleri';
-$labels['parentfolder'] = 'Ana Dizin';
+$labels['folderproperties'] = 'Klasör özellikleri';
+$labels['parentfolder'] = 'Ana klasör';
 $labels['location'] = 'Konum';
 $labels['info'] = 'Bilgi';
 $labels['getfoldersize'] = 'Klasör büyüklüğünü öğrenmek için tıklayın';
 $labels['changesubscription'] = 'Abonelik durumunu değiştirmek için tıklayın';
 $labels['foldertype'] = 'Klasör Türü';
-$labels['personalfolder']  = 'Kişisel Klasör';
-$labels['otherfolder']  = 'Diğer Kullanıcıların Klasörü';
-$labels['sharedfolder']  = 'Genel Klasör';
+$labels['personalfolder'] = 'Kişisel Klasör';
+$labels['otherfolder'] = 'Diğer Kullanıcıların Klasörü';
+$labels['sharedfolder'] = 'Genel Klasör';
+$labels['findfolders'] = 'Klasörleri bul';
+$labels['namespace.personal'] = 'Kişisel';
+$labels['namespace.other'] = 'Diğer kullanıcılar';
+$labels['namespace.shared'] = 'Paylaşılan';
 $labels['sortby'] = 'Sırala';
 $labels['sortasc']  = 'Artarak';
 $labels['sortdesc'] = 'Azalarak';
@@ -494,4 +528,53 @@ $labels['vietnamese'] = 'Vietnamca';
 $labels['japanese'] = 'Japonca';
 $labels['korean'] = 'Korece';
 $labels['chinese'] = 'Çince';
+$labels['arialabeltopnav'] = 'Pencere kontrolü';
+$labels['arialabeltasknav'] = 'Uygulama görevleri';
+$labels['arialabeltoolbar'] = 'Uygulama araç çubuğu';
+$labels['arialabelactivetask'] = 'Aktif görevler';
+$labels['arialabelmessagessearchfilter'] = 'E-posta listeleme filtresi';
+$labels['arialabelmailsearchform'] = 'E-posta mesaj arama formu';
+$labels['arialabelcontactsearchform'] = 'Kişiler arama formu';
+$labels['arialabelmailquicksearchbox'] = 'E-posta arama girdisi';
+$labels['arialabelquicksearchbox'] = 'Arama girdisi';
+$labels['arialabelfoldersearchfilter'] = 'Klasör listeleme filtresi';
+$labels['arialabelfoldersearchform'] = 'Klasör arama formu';
+$labels['arialabelfolderlist'] = 'E-posta klasör seçimi';
+$labels['arialabelmessagelist'] = 'E-posta mesajları listelemesi';
+$labels['arialabelmailpreviewframe'] = 'Mesaj önizleme';
+$labels['arialabelmailboxmenu'] = 'Klasör eylem menüsü';
+$labels['arialabellistselectmenu'] = 'Liste seçme menüsü';
+$labels['arialabelthreadselectmenu'] = 'Thread listeleme menüsü';
+$labels['arialabelmessagelistoptions'] = 'Mesaj liste gösterimi ve sıralama seçenekleri';
+$labels['arialabelmailimportdialog'] = 'Mesaj içe aktarım diyalogu';
+$labels['arialabelmessagenav'] = 'Mesaj gezinimi';
+$labels['arialabelmessagebody'] = 'Mesaj gövdesi';
+$labels['arialabelmessageactions'] = 'Mesaj eylemleri';
+$labels['arialabelcontactquicksearch'] = 'Kişiler arama formu';
+$labels['arialabelcontactsearchbox'] = 'Kişi arama girdisi';
+$labels['arialabelmessageheaders'] = 'Mesaj başlıkları';
+$labels['arialabelforwardingoptions'] = 'Yönlendirme seçenekleri';
+$labels['arialabelreplyalloptions'] = 'Hepsine-Yanıtla seçenekleri';
+$labels['arialabelmoremessageactions'] = 'Daha fazla mesaj aksiyonu';
+$labels['arialabelmarkmessagesas'] = 'Seçili mesajları şu şekilde işaretle ..';
+$labels['arialabelcomposeoptions'] = 'Kompozisyon seçenekleri';
+$labels['arialabelresponsesmenu'] = 'Hazır cevaplar menüsü';
+$labels['arialabelattachmentuploadform'] = 'Eklenti yükleme formu';
+$labels['arialabelattachmentpreview'] = 'Eklenti önizleme';
+$labels['ariasummarycomposecontacts'] = 'Kişileri ve grupları alıcı olarak seçmek için listeleme';
+$labels['arialabelcontactexportoptions'] = 'Kişi dışar aktarım seçenekleri';
+$labels['arialabelabookgroupoptions'] = 'Adres defteri/kişiler seçenekleri';
+$labels['arialabelpreferencesform'] = 'Tercihler formu';
+$labels['arialabelidentityeditfrom'] = 'Kimlik düzenleme formu';
+$labels['arialabelresonseeditfrom'] = 'Yanıt düzenleme formu';
+$labels['arialabelsearchterms'] = 'Arama maddeleri';
+$labels['helplistnavigation'] = 'Klavye gezinimi listele';
+$labels['helplistkeyboardnavigation'] = "Yukarı / aşağı oklar: odak / seçim satırı taşımak.
+Boşluk: odaklanan satırı seç.
+Shift + yukarı/aşağı: Yukarı/aşağı ilave satır seçimi.
+Ctrl + Boşluk: Seçilen odaklı satırı seçme/silme koleksiyonuna ekle";
+$labels['helplistkeyboardnavmessages'] = "Sağ/Sol oklar:  Mesaj gruplarını genişlet/topla(Sadece thread modu için)
+Enter: Seçilen/odaklanan mesajı aç
+Delete: Seçili mesajı çöp kutusuna taşı";
+$labels['helplistkeyboardnavcontacts'] = "Enter: Seçili/odaklı kişiyi aç";
 ?>
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index cf3607498..68c9e8dc3 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -22,7 +22,9 @@ $messages['sessionerror'] = 'Oturumunuz sona ermiş veya hatalı';
 $messages['storageerror'] = 'IMAP sunucusuna bağlanılamadı';
 $messages['servererror'] = 'Sunucu Hatası!';
 $messages['servererrormsg'] = 'Sunucu hatası: $msg';
+$messages['connerror'] = 'Bağlantı Hatası (Sunucuya erişim başarısız oldu)!';
 $messages['dberror'] = 'Veritabanı Hatası!';
+$messages['windowopenerror'] = 'Açılır pencere engellendi!';
 $messages['requesttimedout'] = 'İstek zaman aşımına uğradı';
 $messages['errorreadonly'] = 'İşlem gerçekleştirilemedi. Dizin salt okunabilir';
 $messages['errornoperm'] = 'İşlem gerçekleştirilemedi. İzin verilmedi.';
@@ -92,11 +94,12 @@ $messages['contactsearchsuccessful'] = '$nr kişi bulundu.';
 $messages['searchnomatch'] = 'Aramanıza uygun hiçbir sonuç bulunamadı.';
 $messages['searching'] = 'Aranıyor...';
 $messages['checking'] = 'Denetleniyor...';
+$messages['stillsearching'] = 'Hala arıyor...';
 $messages['nospellerrors'] = 'Yazım hatası bulunamadı.';
 $messages['folderdeleted'] = 'Klasör başarıyla silindi.';
 $messages['foldersubscribed'] = 'Klasöre başarıyla abone olundu.';
 $messages['folderunsubscribed'] = 'Klasör aboneliği başarıyla kaldırıldı.';
-$messages['folderpurged'] = 'Klasör başarıyla sıklaştırıldı.';
+$messages['folderpurged'] = 'Klasör başarıyla boşaltıldı.';
 $messages['folderexpunged'] = 'Klasör başarıyla boşaltıldı.';
 $messages['deletedsuccessfully'] = 'Başarıyla silindi.';
 $messages['converting'] = 'Postanın biçimlendirmesi kaldırılıyor...';
@@ -135,7 +138,7 @@ $messages['importmessagesuccess'] = '$nr adet mesaj başarıyla içe aktarıldı
 $messages['importmessageerror'] = 'İçe aktarım başarısız. Yüklenen dosya geçerli bir içe aktarım dosyası değil.';
 $messages['opnotpermitted'] = 'Bu işleme izin verilmedi!';
 $messages['nofromaddress'] = 'Seçili kimlikte e-posta adresi yok';
-$messages['editorwarning'] = 'Düz metin düzenleyiciye geçmek, metin üzerindeki bütün biçimlendirmeleri kaldıracak. Devam etmek istiyor musunuz?';
+$messages['editorwarning'] = 'Editör tipini değiştirmek, metin biçimlendirmeyi kaybetmenize sebep olabilir. Devam etmek istiyor musunuz?';
 $messages['httpreceivedencrypterror'] = 'Ayarlarda bir hata oluştu. Sistem yöneticinize haber verin. <b>Postanız gönderilemedi</b>';
 $messages['smtpconnerror'] = 'SMTP Hatası ($code): Sunucuya bağlanılamadı';
 $messages['smtpautherror'] = 'SMTP Hatası ($code): Kimlik doğrulama başarısız oldu';
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index 5e4e6c631..863d12808 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -132,7 +132,6 @@ $messages['importmessagesuccess'] = 'Успішно імпортовано $nr �
 $messages['importmessageerror'] = 'Імпорт не вдався! Завантажений файл не є припустимим повідомлення або файлом поштової скриньки';
 $messages['opnotpermitted'] = 'Дія заборонена!';
 $messages['nofromaddress'] = 'В обраному профілі не вистачає адреси електронної пошти';
-$messages['editorwarning'] = 'Перемикання в режим звичайного тексту спричинить втрату всього форматування. Продовжити?';
 $messages['httpreceivedencrypterror'] = 'Помилка конфігурації. Негайно зверніться до адміністратора. <b>Ваше повідомлення не буде відправлено.</b>';
 $messages['smtpconnerror'] = 'Помилка SMTP-сервера ($code): Не вдалося з\'єднатися з сервером';
 $messages['smtpautherror'] = 'Помилка SMTP-сервера ($code): Невдала спроба автентифікації';
diff --git a/program/localization/vi_VN/messages.inc b/program/localization/vi_VN/messages.inc
index 5c9983e33..31493da47 100644
--- a/program/localization/vi_VN/messages.inc
+++ b/program/localization/vi_VN/messages.inc
@@ -19,23 +19,27 @@ $messages['errortitle']  = 'Có lỗi xảy ra.';
 $messages['loginfailed']  = 'Không đăng nhập được';
 $messages['cookiesdisabled'] = 'Trình duyệt không hỗ trợ cookies';
 $messages['sessionerror'] = 'Phiên làm việc không hợp lệ hoặc đã hết hạn';
-$messages['storageerror'] = 'Không kết nối được với máy chủ IMAP';
+$messages['storageerror'] = 'Không kết nối được với máy chủ.';
 $messages['servererror'] = 'Lỗi máy chủ';
-$messages['servererrormsg'] = 'Lỗi máy chủ';
+$messages['servererrormsg'] = 'Lỗi máy chủ: $msg';
+$messages['connerror'] = 'Lỗi kết nối (không kết nối được đến máy chủ)';
 $messages['dberror'] = 'Lỗi cơ sở dữ liệu';
+$messages['windowopenerror'] = 'Cửa sổ thông tin bật lên bị chặn';
 $messages['requesttimedout'] = 'Yêu cầu hết  hạn';
 $messages['errorreadonly'] = 'Không thể thực hiện thao tác. Thư mục chỉ cho phép đọc.';
 $messages['errornoperm'] = 'Bạn không đủ quyền hạn để thực hiện thao tác này.';
 $messages['erroroverquota'] = 'Không thể thực hiện thao tác do không còn đủ chỗ trống trên ổ đĩa.';
 $messages['erroroverquotadelete'] = 'Không còn dư chỗ trống trên ổ đĩa. Sử dụng tổ hợp phím SHIFT+DEL để xoá thư.';
 $messages['invalidrequest'] = 'Yêu cầu không hợp lệ! Không có dữ liệu nào được lưu.';
-$messages['invalidhost'] = 'Sai thông tin máy chủ';
+$messages['invalidhost'] = 'Sai thông tin tên máy chủ';
 $messages['nomessagesfound'] = 'Không thấy có thư nào trong hộp thư này.';
-$messages['loggedout'] = 'Phiên làm việc đã kết thúc thành công. Hẹn gặp lại!';
-$messages['refreshing'] = 'Đang tải xuống bản cập nhật mới...';
+$messages['loggedout'] = 'Phiên làm việc đã kết thúc thành công. Tạm biệt!';
+$messages['mailboxempty'] = 'Hộp thư rỗng';
+$messages['nomessages'] = 'Không có thư nào';
+$messages['refreshing'] = 'Nạp lại dữ liệu...';
 $messages['loading'] = 'Đang tải...';
-$messages['uploading'] = 'Đang tải lên tập tin...';
-$messages['uploadingmany'] = 'Đang tải lên các tập tin';
+$messages['uploading'] = 'Đang tải tập tin lên...';
+$messages['uploadingmany'] = 'Đang tải các tập tin lên...';
 $messages['loadingdata'] = 'Đang nạp dữ liệu...';
 $messages['checkingmail'] = 'Kiểm tra thư mới...';
 $messages['sendingmessage'] = 'Đang gửi thư...';
@@ -46,8 +50,8 @@ $messages['successfullysaved'] = 'Đã lưu thành công';
 $messages['savingresponse'] = 'Đang lưu thông tin...';
 $messages['deleteresponseconfirm'] = 'Bạn có thực sự muốn xoá thông tin này?';
 $messages['addedsuccessfully'] = 'Liên hệ đã được thêm vào sổ địa chỉ thành công.';
-$messages['contactexists'] = 'Liên hệ trùng địa chỉ email đã tồn tại';
-$messages['contactnameexists'] = 'Liên hệ trùng  tên đã tồn tại.';
+$messages['contactexists'] = 'Đã có một địa chỉ email này trong sổ địa chỉ.';
+$messages['contactnameexists'] = 'Đã có một liên hệ có tên như thế này.';
 $messages['blockedimages'] = 'Để bảo vệ tính riêng tư, chức năng hiện ảnh từ xa bị cấm trong thư này.';
 $messages['encryptedmessage'] = 'Thư này được mã hóa, không thể xem. Rất tiếc!';
 $messages['nocontactsfound'] = 'Không tìm thấy liên hệ.';
@@ -90,6 +94,7 @@ $messages['contactsearchsuccessful'] = '$nr liên hệ đã tìm được.';
 $messages['searchnomatch'] = 'Không tìm thấy sự trùng hợp nào.';
 $messages['searching'] = 'Đang tìm kiếm...';
 $messages['checking'] = 'Đang kiểm tra...';
+$messages['stillsearching'] = 'Đang tiếp tục tìm kiếm...';
 $messages['nospellerrors'] = 'Không tìm thấy lỗi chính tả.';
 $messages['folderdeleted'] = 'Giữ liệu đã được xóa thành công.';
 $messages['foldersubscribed'] = 'Giữ liệu được nhập vào thành công.';
@@ -133,7 +138,7 @@ $messages['importmessagesuccess'] = 'Đã nhập thành công $nr thư.';
 $messages['importmessageerror'] = 'Nhập dữ liệu bị lỗi. Tệp tin vừa tải lên không có định dạng chính xác của tệp cấu hình hòm thư hoặc một thư đơn lẻ.';
 $messages['opnotpermitted'] = 'Thao tác không được cho phép!';
 $messages['nofromaddress'] = 'Địa chỉ email mất ở trong nhận dạng đã chọn';
-$messages['editorwarning'] = 'Việc chuyển soạn thảo text gốc sẽ gây ra toàn bộ định dạng text đã có bị mất. Bạn có muốn tiếp tục không?';
+$messages['editorwarning'] = 'Việc chuyển công cụ soạn thảo có thể làm mất định dạng dữ liệu. Bạn có muốn tiếp tục không?';
 $messages['httpreceivedencrypterror'] = 'Xuất hiện một lỗi cấu hình  tai hại. Hãy liên hệ với người quản trị ngay. <b> Thư của bạn không thể gửi được </b>';
 $messages['smtpconnerror'] = 'Lỗi SMTP ($code): Kết nỗi tới máy chủ bị lỗi.';
 $messages['smtpautherror'] = 'Lỗi SMTP ($code): Xác thực thất bại.';
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index c3b14396c..e1e05414d 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -52,6 +52,7 @@ $labels['fromtoshort'] = '$from – $to 共计 $count 个';
 $labels['copy']     = '复制';
 $labels['move']     = '移动';
 $labels['moveto']   = '移至...';
+$labels['copyto']   = '复制至';
 $labels['download'] = '下载';
 $labels['open']     = '打开';
 $labels['showattachment'] = '显示';
@@ -130,16 +131,24 @@ $labels['moreactions']      = '更多操作...';
 $labels['more']             = '更多';
 $labels['back']             = '返回';
 $labels['options']          = '个人选项';
+$labels['first'] = '首';
+$labels['last'] = '尾';
+$labels['previous'] = '前一';
+$labels['next'] = '后一';
 $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
 $labels['currpage'] = '当前页';
+$labels['isread'] = '读';
 $labels['unread'] = '未读邮件';
 $labels['flagged'] = '已标记邮件';
+$labels['unflagged'] = '未标记';
 $labels['unanswered'] = '未回复邮件';
 $labels['withattachment'] = '包含附件';
 $labels['deleted'] = '已删除邮件';
 $labels['undeleted'] = '未删除邮件';
+$labels['replied'] = '已回复';
+$labels['forwarded'] = '已转发';
 $labels['invert'] = '反选';
 $labels['filter'] = '过滤';
 $labels['list'] = '列表';
@@ -170,6 +179,11 @@ $labels['importmessages'] = '导入邮件';
 $labels['quota'] = '邮箱容量';
 $labels['unknown']  = '未知';
 $labels['unlimited']  = '无限制';
+$labels['quotatype'] = '容量类型';
+$labels['quotatotal'] = '限额';
+$labels['quotaused'] = '已用';
+$labels['quotastorage'] = '存储空间';
+$labels['quotamessage'] = '邮件数统计';
 $labels['quicksearch']  = '快速查找';
 $labels['resetsearch']  = '清空';
 $labels['searchmod']  = '修改搜索';
@@ -177,6 +191,10 @@ $labels['msgtext']  = '整封邮件';
 $labels['body']  = '正文';
 $labels['type'] = '类型：';
 $labels['namex'] = '姓名';
+$labels['searchscope'] = '范围';
+$labels['currentfolder'] = '当前文件夹';
+$labels['subfolders'] = '当前文件夹及其子文件夹';
+$labels['allfolders'] = '所有文件夹';
 $labels['openinextwin'] = '在新窗口中打开';
 $labels['emlsave'] = '下载(.eml)';
 $labels['changeformattext'] = '以文本格式显示';
@@ -192,6 +210,10 @@ $labels['returnreceipt']  = '需要已读回执';
 $labels['dsn']            = '投递状态通知';
 $labels['mailreplyintro'] = '在 $date，$sender 写道：';
 $labels['originalmessage'] = '原始邮件';
+$labels['selectimage']    = '选择图片';
+$labels['addimage']       = '添加图片';
+$labels['selectmedia']    = '选择影片';
+$labels['addmedia']       = '添加影片';
 $labels['editidents']    = '编辑身份';
 $labels['spellcheck']    = '拼写';
 $labels['checkspelling'] = '拼写检查';
@@ -202,9 +224,10 @@ $labels['restoremessage'] = '是否恢复信息？';
 $labels['responses'] = '回复';
 $labels['insertresponse'] = '插入回复';
 $labels['manageresponses'] = '管理回复';
-$labels['savenewresponse'] = '保存新回复';
-$labels['editresponses'] = '编辑回复';
+$labels['savenewresponse'] = '创建新回复';
+$labels['addresponse'] = '添加回复';
 $labels['editresponse'] = '编辑回复';
+$labels['editresponses'] = '编辑回复';
 $labels['responsename'] = '姓名';
 $labels['responsetext'] = '以文本形式回复';
 $labels['attach'] = '附加';
@@ -213,6 +236,7 @@ $labels['upload'] = '上传';
 $labels['uploadprogress'] = '$percent ($current / $total)';
 $labels['close']  = '关闭';
 $labels['messageoptions']  = '邮件选项...';
+$labels['togglecomposeoptions'] = '切换布局选项';
 $labels['low']     = '低';
 $labels['lowest']  = '最低';
 $labels['normal']  = '普通';
@@ -287,11 +311,13 @@ $labels['typehomepage']  = '主页';
 $labels['typeblog'] = '博客';
 $labels['typeprofile'] = '资料';
 $labels['addfield'] = '新增条目...';
-$labels['addcontact'] = '新建联系人';
+$labels['addcontact'] = '添加联系人';
 $labels['editcontact'] = '编辑联系人';
 $labels['contacts'] = '联系人';
 $labels['contactproperties'] = '联系人信息';
+$labels['contactnameandorg'] = '姓名和公司';
 $labels['personalinfo'] = '个人信息';
+$labels['contactphoto'] = '联系人照片';
 $labels['edit']   = '编辑';
 $labels['cancel'] = '取消';
 $labels['save']   = '保存';
@@ -309,10 +335,11 @@ $labels['export']         = '导出';
 $labels['exportall']      = '导出全部';
 $labels['exportsel']      = '导出选中';
 $labels['exportvcards']   = '导出联系人为 vCard 格式';
-$labels['newcontactgroup'] = '创建新的联系人群组';
+$labels['newcontactgroup']       = '创建新组';
 $labels['grouprename']    = '重命名群组';
 $labels['groupdelete']    = '删除群组';
 $labels['groupremoveselected'] = '删除选中';
+$labels['uponelevel']     = '升一级';
 $labels['previouspage']   = '上一页';
 $labels['firstpage']      = '首页';
 $labels['nextpage']       = '下一页';
@@ -339,10 +366,10 @@ $labels['preferences'] = '选项';
 $labels['userpreferences'] = '个人选项';
 $labels['editpreferences'] = '修改个人选项';
 $labels['identities'] = '发件人身份';
-$labels['manageidentities'] = '管理此账号的身份';
-$labels['newidentity'] = '添加身份';
-$labels['newitem'] = '添加条目';
-$labels['edititem'] = '编辑条目';
+$labels['manageidentities'] = '管理身份';
+$labels['newidentity'] = '创建新身份';
+$labels['addidentity'] = '添加身份';
+$labels['edititem'] = '编辑身份';
 $labels['preferhtml'] = '以 HTML 格式显示';
 $labels['defaultcharset'] = '默认字符集';
 $labels['htmlmessage'] = 'HTML 邮件';
@@ -400,6 +427,7 @@ $labels['miscfolding'] = 'RFC 2047/2232（MS Outlook）';
 $labels['2047folding'] = '完整的 RFC 2047（其它）';
 $labels['force7bit'] = '对 8 位字符使用 MIME 编码';
 $labels['advancedoptions'] = '高级选项';
+$labels['toggleadvancedoptions'] = '切换高级选项';
 $labels['focusonnewmessage'] = '新邮件到达时将窗口提升为焦点窗口';
 $labels['checkallfolders'] = '检查所有邮件夹里的新邮件';
 $labels['displaynext'] = '当邮件删除/移动后显示下一封邮件';
@@ -441,14 +469,14 @@ $labels['asattachment'] = '作为附件';
 $labels['replyallmode'] = '[回复所有]按钮的默认动作';
 $labels['replyalldefault'] = '回复全部';
 $labels['replyalllist'] = '只回复邮件列表中的联系人(找到的)';
-$labels['folder']  = '文件夹管理';
-$labels['folders']  = '文件夹管理';
-$labels['foldername']  = '邮件夹名称';
-$labels['subscribed']  = '已订阅';
+$labels['folder'] = '文件夹管理';
+$labels['folders'] = '文件夹管理';
+$labels['foldername'] = '邮件夹名称';
+$labels['subscribed'] = '已订阅';
 $labels['messagecount'] = '邮件数量';
-$labels['create']  = '建立';
-$labels['createfolder']  = '建立新邮件夹';
-$labels['managefolders']  = '管理邮件夹';
+$labels['create'] = '建立';
+$labels['createfolder'] = '建立新邮件夹';
+$labels['managefolders'] = '管理邮件夹';
 $labels['specialfolders'] = '自定义邮件夹';
 $labels['properties'] = '属性';
 $labels['folderproperties'] = '文件夹属性';
@@ -458,9 +486,9 @@ $labels['info'] = '信息';
 $labels['getfoldersize'] = '获得文件夹容量';
 $labels['changesubscription'] = '更改订阅';
 $labels['foldertype'] = '文件夹类型';
-$labels['personalfolder']  = '私有文件夹';
-$labels['otherfolder']  = '他人文件夹';
-$labels['sharedfolder']  = '共享文件夹';
+$labels['personalfolder'] = '私有文件夹';
+$labels['otherfolder'] = '他人文件夹';
+$labels['sharedfolder'] = '共享文件夹';
 $labels['sortby'] = '排序';
 $labels['sortasc']  = '递增排序';
 $labels['sortdesc'] = '递减排序';
@@ -493,4 +521,43 @@ $labels['vietnamese'] = '越南语';
 $labels['japanese'] = '日文';
 $labels['korean'] = '韩语';
 $labels['chinese'] = '中文';
+$labels['arialabeltopnav'] = '窗口控制';
+$labels['arialabeltasknav'] = '应用事务';
+$labels['arialabeltoolbar'] = '应用工具栏';
+$labels['arialabelactivetask'] = '活动事务';
+$labels['arialabelmessagessearchfilter'] = '邮件列表过滤器';
+$labels['arialabelmailsearchform'] = '邮件信息查询表单';
+$labels['arialabelcontactsearchform'] = '联系人查询表单';
+$labels['arialabelmailquicksearchbox'] = '邮件查询条件';
+$labels['arialabelquicksearchbox'] = '查询条件';
+$labels['arialabelfolderlist'] = '邮件文件夹选择';
+$labels['arialabelmessagelist'] = '邮件信息列表';
+$labels['arialabelmailpreviewframe'] = '邮件预览';
+$labels['arialabelmailboxmenu'] = '文件夹操作菜单';
+$labels['arialabellistselectmenu'] = '列表选择菜单';
+$labels['arialabelthreadselectmenu'] = '线程列表菜单';
+$labels['arialabelmessagelistoptions'] = '邮件列表显示和排序选项';
+$labels['arialabelmailimportdialog'] = '邮件导入对话框';
+$labels['arialabelmessagenav'] = '邮件导航';
+$labels['arialabelmessagebody'] = '邮件正文';
+$labels['arialabelmessageactions'] = '邮件动作';
+$labels['arialabelcontactquicksearch'] = '联系人查询表单';
+$labels['arialabelcontactsearchbox'] = '联系人查询条件';
+$labels['arialabelmessageheaders'] = '邮件头';
+$labels['arialabelforwardingoptions'] = '转发选项';
+$labels['arialabelreplyalloptions'] = '回复全部选项';
+$labels['arialabelmoremessageactions'] = '更多邮件选项';
+$labels['arialabelmarkmessagesas'] = '标记选中邮件为...';
+$labels['arialabelcomposeoptions'] = '布局选项';
+$labels['arialabelresponsesmenu'] = '预设回复菜单';
+$labels['arialabelattachmentuploadform'] = '附件上传表单';
+$labels['arialabelattachmentpreview'] = '附件预览';
+$labels['ariasummarycomposecontacts'] = '选择联系人或组作为收件人';
+$labels['arialabelcontactexportoptions'] = '联系人导出选项';
+$labels['arialabelabookgroupoptions'] = '地址簿/组选项';
+$labels['arialabelpreferencesform'] = '偏好设置表单';
+$labels['arialabelidentityeditfrom'] = '标识编辑表单';
+$labels['arialabelresonseeditfrom'] = '回复编辑表单';
+$labels['helplistnavigation'] = '列表键盘导航';
+$labels['helplistkeyboardnavcontacts'] = "回车：打开选中的联系人";
 ?>
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index 4adebcc74..6e8cbf403 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -133,7 +133,6 @@ $messages['importmessagesuccess'] = '成功导入 $nr 条信息';
 $messages['importmessageerror'] = '导入失败！文件无效';
 $messages['opnotpermitted'] = '不允许的操作!';
 $messages['nofromaddress'] = '选中的身份没有邮件地址。';
-$messages['editorwarning'] = '切换至纯文本编辑器将导致邮件正文中的所有文本格式失效，您确定要这样做吗？';
 $messages['httpreceivedencrypterror'] = '<b>您的邮件无法发送</b>，因为发生了一个严重的配置错误，请立即联系管理员。';
 $messages['smtpconnerror'] = 'SMTP 错误 ($code):连接服务器失败。';
 $messages['smtpautherror'] = 'SMTP 错误 ($code): 认证失败。';
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index 23c951a8b..e5d7df560 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -22,6 +22,7 @@ $messages['sessionerror'] = '你的工作階段已失效或過期';
 $messages['storageerror'] = '連線到 IMAP 伺服器失敗';
 $messages['servererror'] = '伺服器錯誤！';
 $messages['servererrormsg'] = '伺服器錯誤：$msg';
+$messages['connerror'] = '連線錯誤 (無法連線到伺服器)！';
 $messages['dberror'] = '資料庫錯誤!';
 $messages['requesttimedout'] = '要求逾時';
 $messages['errorreadonly'] = '動作無法完成。資料夾唯讀';
@@ -92,6 +93,7 @@ $messages['contactsearchsuccessful'] = '找到連絡人 $nr';
 $messages['searchnomatch'] = '找不到任何符合的郵件';
 $messages['searching'] = '搜尋中...';
 $messages['checking'] = '檢查中...';
+$messages['stillsearching'] = '仍在搜尋中...';
 $messages['nospellerrors'] = '沒有找到任何拼字錯誤';
 $messages['folderdeleted'] = '資料夾已經成功地被刪除';
 $messages['foldersubscribed'] = '資料夾成功訂閱';
@@ -135,7 +137,7 @@ $messages['importmessagesuccess'] = '成功匯入 $nr 封郵件';
 $messages['importmessageerror'] = '匯入失敗！上載的檔案不是有效的郵件或資料夾檔案。';
 $messages['opnotpermitted'] = '不允許的操作';
 $messages['nofromaddress'] = '在選擇的身分中遺失了電子郵件位址';
-$messages['editorwarning'] = '切換到純文字編輯模式將會遺失所有設定的樣式。您確定要繼續嗎？';
+$messages['editorwarning'] = '切換編輯器模式將會遺失所有設定的樣式。您確定要繼續嗎？';
 $messages['httpreceivedencrypterror'] = '發生嚴重錯誤。請立即聯絡管理者。<b>您的郵件無法送出。</b>';
 $messages['smtpconnerror'] = 'SMTP 錯誤（$code）：與伺服器連線失敗';
 $messages['smtpautherror'] = 'SMTP 錯誤（$code）：認證失敗';
author	Aleksander Machniak <alec@alec.pl>	2014-11-15 10:03:58 +0100
committer	Aleksander Machniak <alec@alec.pl>	2014-11-15 10:03:58 +0100
commit	7e34e4c5b5dac037435d0fc2c6db1f71199006e0 (patch)
tree	d3de8c0f9b8f609efa3e5434da2da48a4cf5b00b
parent	9f1fd396951dd1bf9a082422d0835ca1a229255d (diff)
parent	ced9e5a5bf5d6ffe051b42f474d7a97203641913 (diff)