diff --git a/languages/bg.lang b/languages/bg.lang
index 5b0ea7df..b6876b28 100644
--- a/languages/bg.lang
+++ b/languages/bg.lang
@@ -129,7 +129,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Този е-мейл адре
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Вие сте достигнали своя лимит за създаване на пощенски кутии!';
 $PALANG['pCreate_mailbox_password2'] = 'Парола (отново)';
 $PALANG['pCreate_mailbox_password_text'] = 'Парола за POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Паролите, които сте дали не съвпадат! Или са празни!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Пълно име';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Обема, който сте задали е твърде голям!';
 $PALANG['pCreate_mailbox_mail'] = 'Създай пощенска кутия'; # XXX Text change to 'Send Welcome mail'
@@ -272,7 +271,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Добави нов админ на д
 $PALANG['pAdminCreate_admin_username_text'] = 'Е-мейл адрес';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Админ не е валиден е-мейл адрес!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Админ-а вече съществува или не е валиден';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Паролите, които сте въвели не съвпадат! Или са празни!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Добави админ';
 $PALANG['pAdminCreate_admin_result_error'] = 'Не мога да добавя админа!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Админа беше добавен успешно!';
@@ -280,7 +278,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Админа беше добав
 $PALANG['pAdminEdit_admin_welcome'] = 'Редакция на админ на домейн';
 $PALANG['pAdminEdit_admin_username'] = 'Админ';
 $PALANG['pAdminEdit_admin_password2'] = 'Парола (отново)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Паролите, които сте въвели не съвпадат! Или са празни!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Главен Администратор';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Редактирай Админ'; # XXX text no longer used
diff --git a/languages/ca.lang b/languages/ca.lang
index 81f6164e..a48e0a65 100644
--- a/languages/ca.lang
+++ b/languages/ca.lang
@@ -127,7 +127,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Aquest e-mail ja existeix, es
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Has arribat al límit de creació de bústies!';
 $PALANG['pCreate_mailbox_password2'] = 'Contrasenya (repetir)';
 $PALANG['pCreate_mailbox_password_text'] = 'Contrasenya per a POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Les contrasenyes introduides no coincideixen o estan en blanc!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Nom complet';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'La quota especificada és massa alta!';
 $PALANG['pCreate_mailbox_mail'] = 'Crear bústia'; # XXX Text change to 'Send Welcome mail'
@@ -271,7 +270,6 @@ $PALANG['pAdminCreate_admin_username_text'] = 'E-mail';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrador no es un e-mail vàlid!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'L\'administrador ja existeix o no es vàlid!';
 
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Les contrasenyes introduides no coincideixen o estan en blanc!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Afegir administrador';
 $PALANG['pAdminCreate_admin_result_error'] = 'Imposible afegir l\'administrador!';
 $PALANG['pAdminCreate_admin_result_success'] = 'L\'administrador ha estat afegit!';
@@ -279,7 +277,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'L\'administrador ha estat afegit
 $PALANG['pAdminEdit_admin_welcome'] = 'Editar un administrador de domini';
 $PALANG['pAdminEdit_admin_username'] = 'Administrador';
 $PALANG['pAdminEdit_admin_password2'] = 'Contrasenya (repetiu)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Les contrasenyes introduides no coincideixen o estan en blanc!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Editar administrador'; # XXX text no longer used
diff --git a/languages/cn.lang b/languages/cn.lang
index 8d9048cf..0feff080 100644
--- a/languages/cn.lang
+++ b/languages/cn.lang
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = '邮件地址已经存在,请
 $PALANG['pCreate_mailbox_username_text_error3'] = '邮箱地址已经达到上限!';
 $PALANG['pCreate_mailbox_password2'] = '密码 (再次输入)';
 $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP 密码';
-$PALANG['pCreate_mailbox_password_text_error'] = '你输入的密码不相同! 或者为空!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = '全名';
 $PALANG['pCreate_mailbox_quota_text_error'] = '你输入的容量限制超出范围!';
 $PALANG['pCreate_mailbox_mail'] = '新建邮箱'; # XXX Text change to 'Send Welcome mail'
@@ -271,7 +270,6 @@ $PALANG['pAdminCreate_admin_welcome'] = '新增域管理员';
 $PALANG['pAdminCreate_admin_username_text'] = '邮件地址';
 $PALANG['pAdminCreate_admin_username_text_error1'] = '管理员名不是一个合法的邮件地址!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = '管理员已经存在或者管理员名非法!';
-$PALANG['pAdminCreate_admin_password_text_error'] = '新所输入的两次新密码不相同! 或者为空!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = '新增';
 $PALANG['pAdminCreate_admin_result_error'] = '新增管理员失败!';
 $PALANG['pAdminCreate_admin_result_success'] = '新增管理员成功!';
@@ -279,7 +277,6 @@ $PALANG['pAdminCreate_admin_result_success'] = '新增管理员成功!';
 $PALANG['pAdminEdit_admin_welcome'] = '修改域管理员';
 $PALANG['pAdminEdit_admin_username'] = '管理员';
 $PALANG['pAdminEdit_admin_password2'] = '密码 (验证)';
-$PALANG['pAdminEdit_admin_password_text_error'] = '你两次输入的新密码不相同! 或者为空!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = '修改'; # XXX text no longer used
diff --git a/languages/cs.lang b/languages/cs.lang
index 666a753e..199347b3 100644
--- a/languages/cs.lang
+++ b/languages/cs.lang
@@ -133,7 +133,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Taková emailová adresa již
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Dosáhli jste limitu, nemů¸ete vytvářet další schránky!';
 $PALANG['pCreate_mailbox_password2'] = 'Heslo (znovu)';
 $PALANG['pCreate_mailbox_password_text'] = 'Heslo pro POP3/IMAP/SMTP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Zadaná hesla jsou rozdílná nebo prázdná!';
 $PALANG['pCreate_mailbox_name_text'] = 'Celé jméno';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Zadané místo je příliš velké!';
 $PALANG['pCreate_mailbox_mail'] = 'Vytvořit schránku na disku (odešle uvítací email)'; # XXX Text change to 'Send Welcome mail'
@@ -280,7 +279,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Přidat nového doménového administr
 $PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Tato adresa není platná!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Taková adresa již existuje!';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Zadaná hesla jsou rozdílná nebo prázdná!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Přidat administrátora';
 $PALANG['pAdminCreate_admin_result_error'] = 'Nepodařilo se přidat administrátora!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Administrátor byl přidán!';
@@ -288,7 +286,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administrátor byl přidán!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Upravit doménového administrátora';
 $PALANG['pAdminEdit_admin_username'] = 'Uživatelské jméno';
 $PALANG['pAdminEdit_admin_password2'] = 'Heslo (znovu)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Zadaná hesla jsou rozdílná nebo prázdná!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Superuživatel';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Upravit Administrátora'; # XXX text no longer used
