Merge branch 'master' of github.com:roundcube/roundcubemail

57 files changed, 290 insertions, 255 deletions

diff --git a/plugins/password/localization/ar.inc b/plugins/password/localization/ar.inc
new file mode 100644
index 000000000..521127a8f
--- /dev/null
+++ b/plugins/password/localization/ar.inc
@@ -0,0 +1,32 @@
+<?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'] = 'كلمة المرور تحتوى على أحرف ممنوعة';
+?>
diff --git a/plugins/password/localization/ar_SA.inc b/plugins/password/localization/ar_SA.inc
new file mode 100644
index 000000000..990505bac
--- /dev/null
+++ b/plugins/password/localization/ar_SA.inc
@@ -0,0 +1,29 @@
+<?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'] = 'كلمة المرور تحتوي حروفاً ممنوعة';
+?>
diff --git a/plugins/password/localization/ast.inc b/plugins/password/localization/ast.inc
new file mode 100644
index 000000000..99b283ec5
--- /dev/null
+++ b/plugins/password/localization/ast.inc
@@ -0,0 +1,32 @@
+<?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']  = 'Camudar contraseña';
+$labels['curpasswd']  = 'Contraseña actual:';
+$labels['newpasswd']  = 'Contraseña nueva:';
+$labels['confpasswd']  = 'Confirmar contraseña:';
+$messages['nopassword'] = 'Por favor, introduz una contraseña nueva.';
+$messages['nocurpassword'] = 'Por favor, introduz la contraseña actual.';
+$messages['passwordincorrect'] = 'La contraseña actual ye incorreuta.';
+$messages['passwordinconsistency'] = 'Les contraseñes nun concasen. Por favor, inténtalo otra vegada.';
+$messages['crypterror'] = 'Nun pudo guardase la contraseña nueva. Falta la función de cifráu.';
+$messages['connecterror'] = 'Nun pudo guardase la contraseña nueva. Fallu de conexón.';
+$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.';
+?>
diff --git a/plugins/password/localization/az_AZ.inc b/plugins/password/localization/az_AZ.inc
index c99ab2ab3..18fa758f4 100644
--- a/plugins/password/localization/az_AZ.inc
+++ b/plugins/password/localization/az_AZ.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Şifrəni dəyiş';
 $labels['curpasswd']  = 'Hal-hazırki şifrə:';
 $labels['newpasswd']  = 'Yeni şifrə:';
 $labels['confpasswd']  = 'Yeni şifrə: (təkrar)';
-
-$messages = array();
 $messages['nopassword'] = 'Yeni şifrəni daxil edin.';
 $messages['nocurpassword'] = 'Hal-hazırda istifadə etdiyiniz şifrəni daxil edin.';
 $messages['passwordincorrect'] = 'Yalnış şifrə daxil etdiniz.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Yeni şifrənin saxlanılması mümkün olmadı.';
 $messages['passwordshort'] = 'Yeni şifrə $length simvoldan uzun olmalıdır.';
 $messages['passwordweak'] = 'Şifrədə heç olmasa minimum bir rəqəm və simvol olmalıdır.';
 $messages['passwordforbidden'] = 'Şifrədə icazə verilməyən simvollar vardır.';
-
 ?>
diff --git a/plugins/password/localization/be_BE.inc b/plugins/password/localization/be_BE.inc
new file mode 100644
index 000000000..457e67e9e
--- /dev/null
+++ b/plugins/password/localization/be_BE.inc
@@ -0,0 +1,32 @@
+<?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'] = 'Пароль утрымлівае забароненыя знакі.';
+?>
diff --git a/plugins/password/localization/ber.inc b/plugins/password/localization/ber.inc
index 12fe4442e..046e45733 100644
--- a/plugins/password/localization/ber.inc
+++ b/plugins/password/localization/ber.inc
@@ -13,5 +13,4 @@
  +-----------------------------------------------------------------------+
 */
 
-$labels = array();
 
diff --git a/plugins/password/localization/bg_BG.inc b/plugins/password/localization/bg_BG.inc
index 2823fbfde..c1c8b9b7a 100644
--- a/plugins/password/localization/bg_BG.inc
+++ b/plugins/password/localization/bg_BG.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Промяна на парола';
 $labels['curpasswd']  = 'Текуща парола:';
 $labels['newpasswd']  = 'Нова парола:';
 $labels['confpasswd']  = 'Повторно нова парола:';
-
-$messages = array();
 $messages['nopassword'] = 'Моля въведете нова парола.';
 $messages['nocurpassword'] = 'Моля въведете текущата парола.';
 $messages['passwordincorrect'] = 'Невалидна текуща парола.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Паролата не може да бъде пр�
 $messages['passwordshort'] = 'Паролата трябва да е дълга поне $length знака.';
 $messages['passwordweak'] = 'Паролата трябва да включва поне един цифра и поне един знак за пунктуация.';
 $messages['passwordforbidden'] = 'Паролата съдържа непозволени символи.';
-
 ?>
diff --git a/plugins/password/localization/br.inc b/plugins/password/localization/br.inc
index f07786b39..423fc74df 100644
--- a/plugins/password/localization/br.inc
+++ b/plugins/password/localization/br.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Kemmañ ar ger-tremen';
 $labels['curpasswd']  = 'Ger-tremen red :';
 $labels['newpasswd']  = 'Ger-tremen nevez :';
 $labels['confpasswd']  = 'Kadarnaat ar ger-tremen :';
-
-$messages = array();
 $messages['nopassword'] = 'Roit ur ger-tremen nevez, mar plij.';
 $messages['nocurpassword'] = 'Roit ar ger-tremen red, mar plij.';
 $messages['passwordincorrect'] = 'Direizh eo ar ger-tremen red.';
@@ -31,7 +27,5 @@ $messages['crypterror'] = 'N\'haller ket enrollañ ar ger-tremen nevez. Arc\'hwe
 $messages['connecterror'] = 'N\'haller ket enrollañ ar ger-tremen nevez. Fazi gant ar c\'hennask.';
 $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'] = 'Password must include at least one number and one punctuation character.';
 $messages['passwordforbidden'] = 'Arouezennoù difennet zo er ger-tremen.';
-
 ?>
