*.lang:

- add $PALANG['password'] to replace duplicate texts
  -$PALANG['pLogin_password']
  -$PALANG['pCreate_mailbox_password']
  -$PALANG['pAdminEdit_admin_password']
- set $PALANG['pFetchmail_field_src_password']= $PALANG['password']; 
  (needed until fetchmail is migrated into FetchmailHandler)

model/*, setup.php, templates/*:
- use $PALANG['password'] everywhere	  


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1504 a1433add-5e2c-0410-b055-b7f2511e0802

languages/bg.lang

@@ -24,7 +24,7 @@ $PALANG['pFooter_logged_as'] = 'Потребител %s'; # XXX # XXX Text chang
 
 $PALANG['pLogin_welcome'] = 'Администратора може да се логне оттук за администриране на домейн.';
 $PALANG['pLogin_username'] = 'Логин (е-мейл)';
-$PALANG['pLogin_password'] = 'Парола';
+$PALANG['password'] = 'Парола';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Изход'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -127,7 +127,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Създаване на нова поще
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Е-мейл-а не е валиден!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Този е-мейл адрес вече съществува, моля изберете друг!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Вие сте достигнали своя лимит за създаване на пощенски кутии!';
-$PALANG['pCreate_mailbox_password'] = 'Парола';
 $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
@@ -280,7 +279,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Админа беше добав
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Редакция на админ на домейн';
 $PALANG['pAdminEdit_admin_username'] = 'Админ';
-$PALANG['pAdminEdit_admin_password'] = 'Парола';
 $PALANG['pAdminEdit_admin_password2'] = 'Парола (отново)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Паролите, които сте въвели не съвпадат! Или са празни!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = 'Главен Администратор';
@@ -358,7 +356,7 @@ $PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/ca.lang

@@ -23,7 +23,7 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = 'Login d\'administrador per l\'administració de dominis.';
 $PALANG['pLogin_username'] = 'Usuari (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
-$PALANG['pLogin_password'] = 'Contrasenya';
+$PALANG['password'] = 'Contrasenya';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Usuari'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -125,7 +125,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Crear una nova bústia pel seu domini.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'L\'e-mail no és vàlido!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Aquest e-mail ja existeix, escull un de diferente si us plau!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Has arribat al límit de creació de bústies!';
-$PALANG['pCreate_mailbox_password'] = 'Contrasenya';
 $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
@@ -279,7 +278,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_password'] = 'Contrasenya';
 $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
@@ -357,7 +355,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/cn.lang

@@ -23,7 +23,7 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = '邮件管理员请从这里登录以管理你的域名.';
 $PALANG['pLogin_username'] = '帐号 (邮件地址)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
-$PALANG['pLogin_password'] = '密码';
+$PALANG['password'] = '密码';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = '登录';
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = '在你的域中新建一个本地邮箱.';
 $PALANG['pCreate_mailbox_username_text_error1'] = '邮件非法!';
 $PALANG['pCreate_mailbox_username_text_error2'] = '邮件地址已经存在,请重新选择!';
 $PALANG['pCreate_mailbox_username_text_error3'] = '邮箱地址已经达到上限!';
-$PALANG['pCreate_mailbox_password'] = '密码';
 $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
@@ -279,7 +278,6 @@ $PALANG['pAdminCreate_admin_result_success'] = '新增管理员成功!';
 
 $PALANG['pAdminEdit_admin_welcome'] = '修改域管理员';
 $PALANG['pAdminEdit_admin_username'] = '管理员';
-$PALANG['pAdminEdit_admin_password'] = '密码';
 $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
@@ -357,7 +355,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/cs.lang

@@ -28,7 +28,7 @@ $PALANG['pFooter_logged_as'] = 'Přihlášen jako %s'; # XXX Text change: 'logge
 
 $PALANG['pLogin_welcome'] = 'Zde se přihlašují emailoví administrátoři pro administraci svých domén.';
 $PALANG['pLogin_username'] = 'Uživatelské jméno (email)';
-$PALANG['pLogin_password'] = 'Heslo';
+$PALANG['password'] = 'Heslo';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Přihlásit';
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -131,7 +131,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Vytvořit novou lokální schránku v dom
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa neni platná!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Taková emailová adresa již¸ existuje!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Dosáhli jste limitu, nemů¸ete vytvářet další schránky!';
-$PALANG['pCreate_mailbox_password'] = 'Heslo';
 $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á!';
@@ -288,7 +287,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_password'] = 'Heslo';
 $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';
@@ -369,7 +367,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Schránka';
 $PALANG['pFetchmail_field_src_server']      = 'Server';
 $PALANG['pFetchmail_field_src_auth']        = 'Typ autentizace';
 $PALANG['pFetchmail_field_src_user']        = 'Uživatel';
-$PALANG['pFetchmail_field_src_password']    = 'Heslo';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Složka';
 $PALANG['pFetchmail_field_poll_time']       = 'Interval';
 $PALANG['pFetchmail_field_fetchall']        = 'Stahovat vše';

languages/da.lang

@@ -27,7 +27,7 @@ $PALANG['pFooter_logged_as'] = 'Indlogget som %s'; # XXX Text change: 'logged in
 
 $PALANG['pLogin_welcome'] = 'Postadministrator: Log ind for at administrere dine domæner.';
 $PALANG['pLogin_username'] = 'Brugernavn (email)';
-$PALANG['pLogin_password'] = 'Adgangskode';
+$PALANG['password'] = 'Adgangskode';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Log ind'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Dit brugernavn eller adgangskode var ikke korrekt.';
@@ -131,7 +131,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Tilføj en ny lokal postboks til domænet.
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Emailadressen er ikke gyldig!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Emailadressen eksisterer allerede. Vælg venligst en anden!';
 $PALANG['pCreate_mailbox_username_text_error3']       = 'Du har nået grænsen for antallet af postbokse til domæne!';
-$PALANG['pCreate_mailbox_password'] = 'Adgangskode';
 $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
@@ -288,7 +287,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_password'] = 'Adgangskode';
 $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';
@@ -371,7 +369,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Postboks';
 $PALANG['pFetchmail_field_src_server']      = 'Server';
 $PALANG['pFetchmail_field_src_auth']        = 'Godkendelsesmetode';
 $PALANG['pFetchmail_field_src_user']        = 'Brugernavn';
-$PALANG['pFetchmail_field_src_password']    = 'Adgangskode';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Mappe';
 $PALANG['pFetchmail_field_poll_time']       = 'Prøve';
 $PALANG['pFetchmail_field_fetchall']        = 'Hent alle';

languages/de.lang

@@ -25,7 +25,7 @@ $PALANG['pFooter_logged_as'] = 'Angemeldet als %s';
 
 $PALANG['pLogin_welcome'] = 'Mail-Administratoren loggen sich bitte hier ein.';
 $PALANG['pLogin_username'] = 'Login (eMail)';
-$PALANG['pLogin_password'] = 'Passwort';
+$PALANG['password'] = 'Passwort';
 $PALANG['pLogin_language'] = 'Sprache';
 $PALANG['pLogin_button'] = 'Login';
 $PALANG['pLogin_failed'] = 'Ihre Mailadresse oder das Passwort sind nicht korrekt.';
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Legen Sie eine neue Mailbox für Ihre Doma
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Die EMAIL ist nicht korrekt!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Diese Email-Adresse existiert bereits. Bitte wählen Sie eine andere!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Sie dürfen leider nicht mehr Mailboxen für diese Domain anlegen!';
-$PALANG['pCreate_mailbox_password'] = 'Passwort';
 $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!';
@@ -285,7 +284,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admin angelegt!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Domain Admin editieren';
 $PALANG['pAdminEdit_admin_username'] = 'Admin';
-$PALANG['pAdminEdit_admin_password'] = 'Passwort';
 $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';
@@ -369,7 +367,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox';
 $PALANG['pFetchmail_field_src_server']      = 'Server';
 $PALANG['pFetchmail_field_src_auth']        = 'Anmeldemethode';
 $PALANG['pFetchmail_field_src_user']        = 'Benutzername';
-$PALANG['pFetchmail_field_src_password']    = 'Passwort';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Ordner';
 $PALANG['pFetchmail_field_poll_time']       = 'Abruf';
 $PALANG['pFetchmail_field_fetchall']        = 'Alle abholen';

languages/en.lang

@@ -25,7 +25,7 @@ $PALANG['pFooter_logged_as'] = 'Logged in as %s';
 
 $PALANG['pLogin_welcome'] = 'Mail admins login here to administer your domain.';
 $PALANG['pLogin_username'] = 'Login (email)';
-$PALANG['pLogin_password'] = 'Password';
+$PALANG['password'] = 'Password';
 $PALANG['pLogin_language'] = 'Language';
 $PALANG['pLogin_button'] = 'Login';
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.';
@@ -129,7 +129,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Create a new mailbox for your domain.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'The EMAIL is not valid!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'This email address already exists, please choose a different one!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'You have reached your limit to create mailboxes!';
-$PALANG['pCreate_mailbox_password'] = 'Password';
 $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!';
@@ -289,7 +288,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_password'] = 'Password';
 $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';
@@ -372,7 +370,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox';
 $PALANG['pFetchmail_field_src_server']      = 'Server';
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type';
 $PALANG['pFetchmail_field_src_user']        = 'User';
-$PALANG['pFetchmail_field_src_password']    = 'Password';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder';
 $PALANG['pFetchmail_field_poll_time']       = 'Poll';
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All';

languages/es.lang

@@ -24,7 +24,7 @@ $PALANG['pFooter_logged_as'] = 'Autenticado como %s';  # XXX Text change: 'logge
 
 $PALANG['pLogin_welcome'] = 'Login de administrador para administración de dominios.';
 $PALANG['pLogin_username'] = 'Usuario (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
-$PALANG['pLogin_password'] = 'Contraseña';
+$PALANG['password'] = 'Contraseña';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Usuario'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'La cuenta de email o la contraseña no son correctas.'; 
@@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Crear un nuevo buzón para su dominio.';
 $PALANG['pCreate_mailbox_username_text_error1'] = '¡El e-mail no es válido!';
 $PALANG['pCreate_mailbox_username_text_error2'] = '¡Este e-mail ya existe, escoja uno diferente por favor!';
 $PALANG['pCreate_mailbox_username_text_error3'] = '¡Ha llegado al límite de creación de buzones!';
-$PALANG['pCreate_mailbox_password'] = 'Contraseña';
 $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
@@ -281,7 +280,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_password'] = 'Contraseña';
 $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
@@ -359,7 +357,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Buzón';
 $PALANG['pFetchmail_field_src_server']      = 'Servidor'; 
 $PALANG['pFetchmail_field_src_auth']        = 'Tipo Autenticación'; 
 $PALANG['pFetchmail_field_src_user']        = 'Usuario'; 
-$PALANG['pFetchmail_field_src_password']    = 'Contraseña'; 
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Carpeta'; 
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Obtener todo'; 

languages/et.lang

@@ -23,7 +23,7 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = 'E-posti haldaja, logi siit domeeni administreerimiseks sisse.';
 $PALANG['pLogin_username'] = 'Kasutajanimi (e-posti aadress)';
-$PALANG['pLogin_password'] = 'Parool';
+$PALANG['password'] = 'Parool';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Logi sisse';
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Loo uus postkast domeenis.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-posti aadress pole kehtiv!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Selline e-posti aadress on juba olemas, palun vali erinev!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Oled kasutanud kogu postkastide arvu!';
-$PALANG['pCreate_mailbox_password'] = 'Parool';
 $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
@@ -279,7 +278,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Haldaja on lisatud!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Muuda domeeni haldajat';
 $PALANG['pAdminEdit_admin_username'] = 'Haldaja';
-$PALANG['pAdminEdit_admin_password'] = 'Parool';
 $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
@@ -361,7 +359,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/eu.lang

@@ -23,7 +23,7 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = 'Kudeatzailearen logina domeinuak kudeatzeko.';
 $PALANG['pLogin_username'] = 'Erabiltzailea (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
-$PALANG['pLogin_password'] = 'Pasahitza';
+$PALANG['password'] = 'Pasahitza';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Erabiltzailea'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -124,7 +124,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Postontzi berri bat sortu domeinuarentzat.
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-maila baliogabekoa da!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'E-mail hau existitzen da. Ezberdin bat aukera ezazu, mesedez!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Postontzi sorkuntza mugara iritsi zara!';
-$PALANG['pCreate_mailbox_password'] = 'Pasahitza';
 $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
@@ -278,7 +277,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Kudeatzailea gehituta1';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Domeinu kudeatzaile bat aldatu';
 $PALANG['pAdminEdit_admin_username'] = 'Kudeatzailea';
-$PALANG['pAdminEdit_admin_password'] = 'Pasahitza';
 $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
@@ -356,7 +354,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/fi.lang

@@ -24,7 +24,7 @@ $PALANG['pFooter_logged_as'] = 'Kirjautunut sisään tunnuksella %s'; # XXX Text
 
 $PALANG['pLogin_welcome'] = 'Kirjautuminen';
 $PALANG['pLogin_username'] = 'Tunnus';
-$PALANG['pLogin_password'] = 'Salasana';
+$PALANG['password'] = 'Salasana';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Kirjaudu';
 $PALANG['pLogin_failed'] = 'Sähköpostiosoite tai salasana väärin!';
@@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Luo uusi paikallinen postilaatikko.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Sähköpostiosoite ei ole oikean muotoinen!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Postilaatikoiden maksimimäärä saavutettu!';
-$PALANG['pCreate_mailbox_password'] = 'Salasana';
 $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
@@ -279,7 +278,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_password'] = 'Salasana';
 $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ä';
@@ -357,7 +355,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Sähköpostilaatikko';
 $PALANG['pFetchmail_field_src_server']      = 'Palvelin';
 $PALANG['pFetchmail_field_src_auth']        = 'Tunnistautumisen tyyppi';
 $PALANG['pFetchmail_field_src_user']        = 'Käyttäjä';
-$PALANG['pFetchmail_field_src_password']    = 'Salasana';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Kansio';
 $PALANG['pFetchmail_field_poll_time']       = 'Tarkista';
 $PALANG['pFetchmail_field_fetchall']        = 'Hae kaikki';

languages/fo.lang

@@ -23,7 +23,7 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = 'Umsitarar kunnu logga inn her fyri at umsita tykkara navnaøki.';
 $PALANG['pLogin_username'] = 'Login (e-post)';
-$PALANG['pLogin_password'] = 'Loyniorð';
+$PALANG['password'] = 'Loyniorð';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Logga inn';
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Stovna ein nýggjan postkassa á tínum na
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-post adressan er ógyldug!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Hendan e-post adressan finst longu, vinarliga vel eina aðra!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Tú hevur nýtt tínum marki at stovna postkassar!';
-$PALANG['pCreate_mailbox_password'] = 'Loyniorð';
 $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
@@ -279,7 +278,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_password'] = 'Loyniorð';
 $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
@@ -362,7 +360,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/fr.lang

@@ -25,7 +25,7 @@ $PALANG['pFooter_logged_as'] = 'Bonjour %s'; # XXX Text change: 'logged in as %s
 
 $PALANG['pLogin_welcome'] = 'Entrez votre adresse courriel pour administrer votre domaine.';
 $PALANG['pLogin_username'] = 'Adresse courriel';
-$PALANG['pLogin_password'] = 'Mot de passe';
+$PALANG['password'] = 'Mot de passe';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Entrer';
 $PALANG['pLogin_failed'] = 'Votre email ou mot de passe est incorrect.';
@@ -127,7 +127,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Ajouter un nouveau compte courriel à votr
 $PALANG['pCreate_mailbox_username_text_error1'] = 'L\'adresse courriel est invalide!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Ce compte courriel existe deja ! Entrez une autre adresse courriel !';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Vous avez atteint le nombre maximum de compte courriel !';
-$PALANG['pCreate_mailbox_password'] = 'Mot de passe';
 $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
@@ -281,7 +280,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_password'] = 'Mot de passe';
 $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';
@@ -359,7 +357,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Compte courriel';
 $PALANG['pFetchmail_field_src_server']      = 'Serveur';
 $PALANG['pFetchmail_field_src_auth']        = 'Type Auth';
 $PALANG['pFetchmail_field_src_user']        = 'Utilisateur';
-$PALANG['pFetchmail_field_src_password']    = 'Mot de passe';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Dossier';
 $PALANG['pFetchmail_field_poll_time']       = 'Fréquence'; 
 $PALANG['pFetchmail_field_fetchall']        = 'Tout récupérer';

languages/hr.lang

@@ -22,7 +22,7 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = 'Administratori prijavite se ovdje.';
 $PALANG['pLogin_username'] = 'Korisničko ime (adresa e-pošte)'; # XXX check translation - should be "Login (email)"
-$PALANG['pLogin_password'] = 'Lozinka';
+$PALANG['password'] = 'Lozinka';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Prijavi'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -125,7 +125,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Stvori novi poštanski ormarić za izbranu
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa e-pošte nije pravilna!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Ova adresa e-pošte već postoji, molimo izaberite drugu!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Dostigli ste vaš limit poštanskih ormarića!';
-$PALANG['pCreate_mailbox_password'] = 'Lozinka';
 $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
@@ -278,7 +277,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_password'] = 'Lozinka';
 $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
@@ -356,7 +354,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/hu.lang

@@ -24,7 +24,7 @@ $PALANG['pFooter_logged_as'] = '%s-ként bejelentkezve'; # XXX Text change: 'log
 
 $PALANG['pLogin_welcome'] = 'Mail adminisztrátorok itt jelentkezzenek be, hogy adminisztrálják a domainjüket.';
 $PALANG['pLogin_username'] = 'Bejelentkezés (email)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
-$PALANG['pLogin_password'] = 'Jelszó';
+$PALANG['password'] = 'Jelszó';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Bejelentkezés'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Új postafiók létrehozása az adott doma
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Érvénytelen EMAIL !';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Ez az email cím már létezik, kérlek válassz másikat!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Elérted a maximális postafiók számot!';
-$PALANG['pCreate_mailbox_password'] = 'Jelszó';
 $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
@@ -285,7 +284,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_password'] = 'Jelszó';
 $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
@@ -370,7 +368,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/is.lang

@@ -23,7 +23,7 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = 'Póst kerfisstjóri tengist hér til að viðhalda póstkerfi lénsins þins.';
 $PALANG['pLogin_username'] = 'Auðkenni(email)'; # XXX check translation - should be "Login (email)"
-$PALANG['pLogin_password'] = 'Lykilorð';
+$PALANG['password'] = 'Lykilorð';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Tengjast'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -125,7 +125,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Create a new local mailbox for your domain
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Netfangið er ekki til!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Þetta pósthólf er til núþegar, veldu þér annað!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Þú hefur stofnað þau póstholf sem þú hefur heimild til!';
-$PALANG['pCreate_mailbox_password'] = 'Lykilorð';
 $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
@@ -278,7 +277,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_password'] = 'Lykilorð';
 $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
@@ -356,7 +354,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/it.lang

@@ -24,7 +24,7 @@ $PALANG['pFooter_logged_as'] = 'Collegato come %s'; # XXX Text change: 'logged i
 
 $PALANG['pLogin_welcome'] = 'Gli amministratori di posta devono effettuare il login qui per amministrare il proprio dominio.';
 $PALANG['pLogin_username'] = 'Nome utente (email)';
-$PALANG['pLogin_password'] = 'Password';
+$PALANG['password'] = 'Password';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Entra';
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -127,7 +127,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Crea una nuova casella di posta locale per
 $PALANG['pCreate_mailbox_username_text_error1'] = 'L\'indirizzo EMAIL non è valido!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Questo indirizzo email esiste già, per favore scegline uno diverso!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Hai raggiunto il limite per creare caselle di posta!';
-$PALANG['pCreate_mailbox_password'] = 'Password';
 $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
@@ -280,7 +279,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_password'] = 'Password';
 $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';
@@ -358,7 +356,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Casella';
 $PALANG['pFetchmail_field_src_server']      = 'Server';
 $PALANG['pFetchmail_field_src_auth']        = 'Autenticazione';
 $PALANG['pFetchmail_field_src_user']        = 'Utente';
-$PALANG['pFetchmail_field_src_password']    = 'Password';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Cartella';
 $PALANG['pFetchmail_field_poll_time']       = 'Scansione';
 $PALANG['pFetchmail_field_fetchall']        = 'Ricevi tutto';

languages/ja.lang

@@ -25,7 +25,7 @@ $PALANG['pFooter_logged_as'] = 'ログイン名 %s';
 
 $PALANG['pLogin_welcome'] = 'こちらからドメインの管理ができます。';
 $PALANG['pLogin_username'] = 'ログイン (メールアドレス)';
-$PALANG['pLogin_password'] = 'パスワード';
+$PALANG['password'] = 'パスワード';
 $PALANG['pLogin_language'] = '言語';
 $PALANG['pLogin_button'] = 'ログイン';
 $PALANG['pLogin_failed'] = 'ユーザ名かパスワードが違います。';
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_welcome'] = '新しいメールアドレスの作成';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'メールアドレスが無効です。';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'このメールアドレスは既に存在するので、別のアドレスを選択してください。';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'メールアドレスの制限数に達しました。';
-$PALANG['pCreate_mailbox_password'] = 'パスワード';
 $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
@@ -285,7 +284,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_password'] = 'パスワード';
 $PALANG['pAdminEdit_admin_password2'] = 'パスワード (確認)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'パスワードが一致しません。 または空です。'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_super_admin'] = '特権管理者';
@@ -368,7 +366,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'メールボックス';
 $PALANG['pFetchmail_field_src_server']      = 'サーバ';
 $PALANG['pFetchmail_field_src_auth']        = '認証タイプ';
 $PALANG['pFetchmail_field_src_user']        = 'ユーザ';
-$PALANG['pFetchmail_field_src_password']    = 'パスワード';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'フォルダ';
 $PALANG['pFetchmail_field_poll_time']       = '間隔';
 $PALANG['pFetchmail_field_fetchall']        = 'すべて取得';

languages/lt.lang

@@ -23,7 +23,7 @@ $PALANG['pFooter_logged_as'] = 'Prisijungęs kaip %s';
 
 $PALANG['pLogin_welcome'] = 'Pašto srities administratorius.';
 $PALANG['pLogin_username'] = 'Vartotojas (el.paštas)';
-$PALANG['pLogin_password'] = 'Slaptažodis';
+$PALANG['password'] = 'Slaptažodis';
 $PALANG['pLogin_language'] = 'Kalba';
 $PALANG['pLogin_button'] = 'Prisijungti';
 $PALANG['pLogin_failed'] = 'Neteisingas el. pašto adresas arba slaptažodis.';
@@ -127,7 +127,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Nauja pašto dėžutė.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Šis el.pašto adresas neteisingas!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Šis el.pašto adresas jau yra, pasirinkite kitą pavadinimą!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Išnaudota srities pašto dėžučių kvota!';
-$PALANG['pCreate_mailbox_password'] = 'Slaptažodis';
 $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!';
@@ -280,7 +279,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratorius užregistruotas
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Registruoti srities administratorių';
 $PALANG['pAdminEdit_admin_username'] = 'Administratorius';
-$PALANG['pAdminEdit_admin_password'] = 'Slaptažodis';
 $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';
@@ -363,7 +361,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/mk.lang

@@ -23,7 +23,7 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = 'Логин за администрирање на домени (Само за администратори!)';
 $PALANG['pLogin_username'] = 'Корисничко име (email)';
-$PALANG['pLogin_password'] = 'Лозинка';
+$PALANG['password'] = 'Лозинка';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Пријава';
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Креирање на ново поште
 $PALANG['pCreate_mailbox_username_text_error1'] = 'EMAIL не е валиден!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Оваа адреса веќе постои, одберете друга!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Достигнат е лимитот на поштенски сандачиња!';
-$PALANG['pCreate_mailbox_password'] = 'Лозинка';
 $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
@@ -280,7 +279,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Администраторот
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Измена на администратор на домен';
 $PALANG['pAdminEdit_admin_username'] = 'Администратор';
-$PALANG['pAdminEdit_admin_password'] = 'Лозинка';
 $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
@@ -358,7 +356,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/nb.lang

@@ -25,7 +25,7 @@ $PALANG['pFooter_logged_as'] = 'Logget inn som %s'; # XXX Text change: 'logged i
 
 $PALANG['pLogin_welcome'] = 'E-postadministratorer kan logge inn her for å administrere sine domener';
 $PALANG['pLogin_username'] = 'Brukernavn (e-postadresse)';
-$PALANG['pLogin_password'] = 'Passord';
+$PALANG['password'] = 'Passord';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Logg inn';
 $PALANG['pLogin_failed'] = 'E-postadressen eller passordet er ikke korrekt.';
@@ -127,7 +127,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Opprett en ny e-postkonto.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-postadressen er ikke gyldig!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'E-postadressen eksisterer allerede, vennligst velg en annen!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Du har nådd grensen for antall e-postkontoer under dette domenet!';
-$PALANG['pCreate_mailbox_password'] = 'Passord';
 $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
@@ -280,7 +279,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Endre domeneadministrator';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['pAdminEdit_admin_password'] = 'Passord';
 $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';
@@ -358,7 +356,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'E-postkonto';
 $PALANG['pFetchmail_field_src_server']      = 'Server';
 $PALANG['pFetchmail_field_src_auth']        = 'Autentiseringstype';
 $PALANG['pFetchmail_field_src_user']        = 'Bruker';
-$PALANG['pFetchmail_field_src_password']    = 'Passord';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Mappe';
 $PALANG['pFetchmail_field_poll_time']       = 'Spørringsintervall';
 $PALANG['pFetchmail_field_fetchall']        = 'Hent alt';

languages/nl.lang

@@ -24,7 +24,7 @@ $PALANG['pFooter_logged_as'] = 'aangemeld als %s';
 
 $PALANG['pLogin_welcome'] = 'Mail beheerders log hier in om uw domeinen te beheren.';
 $PALANG['pLogin_username'] = 'Login (e-mail)';
-$PALANG['pLogin_password'] = 'Wachtwoord';
+$PALANG['password'] = 'Wachtwoord';
 $PALANG['pLogin_language'] = 'Taal';
 $PALANG['pLogin_button'] = 'Login';
 $PALANG['pLogin_failed'] = 'Uw login gegevens zijn onjuist.';
@@ -127,7 +127,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Maak een nieuw lokale mailbox voor uw dome
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Het e-mail adres is niet geldig.';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Dit e-mail adres is al ingebruik. Kies aub een andere.';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'U bezit het maximum aantal mailboxen.';
-$PALANG['pCreate_mailbox_password'] = 'Wachtwoord';
 $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.';
@@ -283,7 +282,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_password'] = 'Wachtwoord';
 $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';
@@ -361,7 +359,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'mailbox';
 $PALANG['pFetchmail_field_src_server']      = 'server';
 $PALANG['pFetchmail_field_src_auth']        = 'authenticatietype';
 $PALANG['pFetchmail_field_src_user']        = 'gebruiker';
-$PALANG['pFetchmail_field_src_password']    = 'wachtwoord';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'map';
 $PALANG['pFetchmail_field_poll_time']       = 'controle';
 $PALANG['pFetchmail_field_fetchall']        = 'alle berichten ophalen';

languages/nn.lang

@@ -23,7 +23,7 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = 'Postadministrator; Logg inn her for å administrere ditt domene';
 $PALANG['pLogin_username'] = 'Brukernavn (e-postadressen)';
-$PALANG['pLogin_password'] = 'Passord';
+$PALANG['password'] = 'Passord';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Logg inn';
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -125,7 +125,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Opprett en ny epostkonto.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-postadressen er ugyldig!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'E-postadressen eksisterer allerede, velg en annen!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Du er over grensen for antall e-postkontoer!';
-$PALANG['pCreate_mailbox_password'] = 'Passord';
 $PALANG['pCreate_mailbox_password2'] = 'Passord (igjen)';
 $PALANG['pCreate_mailbox_password_text'] = 'Passord for POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Fornavn og etternavn';
@@ -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_password'] = 'Passord';
 $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
@@ -355,7 +353,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/pl.lang

@@ -26,7 +26,7 @@ $PALANG['pFooter_logged_as'] = 'Zalogowano jako %s'; # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = 'Sekcja przeznaczona dla administratorów domen.';
 $PALANG['pLogin_username'] = 'Użytkownik (email)'; # XXX check translation - should be "Login (email)"
-$PALANG['pLogin_password'] = 'Hasło';
+$PALANG['password'] = 'Hasło';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Zaloguj';
 $PALANG['pLogin_failed'] = 'Twój adres Email lub hasło jest niepoprawne.';
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Utwórz lokalne konto pocztowe dla Twojej
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Adres EMAIL jest niepoprawny!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Taki adres email już istnieje, proszę wybrać inny!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Twój limit kont pocztowych został osiągniety!';
-$PALANG['pCreate_mailbox_password'] = 'Hasło';
 $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
@@ -282,7 +281,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administrator został dodany!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Edytuj administratora domeny';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['pAdminEdit_admin_password'] = 'Hasło';
 $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';
@@ -363,7 +361,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Konto';
 $PALANG['pFetchmail_field_src_server']      = 'Serwer';
 $PALANG['pFetchmail_field_src_auth']        = 'Uwierzytelnianie';
 $PALANG['pFetchmail_field_src_user']        = 'Użytkownik';
-$PALANG['pFetchmail_field_src_password']    = 'Hasło';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder';
 $PALANG['pFetchmail_field_poll_time']       = 'Sprawdzaj';
 $PALANG['pFetchmail_field_fetchall']        = 'Pobierz wszystkie';

languages/pt-br.lang

@@ -25,7 +25,7 @@ $PALANG['pFooter_logged_as'] = 'Autenticado como %s'; # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = 'Administradores devem se autenticar aqui para gerenciar seus domínios.';
 $PALANG['pLogin_username'] = 'Usuário (email)';
-$PALANG['pLogin_password'] = 'Senha';
+$PALANG['password'] = 'Senha';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Entrar';
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -130,7 +130,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Criação de uma nova conta de email para
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Email inválido!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Endereço de email fornecido já existe. Por favor, escolha outro endereço!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Você alcançou o limite de contas de email!';
-$PALANG['pCreate_mailbox_password'] = 'Senha';
 $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
@@ -287,7 +286,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_password'] = 'Senha';
 $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';
@@ -370,7 +368,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Conta';
 $PALANG['pFetchmail_field_src_server']      = 'Servidor';
 $PALANG['pFetchmail_field_src_auth']        = 'Autenticação';
 $PALANG['pFetchmail_field_src_user']        = 'Usuário';
-$PALANG['pFetchmail_field_src_password']    = 'Senha';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Diretório';
 $PALANG['pFetchmail_field_poll_time']       = 'Checar';
 $PALANG['pFetchmail_field_fetchall']        = 'Recuperar todas';

languages/ru.lang

@@ -26,7 +26,7 @@ $PALANG['pFooter_logged_as'] = 'Вошли как %s';
 
 $PALANG['pLogin_welcome'] = 'Вход для администраторов почтовых доменов.';
 $PALANG['pLogin_username'] = 'Имя (адрес e-mail)';
-$PALANG['pLogin_password'] = 'Пароль';
+$PALANG['password'] = 'Пароль';
 $PALANG['pLogin_language'] = 'Язык';
 $PALANG['pLogin_button'] = 'Войти';
 $PALANG['pLogin_failed'] = 'Ваш адрес e-mail или пароль неверен.';
@@ -130,7 +130,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Создание нового почтов
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Неверное имя!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Это имя уже существует, пожалуйста, выберите другое!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Вы достигли лимита по созданию почтовых ящиков!';
-$PALANG['pCreate_mailbox_password'] = 'Пароль';
 $PALANG['pCreate_mailbox_password2'] = 'Пароль (еще раз)';
 $PALANG['pCreate_mailbox_password_text'] = 'Пароль для POP3/IMAP';
 $PALANG['pCreate_mailbox_password_text_error'] = 'Введенные вами пароли не совпадают либо пусты!';
@@ -287,7 +286,6 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Администратор бы
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Редактирование администратора домена';
 $PALANG['pAdminEdit_admin_username'] = 'Администратор';
-$PALANG['pAdminEdit_admin_password'] = 'Пароль';
 $PALANG['pAdminEdit_admin_password2'] = 'Пароль (еще раз)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Введенные вами пароли не совпадают либо пустые!';
 $PALANG['pAdminEdit_admin_super_admin'] = 'Супер админ';
@@ -370,7 +368,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Ящик';
 $PALANG['pFetchmail_field_src_server']      = 'Сервер';
 $PALANG['pFetchmail_field_src_auth']        = 'Тип аутентификации';
 $PALANG['pFetchmail_field_src_user']        = 'Пользователь';
-$PALANG['pFetchmail_field_src_password']    = 'Пароль';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Папка';
 $PALANG['pFetchmail_field_poll_time']       = 'Опрашивать';
 $PALANG['pFetchmail_field_fetchall']        = 'Скачивать все';

languages/sk.lang

@@ -24,7 +24,7 @@ $PALANG['pFooter_logged_as'] = 'Prihlásený ako %s'; # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = 'Prihlásenie administrátorov pre správu domén';
 $PALANG['pLogin_username'] = 'Užívateľské meno (email)';
-$PALANG['pLogin_password'] = 'Heslo';
+$PALANG['password'] = 'Heslo';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Prihlásiť';
 $PALANG['pLogin_failed'] = 'Váš email alebo heslo nie je správne.';
@@ -127,7 +127,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Vytvoriť novú schránku v doméne';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa nie je platná!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Takáto emailová adresa už¸ existuje!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Dosiahli ste limit, nemôžete vytvárať ďalšie schránky!';
-$PALANG['pCreate_mailbox_password'] = 'Heslo';
 $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!';
@@ -280,7 +279,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_password'] = 'Heslo';
 $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';
@@ -358,7 +356,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Schránka';
 $PALANG['pFetchmail_field_src_server']      = 'Server';
 $PALANG['pFetchmail_field_src_auth']        = 'Autentifikácia';
 $PALANG['pFetchmail_field_src_user']        = 'Meno';
-$PALANG['pFetchmail_field_src_password']    = 'Heslo';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Adresár';
 $PALANG['pFetchmail_field_poll_time']       = 'Opakovanie';
 $PALANG['pFetchmail_field_fetchall']        = 'Staré';

languages/sl.lang

@@ -23,7 +23,7 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = 'Administratorji se prijavite tukaj.';
 $PALANG['pLogin_username'] = 'Uporabniško ime (e-poštni naslov)'; # XXX check translation - should be "Login (email)"
-$PALANG['pLogin_password'] = 'Geslo';
+$PALANG['password'] = 'Geslo';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Prijavi'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Ustvari nov predal za izbrano domeno.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-poštni naslov ni pravilen!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Izbrani e-poštni naslov že obstaja, prosimo izberite drugega!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Maksimalno število predalov je preseženo!';
-$PALANG['pCreate_mailbox_password'] = 'Geslo';
 $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
@@ -279,7 +278,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_password'] = 'Geslo';
 $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
@@ -357,7 +355,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/sv.lang

@@ -25,7 +25,7 @@ $PALANG['pFooter_logged_as'] = 'Inloggad som %s'; # XXX Text change: 'logged in
 
 $PALANG['pLogin_welcome'] = 'Mail administratörer loggar in här för att sköta er domän.';
 $PALANG['pLogin_username'] = 'Login (epost)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
-$PALANG['pLogin_password'] = 'Lösenord';
+$PALANG['password'] = 'Lösenord';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Login';
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Skapa ett nytt lokalt brevlåda i din dom
 $PALANG['pCreate_mailbox_username_text_error1'] = 'EPOSTADRESSEN är inte korrekt!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Denna epostadress finns redan, ange en annan adress!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Du har redan skapat max tillåtet antal brevlådan!';
-$PALANG['pCreate_mailbox_password'] = 'Lösenord';
 $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
@@ -281,7 +280,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_password'] = 'Lösenord';
 $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';
@@ -359,7 +357,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailkonto';
 $PALANG['pFetchmail_field_src_server']      = 'Värddator';
 $PALANG['pFetchmail_field_src_auth']        = 'Autentiseringstyp';
 $PALANG['pFetchmail_field_src_user']        = 'Användarnamn';
-$PALANG['pFetchmail_field_src_password']    = 'Lösenord';
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Katalog';
 $PALANG['pFetchmail_field_poll_time']       = 'Kontrollera';
 $PALANG['pFetchmail_field_fetchall']        = 'Hämta samtliga';

languages/tr.lang

@@ -23,7 +23,7 @@ $PALANG['pFooter_logged_as'] = 'Logged in as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Posta Yöneticileri buradan domainlerinizi yönetmek için giriþ yapabilirsiniz.';
 $PALANG['pLogin_username'] = 'Kullanýcý adý (eposta)'; # # XXX check translation - should be "Login (email)"
-$PALANG['pLogin_password'] = 'Þifre'; # XXX compare with pUsersLogin_password - should be "Password"
+$PALANG['password'] = 'Þifre'; # XXX compare with pUsersLogin_password - should be "Password"
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = 'Giriþ'; # XXX compare with pUsersLogin_button - should be "Login"
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Domaininiz için yeni bir lokal e-posta ya
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-POSTA uygun deðil!';
 $PALANG['pCreate_mailbox_username_text_error2'] = 'Bu elektronik posta kullanýlmakta, lütfen farklý bir tane seçin!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Posta kutusu yaratma limitinize eriþtiniz!';
-$PALANG['pCreate_mailbox_password'] = 'þifre';
 $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
@@ -279,7 +278,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_password'] = 'Þifre';
 $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
@@ -357,7 +355,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

languages/tw.lang

@@ -23,7 +23,7 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged
 
 $PALANG['pLogin_welcome'] = '郵件管理員請從這裡登錄以管理你的網域名.';
 $PALANG['pLogin_username'] = '帳號 (郵件地址)'; # XXX compare with pUsersLogin_username - should be "Login (email)"
-$PALANG['pLogin_password'] = '密碼';
+$PALANG['password'] = '密碼';
 $PALANG['pLogin_language'] = 'Language'; # XXX
 $PALANG['pLogin_button'] = '登錄';
 $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
@@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = '在你的網域中新建一個本地郵箱
 $PALANG['pCreate_mailbox_username_text_error1'] = '郵件非法!';
 $PALANG['pCreate_mailbox_username_text_error2'] = '郵件地址已經存在,請重新選擇!';
 $PALANG['pCreate_mailbox_username_text_error3'] = '郵箱地址已經達到上限!';
-$PALANG['pCreate_mailbox_password'] = '密碼';
 $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
@@ -279,7 +278,6 @@ $PALANG['pAdminCreate_admin_result_success'] = '新增管理員成功!';
 
 $PALANG['pAdminEdit_admin_welcome'] = '修改網域管理員';
 $PALANG['pAdminEdit_admin_username'] = '管理員';
-$PALANG['pAdminEdit_admin_password'] = '密碼';
 $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
@@ -357,7 +355,7 @@ $PALANG['pFetchmail_field_mailbox']         = 'Mailbox'; # XXX
 $PALANG['pFetchmail_field_src_server']      = 'Server'; # XXX
 $PALANG['pFetchmail_field_src_auth']        = 'Auth Type'; # XXX
 $PALANG['pFetchmail_field_src_user']        = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password']    = 'Password'; # XXX
+$PALANG['pFetchmail_field_src_password']    = $PALANG['password']; # needed until fetchmail is migrated into FetchmailHandler
 $PALANG['pFetchmail_field_src_folder']      = 'Folder'; # XXX
 $PALANG['pFetchmail_field_poll_time']       = 'Poll'; # XXX
 $PALANG['pFetchmail_field_fetchall']        = 'Fetch All'; # XXX

model/AdminHandler.php

@@ -42,7 +42,7 @@ class AdminHandler extends PFAHandler {
             # field name                allow       display in...   type    $PALANG label                    $PALANG description                 default / options / ...
             #                           editing?    form    list
             'username'        => pacol( $this->new, 1,      1,      'text', 'pAdminEdit_admin_username'    , 'pAdminCreate_admin_username_text' ),
-            'password'        => pacol( 1,          1,      0,      'pass', 'pAdminEdit_admin_password'    , ''                                 ),
+            'password'        => pacol( 1,          1,      0,      'pass', 'password'                     , ''                                 ),
             'password2'       => pacol( 1,          1,      0,      'pass', 'pAdminEdit_admin_password2'   , ''                                 , '', '',
                 /*not_in_db*/ 0,
                 /*dont_write_to_db*/ 1,