diff --git a/languages/da.lang b/languages/da.lang
index fcd0b3f0..ed69da8b 100644
--- a/languages/da.lang
+++ b/languages/da.lang
@@ -133,7 +133,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Emailadressen eksisterer alle
 $PALANG['pCreate_mailbox_username_text_error3']       = 'Du har nået grænsen for antallet af postbokse til domæne!';
 $PALANG['pCreate_mailbox_password2'] = 'Adgangskode (igen)';
 $PALANG['pCreate_mailbox_password_text'] = 'Adgangskode til POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Adgangskoderne er ikke ens! Eller er tomme!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Fulde navn';
 $PALANG['pCreate_mailbox_quota_text_error']           = 'Den valgte kvota er for høj.';
 $PALANG['pCreate_mailbox_mail'] = 'Send velkomsthilsen'; # XXX Text change to 'Send Welcome mail'
@@ -280,7 +279,6 @@ $PALANG['pAdminCreate_admin_welcome']              = 'Tilføj en ny domæneadmin
 $PALANG['pAdminCreate_admin_username_text'] = 'Emailadresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke en gyldig emailadresse!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Aministratoren findes allerede eller er ikke gyldig';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Adgangskoderne er ikke ens! Eller er tomme!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Tilføj administrator';
 $PALANG['pAdminCreate_admin_result_error']         = 'Administratoren kunne ikke tilføjes!';
 $PALANG['pAdminCreate_admin_result_success']       = 'Administratoren er tilføjet!';
@@ -288,7 +286,6 @@ $PALANG['pAdminCreate_admin_result_success']       = 'Administratoren er tilføj
 $PALANG['pAdminEdit_admin_welcome']             = 'Redigér en domæneadministrator';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
 $PALANG['pAdminEdit_admin_password2'] = 'Adgangskode (igen)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Adgangskoderne er ikke ens! Eller er tomme!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Superadministrator';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Redigér administrator'; # XXX text no longer used
diff --git a/languages/de.lang b/languages/de.lang
index 3b7aea4d..a2ec8d9e 100644
--- a/languages/de.lang
+++ b/languages/de.lang
@@ -130,7 +130,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Diese Email-Adresse existiert
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Sie dürfen leider nicht mehr Mailboxen für diese Domain anlegen!';
 $PALANG['pCreate_mailbox_password2'] = 'Passwort (nochmal)';
 $PALANG['pCreate_mailbox_password_text'] = 'Passwort für POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Die beiden Passwörter sind nicht identisch oder ganz leer!';
 $PALANG['pCreate_mailbox_name_text'] = 'Vollständiger Name';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Das angegebene Quota ist zu hoch!';
 $PALANG['pCreate_mailbox_mail'] = 'Begrüßungsmail senden';
@@ -277,7 +276,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Neuen Domain-Admin hinzufügen';
 $PALANG['pAdminCreate_admin_username_text'] = 'Email Adresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin-Adresse ist keine echte Email-Adresse!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Der Admin existiert bereits bzw. ist nicht korrekt';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Die angegebenen Passwörter sind nicht identisch oder leer!';
 $PALANG['pAdminCreate_admin_button'] = 'Admin hinzufügen';
 $PALANG['pAdminCreate_admin_result_error'] = 'Konnte den Admin nicht anlegen!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Admin angelegt!';
@@ -285,7 +283,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admin angelegt!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Domain Admin editieren';
 $PALANG['pAdminEdit_admin_username'] = 'Admin';
 $PALANG['pAdminEdit_admin_password2'] = 'Passwort (nochmal)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Die beiden Passwörter sind nicht identisch oder leer!';
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super-Admin';
 $PALANG['super_admin_desc'] = 'Super-Admins haben Zugriff auf alle Domains und können Domains und Admins verwalten.';
 $PALANG['pAdminEdit_admin_button'] = 'Admin editieren'; # obsolete
diff --git a/languages/en.lang b/languages/en.lang
index 14c6a81f..65a950e8 100644
--- a/languages/en.lang
+++ b/languages/en.lang
@@ -131,7 +131,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'This email address already ex
 $PALANG['pCreate_mailbox_username_text_error3'] = 'You have reached your limit to create mailboxes!';
 $PALANG['pCreate_mailbox_password2'] = 'Password (again)';
 $PALANG['pCreate_mailbox_password_text'] = 'Password for POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'The passwords that you supplied don\'t match or are empty!';
 $PALANG['pCreate_mailbox_name_text'] = 'Full name';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'The quota that you specified is too high!';
 $PALANG['pCreate_mailbox_mail'] = 'Send Welcome mail';
@@ -281,7 +280,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Add a new domain admin';
 $PALANG['pAdminCreate_admin_username_text'] = 'Email address';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin is not a valid email address!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'The admin already exists or is not valid';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'The passwords that you supplied don\'t match or are empty!';
 $PALANG['pAdminCreate_admin_button'] = 'Add Admin';
 $PALANG['pAdminCreate_admin_result_error'] = 'Unable to add admin!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Admin has been added!';
@@ -289,7 +287,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admin has been added!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Edit a domain admin';
 $PALANG['pAdminEdit_admin_username'] = 'Admin';
 $PALANG['pAdminEdit_admin_password2'] = 'Password (again)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'The passwords that you supplied don\'t match or are empty!';
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.';
 $PALANG['pAdminEdit_admin_button'] = 'Edit Admin'; # text no longer used
diff --git a/languages/es.lang b/languages/es.lang
index 9160b635..7ddb6e9b 100644
--- a/languages/es.lang
+++ b/languages/es.lang
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = '¡Este e-mail ya existe, esco
 $PALANG['pCreate_mailbox_username_text_error3'] = '¡Ha llegado al límite de creación de buzones!';
 $PALANG['pCreate_mailbox_password2'] = 'Contraseña (repetir)';
 $PALANG['pCreate_mailbox_password_text'] = 'Contraseña para POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = '¡Las contraseñas introducidas no coinciden o están en blanco!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Nombre completo';
 $PALANG['pCreate_mailbox_quota_text_error'] = '¡La cuota especificada es demasiado alta!';
 $PALANG['pCreate_mailbox_mail'] = 'Enviar correo bienvenida';
@@ -273,7 +272,6 @@ $PALANG['pAdminCreate_admin_username_text'] = 'E-mail';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrador no es un e-mail válido!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'El administrador ya existe o no es válido!';
 
-$PALANG['pAdminCreate_admin_password_text_error'] = '¡Las contraseñas introducidas no coinciden o están en blanco!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Añadir administrador';
 $PALANG['pAdminCreate_admin_result_error'] = '¡Imposible añadir el administrador!';
 $PALANG['pAdminCreate_admin_result_success'] = '¡El administrador ha sido añadido!';
@@ -281,7 +279,6 @@ $PALANG['pAdminCreate_admin_result_success'] = '¡El administrador ha sido añad
 $PALANG['pAdminEdit_admin_welcome'] = 'Editar un administrador de dominio';
 $PALANG['pAdminEdit_admin_username'] = 'Administrador';
 $PALANG['pAdminEdit_admin_password2'] = 'Contraseña (repetir)';