diff --git a/plugins/password/localization/bs_BA.inc b/plugins/password/localization/bs_BA.inc
index c98a49d97..f030fef87 100644
--- a/plugins/password/localization/bs_BA.inc
+++ b/plugins/password/localization/bs_BA.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Promijeni šifru';
 $labels['curpasswd']  = 'Trenutna šifra:';
 $labels['newpasswd']  = 'Nova šifra:';
 $labels['confpasswd']  = 'Potvrdite novu šifru:';
-
-$messages = array();
 $messages['nopassword'] = 'Molimo vas da upišete novu šifru.';
 $messages['nocurpassword'] = 'Molimo vas da upišete trenutnu šifru.';
 $messages['passwordincorrect'] = 'Trenutna šifra je netačna.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/ca_ES.inc b/plugins/password/localization/ca_ES.inc
index 95f5df833..3ab4ed1ad 100644
--- a/plugins/password/localization/ca_ES.inc
+++ b/plugins/password/localization/ca_ES.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Canvia la contrasenya';
 $labels['curpasswd']  = 'Contrasenya actual:';
 $labels['newpasswd']  = 'Nova contrasenya:';
 $labels['confpasswd']  = 'Confirmeu la nova contrasenya:';
-
-$messages = array();
 $messages['nopassword'] = 'Si us plau, introduïu la nova contrasenya.';
 $messages['nocurpassword'] = 'Si us plau, introduïu la contrasenya actual.';
 $messages['passwordincorrect'] = 'Contrasenya actual incorrecta.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'No es pot desar la nova contrasenya.';
 $messages['passwordshort'] = 'La nova contrasenya ha de tenir com a mínim $length caràcters de llarg.';
 $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.';
-
 ?>
diff --git a/plugins/password/localization/cs_CZ.inc b/plugins/password/localization/cs_CZ.inc
index 857961c61..46076b0a0 100644
--- a/plugins/password/localization/cs_CZ.inc
+++ b/plugins/password/localization/cs_CZ.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Změna hesla';
 $labels['curpasswd']  = 'Aktuální heslo:';
 $labels['newpasswd']  = 'Nové heslo:';
 $labels['confpasswd']  = 'Nové heslo (pro kontrolu):';
-
-$messages = array();
 $messages['nopassword'] = 'Prosím zadejte nové heslo.';
 $messages['nocurpassword'] = 'Prosím zadejte aktuální heslo.';
 $messages['passwordincorrect'] = 'Zadané aktuální heslo není správné.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/cy_GB.inc b/plugins/password/localization/cy_GB.inc
index c43b7473b..16fc65447 100644
--- a/plugins/password/localization/cy_GB.inc
+++ b/plugins/password/localization/cy_GB.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Newid Cyfrinair';
 $labels['curpasswd']  = 'Cyfrinair Presennol:';
 $labels['newpasswd']  = 'Cyfrinair Newydd:';
 $labels['confpasswd']  = 'Cadarnhau Cyfrinair Newydd:';
-
-$messages = array();
 $messages['nopassword'] = 'Rhowch eich cyfrinair newydd.';
 $messages['nocurpassword'] = 'Rhowch eich cyfrinair presennol.';
 $messages['passwordincorrect'] = 'Roedd y cyfrinair presennol yn anghywir.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/da_DK.inc b/plugins/password/localization/da_DK.inc
index bc8fb26df..76e161db4 100644
--- a/plugins/password/localization/da_DK.inc
+++ b/plugins/password/localization/da_DK.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Skift adgangskode';
 $labels['curpasswd']  = 'Nuværende adgangskode:';
 $labels['newpasswd']  = 'Ny adgangskode:';
 $labels['confpasswd']  = 'Bekræft ny adgangskode:';
-
-$messages = array();
 $messages['nopassword'] = 'Indtast venligst en ny adgangskode.';
 $messages['nocurpassword'] = 'Indtast venligst nuværende adgangskode.';
 $messages['passwordincorrect'] = 'Nuværende adgangskode er forkert.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/de_CH.inc b/plugins/password/localization/de_CH.inc
index 6016ffeac..a446e1b52 100644
--- a/plugins/password/localization/de_CH.inc
+++ b/plugins/password/localization/de_CH.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Passwort ändern';
 $labels['curpasswd']  = 'Aktuelles Passwort';
 $labels['newpasswd']  = 'Neues Passwort';
 $labels['confpasswd']  = 'Passwort Wiederholung';
-
-$messages = array();
 $messages['nopassword'] = 'Bitte geben Sie ein neues Passwort ein';
 $messages['nocurpassword'] = 'Bitte geben Sie Ihr aktuelles Passwort an';
 $messages['passwordincorrect'] = 'Das aktuelle Passwort ist nicht korrekt';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/de_DE.inc b/plugins/password/localization/de_DE.inc
index 2190fd39a..fab78fce9 100644
--- a/plugins/password/localization/de_DE.inc
+++ b/plugins/password/localization/de_DE.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Kennwort ändern';
 $labels['curpasswd']  = 'Aktuelles Kennwort:';
 $labels['newpasswd']  = 'Neues Kennwort:';
 $labels['confpasswd']  = 'Neues Kennwort bestätigen:';
-
-$messages = array();
 $messages['nopassword'] = 'Bitte geben Sie ein neues Kennwort ein.';
 $messages['nocurpassword'] = 'Bitte geben Sie ihr aktuelles Kennwort ein.';
 $messages['passwordincorrect'] = 'Das aktuelle Kennwort ist falsch.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/el_GR.inc b/plugins/password/localization/el_GR.inc
new file mode 100644
index 000000000..b1c72ab69
--- /dev/null
+++ b/plugins/password/localization/el_GR.inc
@@ -0,0 +1,32 @@
+<?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'] = 'Ο κωδικός πρόσβασης πρέπει να είναι τουλάχιστον $μήκος χαρακτήρων.';
+$messages['passwordweak'] = 'Ο κωδικός πρόσβασης πρέπει να περιλαμβάνει τουλάχιστον έναν αριθμό και ένα σημείο στίξης. ';
+$messages['passwordforbidden'] = 'Ο κωδικός πρόσβασης περιέχει μη επιτρεπτούς χαρακτήρες. ';
+?>
diff --git a/plugins/password/localization/en_GB.inc b/plugins/password/localization/en_GB.inc
index d7d192280..1f1b4e286 100644
--- a/plugins/password/localization/en_GB.inc
+++ b/plugins/password/localization/en_GB.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Change Password';
 $labels['curpasswd']  = 'Current Password:';
 $labels['newpasswd']  = 'New Password:';
 $labels['confpasswd']  = 'Confirm New Password:';