model/MailboxHandler.php

@@ -22,7 +22,7 @@ class MailboxHandler extends PFAHandler {
             # TODO: maildir: display in list is needed to include maildir in SQL result (for post_edit hook)
             # TODO:          (not a perfect solution, but works for now - maybe we need a separate "include in SELECT query" field?)
             'maildir'       => pacol(   $this->new, 0,      1,      'text', ''                              , ''                                , '' ),
-            'password'      => pacol(   1,          1,      0,      'pass', 'pCreate_mailbox_password'      , 'pCreate_mailbox_password_text'   , '' ),
+            'password'      => pacol(   1,          1,      0,      'pass', 'password'                      , 'pCreate_mailbox_password_text'   , '' ),
             'password2'     => pacol(   1,          1,      0,      'pass', 'pCreate_mailbox_password2'    , ''                                 , '', 
                 /*options*/ '',
                 /*not_in_db*/ 0,

setup.php

@@ -416,7 +416,7 @@ else
       <td><?php if (isset($errormsg['username'])) print $errormsg['username']; ?></td>
    </tr>
    <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_password'] . ":"; ?></td>
+      <td><?php print $PALANG['password'] . ":"; ?></td>
       <td><input class="flat" type="password" name="password" /></td>
       <td><?php if (isset($errormsg['password'])) print $errormsg['password']; ?></td>
    </tr>

templates/login.tpl

@@ -13,7 +13,7 @@
 		<td><input class="flat" type="text" name="fUsername" /></td>
 	</tr>
 	<tr>
-		<td class="label"><label>{$PALANG.pLogin_password}:</label></td>
+		<td class="label"><label>{$PALANG.password}:</label></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
 	</tr>
 	<tr>