-$PALANG['pAdminEdit_admin_password_text_error'] = '¡Las contraseñas introducidas no coinciden o están en blanco!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Editar administrador'; # XXX text no longer used
diff --git a/languages/et.lang b/languages/et.lang
index 1cbc0ee1..b60cd7ee 100644
--- a/languages/et.lang
+++ b/languages/et.lang
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Selline e-posti aadress on j
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Oled kasutanud kogu postkastide arvu!';
 $PALANG['pCreate_mailbox_password2'] = 'Parool (uuesti)';
 $PALANG['pCreate_mailbox_password_text'] = 'Parool POP3/IMAP\'le';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Sisestatud paroolid ei kattu! Või on tühjad!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Täielik nimi';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Sisestatud kettaruumi piirang on liiga kõrge!';
 $PALANG['pCreate_mailbox_mail'] = 'Loo postkast'; # XXX Text change to 'Send Welcome mail'
@@ -271,7 +270,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Lisa uus domeeni haldaja';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-posti aadress';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Väljal haldaja pole kehtiv e-posti aadress!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Selline haldaja on juba olemas';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Sisestatud paroolid ei kattu! Või on tühjad!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Lisa haldaja';
 $PALANG['pAdminCreate_admin_result_error'] = 'Haldaja lisamine ebaõnnestus!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Haldaja on lisatud!';
@@ -279,7 +277,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Haldaja on lisatud!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Muuda domeeni haldajat';
 $PALANG['pAdminEdit_admin_username'] = 'Haldaja';
 $PALANG['pAdminEdit_admin_password2'] = 'Parool (uuesti)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Sisestatud paroolid ei kattu! Või on tühjad!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Muuda haldaja'; # XXX text no longer used
diff --git a/languages/eu.lang b/languages/eu.lang
index 82be5e1d..52cbb83c 100644
--- a/languages/eu.lang
+++ b/languages/eu.lang
@@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'E-mail hau existitzen da. Ezb
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Postontzi sorkuntza mugara iritsi zara!';
 $PALANG['pCreate_mailbox_password2'] = 'Pasahitza (errepikatu)';
 $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP-entzat pasahitza';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Sartutako pasahitzak ez datoz bat edo zuriz daude!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Izen osoa';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Zehazturiko kuota altuegia da!';
 $PALANG['pCreate_mailbox_mail'] = 'Postontzia sortu'; # XXX Text change to 'Send Welcome mail'
@@ -270,7 +269,6 @@ $PALANG['pAdminCreate_admin_username_text'] = 'E-mail helbidea';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Kudeatzaile e-mailak ez du balio!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Kudeatzailea existitzen da edo ez du balio!';
 
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Sartutako pasahitzak ez datoz bat edo zuriz daude!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Kudeatzailea gehitu';
 $PALANG['pAdminCreate_admin_result_error'] = 'Ezinezkoa kudeatzailea gehitzea!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Kudeatzailea gehituta1';
@@ -278,7 +276,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Kudeatzailea gehituta1';
 $PALANG['pAdminEdit_admin_welcome'] = 'Domeinu kudeatzaile bat aldatu';
 $PALANG['pAdminEdit_admin_username'] = 'Kudeatzailea';
 $PALANG['pAdminEdit_admin_password2'] = 'Pasahitza (errepikatu)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Sartutako pasahitzak ez datoz bat edo zuriz daude!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Kudeatzailea aldatu'; # XXX text no longer used
diff --git a/languages/fi.lang b/languages/fi.lang
index 2b55a553..e0636fe4 100644
--- a/languages/fi.lang
+++ b/languages/fi.lang
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Sähköpostiosoite on jo käy
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Postilaatikoiden maksimimäärä saavutettu!';
 $PALANG['pCreate_mailbox_password2'] = 'Salasana (toistamiseen)';
 $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP salasana';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Antamasi salasanat eivät täsmää! tai ne ovat tyhjät!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Koko nimi';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Antamasi kiintiö on liian korkea!';
 $PALANG['pCreate_mailbox_mail'] = 'Luo postilaatikko'; # XXX Text change to 'Send Welcome mail'
@@ -271,7 +270,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Lisää uusi domainin ylläpitäjä';
 $PALANG['pAdminCreate_admin_username_text'] = 'Sähköpostiosoite';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Ylläpitäjän sähköpostiosoite ei ole oikeanmuotoinen!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Ylläpitäjän sähköpostiosoite on jo olemassa tai se ei ole oikean muotoinen';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Antamasi salasanat eivät täsmää Tai ne ovat tyhjiä!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Lisää ylläpitäjä';
 $PALANG['pAdminCreate_admin_result_error'] = 'Ylläpitäjän lisäys ei onnistu!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Ylläpitäjä on lisätty!';
@@ -279,7 +277,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Ylläpitäjä on lisätty!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Muokkaa domainin ylläpitäjää';
 $PALANG['pAdminEdit_admin_username'] = 'Ylläpitäjä';
 $PALANG['pAdminEdit_admin_password2'] = 'Salasana (toistamiseen)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Antamasi salasanat eivät täsmää! Tai ne ovat tyhjiä!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Pääylläpitäjä';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Muokkaa ylläpitäjää'; # XXX text no longer used
diff --git a/languages/fo.lang b/languages/fo.lang
index 6cba9ad6..e9506baf 100644
--- a/languages/fo.lang
+++ b/languages/fo.lang
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Hendan e-post adressan finst
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Tú hevur nýtt tínum marki at stovna postkassar!';
 $PALANG['pCreate_mailbox_password2'] = 'Loyniorð (umaftur)';
 $PALANG['pCreate_mailbox_password_text'] = 'Loyniorð til POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Loyniorðini tú skrivaði samsvara ikki! Ella eru tóm!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Fult navn';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Kvotan tú skrivaði er ov høg!';
 $PALANG['pCreate_mailbox_mail'] = 'Stovna postkassa'; # XXX Text change to 'Send Welcome mail'
@@ -271,7 +270,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Stovna navnaøki umsitara';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-post adressa';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Umsitari er ógyldug e-post adressa!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Umsitari finst longu ella er ógyldugur';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Loyniorðini tú skrivaði samsvara ikki! Ella eru tóm!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Stovna umsitara';
 $PALANG['pAdminCreate_admin_result_error'] = 'Fái ikki stovnað umsitara!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Umsitari er stovnaður!';
@@ -279,7 +277,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Umsitari er stovnaður!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Broyt navnaøki umsitara';
 $PALANG['pAdminEdit_admin_username'] = 'Umsitari';
 $PALANG['pAdminEdit_admin_password2'] = 'Loyniorð (umaftur)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Loyniorðini tú skrivaði samsvara ikki! Ella eru tóm!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Broyt umsitara'; # XXX text no longer used
diff --git a/languages/fr.lang b/languages/fr.lang
index b18c0c3c..603c60b9 100644
--- a/languages/fr.lang
+++ b/languages/fr.lang
@@ -129,7 +129,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Ce compte courriel existe dej
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Vous avez atteint le nombre maximum de compte courriel !';
 $PALANG['pCreate_mailbox_password2'] = 'Mot de passe (confirmation)';
 $PALANG['pCreate_mailbox_password_text'] = 'Mot de passe pour compte POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Les mots de passe ne correspondent pas ! ou sont vide !'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Nom complet';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'La limite que vous avez specifie est trop haute!';
 $PALANG['pCreate_mailbox_mail'] = 'Envoyer le message de bienvenue'; # XXX Text change to 'Send Welcome mail'