-
-$messages = array();
 $messages['nopassword'] = 'Please enter a new password.';
 $messages['nocurpassword'] = 'Please enter the current password.';
 $messages['passwordincorrect'] = 'Current password is incorrect.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/eo.inc b/plugins/password/localization/eo.inc
index f99004c63..d985c18e6 100644
--- a/plugins/password/localization/eo.inc
+++ b/plugins/password/localization/eo.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Ŝanĝi pasvorton';
 $labels['curpasswd']  = 'Nuna pasvorto:';
 $labels['newpasswd']  = 'Nova pasvorto:';
 $labels['confpasswd']  = 'Konfirmi novan pasvorton:';
-
-$messages = array();
 $messages['nopassword'] = 'Bonvole tajpu novan pasvorton.';
 $messages['nocurpassword'] = 'Bonvole tajpu nunan pasvorton.';
 $messages['passwordincorrect'] = 'Nuna pasvorto nekorekta.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Nova pasvorto ne konserveblas.';
 $messages['passwordshort'] = 'Pasvorto longu almenaŭ $length signojn.';
 $messages['passwordweak'] = 'La pasvorto enhavu almenaŭ unu ciferon kaj unu interpunktan signon.';
 $messages['passwordforbidden'] = 'La pasvorto enhavas malpermesitajn signojn.';
-
 ?>
diff --git a/plugins/password/localization/es_AR.inc b/plugins/password/localization/es_AR.inc
index 8edc8feae..47589cfc7 100644
--- a/plugins/password/localization/es_AR.inc
+++ b/plugins/password/localization/es_AR.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Cambiar Contraseña';
 $labels['curpasswd']  = 'Contraseña Actual:';
 $labels['newpasswd']  = 'Contraseña Nueva:';
 $labels['confpasswd']  = 'Confirmar Contraseña:';
-
-$messages = array();
 $messages['nopassword'] = 'Por favor introduce una nueva contraseña.';
 $messages['nocurpassword'] = 'Por favor introduce la contraseña actual.';
 $messages['passwordincorrect'] = 'Contraseña actual incorrecta.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/es_ES.inc b/plugins/password/localization/es_ES.inc
index 336666eb5..80ee2e9a1 100644
--- a/plugins/password/localization/es_ES.inc
+++ b/plugins/password/localization/es_ES.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Cambiar contraseña';
 $labels['curpasswd']  = 'Contraseña actual:';
 $labels['newpasswd']  = 'Contraseña nueva:';
 $labels['confpasswd']  = 'Confirmar contraseña:';
-
-$messages = array();
 $messages['nopassword'] = 'Por favor introduzca una contraseña nueva.';
 $messages['nocurpassword'] = 'Por favor introduzca la contraseña actual.';
 $messages['passwordincorrect'] = 'La contraseña actual es incorrecta.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/et_EE.inc b/plugins/password/localization/et_EE.inc
index b93d32540..e1c524dcf 100644
--- a/plugins/password/localization/et_EE.inc
+++ b/plugins/password/localization/et_EE.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Muuda parooli';
 $labels['curpasswd']  = 'Vana parool:';
 $labels['newpasswd']  = 'Uus parool:';
 $labels['confpasswd']  = 'Uus parool uuesti:';
-
-$messages = array();
 $messages['nopassword'] = 'Palun sisesta uus parool.';
 $messages['nocurpassword'] = 'Palun sisesta vana parool.';
 $messages['passwordincorrect'] = 'Vana parool on vale.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/eu_ES.inc b/plugins/password/localization/eu_ES.inc
new file mode 100644
index 000000000..b814d2983
--- /dev/null
+++ b/plugins/password/localization/eu_ES.inc
@@ -0,0 +1,32 @@
+<?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']  = 'Pasahitza aldatu';
+$labels['curpasswd']  = 'Oraingo pasahitza:';
+$labels['newpasswd']  = 'Pasahitz berria:';
+$labels['confpasswd']  = 'Konfirmatu pasahitz berria:';
+$messages['nopassword'] = 'Sartu pasahitz berria.';
+$messages['nocurpassword'] = 'Sartu oraingo pasahitza.';
+$messages['passwordincorrect'] = 'Oraingo pasahitza ez da zuzena.';
+$messages['passwordinconsistency'] = 'Pasahitz berria ez datoz bat, saiatu berriz.';
+$messages['crypterror'] = 'Ezin izan da pasahitz berria gorde. Ez da enkriptazio funtziorik aurkitu.';
+$messages['connecterror'] = 'Ezin izan da pasahitz berria gorde. Konexio arazoak egon dira.';
+$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.';
+?>
diff --git a/plugins/password/localization/fa_AF.inc b/plugins/password/localization/fa_AF.inc
new file mode 100644
index 000000000..5bf7c3a8f
--- /dev/null
+++ b/plugins/password/localization/fa_AF.inc
@@ -0,0 +1,32 @@
+<?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'] = 'رمز عبور شامل کاراکترهای غیر مجاز است';
+?>
diff --git a/plugins/password/localization/fa_IR.inc b/plugins/password/localization/fa_IR.inc
index 2cf126689..5f9285770 100644
--- a/plugins/password/localization/fa_IR.inc
+++ b/plugins/password/localization/fa_IR.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'تغییر گذرواژه';
 $labels['curpasswd']  = 'گذرواژه فعلی';
 $labels['newpasswd']  = 'گذرواژه جدید';
 $labels['confpasswd']  = 'تایید گذرواژه جدید';
-
-$messages = array();
 $messages['nopassword'] = 'گذرواژه جدید را وارد نمایید';
 $messages['nocurpassword'] = 'گذرواژه فعلی را وارد نمایید';
 $messages['passwordincorrect'] = 'گذرواژه فعلی اشتباه است';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'گذرواژه جدید ذخیره نشد';
 $messages['passwordshort'] = 'گذرواژه باید حداقل $length کاراکتر طول داشته باشد.';
 $messages['passwordweak'] = 'گذرواژه باید شامل حداقل یک عدد و یک کاراکتر نشانه‌ای باشد.';
 $messages['passwordforbidden'] = 'گذرواژه شما کاراکترهای غیرمجاز است.';
-
 ?>