@@ -273,7 +272,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Ajouter un nouvel administrateur de dom
 $PALANG['pAdminCreate_admin_username_text'] = 'adresse courriel';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Ce n\'est pas une adresse courriel administrateur valide!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Cet adresse courriel administrateur existe déjà ou n\'est pas valide';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Le mot de passe fournit ne correspond pas ou est vide!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Ajouter un administrateur';
 $PALANG['pAdminCreate_admin_result_error'] = 'Impossible d\'ajouter un administrateur!';
 $PALANG['pAdminCreate_admin_result_success'] = 'L\'administrateur a été ajouté!';
@@ -281,7 +279,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'L\'administrateur a été ajout
 $PALANG['pAdminEdit_admin_welcome'] = 'Modifier un domaine';
 $PALANG['pAdminEdit_admin_username'] = 'Administrateur';
 $PALANG['pAdminEdit_admin_password2'] = 'Mot de passe (confirmation)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Le mot de passe fournit ne correspond pas  ou est vide!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super administrateur';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Modifier l\administrateur'; # XXX text no longer used
diff --git a/languages/hr.lang b/languages/hr.lang
index d67eee87..621f2d5b 100644
--- a/languages/hr.lang
+++ b/languages/hr.lang
@@ -127,7 +127,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Ova adresa e-pošte već post
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Dostigli ste vaš limit poštanskih ormarića!';
 $PALANG['pCreate_mailbox_password2'] = 'Lozinka (ponovi)';
 $PALANG['pCreate_mailbox_password_text'] = 'Lozinka za POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Unešene lozinke se ne podudaraju ili su prazne!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Puno ime';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Unešena kvota je prevelika!';
 $PALANG['pCreate_mailbox_mail'] = 'Stvori poštanski ormarić'; # XXX Text change to 'Send Welcome mail'
@@ -270,7 +269,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj administratora domene';
 $PALANG['pAdminCreate_admin_username_text'] = 'Adresa e-pošte';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator nije valjana adresa e-pošte!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Adminstrator već postoji ili nije valjan';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Unešene lozinke se ne podudaraju ili su prazne!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Dodaj administratora';
 $PALANG['pAdminCreate_admin_result_error'] = 'Administratora nije bilo moguće dodati!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je uspješno dodan';
@@ -278,7 +276,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je uspješno doda
 $PALANG['pAdminEdit_admin_welcome'] = 'Uredi administratora domene';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
 $PALANG['pAdminEdit_admin_password2'] = 'Lozinka (ponovi)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Unešene lozinke se ne podudaraju ili su prazne!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Uredi Administratora'; # XXX text no longer used
diff --git a/languages/hu.lang b/languages/hu.lang
index 27e94171..ce8fb451 100644
--- a/languages/hu.lang
+++ b/languages/hu.lang
@@ -130,7 +130,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Ez az email cím már létezi
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Elérted a maximális postafiók számot!';
 $PALANG['pCreate_mailbox_password2'] = 'Jelszó (mégegyszer)';
 $PALANG['pCreate_mailbox_password_text'] = 'Jelszó a POP3/IMAP -hoz';
-$PALANG['pCreate_mailbox_password_text_error'] = 'A jelszavak amiket megadtál nem egyeznek! Vagy üresek!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Teljes név';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Túl magas quota értéket adtál meg!';
 $PALANG['pCreate_mailbox_mail'] = 'Postafiók létrehozása'; # XXX Text change to 'Send Welcome mail'
@@ -157,7 +156,7 @@ $PALANG['pPassword_password_current'] = 'Régi jelszó';
 $PALANG['pPassword_password_current_text_error'] = 'Nem adtad meg a régi jelszavadat!';
 $PALANG['pPassword_password'] = 'Új jelszó';
 $PALANG['pPassword_password2'] = 'Új jelszó (mégegyszer)';
-$PALANG['pPassword_password_text_error'] = 'A jelszavak amiket megadtál nem egyeznek! Vagy üresek!'; # XXX check/beautify - was split in two lines before
+$PALANG['pPassword_password_text_error'] = 'A beírt jelszavak nem egyeznek! Vagy üresek!'; # XXX check/beautify - was split in two lines before
 $PALANG['pPassword_button'] = 'Jelszó megváltoztatása';
 $PALANG['pPassword_result_error'] = 'Nemsikerült megváltoztatni a jelszavad!';
 $PALANG['pPassword_result_success'] = 'A jelszavad megváltozott!';
@@ -277,7 +276,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Új domain admin felvétele';
 $PALANG['pAdminCreate_admin_username_text'] = 'Email cím';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Az Admin nem valós email cím!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Az Admin már létezik, vagy nem valós a cím!';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'A beírt jelszavak nem egyeznek! Vagy üresek!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Admin felvétele';
 $PALANG['pAdminCreate_admin_result_error'] = 'Nemsikerült az Admint felvenni!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Az Admin sikeresen bekerült az adatbázisba!';
@@ -285,7 +283,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Az Admin sikeresen bekerült az
 $PALANG['pAdminEdit_admin_welcome'] = 'Domain admin szerkesztése';
 $PALANG['pAdminEdit_admin_username'] = 'Admin';
 $PALANG['pAdminEdit_admin_password2'] = 'Jelszó (mégegyszer)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'A beírt jelszavak nem egyeznek! Vagy üresek!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Admin szerkesztése'; # XXX text no longer used
diff --git a/languages/is.lang b/languages/is.lang
index ffdd40ba..51f42245 100644
--- a/languages/is.lang
+++ b/languages/is.lang
@@ -127,7 +127,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Þetta pósthólf er til nú
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Þú hefur stofnað þau póstholf sem þú hefur heimild til!';
 $PALANG['pCreate_mailbox_password2'] = 'Lykilorð (aftur)';
 $PALANG['pCreate_mailbox_password_text'] = 'Lykilorð til að opna POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Lykilorðin sem þú skrifaðir inn passa ekki saman! Eða þú gafst ekkert lykilorð upp!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Fullt nafn';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Kvótinn sem þú skilgreindir er meiri en heimild þín gefur!';
 $PALANG['pCreate_mailbox_mail'] = 'Stofna pósthólf'; # XXX Text change to 'Send Welcome mail'
@@ -270,7 +269,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Bæta nýju léni við';
 $PALANG['pAdminCreate_admin_username_text'] = 'Póstfang';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Kerfisstjóri er ekki rétt póstfang!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Kerfisstjóri er til nú þegar eða er ekki leyfilegt';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Lykilorðið sem þú gafst upp passar ekki! Eða var tómt!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Bæta við kerfisstjóra';
 $PALANG['pAdminCreate_admin_result_error'] = 'Get ekki bætt við kerfisstjóra!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Kerfisstjórinn hefur verið skráður!';
@@ -278,7 +276,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Kerfisstjórinn hefur verið skr
 $PALANG['pAdminEdit_admin_welcome'] = 'Breyta kerfisstjóra léns';
 $PALANG['pAdminEdit_admin_username'] = 'Kerfisstjóri';
 $PALANG['pAdminEdit_admin_password2'] = 'Lykilorð (aftur)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Lykilorðið sem þú gafst upp passar ekki! Eða var tómt!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Breyta kerfisstjóra'; # XXX text no longer used
diff --git a/languages/it.lang b/languages/it.lang
index e6dc3898..4cbf1a39 100644
--- a/languages/it.lang
+++ b/languages/it.lang
@@ -129,7 +129,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Questo indirizzo email esiste
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Hai raggiunto il limite per creare caselle di posta!';
 $PALANG['pCreate_mailbox_password2'] = 'Password (ripeti)';
 $PALANG['pCreate_mailbox_password_text'] = 'Password per POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Le password che hai fornito non sono uguali! O sono vuote!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Nome completo';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'La quota che hai specificato è troppo alta!';
 $PALANG['pCreate_mailbox_mail'] = 'Crea casella di posta'; # XXX Text change to 'Send Welcome mail'
@@ -156,7 +155,7 @@ $PALANG['pPassword_password_current'] = 'Password Corrente';
 $PALANG['pPassword_password_current_text_error'] = 'Non hai fornito una password corretta!';
 $PALANG['pPassword_password'] = 'Nuova Password';
 $PALANG['pPassword_password2'] = 'Nuova Password (ripeti)';
-$PALANG['pPassword_password_text_error'] = 'Le password che hai fornito non sono uguali! O sono vuote!'; # XXX check/beautify - was split in two lines before
+$PALANG['pPassword_password_text_error'] = 'Le password che hai fornito non sono uguali! Oppure sono vuote!'; # XXX check/beautify - was split in two lines before
 $PALANG['pPassword_button'] = 'Cambia Password';
 $PALANG['pPassword_result_error'] = 'Impossibile cambiare password!';
 $PALANG['pPassword_result_success'] = 'La tua password è stata modificata!';
@@ -272,7 +271,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Aggiungi un nuovo amministratore per il
 $PALANG['pAdminCreate_admin_username_text'] = 'Indirizzo email';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'L\'indirizzo dell\'amministratore non è valido!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'L\'amministratore esiste di già, oppure non è valido';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Le password che hai digitato non sono uguali! Oppure sono vuote!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Aggiungi amministratore';
 $PALANG['pAdminCreate_admin_result_error'] = 'Impossibile aggiungere amministratore!';
 $PALANG['pAdminCreate_admin_result_success'] = 'L\'amministratore è stato aggiunto!';
@@ -280,7 +278,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'L\'amministratore è stato aggiu
 $PALANG['pAdminEdit_admin_welcome'] = 'Modifica l\'amministratore del dominio';
 $PALANG['pAdminEdit_admin_username'] = 'Amministratore';
 $PALANG['pAdminEdit_admin_password2'] = 'Password (ancora)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Le password che hai fornito non sono uguali! Oppure sono vuote!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Superutente';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Modifica amministratore'; # XXX text no longer used
diff --git a/languages/ja.lang b/languages/ja.lang
index 2c714bec..17e43c5e 100644
--- a/languages/ja.lang
+++ b/languages/ja.lang
@@ -130,7 +130,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'このメールアドレス
 $PALANG['pCreate_mailbox_username_text_error3'] = 'メールアドレスの制限数に達しました。';
 $PALANG['pCreate_mailbox_password2'] = 'パスワード (確認)';
 $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAPのパスワード';
-$PALANG['pCreate_mailbox_password_text_error'] = 'パスワードが一致しません。 または空です。'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'フルネーム';
 $PALANG['pCreate_mailbox_quota_text_error'] = '指定された容量制限が大きすぎます。';
 $PALANG['pCreate_mailbox_mail'] = 'ようこそメールの送信'; # XXX Text change to 'Send Welcome mail'
@@ -277,7 +276,6 @@ $PALANG['pAdminCreate_admin_welcome'] = '新しいドメイン管理者の追加
 $PALANG['pAdminCreate_admin_username_text'] = 'メールアドレス';
 $PALANG['pAdminCreate_admin_username_text_error1'] = '管理者は有効なメールアドレスではありません。';
 $PALANG['pAdminCreate_admin_username_text_error2'] = '管理者は存在するか無効です。';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'パスワードが一致しません。 または空です。'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = '管理者追加';
 $PALANG['pAdminCreate_admin_result_error'] = '管理者を追加できません！';
 $PALANG['pAdminCreate_admin_result_success'] = '管理者を追加しました。';
@@ -285,7 +283,6 @@ $PALANG['pAdminCreate_admin_result_success'] = '管理者を追加しました
 $PALANG['pAdminEdit_admin_welcome'] = 'ドメイン管理者の編集';
 $PALANG['pAdminEdit_admin_username'] = '管理者'; # XXX check / compare with pAdminCreate_admin_username - should be "admin"
 $PALANG['pAdminEdit_admin_password2'] = 'パスワード (確認)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'パスワードが一致しません。 または空です。'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = '特権管理者';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = '管理者修正'; # XXX text no longer used
diff --git a/languages/lt.lang b/languages/lt.lang
index 1aadefdf..d47b2d74 100644
--- a/languages/lt.lang
+++ b/languages/lt.lang
@@ -129,7 +129,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Šis el.pašto adresas jau yr
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Išnaudota srities pašto dėžučių kvota!';
 $PALANG['pCreate_mailbox_password2'] = 'Slaptažodis (dar kartą)';
 $PALANG['pCreate_mailbox_password_text'] = 'Slaptažodis jungtis prie POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Įvesti slaptažodžiai nesutampa arba tušti!';
 $PALANG['pCreate_mailbox_name_text'] = 'Vardas Pavardė';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Įvesta per didelė kvota!';
 $PALANG['pCreate_mailbox_mail'] = 'Siųsti pasveikinimo žinutę';
@@ -272,7 +271,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Registruoti naują srities administrato
 $PALANG['pAdminCreate_admin_username_text'] = 'El.pašto adresas';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administratorius turi būti el.pašto adresas!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Administratorius šiai sričiai jau yra arba neteisingas';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Įvesti slaptažodžiai nesutampa arba tušti!';
 $PALANG['pAdminCreate_admin_button'] = 'Registruoti administratorių';
 $PALANG['pAdminCreate_admin_result_error'] = 'Administratoriaus užregistruoti nepavyko!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Administratorius užregistruotas!';
@@ -280,7 +278,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratorius užregistruotas
 $PALANG['pAdminEdit_admin_welcome'] = 'Registruoti srities administratorių';
 $PALANG['pAdminEdit_admin_username'] = 'Administratorius';
 $PALANG['pAdminEdit_admin_password2'] = 'Slaptažodis (dar kartą)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Įvesti slaptažodžiai nesutampa arba tušti!';
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super administratorius';
 $PALANG['super_admin_desc'] = 'Super administratoriai turi priėjimą prie visų sričių, gali keisti sritis ir administratorius.';
 $PALANG['pAdminEdit_admin_button'] = 'Keisti administratorių'; # XXX text no longer used