diff --git a/plugins/password/localization/fi_FI.inc b/plugins/password/localization/fi_FI.inc
index 2098cf6c3..3b6735bec 100644
--- a/plugins/password/localization/fi_FI.inc
+++ b/plugins/password/localization/fi_FI.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Vaihda salasana';
 $labels['curpasswd']  = 'Nykyinen salasana:';
 $labels['newpasswd']  = 'Uusi salasana:';
 $labels['confpasswd']  = 'Vahvista uusi salasana:';
-
-$messages = array();
 $messages['nopassword'] = 'Syötä uusi salasana.';
 $messages['nocurpassword'] = 'Syötä nykyinen salasana.';
 $messages['passwordincorrect'] = 'Nykyinen salasana on väärin.';
@@ -33,5 +29,4 @@ $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ä.';
-
 ?>
diff --git a/plugins/password/localization/fr_FR.inc b/plugins/password/localization/fr_FR.inc
index 66b43784e..c38abc558 100644
--- a/plugins/password/localization/fr_FR.inc
+++ b/plugins/password/localization/fr_FR.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Changer le mot de passe';
 $labels['curpasswd']  = 'Mot de passe actuel:';
 $labels['newpasswd']  = 'Nouveau mot de passe:';
 $labels['confpasswd']  = 'Confirmez le nouveau mot de passe:';
-
-$messages = array();
 $messages['nopassword'] = 'Veuillez saisir le nouveau mot de passe.';
 $messages['nocurpassword'] = 'Veuillez saisir le mot de passe actuel.';
 $messages['passwordincorrect'] = 'Mot de passe actuel incorrect.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Impossible d\'enregistrer le nouveau mot de passe.
 $messages['passwordshort'] = 'Le mot de passe doit être composé d\'au moins $length caractères.';
 $messages['passwordweak'] = 'Le mot de passe doit contenir au moins un chiffre et un signe de ponctuation.';
 $messages['passwordforbidden'] = 'Le mot de passe contient des caractères interdits.';
-
 ?>
diff --git a/plugins/password/localization/gl_ES.inc b/plugins/password/localization/gl_ES.inc
index 93c505a6a..f738c62a0 100644
--- a/plugins/password/localization/gl_ES.inc
+++ b/plugins/password/localization/gl_ES.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Cambiar contrasinal';
 $labels['curpasswd']  = 'Contrasinal actual:';
 $labels['newpasswd']  = 'Contrasinal novo:';
 $labels['confpasswd']  = 'Confirmar contrasinal:';
-
-$messages = array();
 $messages['nopassword'] = 'Por favor, introduza un contrasinal novo.';
 $messages['nocurpassword'] = 'Por favor, introduza o contrasinal actual.';
 $messages['passwordincorrect'] = 'O contrasinal actual é incorrecto.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Non foi posible 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.';
-
 ?>
diff --git a/plugins/password/localization/he_IL.inc b/plugins/password/localization/he_IL.inc
index 005a8e9d8..ce05ea59c 100644
--- a/plugins/password/localization/he_IL.inc
+++ b/plugins/password/localization/he_IL.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'שינוי סיסמה';
 $labels['curpasswd']  = 'סיסמה נוכחית:';
 $labels['newpasswd']  = 'סיסמה חדשה:';
 $labels['confpasswd']  = 'אימות הסיסמה החדשה:';
-
-$messages = array();
 $messages['nopassword'] = 'נא להקליד סיסמה חדשה';
 $messages['nocurpassword'] = 'נא להקיש הסיסמה הנוכחית';
 $messages['passwordincorrect'] = 'הוקשה סיסמה נוכחית שגויה';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'לא ניתן לשמור על הסיסמה החד�
 $messages['passwordshort'] = 'הסיסמה צריכה להיות לפחות בעלת $length תווים';
 $messages['passwordweak'] = 'הסיסמה חייבת לכלול לפחות סיפרה אחת ולפחות סימן פיסוק אחד.';
 $messages['passwordforbidden'] = 'הסיסמה מכילה תווים אסורים.';
-
 ?>
diff --git a/plugins/password/localization/hr_HR.inc b/plugins/password/localization/hr_HR.inc
index f97f5a44c..44b62b2af 100644
--- a/plugins/password/localization/hr_HR.inc
+++ b/plugins/password/localization/hr_HR.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Promijeni zaporku';
 $labels['curpasswd']  = 'Važeća zaporka:';
 $labels['newpasswd']  = 'Nova zaporka:';
 $labels['confpasswd']  = 'Potvrda nove zaporke:';
-
-$messages = array();
 $messages['nopassword'] = 'Molimo unesite novu zaporku.';
 $messages['nocurpassword'] = 'Molimo unesite trenutnu zaporku.';
 $messages['passwordincorrect'] = 'Trenutna zaporka je nevažeća.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Nemoguće promijeniti zaporku.';
 $messages['passwordshort'] = 'Zaporka mora sadržavati barem $length znakova.';
 $messages['passwordweak'] = 'Zaporka mora sadržavati barem jedanu znamenku i jedan interpunkcijski znak.';
 $messages['passwordforbidden'] = 'Zaporka sadrži nedozvoljene znakove.';
-
 ?>
diff --git a/plugins/password/localization/hu_HU.inc b/plugins/password/localization/hu_HU.inc
index 6b6077115..e9167b0c9 100644
--- a/plugins/password/localization/hu_HU.inc
+++ b/plugins/password/localization/hu_HU.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Jelszó módosítás';
 $labels['curpasswd']  = 'Jelenlegi jelszó:';
 $labels['newpasswd']  = 'Új jelszó:';
 $labels['confpasswd']  = 'Új jelszó mégegyszer:';
-
-$messages = array();
 $messages['nopassword'] = 'Kérjük adja meg az új jelszót.';
 $messages['nocurpassword'] = 'Kérjük adja meg a jelenlegi jelszót.';
 $messages['passwordincorrect'] = 'Érvénytelen a jelenlegi jelszó.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/hy_AM.inc b/plugins/password/localization/hy_AM.inc
index b30f31894..ebca6cd85 100644
--- a/plugins/password/localization/hy_AM.inc
+++ b/plugins/password/localization/hy_AM.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Գաղտնաբառի փոփոխում';
 $labels['curpasswd']  = 'Առկա գաղտնաբառը`';
 $labels['newpasswd']  = 'Նոր գաղտնաբառը`';
 $labels['confpasswd']  = 'Կրկնեք նոր գաղտնաբառը`';