diff --git a/languages/mk.lang b/languages/mk.lang
index f615d7be..f418c06b 100644
--- a/languages/mk.lang
+++ b/languages/mk.lang
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Оваа адреса веќ
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Достигнат е лимитот на поштенски сандачиња!';
 $PALANG['pCreate_mailbox_password2'] = 'Лозинка (лозинка)';
 $PALANG['pCreate_mailbox_password_text'] = 'Лозинка за POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Внесените лозинки не се поклопуваат! Или се празни!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Цело име';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Внесената квота е превисока!';
 $PALANG['pCreate_mailbox_mail'] = 'Креирање на поштенско сандаче'; # XXX Text change to 'Send Welcome mail'
@@ -272,7 +271,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Додади нов администр
 $PALANG['pAdminCreate_admin_username_text'] = 'Email адреса';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Администратор не е валидна адреса!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Администраторот веќе постои или не е валидна';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Внесените лозинки не одговараат! Или се празни!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Додади Администратор';
 $PALANG['pAdminCreate_admin_result_error'] = 'Не можам да додадам администратор!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Администраторот е додаден!';
@@ -280,7 +278,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Администраторот 
 $PALANG['pAdminEdit_admin_welcome'] = 'Измена на администратор на домен';
 $PALANG['pAdminEdit_admin_username'] = 'Администратор';
 $PALANG['pAdminEdit_admin_password2'] = 'Лозинка (повторно)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Внесените лозинки не одговараат! Или се празни!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Едитирај Администратор'; # XXX text no longer used
diff --git a/languages/nb.lang b/languages/nb.lang
index 528e65a1..6483798b 100644
--- a/languages/nb.lang
+++ b/languages/nb.lang
@@ -129,7 +129,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'E-postadressen eksisterer all
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Du har nådd grensen for antall e-postkontoer under dette domenet!';
 $PALANG['pCreate_mailbox_password2'] = 'Passord (bekreft)';
 $PALANG['pCreate_mailbox_password_text'] = 'Passord for POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Passordene du oppga stemmer ikke overens! Eller du har ikke fylt ut feltene!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Fullt navn';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Kvoten du har angitt er for høy!';
 $PALANG['pCreate_mailbox_mail'] = 'Send velkomstmelding'; # XXX Text change to 'Send Welcome mail'
@@ -272,7 +271,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Legg til en ny domeneadministrator';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Du har ikke skrevet inn en gyldig e-postadresse!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Administratoren er allerede definert, eller du har skrevet inn en ugyldig adresse';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Passordene du oppga stemmer ikke overens! Eller du har ikke fylt ut feltene!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Legg til en administrator';
 $PALANG['pAdminCreate_admin_result_error'] = 'Kunne ikke legge til administratoren!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';
@@ -280,7 +278,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Endre domeneadministrator';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
 $PALANG['pAdminEdit_admin_password2'] = 'Passord (bekreft)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Passordene du oppga stemmer ikke overens! Eller du har ikke fylt ut feltene!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super-administrator';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Endre administrator'; # XXX text no longer used
diff --git a/languages/nl.lang b/languages/nl.lang
index 4b9eea0b..4be7b7da 100644
--- a/languages/nl.lang
+++ b/languages/nl.lang
@@ -129,7 +129,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Dit e-mail adres is al ingebr
 $PALANG['pCreate_mailbox_username_text_error3'] = 'U bezit het maximum aantal mailboxen.';
 $PALANG['pCreate_mailbox_password2'] = 'Wachtwoord nogmaals';
 $PALANG['pCreate_mailbox_password_text'] = 'Wachtwoord voor POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'De wachtwoorden die u opgaf komen niet overeen of zijn leeg.';
 $PALANG['pCreate_mailbox_name_text'] = 'Volledige naam';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'De quota die opgaf is te hoog.';
 $PALANG['pCreate_mailbox_mail'] = 'Mailbox toevoegen'; # XXX Text change to 'Send Welcome mail'
@@ -156,7 +155,7 @@ $PALANG['pPassword_password_current'] = 'Huidig wachtwoord';
 $PALANG['pPassword_password_current_text_error'] = 'U heeft uw huidige wachtwoord niet opgegeven.';
 $PALANG['pPassword_password'] = 'Nieuw wachtwoord';
 $PALANG['pPassword_password2'] = 'Nieuw wachtwoord (nogmaals)';
-$PALANG['pPassword_password_text_error'] = 'De wachtwoorden komen niet overeen of zijn leeg.';
+$PALANG['pPassword_password_text_error'] = 'De wachtwoorden die u opgaf komen niet overeen of zijn leeg.';
 $PALANG['pPassword_button'] = 'Wijzig wachtwoord';
 $PALANG['pPassword_result_error'] = 'Mislukt om uw wachtwoord te veranderen.';
 $PALANG['pPassword_result_success'] = 'Uw wachtwoord is veranderd.';
@@ -275,7 +274,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Voeg een nieuw domein beheerder toe';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-mail adres';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Beheerder is geen geldig e-mail adres!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'De beheerder bestaat al of is niet geldig';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'De wachtwoorden die u opgaf komen niet overeen of zijn leeg.';
 $PALANG['pAdminCreate_admin_button'] = 'Voeg beheerder toe';
 $PALANG['pAdminCreate_admin_result_error'] = 'Mislukt om beheerder toe te voegen!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Beheerder is toegevoegd.';
@@ -283,7 +281,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Beheerder is toegevoegd.';
 $PALANG['pAdminEdit_admin_welcome'] = 'Bewerk een domein beheerder';
 $PALANG['pAdminEdit_admin_username'] = 'Beheerder';
 $PALANG['pAdminEdit_admin_password2'] = 'Wachtwoord (nogmaals)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'De wachtwoorden die u opgaf komen niet overeen of zijn leeg.';
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super administrator';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Bewerk beheerder'; # XXX text no longer used
diff --git a/languages/nn.lang b/languages/nn.lang
index 3872e545..b9ebf256 100644
--- a/languages/nn.lang
+++ b/languages/nn.lang
@@ -153,7 +153,7 @@ $PALANG['pPassword_password_current'] = 'Eksisterende passord';
 $PALANG['pPassword_password_current_text_error'] = 'Oppgi det eksisterende passordet!';
 $PALANG['pPassword_password'] = 'Nytt passord';
 $PALANG['pPassword_password2'] = 'Nytt passord (igjen)';
-$PALANG['pPassword_password_text_error'] = 'Passordene er ikke like! Eller feltet er tomt!'; # XXX check/beautify - was split in two lines before
+$PALANG['pPassword_password_text_error'] = 'Passordene er ikke like! Eller feltene er tomme!'; # XXX check/beautify - was split in two lines before
 $PALANG['pPassword_button'] = 'Endre Passord';
 $PALANG['pPassword_result_error'] = 'Klarte ikke å endre passord!';
 $PALANG['pPassword_result_success'] = 'Passordet ditt er nå endret!';