-
-$messages = array();
 $messages['nopassword'] = 'Ներմուցեք նոր գաղտնաբառը։';
 $messages['nocurpassword'] = 'Ներմուցեք առկա գաղտնաբառը։';
 $messages['passwordincorrect'] = 'Առկա գաղտնաբառը սխալ է։';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Նոր գաղտնաբառի պահպանումը �
 $messages['passwordshort'] = 'Գաղտնաբառերը պետք է լինեն առնվազն $length նիշ երկարությամբ։';
 $messages['passwordweak'] = 'Գաղտնաբառերը պետք է պարունակեն առնվազն մեկ թիվ և մեկ կետադրական նիշ։';
 $messages['passwordforbidden'] = 'Գաղտնաբառը պարունակում է արգելված նիշ։';
-
 ?>
diff --git a/plugins/password/localization/id_ID.inc b/plugins/password/localization/id_ID.inc
index 5026de259..b7b0cde8c 100644
--- a/plugins/password/localization/id_ID.inc
+++ b/plugins/password/localization/id_ID.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Ubah Sandi';
 $labels['curpasswd']  = 'Sandi saat ini:';
 $labels['newpasswd']  = 'Sandi Baru:';
 $labels['confpasswd']  = 'Konfirmasi Sandi Baru:';
-
-$messages = array();
 $messages['nopassword'] = 'Masukkan sandi baru.';
 $messages['nocurpassword'] = 'Masukkan sandi saat ini.';
 $messages['passwordincorrect'] = 'Sandi saat ini salah.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Tidak dapat menyimpan sandi baru.';
 $messages['passwordshort'] = 'Panjang password minimal $length karakter';
 $messages['passwordweak'] = 'Sandi harus menyertakan setidaknya satu angka dan satu tanda baca.';
 $messages['passwordforbidden'] = 'Sandi mengandung karakter terlarang.';
-
 ?>
diff --git a/plugins/password/localization/it_IT.inc b/plugins/password/localization/it_IT.inc
index 6ce2f7499..ddb83ca82 100644
--- a/plugins/password/localization/it_IT.inc
+++ b/plugins/password/localization/it_IT.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Modifica la Password';
 $labels['curpasswd']  = 'Password corrente:';
 $labels['newpasswd']  = 'Nuova password:';
 $labels['confpasswd']  = 'Conferma la nuova Password:';
-
-$messages = array();
 $messages['nopassword'] = 'Per favore inserire la nuova password.';
 $messages['nocurpassword'] = 'Per favore inserire la password corrente.';
 $messages['passwordincorrect'] = 'La password corrente non è corretta.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/ja_JP.inc b/plugins/password/localization/ja_JP.inc
index 6abea5348..cc5a1173d 100644
--- a/plugins/password/localization/ja_JP.inc
+++ b/plugins/password/localization/ja_JP.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'パスワードの変更';
 $labels['curpasswd']  = '現在のパスワード:';
 $labels['newpasswd']  = '新しいパスワード:';
 $labels['confpasswd']  = '新しいパスワード (確認):';
-
-$messages = array();
 $messages['nopassword'] = '新しいパスワードを入力してください。';
 $messages['nocurpassword'] = '現在のパスワードを入力してください。';
 $messages['passwordincorrect'] = '現在のパスワードが間違っています。';
@@ -33,5 +29,4 @@ $messages['internalerror'] = '新しいパスワードを保存できません�
 $messages['passwordshort'] = 'パスワードは少なくとも $length 文字の長さが必要です。';
 $messages['passwordweak'] = 'パスワードは少なくとも数字の 1 文字と記号の 1 文字を含んでいなければなりません。';
 $messages['passwordforbidden'] = 'パスワードに禁止された文字が含まれています。';
-
 ?>
diff --git a/plugins/password/localization/ko_KR.inc b/plugins/password/localization/ko_KR.inc
index ec346ee00..21e2dbbf8 100644
--- a/plugins/password/localization/ko_KR.inc
+++ b/plugins/password/localization/ko_KR.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = '암호 변경';
 $labels['curpasswd']  = '현재 암호:';
 $labels['newpasswd']  = '새 암호:';
 $labels['confpasswd']  = '새로운 비밀번호 확인 :';
-
-$messages = array();
 $messages['nopassword'] = '새 암호를 입력하시오.';
 $messages['nocurpassword'] = '현재 사용중인 암호를 입력하세요.';
 $messages['passwordincorrect'] = '현재 사용중인 암호가 올바르지 않습니다.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = '새로운 암호를 저장할 수 없습니다.';
 $messages['passwordshort'] = '암호는 적어도 $length 글자 이상이어야 합니다.';
 $messages['passwordweak'] = '암호는 적어도 숫자 하나와 특수 문자 하나를 포함하여야 합니다.';
 $messages['passwordforbidden'] = '암호가 허락되지 않은 문자들을 포함하고 있습니다.';
-
 ?>
diff --git a/plugins/password/localization/ku.inc b/plugins/password/localization/ku.inc
index 3bee221b6..544626846 100644
--- a/plugins/password/localization/ku.inc
+++ b/plugins/password/localization/ku.inc
@@ -15,23 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'گۆڕینی ووشەی نهێنی';
-$labels['curpasswd']  = 'Current Password:';
-$labels['newpasswd']  = 'New Password:';
-$labels['confpasswd']  = 'Confirm New Password:';
-
-$messages = array();
-$messages['nopassword'] = 'Please input new password.';
-$messages['nocurpassword'] = 'Please input current password.';
-$messages['passwordincorrect'] = 'Current password incorrect.';
-$messages['passwordinconsistency'] = 'Passwords do not match, please try again.';
-$messages['crypterror'] = 'Could not save new password. Encryption function missing.';
-$messages['connecterror'] = 'Could not save new password. Connection error.';
-$messages['internalerror'] = 'Could not save new password.';
-$messages['passwordshort'] = 'Password must be at least $length characters long.';
-$messages['passwordweak'] = 'Password must include at least one number and one punctuation character.';
-$messages['passwordforbidden'] = 'Password contains forbidden characters.';
-
 ?>
diff --git a/plugins/password/localization/lb_LU.inc b/plugins/password/localization/lb_LU.inc
index 9962aed28..08026f242 100644
--- a/plugins/password/localization/lb_LU.inc
+++ b/plugins/password/localization/lb_LU.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Passwuert änneren';
 $labels['curpasswd']  = 'Aktuellt Passwuert:';
 $labels['newpasswd']  = 'Neit Passwuert:';
 $labels['confpasswd']  = 'Neit Passwuert bestätegen:';