@@ -269,7 +269,6 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Klarte ikke å oppdatere domenet!';
 $PALANG['pAdminCreate_admin_welcome'] = 'Legg til ny domene-administrator';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke gyldig adresse!';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Passordene er ikke like! Eller feltene er tomme!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Legg til en administrator';
 $PALANG['pAdminCreate_admin_result_error'] = 'Klarte ikke å legge til administratoren!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';
@@ -277,7 +276,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Endre domene-administrator';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
 $PALANG['pAdminEdit_admin_password2'] = 'Passord (igjen)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Passordene er ikke like! Eller feltene er tomme!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Endre Administrator'; # XXX text no longer used
diff --git a/languages/pl.lang b/languages/pl.lang
index ef4f58c4..4fa529b1 100644
--- a/languages/pl.lang
+++ b/languages/pl.lang
@@ -130,7 +130,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Taki adres email już istniej
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Twój limit kont pocztowych został osiągniety!';
 $PALANG['pCreate_mailbox_password2'] = 'Hasło (ponownie)';
 $PALANG['pCreate_mailbox_password_text'] = 'Hasło do POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Wpisane hasło nie pasuje! Lub jest puste!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Pełna nazwa';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Podany udział jest za wysoki!';
 $PALANG['pCreate_mailbox_mail'] = 'Utwórz konto'; # XXX Text change to 'Send Welcome mail'
@@ -274,7 +273,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj konto administratora';
 $PALANG['pAdminCreate_admin_username_text'] = 'Adres email';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administartor nie jest poprawnym adresem email!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Administrator już istnieje lub jest niepoprawny';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Podane hasło nie pasuje! Lub jest puste!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Dodaj administratora';
 $PALANG['pAdminCreate_admin_result_error'] = 'Nie można dodać administratora!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Administrator został dodany!';
@@ -282,7 +280,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administrator został dodany!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Edytuj administratora domeny';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
 $PALANG['pAdminEdit_admin_password2'] = 'Hasło (ponownie)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Podane hasło nie pasuje! Lub jest puste!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Główny administrator';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Edytuj administratora'; # XXX text no longer used
diff --git a/languages/pt-br.lang b/languages/pt-br.lang
index c49baf6b..9164bf20 100644
--- a/languages/pt-br.lang
+++ b/languages/pt-br.lang
@@ -132,7 +132,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Endereço de email fornecido
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Você alcançou o limite de contas de email!';
 $PALANG['pCreate_mailbox_password2'] = 'Senha (confirmação)';
 $PALANG['pCreate_mailbox_password_text'] = 'Senha para POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'As senhas fornecidas são diferentes! Ou não foram digitadas!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Nome completo';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'A cota de espaço especificada é muito alta!';
 $PALANG['pCreate_mailbox_mail'] = 'Enviar mensagem de boas-vindas'; # XXX Text change to 'Send Welcome mail'
@@ -279,7 +278,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Criação de um novo administrador de d
 $PALANG['pAdminCreate_admin_username_text'] = 'Endereço de email';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Endereço de email inválido!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Administrador já existe ou é inválido';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'As senhas fornecidas são diferentes! Ou não foram digitadas!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Criar Administrador';
 $PALANG['pAdminCreate_admin_result_error'] = 'Não foi possível criar o administrador!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Administrador criado!';
@@ -287,7 +285,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administrador criado!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Edição de administrador de domínio.';
 $PALANG['pAdminEdit_admin_username'] = 'Administrador';
 $PALANG['pAdminEdit_admin_password2'] = 'Senha (confirmação)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'As senhas fornecidas são diferentes! Ou não foram digitadas!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super administrador';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Editar Administrador'; # XXX text no longer used
diff --git a/languages/ru.lang b/languages/ru.lang
index 30a8fca2..4df94d36 100644
--- a/languages/ru.lang
+++ b/languages/ru.lang
@@ -132,7 +132,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Это имя уже суще
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Вы достигли лимита по созданию почтовых ящиков!';
 $PALANG['pCreate_mailbox_password2'] = 'Пароль (еще раз)';
 $PALANG['pCreate_mailbox_password_text'] = 'Пароль для POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Введенные вами пароли не совпадают либо пусты!';
 $PALANG['pCreate_mailbox_name_text'] = 'Полное имя';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Квота, выставленная вами, слишком велика!';
 $PALANG['pCreate_mailbox_mail'] = 'Отправить приветственное письмо';
@@ -279,7 +278,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Добавление нового ад
 $PALANG['pAdminCreate_admin_username_text'] = 'Почтовый адрес';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Некорректный адрес администратора!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Администратор уже существует либо некорректное имя';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Введенные вами пароли не совпадают либо пустые!';
 $PALANG['pAdminCreate_admin_button'] = 'Добавить администратора';
 $PALANG['pAdminCreate_admin_result_error'] = 'Невозможно добавить администратора!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Администратор был добавлен!';
@@ -287,7 +285,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Администратор бы
 $PALANG['pAdminEdit_admin_welcome'] = 'Редактирование администратора домена';
 $PALANG['pAdminEdit_admin_username'] = 'Администратор';
 $PALANG['pAdminEdit_admin_password2'] = 'Пароль (еще раз)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Введенные вами пароли не совпадают либо пустые!';
 $PALANG['pAdminEdit_admin_super_admin'] = 'Супер админ';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Редактировать администратора'; # XXX text no longer used
diff --git a/languages/sk.lang b/languages/sk.lang
index 24ddaaea..18fa308c 100644
--- a/languages/sk.lang
+++ b/languages/sk.lang
@@ -129,7 +129,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Takáto emailová adresa už
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Dosiahli ste limit, nemôžete vytvárať ďalšie schránky!';
 $PALANG['pCreate_mailbox_password2'] = 'Heslo (znovu)';
 $PALANG['pCreate_mailbox_password_text'] = 'Heslo pre POP3/IMAP/SMTP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Zadaná heslá sú rozdielne alebo prázdne!';
 $PALANG['pCreate_mailbox_name_text'] = 'Celé meno';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Zadané miesto je príliš velké!';
 $PALANG['pCreate_mailbox_mail'] = 'Poslať uvítací email'; # XXX Text change to 'Send Welcome mail'
@@ -272,7 +271,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Pridať nového administrátora';
 $PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Táto adresa nie je platná!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Takáto adresa už existuje!';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Zadané heslá sú rozdielne alebo prázdne!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Vytvoriť administrátora';
 $PALANG['pAdminCreate_admin_result_error'] = 'Nepodarilo sa pridať administrátora!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Administrátor bol pridaný!';
@@ -280,7 +278,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administrátor bol pridaný!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Upraviť doménového administrátora';
 $PALANG['pAdminEdit_admin_username'] = 'Užívateľské meno';
 $PALANG['pAdminEdit_admin_password2'] = 'Heslo (znovu)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Zadané heslá sú rozdielne alebo prázdne!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Upraviť administrátora'; # XXX text no longer used