-
-$messages = array();
 $messages['nopassword'] = 'Gëff wann ech gelift en neit Passwuert an.';
 $messages['nocurpassword'] = 'Gëff wann ech gelift dat aktuellt Passwuert an.';
 $messages['passwordincorrect'] = 'Aktuellt Passwuert net korrekt.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Neit Passwuert konnt net gespäichert ginn.';
 $messages['passwordshort'] = 'D\'Passwuert muss mindestens $length Zeeche laang sinn.';
 $messages['passwordweak'] = 'D\'Passwuert muss mindestens eng Zuel an ee Sazzeechen enthalen.';
 $messages['passwordforbidden'] = 'D\'Passwuert enthält verbueden Zeechen.';
-
 ?>
diff --git a/plugins/password/localization/lt_LT.inc b/plugins/password/localization/lt_LT.inc
index fe512960a..4425d63e0 100644
--- a/plugins/password/localization/lt_LT.inc
+++ b/plugins/password/localization/lt_LT.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Slaptažodžio keitimas';
 $labels['curpasswd']  = 'Dabartinis slaptažodis:';
 $labels['newpasswd']  = 'Naujasis slaptažodis:';
 $labels['confpasswd']  = 'Pakartokite naująjį slaptažodį:';
-
-$messages = array();
 $messages['nopassword'] = 'Prašom įvesti naująjį slaptažodį.';
 $messages['nocurpassword'] = 'Prašom įvesti dabartinį slaptažodį.';
 $messages['passwordincorrect'] = 'Dabartinis slaptažodis neteisingas.';
@@ -33,5 +29,4 @@ $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ų.';
-
 ?>
diff --git a/plugins/password/localization/lv_LV.inc b/plugins/password/localization/lv_LV.inc
index ac0e5da79..c45bc8314 100644
--- a/plugins/password/localization/lv_LV.inc
+++ b/plugins/password/localization/lv_LV.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Nomainīt paroli';
 $labels['curpasswd']  = 'Pašreizējā parole:';
 $labels['newpasswd']  = 'Jaunā parole:';
 $labels['confpasswd']  = 'Apstiprināt jauno paroli:';
-
-$messages = array();
 $messages['nopassword'] = 'Lūdzu ievadiet jauno paroli.';
 $messages['nocurpassword'] = 'Lūdzu ievadiet pašreizējo paroli.';
 $messages['passwordincorrect'] = 'Pašreizējā parole nav pareiza.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Nevarēja saglabāt jauno paroli.';
 $messages['passwordshort'] = 'Jaunajai parolei jābūt vismaz $length simbolu garai.';
 $messages['passwordweak'] = 'Jaunajai parolei jāsatur vismaz viens cipars un speciālais simbols.';
 $messages['passwordforbidden'] = 'Parole satur neatļautus simbolus.';
-
 ?>
diff --git a/plugins/password/localization/nb_NO.inc b/plugins/password/localization/nb_NO.inc
index 6d8440bf3..9901303d2 100644
--- a/plugins/password/localization/nb_NO.inc
+++ b/plugins/password/localization/nb_NO.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Bytt passord';
 $labels['curpasswd']  = 'Nåværende passord:';
 $labels['newpasswd']  = 'Nytt passord:';
 $labels['confpasswd']  = 'Bekreft nytt passord';
-
-$messages = array();
 $messages['nopassword'] = 'Vennligst skriv inn nytt passord';
 $messages['nocurpassword'] = 'Vennligst skriv inn nåværende passord';
 $messages['passwordincorrect'] = 'Nåværende passord er feil.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Kunne ikke lagre nytt passord';
 $messages['passwordshort'] = 'Passordet må minimum inneholde $length tegn.';
 $messages['passwordweak'] = 'Passordet må inneholde minst ett tall og ett tegnsettingssymbol.';
 $messages['passwordforbidden'] = 'Passordet inneholder forbudte tegn.';
-
 ?>
diff --git a/plugins/password/localization/nl_NL.inc b/plugins/password/localization/nl_NL.inc
index e5b634602..1b5f0b15b 100644
--- a/plugins/password/localization/nl_NL.inc
+++ b/plugins/password/localization/nl_NL.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Wachtwoord wijzigen';
 $labels['curpasswd']  = 'Huidig wachtwoord:';
 $labels['newpasswd']  = 'Nieuw wachtwoord:';
 $labels['confpasswd']  = 'Bevestig nieuw wachtwoord:';
-
-$messages = array();
 $messages['nopassword'] = 'Vul uw nieuwe wachtwoord in.';
 $messages['nocurpassword'] = 'Vul uw huidige wachtwoord in.';
 $messages['passwordincorrect'] = 'Huidig wachtwoord is onjuist.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/nn_NO.inc b/plugins/password/localization/nn_NO.inc
index dc7c8f390..89d0ad1c1 100644
--- a/plugins/password/localization/nn_NO.inc
+++ b/plugins/password/localization/nn_NO.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Bytt passord';
 $labels['curpasswd']  = 'Noverande passord:';
 $labels['newpasswd']  = 'Nytt passord:';
 $labels['confpasswd']  = 'Bekreft nytt passord';
-
-$messages = array();
 $messages['nopassword'] = 'Venlegast skriv inn nytt passord.';
 $messages['nocurpassword'] = 'Venlegast skriv inn noverande passord.';
 $messages['passwordincorrect'] = 'Noverande passord er feil.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Kunne ikkje lagre nytt passord.';
 $messages['passwordshort'] = 'Passordet må minimum innehalde $length teikn.';
 $messages['passwordweak'] = 'Passordet må innehalde minst eitt tal og eitt skilleteikn.';
 $messages['passwordforbidden'] = 'Passordet inneheld forbodne teikn.';
-
 ?>
diff --git a/plugins/password/localization/pl_PL.inc b/plugins/password/localization/pl_PL.inc
index f4bce1792..b3ce3726f 100644
--- a/plugins/password/localization/pl_PL.inc
+++ b/plugins/password/localization/pl_PL.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Zmiana hasła';
 $labels['curpasswd']  = 'Aktualne hasło:';
 $labels['newpasswd']  = 'Nowe hasło:';
 $labels['confpasswd']  = 'Potwierdź hasło:';
-
-$messages = array();
 $messages['nopassword'] = 'Wprowadź nowe hasło.';
 $messages['nocurpassword'] = 'Wprowadź aktualne hasło.';
 $messages['passwordincorrect'] = 'Błędne aktualne hasło, spróbuj ponownie.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/pt_BR.inc b/plugins/password/localization/pt_BR.inc
index f6f6ced01..ac714764f 100644
--- a/plugins/password/localization/pt_BR.inc
+++ b/plugins/password/localization/pt_BR.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Alterar senha';
 $labels['curpasswd']  = 'Senha atual:';
 $labels['newpasswd']  = 'Nova senha:';
 $labels['confpasswd']  = 'Confirmar nova senha:';
-
-$messages = array();
 $messages['nopassword'] = 'Por favor, informe a nova senha.';
 $messages['nocurpassword'] = 'Por favor, informe a senha atual.';
 $messages['passwordincorrect'] = 'Senha atual incorreta.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/pt_PT.inc b/plugins/password/localization/pt_PT.inc
index faad112ea..fc5b28899 100644
--- a/plugins/password/localization/pt_PT.inc
+++ b/plugins/password/localization/pt_PT.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Alterar password';
 $labels['curpasswd']  = 'Password atual:';
 $labels['newpasswd']  = 'Nova password:';
 $labels['confpasswd']  = 'Confirmar password:';
-
-$messages = array();
 $messages['nopassword'] = 'Introduza a nova password.';
 $messages['nocurpassword'] = 'Introduza a password actual.';
 $messages['passwordincorrect'] = 'Password actual errada.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Não foi possível gravar a nova password.';
 $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.';
-
 ?>
diff --git a/plugins/password/localization/ro_RO.inc b/plugins/password/localization/ro_RO.inc
index 7406efb9a..004254382 100644
--- a/plugins/password/localization/ro_RO.inc
+++ b/plugins/password/localization/ro_RO.inc
@@ -15,23 +15,18 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Schimbați parola';
 $labels['curpasswd']  = 'Parola curentă:';
 $labels['newpasswd']  = 'Parola nouă:';
-$labels['confpasswd']  = 'Confirmați parola nouă:';
-
-$messages = array();
+$labels['confpasswd']  = 'Confirmare parola nouă:';
 $messages['nopassword'] = 'Te rog să introduci noua parolă.';
 $messages['nocurpassword'] = 'Te rog să introduci parola curentă';
 $messages['passwordincorrect'] = 'Parola curentă este incorectă.';
-$messages['passwordinconsistency'] = 'Parolele nu se potrivesc, vă rugăm să mai încercați';
-$messages['crypterror'] = 'Nu am reușit să salvez noua parolă. Lipsa funcției de criptare.';
+$messages['passwordinconsistency'] = 'Parolele nu se potrivesc, te rog să mai încerci';
+$messages['crypterror'] = 'Nu am reușit să salvez noua parolă. Funcția de criptare lipsește.';
 $messages['connecterror'] = 'Nu am reușit să salvez noua parolă. Eroare connexiune.';
 $messages['internalerror'] = 'Nu am reușit să salvez noua parolă.';
-$messages['passwordshort'] = 'Parola trebuie să aibă $length caractere.';
-$messages['passwordweak'] = 'Parola trebuie să conțina cel puțin un număr si un semn de punctuație';
+$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.';
-
 ?>
diff --git a/plugins/password/localization/ru_RU.inc b/plugins/password/localization/ru_RU.inc
index 2517f922b..85b7bf2c4 100644
--- a/plugins/password/localization/ru_RU.inc
+++ b/plugins/password/localization/ru_RU.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Изменить пароль';
 $labels['curpasswd']  = 'Текущий пароль:';
 $labels['newpasswd']  = 'Новый пароль:';
 $labels['confpasswd']  = 'Подтвердите новый пароль:';
-
-$messages = array();
 $messages['nopassword'] = 'Пожалуйста, введите новый пароль.';
 $messages['nocurpassword'] = 'Пожалуйста, введите текущий пароль.';
 $messages['passwordincorrect'] = 'Текущий пароль неверен.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Не могу сохранить новый пар
 $messages['passwordshort'] = 'Длина пароля должна быть как минимум $length символов.';
 $messages['passwordweak'] = 'Пароль должен включать в себя как минимум одну цифру и один знак пунктуации.';
 $messages['passwordforbidden'] = 'Пароль содержит недопустимые символы.';
-
 ?>
diff --git a/plugins/password/localization/sk_SK.inc b/plugins/password/localization/sk_SK.inc
index 4098cb685..fd0210285 100644
--- a/plugins/password/localization/sk_SK.inc
+++ b/plugins/password/localization/sk_SK.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Zmeniť heslo';
 $labels['curpasswd']  = 'Súčasné heslo:';
 $labels['newpasswd']  = 'Nové heslo:';
 $labels['confpasswd']  = 'Potvrď nové heslo:';
-
-$messages = array();
 $messages['nopassword'] = 'Prosím zadaj nové heslo.';
 $messages['nocurpassword'] = 'Prosím zadaj súčasné heslo.';
 $messages['passwordincorrect'] = 'Súčasné heslo je nesprávne.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Nemôžem uložiť nové heslo.';
 $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.';
-
 ?>
diff --git a/plugins/password/localization/sl_SI.inc b/plugins/password/localization/sl_SI.inc
index 27a094219..99af3c9f5 100644
--- a/plugins/password/localization/sl_SI.inc
+++ b/plugins/password/localization/sl_SI.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Spremeni geslo';
 $labels['curpasswd']  = 'Obstoječe geslo:';
 $labels['newpasswd']  = 'Novo geslo:';
 $labels['confpasswd']  = 'Potrdi novo geslo:';
-
-$messages = array();
 $messages['nopassword'] = 'Vnesite novo geslo.';
 $messages['nocurpassword'] = 'Vnesite obstoječe geslo.';
 $messages['passwordincorrect'] = 'Obstoječe geslo ni veljavno.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Novega gesla ni bilo mogoče shraniti.';
 $messages['passwordshort'] = 'Geslo mora vsebovati vsaj $length znakov';
 $messages['passwordweak'] = 'Geslo mora vključevati vsaj eno številko in ločilo.';
 $messages['passwordforbidden'] = 'Geslo vsebuje neveljavne znake.';
-
 ?>