diff --git a/languages/sl.lang b/languages/sl.lang
index 1cb893bf..bbc7375e 100644
--- a/languages/sl.lang
+++ b/languages/sl.lang
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Izbrani e-poštni naslov že
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Maksimalno število predalov je preseženo!';
 $PALANG['pCreate_mailbox_password2'] = 'Geslo (ponovitev)';
 $PALANG['pCreate_mailbox_password_text'] = 'Geslo za POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Vnešeni gesli se razlikujeta ali pa sta prazni!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Polno ime';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Vnešena kvota je prevelika!';
 $PALANG['pCreate_mailbox_mail'] = 'Ustvari predal'; # XXX Text change to 'Send Welcome mail'
@@ -271,7 +270,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj domenskega administratorja';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-poštni naslov';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator ni veljaven e-poštni naslov!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Adminstrator že obstaja ali pa ni pravilen';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Vnešeni gesli se ne ujemata ali pa sta prazni!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Dodaj administratorja';
 $PALANG['pAdminCreate_admin_result_error'] = 'Administratorja ni bilo mogoče dodati!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je bil uspešno dodan';
@@ -279,7 +277,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je bil uspešno d
 $PALANG['pAdminEdit_admin_welcome'] = 'Uredi domenskega administratorja';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
 $PALANG['pAdminEdit_admin_password2'] = 'Geslo (ponovitev)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Vnešeni gesli se ne ujemata ali pa sta prazni!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Shrani'; # XXX text no longer used
diff --git a/languages/sv.lang b/languages/sv.lang
index c9b0e53a..3c1a3f3a 100644
--- a/languages/sv.lang
+++ b/languages/sv.lang
@@ -130,7 +130,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Denna epostadress finns redan
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Du har redan skapat max tillåtet antal brevlådan!';
 $PALANG['pCreate_mailbox_password2'] = 'Lösenord (igen)';
 $PALANG['pCreate_mailbox_password_text'] = 'Lösenord för POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Lösenorden du angivit är olika! Eller tomma!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Fullständigt namn';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Quotan du angivit är för stor!';
 $PALANG['pCreate_mailbox_mail'] = 'Skicka välkomstbrev'; # XXX Text change to 'Send Welcome mail'
@@ -273,7 +272,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Lägg till ny domänadmin';
 $PALANG['pAdminCreate_admin_username_text'] = 'Epostadress';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin är inte en giltig epostadress!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Denna admin finns redan eller är inte giltig';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Lösenorden du angav är olika! Eller är tomma!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Lägg till admin';
 $PALANG['pAdminCreate_admin_result_error'] = 'Kan inte lägga till admin!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Admin har lagts till!';
@@ -281,7 +279,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admin har lagts till!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Ändra en domänadmin';
 $PALANG['pAdminEdit_admin_username'] = 'Admin';
 $PALANG['pAdminEdit_admin_password2'] = 'Lösenord (igen)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Lösenorden du angav är olika! Eller är tomma!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super administratör';
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Ändra admin'; # XXX text no longer used
diff --git a/languages/tr.lang b/languages/tr.lang
index 8418dcd8..0a42322f 100644
--- a/languages/tr.lang
+++ b/languages/tr.lang
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = 'Bu elektronik posta kullanýl
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Posta kutusu yaratma limitinize eriþtiniz!';
 $PALANG['pCreate_mailbox_password2'] = 'þifre (tekrar)';
 $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP için þifre';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Verdiðiniz þifreler birbirini tutmuyor! Ya da boþ!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Tam isim';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Veridðiniz kota çok yüksek!';
 $PALANG['pCreate_mailbox_mail'] = 'Posta kutusu yarat'; # XXX Text change to 'Send Welcome mail'
@@ -271,7 +270,6 @@ $PALANG['pAdminCreate_admin_welcome'] = 'Yöneticiye yeni bir domain ekle';
 $PALANG['pAdminCreate_admin_username_text'] = 'Eposta adresi';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Yönetici uygun bir eposta adresi deðil!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Yönetici halen bulunmakta ya da uygun deðil';
-$PALANG['pAdminCreate_admin_password_text_error'] = 'Girdiðiniz þifreler uymuyor! Ya da boþ!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Yönetici ekle';
 $PALANG['pAdminCreate_admin_result_error'] = 'Yönetici eklenemiyor!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Yönetici eklendi!';
@@ -279,7 +277,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Yönetici eklendi!';
 $PALANG['pAdminEdit_admin_welcome'] = 'Domain yöneticisi düzenle';
 $PALANG['pAdminEdit_admin_username'] = 'Yönetici';
 $PALANG['pAdminEdit_admin_password2'] = 'Þifre (tekrar)';
-$PALANG['pAdminEdit_admin_password_text_error'] = 'Verdiðiniz þifreler birbirini tutmuyor! Ya da boþ!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = 'Yönetici Ekle'; # XXX text no longer used
diff --git a/languages/tw.lang b/languages/tw.lang
index 9abdf124..62a44255 100644
--- a/languages/tw.lang
+++ b/languages/tw.lang
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_username_text_error2'] = '郵件地址已經存在,請
 $PALANG['pCreate_mailbox_username_text_error3'] = '郵箱地址已經達到上限!';
 $PALANG['pCreate_mailbox_password2'] = '密碼 (再次輸入)';
 $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP 密碼';
-$PALANG['pCreate_mailbox_password_text_error'] = '你輸入的密碼不相同! 或者為空!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = '全名';
 $PALANG['pCreate_mailbox_quota_text_error'] = '你輸入的容量限制超出範圍!';
 $PALANG['pCreate_mailbox_mail'] = '新建郵箱'; # XXX Text change to 'Send Welcome mail'
@@ -271,7 +270,6 @@ $PALANG['pAdminCreate_admin_welcome'] = '新增網域管理員';
 $PALANG['pAdminCreate_admin_username_text'] = '郵件地址';
 $PALANG['pAdminCreate_admin_username_text_error1'] = '管理員名不是一個合法的郵件地址!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = '管理員已經存在或者管理員名非法!';
-$PALANG['pAdminCreate_admin_password_text_error'] = '新所輸入的兩次新密碼不相同! 或者為空!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = '新增';
 $PALANG['pAdminCreate_admin_result_error'] = '新增管理員失敗!';
 $PALANG['pAdminCreate_admin_result_success'] = '新增管理員成功!';
@@ -279,7 +277,6 @@ $PALANG['pAdminCreate_admin_result_success'] = '新增管理員成功!';
 $PALANG['pAdminEdit_admin_welcome'] = '修改網域管理員';
 $PALANG['pAdminEdit_admin_username'] = '管理員';
 $PALANG['pAdminEdit_admin_password2'] = '密碼 (驗證)';
-$PALANG['pAdminEdit_admin_password_text_error'] = '你兩次輸入的新密碼不相同! 或者為空!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
 $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX
 $PALANG['pAdminEdit_admin_button'] = '修改'; # XXX text no longer used