diff --git a/plugins/password/localization/sr_CS.inc b/plugins/password/localization/sr_CS.inc
index 18361032d..0900b3112 100644
--- a/plugins/password/localization/sr_CS.inc
+++ b/plugins/password/localization/sr_CS.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Промијени лозинку';
 $labels['curpasswd']  = 'Тренутна лозинка:';
 $labels['newpasswd']  = 'Нова лозинка:';
 $labels['confpasswd']  = 'Поновите лозинку:';
-
-$messages = array();
 $messages['nopassword'] = 'Молимо унесите нову лозинку.';
 $messages['nocurpassword'] = 'Молимо унесите тренутну лозинку.';
 $messages['passwordincorrect'] = 'Тренутна лозинка је нетачна.';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Није могуће сачувати нову л
 $messages['passwordshort'] = 'Лозинка мора имати најмање $lenght знакова.';
 $messages['passwordweak'] = 'Лозинка мора да садржи најмање један број и један интерпункцијски знак.';
 $messages['passwordforbidden'] = 'Лозинка садржи недозвољене знакове.';
-
 ?>
diff --git a/plugins/password/localization/sv_SE.inc b/plugins/password/localization/sv_SE.inc
index 90f7b9f58..0aee9da81 100644
--- a/plugins/password/localization/sv_SE.inc
+++ b/plugins/password/localization/sv_SE.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Ändra lösenord';
 $labels['curpasswd']  = 'Nuvarande lösenord:';
 $labels['newpasswd']  = 'Nytt lösenord:';
 $labels['confpasswd']  = 'Bekräfta nytt lösenord:';
-
-$messages = array();
 $messages['nopassword'] = 'Ange nytt lösenord.';
 $messages['nocurpassword'] = 'Ange nuvarande lösenord.';
 $messages['passwordincorrect'] = 'Felaktigt nuvarande lösenord.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/ti.inc b/plugins/password/localization/ti.inc
new file mode 100644
index 000000000..9453318f0
--- /dev/null
+++ b/plugins/password/localization/ti.inc
@@ -0,0 +1,32 @@
+<?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'] = 'እቲ መሕለፊ ቃል ውጉዳት ፊዳላት አለውዎ::';
+?>
diff --git a/plugins/password/localization/tr_TR.inc b/plugins/password/localization/tr_TR.inc
index 99133a158..75ee30f6d 100644
--- a/plugins/password/localization/tr_TR.inc
+++ b/plugins/password/localization/tr_TR.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = 'Parolayı Değiştir';
 $labels['curpasswd']  = 'Şimdiki Parola:';
 $labels['newpasswd']  = 'Yeni Parola:';
 $labels['confpasswd']  = 'Yeni Parolayı Onaylayın:';
-
-$messages = array();
 $messages['nopassword'] = 'Lütfen yeni parolayı girin.';
 $messages['nocurpassword'] = 'Lütfen şimdiki parolayı girin.';
 $messages['passwordincorrect'] = 'Şimdiki parolayı yanlış girdiniz.';
@@ -33,5 +29,4 @@ $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.';
-
 ?>
diff --git a/plugins/password/localization/uk_UA.inc b/plugins/password/localization/uk_UA.inc
new file mode 100644
index 000000000..0d102e528
--- /dev/null
+++ b/plugins/password/localization/uk_UA.inc
@@ -0,0 +1,32 @@
+<?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'] = 'Пароль містить заборонені символи.';
+?>
diff --git a/plugins/password/localization/vi_VN.inc b/plugins/password/localization/vi_VN.inc
index f21d65156..3e5745f4d 100644
--- a/plugins/password/localization/vi_VN.inc
+++ b/plugins/password/localization/vi_VN.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $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']  = 'Xác nhận mật khẩu mới';
-
-$messages = array();
 $messages['nopassword'] = 'Mời nhập mật khẩu mới';
 $messages['nocurpassword'] = 'Mời nhập mật khẩu hiện tại';
 $messages['passwordincorrect'] = 'Mật khẩu hiện thời không đúng';
@@ -33,5 +29,4 @@ $messages['internalerror'] = 'Không thể lưu mật khẩu mới';
 $messages['passwordshort'] = 'Mật khẩu phải dài ít nhất $ ký tự';
 $messages['passwordweak'] = 'Mật khẩu phải bao gồm ít nhất 1 con số và 1 ký tự dấu câu';
 $messages['passwordforbidden'] = 'Mật khẩu bao gồm ký tự không hợp lệ';
-
 ?>
diff --git a/plugins/password/localization/zh_CN.inc b/plugins/password/localization/zh_CN.inc
index 5d14926f2..02db6e83e 100644
--- a/plugins/password/localization/zh_CN.inc
+++ b/plugins/password/localization/zh_CN.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = '修改密码';
 $labels['curpasswd']  = '当前密码：';
 $labels['newpasswd']  = '新密码：';
 $labels['confpasswd']  = '确认新密码：';
-
-$messages = array();
 $messages['nopassword'] = '请输入新密码。';
 $messages['nocurpassword'] = '请输入当前的密码。';
 $messages['passwordincorrect'] = '当前密码不正确。';
@@ -33,5 +29,4 @@ $messages['internalerror'] = '无法保存新密码。';
 $messages['passwordshort'] = '密码至少为 $length 位。';
 $messages['passwordweak'] = '密码必须至少包含一个数字和一个标点符号。';
 $messages['passwordforbidden'] = '密码包含禁止使用的字符。';
-
 ?>
diff --git a/plugins/password/localization/zh_TW.inc b/plugins/password/localization/zh_TW.inc
index b61e113c8..e5e2414f2 100644
--- a/plugins/password/localization/zh_TW.inc
+++ b/plugins/password/localization/zh_TW.inc
@@ -15,14 +15,10 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
-$labels = array();
 $labels['changepasswd']  = '更改密碼';
 $labels['curpasswd']  = '目前的密碼';
 $labels['newpasswd']  = '新密碼';
 $labels['confpasswd']  = '確認新密碼';
-
-$messages = array();
 $messages['nopassword'] = '請輸入新密碼';
 $messages['nocurpassword'] = '請輸入目前的密碼';
 $messages['passwordincorrect'] = '目前的密碼錯誤';
@@ -33,5 +29,4 @@ $messages['internalerror'] = '無法更新密碼';
 $messages['passwordshort'] = '您的密碼至少需 $length 個字元長';
 $messages['passwordweak'] = '您的新密碼至少需含有一個數字與一個標點符號';
 $messages['passwordforbidden'] = '您的密碼含有禁用字元';
-
 ?>