*.lang:

- rename some $PALANG variables once more because smarty breaks when
  using "-"
  - add-alias => add_alias
  - add-alias-domain => add_alias_domain
  - add-mailbox => add_mailbox
  - email-address-already-exists => email_address_already_exists
  - change-password => change_password
  - password-again => password_again

model/*, setup.php, templates/*
- update to use the changed $PALANG variables


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

languages/bg.lang

@@ -32,9 +32,9 @@ $PALANG['pLogin_login_users'] = 'Ако сте потребител натисн
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Преглед';
-$PALANG['add-alias'] = 'Създай нов Alias'; # XXX check text - should be 'Add Alias'
-$PALANG['add-alias-domain'] = 'Добави Alias Domain'; # XXX check text - should be 'Add Alias Domain'
-$PALANG['add-mailbox'] = 'Създай нова пощенска кутия'; # XXX check text - should be 'Add Mailbox'
+$PALANG['add_alias'] = 'Създай нов Alias'; # XXX check text - should be 'Add Alias'
+$PALANG['add_alias_domain'] = 'Добави Alias Domain'; # XXX check text - should be 'Add Alias Domain'
+$PALANG['add_mailbox'] = 'Създай нова пощенска кутия'; # XXX check text - should be 'Add Mailbox'
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = 'Изпрати Email';
 $PALANG['pMenu_password'] = 'Парола';
@@ -95,7 +95,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Този ALIAS не е валиден!';
-$PALANG['email-address-already-exists'] = 'Този е-мейл адрес вече съществува, моля изберете различен!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Този е-мейл адрес вече съществува, моля изберете различен!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Достигнали сте лимита си за създаване на alias-и!';
 $PALANG['pCreate_alias_goto'] = 'Към';
 $PALANG['pCreate_alias_goto_text'] = 'Накъде трябва да се изпраща писмото.';
@@ -145,7 +145,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Не сте въвели в
 $PALANG['pPassword_password'] = 'Нова парола';
 $PALANG['pPassword_password2'] = 'Нова парола (отново)';
 $PALANG['pPassword_password_text_error'] = 'Паролите, които сте въвели не съвпадат! Или са празни!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Смени парола';
+$PALANG['change_password'] = 'Смени парола';
 $PALANG['pPassword_result_error'] = 'Не мога да сменя паролата!';
 $PALANG['pPassword_result_success'] = 'Паролата ви бе сменена успешно!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -252,7 +252,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Админа беше добав
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Редакция на админ на домейн';
 $PALANG['pAdminEdit_admin_username'] = 'Админ';
-$PALANG['password-again'] = 'Парола (отново)';
+$PALANG['password_again'] = 'Парола (отново)';
 $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

languages/ca.lang

@@ -30,9 +30,9 @@ $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; #
 $PALANG['pLogin_login_users'] = 'Login per anar a la secció d\'usuaris.';
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Resum';
-$PALANG['add-alias'] = 'Afegir àlies';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Afegir bústia';
+$PALANG['add_alias'] = 'Afegir àlies';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Afegir bústia';
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = 'Enviar e-mail';
 $PALANG['pMenu_password'] = 'Contrasenya';
@@ -93,7 +93,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'L\'àlies no és vàlid!';
-$PALANG['email-address-already-exists'] = 'Aquesta adreça ja existeix, escull una altra de diferent, si us plau!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Aquesta adreça ja existeix, escull una altra de diferent, si us plau!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Has arribat al límit de creació d\'àlies!';
 $PALANG['pCreate_alias_goto'] = 'Destí';
 $PALANG['pCreate_alias_goto_text'] = 'A on ha de ser enviat l\'e-mail.';
@@ -143,7 +143,7 @@ $PALANG['pPassword_password_current_text_error'] = 'No ha introduït la contrase
 $PALANG['pPassword_password'] = 'Nova contrasenya';
 $PALANG['pPassword_password2'] = 'Nova contrasenya (repetiu)';
 $PALANG['pPassword_password_text_error'] = 'Les contrasenyes introduides no coincideixen o estan en blanc!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Canviar la contrasenya';
+$PALANG['change_password'] = 'Canviar la contrasenya';
 $PALANG['pPassword_result_error'] = 'Imposible canviar la contrasenya!';
 $PALANG['pPassword_result_success'] = 'La seva contrasenya ha estat canviada!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -251,7 +251,7 @@ $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['password-again'] = 'Contrasenya (repetiu)';
+$PALANG['password_again'] = 'Contrasenya (repetiu)';
 $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

languages/cn.lang

@@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = '普通用户点击这里进入用户控制面
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = '概览';
-$PALANG['add-alias'] = '新建别名';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = '新建邮箱'; # XXX check text - should be 'Add Mailbox'
+$PALANG['add_alias'] = '新建别名';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = '新建邮箱'; # XXX check text - should be 'Add Mailbox'
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = '发送邮件';
 $PALANG['pMenu_password'] = '修改密码';
@@ -94,7 +94,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = '该别名非法!';
-$PALANG['email-address-already-exists'] = '邮件地址已经存在, 请重新选择!';
+$PALANG['email_address_already_exists'] = '邮件地址已经存在, 请重新选择!';
 $PALANG['pCreate_alias_address_text_error3'] = '你的别名已经达到上限!';
 $PALANG['pCreate_alias_goto'] = '转到';
 $PALANG['pCreate_alias_goto_text'] = '邮件接收地址.';
@@ -144,7 +144,7 @@ $PALANG['pPassword_password_current_text_error'] = '你没有填写当前密码!
 $PALANG['pPassword_password'] = '新密码';
 $PALANG['pPassword_password2'] = '新密码 (验证)';
 $PALANG['pPassword_password_text_error'] = '你两次输入的新密码不相同! 或者为空!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = '更改密码'; # XXX check text - should be 'Change Password'
+$PALANG['change_password'] = '更改密码'; # XXX check text - should be 'Change Password'
 $PALANG['pPassword_result_error'] = '更改密码失败!';
 $PALANG['pPassword_result_success'] = '更改密码成功!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -251,7 +251,7 @@ $PALANG['pAdminCreate_admin_result_success'] = '新增管理员成功!';
 
 $PALANG['pAdminEdit_admin_welcome'] = '修改域管理员';
 $PALANG['pAdminEdit_admin_username'] = '管理员';
-$PALANG['password-again'] = '密码 (验证)';
+$PALANG['password_again'] = '密码 (验证)';
 $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

languages/cs.lang

@@ -36,9 +36,9 @@ $PALANG['pLogin_login_users'] = 'Vstup do uživatelské sekce.';
 
 $PALANG['pMenu_main'] = 'Hlavní';
 $PALANG['pMenu_overview'] = 'Přehled';
-$PALANG['add-alias'] = 'Přidat přesměrování'; # XXX check text - should be 'Add Alias'
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Přidat schránku';
+$PALANG['add_alias'] = 'Přidat přesměrování'; # XXX check text - should be 'Add Alias'
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Přidat schránku';
 $PALANG['pMenu_fetchmail'] = 'Stahování pošty';
 $PALANG['pMenu_sendmail'] = 'Poslat email';
 $PALANG['pMenu_password'] = 'Změnit heslo';
@@ -99,7 +99,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Adresa neni platná!';
-$PALANG['email-address-already-exists'] = 'Taková emailová adresa již existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Taková emailová adresa již existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Dosáhli jste limitu, nemůžete vytvářet další aliasy!';
 $PALANG['pCreate_alias_goto'] = 'Cíl';
 $PALANG['pCreate_alias_goto_text'] = 'Kam má pošta chodit.';
@@ -149,7 +149,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Nezadal(a) jste současné h
 $PALANG['pPassword_password'] = 'Nové heslo';
 $PALANG['pPassword_password2'] = 'Nové heslo (znovu)';
 $PALANG['pPassword_password_text_error'] = 'Zadaná hesla jsou rozdílná nebo prázdná!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Změnit heslo'; # XXX check text - should be 'Change Password'
+$PALANG['change_password'] = 'Změnit heslo'; # XXX check text - should be 'Change Password'
 $PALANG['pPassword_result_error'] = 'Nepodařilo se změnit heslo!';
 $PALANG['pPassword_result_success'] = 'Heslo bylo změněno!';
 
@@ -260,7 +260,7 @@ $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['password-again'] = 'Heslo (znovu)';
+$PALANG['password_again'] = 'Heslo (znovu)';
 $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

languages/da.lang

@@ -35,9 +35,9 @@ $PALANG['pLogin_login_users'] = 'Log ind på brugersektionen her.';
 
 $PALANG['pMenu_main'] = 'Start';
 $PALANG['pMenu_overview'] = 'Oversigt';
-$PALANG['add-alias'] = 'Tilføj alias';
-$PALANG['add-alias-domain'] = 'Tilføje alias domæne'; # XXX check text - should be 'Add Alias Domain'
-$PALANG['add-mailbox'] = 'Tilføj postboks';
+$PALANG['add_alias'] = 'Tilføj alias';
+$PALANG['add_alias_domain'] = 'Tilføje alias domæne'; # XXX check text - should be 'Add Alias Domain'
+$PALANG['add_mailbox'] = 'Tilføj postboks';
 $PALANG['pMenu_fetchmail'] = 'Hent email';
 $PALANG['pMenu_sendmail'] = 'Send email';
 $PALANG['pMenu_password'] = 'Adgangskode';
@@ -99,7 +99,7 @@ $PALANG['pCreate_alias_domain_error4']      = 'Alle domænerne har allerede alia
 $PALANG['pCreate_alias_domain_success']     = 'Domæne-alias blev tilføjet alias-tabellen.';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldigt.';
-$PALANG['email-address-already-exists'] = 'Emailadressen eksisterer allerede, vælg venligst en anden.';
+$PALANG['email_address_already_exists'] = 'Emailadressen eksisterer allerede, vælg venligst en anden.';
 $PALANG['pCreate_alias_address_text_error3'] = 'Du har nået grænsen for antallet af aliases til domænet.';
 $PALANG['pCreate_alias_goto'] = 'Modtager';
 $PALANG['pCreate_alias_goto_text'] = 'Hvor emailen skal videresendes til.';
@@ -149,7 +149,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Du glemte at skrive din nuv
 $PALANG['pPassword_password'] = 'Ny adgangskode';
 $PALANG['pPassword_password2'] = 'Ny adgangskode (igen)';
 $PALANG['pPassword_password_text_error'] = 'Adgangskoderne er ikke ens! Eller er tomme!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Ændr adgangskode';
+$PALANG['change_password'] = 'Ændr adgangskode';
 $PALANG['pPassword_result_error'] = 'Kan ikke ændre adgangskoden!';
 $PALANG['pPassword_result_success'] = 'Din adgangskode er ændret!';
 
@@ -260,7 +260,7 @@ $PALANG['pAdminCreate_admin_result_success']       = 'Administratoren er tilføj
 
 $PALANG['pAdminEdit_admin_welcome']             = 'Redigér en domæneadministrator';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['password-again'] = 'Adgangskode (igen)';
+$PALANG['password_again'] = 'Adgangskode (igen)';
 $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

languages/de.lang

@@ -33,9 +33,9 @@ $PALANG['pLogin_login_users'] = 'eMail-Benutzer bitte hier einloggen.';
 
 $PALANG['pMenu_main'] = 'Startseite';
 $PALANG['pMenu_overview'] = 'Überblick';
-$PALANG['add-alias'] = 'Alias hinzufügen';
-$PALANG['add-alias-domain'] = 'Alias-Domain hinzufügen';
-$PALANG['add-mailbox'] = 'Mailbox hinzufügen';
+$PALANG['add_alias'] = 'Alias hinzufügen';
+$PALANG['add_alias_domain'] = 'Alias-Domain hinzufügen';
+$PALANG['add_mailbox'] = 'Mailbox hinzufügen';
 $PALANG['pMenu_fetchmail'] = 'E-Mail Abruf';
 $PALANG['pMenu_sendmail'] = 'Email versenden';
 $PALANG['pMenu_password'] = 'Passwort ändern';
@@ -96,7 +96,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Alle Domains sind bereits Alias-Domain
 $PALANG['pCreate_alias_domain_success'] = 'Die Alias-Domain wurde in der Datenbank eingetragen!';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Dieses ALIAS ist nicht erlaubt!';
-$PALANG['email-address-already-exists'] = 'Diese eMail-Adresse existiert bereits. Bitte wählen Sie eine andere!';
+$PALANG['email_address_already_exists'] = 'Diese eMail-Adresse existiert bereits. Bitte wählen Sie eine andere!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Sie haben Ihr Limit für Aliase auf dieser Domain erreicht!';
 $PALANG['pCreate_alias_goto'] = 'An';
 $PALANG['pCreate_alias_goto_text'] = 'Wohin soll die eMail weitergeleitet werden?';
@@ -146,7 +146,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Sie haben Ihr derzeitiges Pa
 $PALANG['pPassword_password'] = 'Neues Passwort';
 $PALANG['pPassword_password2'] = 'Neues Passwort (nochmal)';
 $PALANG['pPassword_password_text_error'] = 'Die beiden angegebenen Passwörter sind nicht identisch oder leer!';
-$PALANG['change-password'] = 'Passwort ändern';
+$PALANG['change_password'] = 'Passwort ändern';
 $PALANG['pPassword_result_error'] = 'Unmöglich das Passwort zu ändern!';
 $PALANG['pPassword_result_success'] = 'Ihr Passwort wurde geändert!';
 
@@ -257,7 +257,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admin angelegt!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Domain Admin editieren';
 $PALANG['pAdminEdit_admin_username'] = 'Admin';
-$PALANG['password-again'] = 'Passwort (nochmal)';
+$PALANG['password_again'] = 'Passwort (nochmal)';
 $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

languages/en.lang

@@ -33,9 +33,9 @@ $PALANG['pLogin_login_users'] = 'Users click here to login to the user section.'
 
 $PALANG['pMenu_main'] = 'Main';
 $PALANG['pMenu_overview'] = 'Overview';
-$PALANG['add-alias'] = 'Add Alias';
-$PALANG['add-alias-domain'] = 'Add Alias Domain';
-$PALANG['add-mailbox'] = 'Add Mailbox';
+$PALANG['add_alias'] = 'Add Alias';
+$PALANG['add_alias_domain'] = 'Add Alias Domain';
+$PALANG['add_mailbox'] = 'Add Mailbox';
 $PALANG['pMenu_fetchmail'] = 'Fetch Email';
 $PALANG['pMenu_sendmail'] = 'Send Email';
 $PALANG['pMenu_password'] = 'Password';
@@ -97,7 +97,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.';
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'The ALIAS is not valid!';
-$PALANG['email-address-already-exists'] = 'This email address already exists, please choose a different one!';
+$PALANG['email_address_already_exists'] = 'This email address already exists, please choose a different one!';
 $PALANG['pCreate_alias_address_text_error3'] = 'You have reached your limit to create aliases!';
 $PALANG['pCreate_alias_goto'] = 'To';
 $PALANG['pCreate_alias_goto_text'] = 'Where the mail needs to be sent to.';
@@ -147,7 +147,7 @@ $PALANG['pPassword_password_current_text_error'] = 'You didn\'t supply your curr
 $PALANG['pPassword_password'] = 'New Password';
 $PALANG['pPassword_password2'] = 'New Password (again)';
 $PALANG['pPassword_password_text_error'] = 'The passwords that you supplied don\'t match or are empty!';
-$PALANG['change-password'] = 'Change Password';
+$PALANG['change_password'] = 'Change Password';
 $PALANG['pPassword_result_error'] = 'Unable to change your password!';
 $PALANG['pPassword_result_success'] = 'Your password has been changed!';
 
@@ -261,7 +261,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admin has been added!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Edit a domain admin';
 $PALANG['pAdminEdit_admin_username'] = 'Admin';
-$PALANG['password-again'] = 'Password (again)';
+$PALANG['password_again'] = 'Password (again)';
 $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

languages/es.lang

@@ -31,9 +31,9 @@ $PALANG['pLogin_failed'] = 'La cuenta de email o la contraseña no son correctas
 $PALANG['pLogin_login_users'] = 'Login para ir a la sección de usuarios.';
 $PALANG['pMenu_main'] = 'Principal'; 
 $PALANG['pMenu_overview'] = 'Resumen';
-$PALANG['add-alias'] = 'Añadir alias';
-$PALANG['add-alias-domain'] = 'Añadir alias de dominio';  # XXX check text - should be 'Add Alias Domain'
-$PALANG['add-mailbox'] = 'Añadir buzón';
+$PALANG['add_alias'] = 'Añadir alias';
+$PALANG['add_alias_domain'] = 'Añadir alias de dominio';  # XXX check text - should be 'Add Alias Domain'
+$PALANG['add_mailbox'] = 'Añadir buzón';
 $PALANG['pMenu_fetchmail'] = 'Obtener Emails'; 
 $PALANG['pMenu_sendmail'] = 'Enviar e-mail';
 $PALANG['pMenu_password'] = 'Contraseña';
@@ -94,7 +94,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Ya están todos los dominios asignados
 $PALANG['pCreate_alias_domain_success'] = '¡El alias de dominio se insertó en la tabla!'; 
 
 $PALANG['pCreate_alias_address_text_error1'] = '¡El ALIAS no es válido!';
-$PALANG['email-address-already-exists'] = '¡Esta dirección ya existe, elija otra diferente por favor!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = '¡Esta dirección ya existe, elija otra diferente por favor!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = '¡Ha llegado a su límite de creación de alias!';
 $PALANG['pCreate_alias_goto'] = 'Destino';
 $PALANG['pCreate_alias_goto_text'] = 'A donde debe de ser enviado el e-mail.';
@@ -144,7 +144,7 @@ $PALANG['pPassword_password_current_text_error'] = '¡No ha introducido la contr
 $PALANG['pPassword_password'] = 'Nueva contraseña';
 $PALANG['pPassword_password2'] = 'Nueva contraseña (repetir)';
 $PALANG['pPassword_password_text_error'] = '¡Las contraseñas introducidas no coinciden o están en blanco!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Cambiar contraseña'; # XXX check text - should be 'Change Password'
+$PALANG['change_password'] = 'Cambiar contraseña'; # XXX check text - should be 'Change Password'
 $PALANG['pPassword_result_error'] = '¡Imposible cambiar la contraseña!';
 $PALANG['pPassword_result_success'] = '¡Su contraseña ha sido cambiada!';
 
@@ -253,7 +253,7 @@ $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['password-again'] = 'Contraseña (repetir)';
+$PALANG['password_again'] = 'Contraseña (repetir)';
 $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

languages/et.lang

@@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = 'Kasutaja, klõpsa siia logimaks sisse kasutaja
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Ülevaade';
-$PALANG['add-alias'] = 'Lisa alias';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Lisa postkast';
+$PALANG['add_alias'] = 'Lisa alias';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Lisa postkast';
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = 'Saada kiri';
 $PALANG['pMenu_password'] = 'Parool';
@@ -94,7 +94,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS pole kehtiv!';
-$PALANG['email-address-already-exists'] = 'See e-posti aadress eksisteerib juba, palun vali erinev!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'See e-posti aadress eksisteerib juba, palun vali erinev!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Oled kasutanud kogu aliaste arvu!';
 $PALANG['pCreate_alias_goto'] = 'Kellele';
 $PALANG['pCreate_alias_goto_text'] = 'Kuhu peab kirja saatma.';
@@ -144,7 +144,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Praegust parooli ei sisestat
 $PALANG['pPassword_password'] = 'Uus parool';
 $PALANG['pPassword_password2'] = 'Uus parool (uuesti)';
 $PALANG['pPassword_password_text_error'] = 'Sisestatud paroolid ei kattu! Või on tühjad!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Muuda parool';
+$PALANG['change_password'] = 'Muuda parool';
 $PALANG['pPassword_result_error'] = 'Parooli muutmine ebaõnnestus!';
 $PALANG['pPassword_result_success'] = 'Parool on muudetud!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -251,7 +251,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Haldaja on lisatud!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Muuda domeeni haldajat';
 $PALANG['pAdminEdit_admin_username'] = 'Haldaja';
-$PALANG['password-again'] = 'Parool (uuesti)';
+$PALANG['password_again'] = 'Parool (uuesti)';
 $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

languages/eu.lang

@@ -30,9 +30,9 @@ $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; #
 $PALANG['pLogin_login_users'] = 'Erabiltzaileen gunera joateko logina.';
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Laburpena';
-$PALANG['add-alias'] = 'Aliasa gehitu';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Postontzia gehitu';
+$PALANG['add_alias'] = 'Aliasa gehitu';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Postontzia gehitu';
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = 'e-maila bidali';
 $PALANG['pMenu_password'] = 'Pasahitza';
@@ -92,7 +92,7 @@ $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
 $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIASa okerra da!';
-$PALANG['email-address-already-exists'] = 'Helbide hau existitzen da, ezberdin bat aukera ezazu mesedez!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Helbide hau existitzen da, ezberdin bat aukera ezazu mesedez!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Alias sortze mugara heldu zara!';
 $PALANG['pCreate_alias_goto'] = 'Norakoa';
 $PALANG['pCreate_alias_goto_text'] = 'Nora bidali behar den e-maila.';
@@ -142,7 +142,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Ez duzu egungo pasahitzik sa
 $PALANG['pPassword_password'] = 'Pasahitz berria';
 $PALANG['pPassword_password2'] = 'Pasahitz berria (errepikatu)';
 $PALANG['pPassword_password_text_error'] = 'Sarturiko pasahitzak ez datoz bat edo zuriz daude!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Pasahitza aldatu';
+$PALANG['change_password'] = 'Pasahitza aldatu';
 $PALANG['pPassword_result_error'] = 'Ezinezkoa pasahitza aldatzea!';
 $PALANG['pPassword_result_success'] = 'Pasahitza aldatuta!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -250,7 +250,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Kudeatzailea gehituta1';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Domeinu kudeatzaile bat aldatu';
 $PALANG['pAdminEdit_admin_username'] = 'Kudeatzailea';
-$PALANG['password-again'] = 'Pasahitza (errepikatu)';
+$PALANG['password_again'] = 'Pasahitza (errepikatu)';
 $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

languages/fi.lang

@@ -32,9 +32,9 @@ $PALANG['pLogin_login_users'] = 'Käyttäjien kirjautuminen.';
 
 $PALANG['pMenu_main'] = 'Etusivu';
 $PALANG['pMenu_overview'] = 'Yleisnäkymä';
-$PALANG['add-alias'] = 'Lisää alias';
-$PALANG['add-alias-domain'] = 'Lisää alias domain'; # XXX check text - should be 'Add Alias Domain'
-$PALANG['add-mailbox'] = 'Lisää postilaatikko';
+$PALANG['add_alias'] = 'Lisää alias';
+$PALANG['add_alias_domain'] = 'Lisää alias domain'; # XXX check text - should be 'Add Alias Domain'
+$PALANG['add_mailbox'] = 'Lisää postilaatikko';
 $PALANG['pMenu_fetchmail'] = 'Hae sähköpostit';
 $PALANG['pMenu_sendmail'] = 'Lähetä postia';
 $PALANG['pMenu_password'] = 'Salasana';
@@ -95,7 +95,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Kaikilla domaineilla on jo alias.';
 $PALANG['pCreate_alias_domain_success'] = 'Domainin alias on lisätty domain alias tauluun!';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Alias ei ole oikean muotoinen!';
-$PALANG['email-address-already-exists'] = 'Tämä sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Tämä sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Aliasten maksimimäärä saavutettu. Et voi lisätä aliaksia enää!';
 $PALANG['pCreate_alias_goto'] = 'Kenelle';
 $PALANG['pCreate_alias_goto_text'] = 'Minne posti lähetetään.';
@@ -144,7 +144,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Et antanut nykyistä salasan
 $PALANG['pPassword_password'] = 'Uusi salasana';
 $PALANG['pPassword_password2'] = 'Uusi salasana (toistamiseen)';
 $PALANG['pPassword_password_text_error'] = 'Antamasi salasanat eivät täsmää! Tai ovat tyhjiä!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Vaihda salasana';
+$PALANG['change_password'] = 'Vaihda salasana';
 $PALANG['pPassword_result_error'] = 'Salasanan vaihto ei onnistunut!';
 $PALANG['pPassword_result_success'] = 'Salasana vaihdettu!';
 $PALANG['pEdit_vacation_set'] = 'Muuta / Aseta poissaoloviesti';
@@ -251,7 +251,7 @@ $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['password-again'] = 'Salasana (toistamiseen)';
+$PALANG['password_again'] = 'Salasana (toistamiseen)';
 $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

languages/fo.lang

@@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = 'Brúkarar kunnu logga inn her.';
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Yvirlit';
-$PALANG['add-alias'] = 'Stovna Dulnevni';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Stovna Postkassa';
+$PALANG['add_alias'] = 'Stovna Dulnevni';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Stovna Postkassa';
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = 'Send E-post';
 $PALANG['pMenu_password'] = 'Loyniorð';
@@ -94,7 +94,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'DULNEVNI er ógyldugt!';
-$PALANG['email-address-already-exists'] = 'Hendan e-post adressa finst longu, vinarliga vel eina aðra!';
+$PALANG['email_address_already_exists'] = 'Hendan e-post adressa finst longu, vinarliga vel eina aðra!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Tú hevur nátt tínum marki at stovna dulnevni!';
 $PALANG['pCreate_alias_goto'] = 'Til';
 $PALANG['pCreate_alias_goto_text'] = 'Har posturin skal sendast til.';
@@ -144,7 +144,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Tú skrivaði ikki títt nú
 $PALANG['pPassword_password'] = 'Nýtt loyniorð';
 $PALANG['pPassword_password2'] = 'Nýtt loyniorð (umaftur)';
 $PALANG['pPassword_password_text_error'] = 'Loyniorðini tú skrivaði samsvara ikki! Ella eru tóm!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Broyt loyniorð';
+$PALANG['change_password'] = 'Broyt loyniorð';
 $PALANG['pPassword_result_error'] = 'Fái ikki broytt títt loyniorð!';
 $PALANG['pPassword_result_success'] = 'Títt loyniorð er broytt!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -251,7 +251,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Umsitari er stovnaður!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Broyt navnaøki umsitara';
 $PALANG['pAdminEdit_admin_username'] = 'Umsitari';
-$PALANG['password-again'] = 'Loyniorð (umaftur)';
+$PALANG['password_again'] = 'Loyniorð (umaftur)';
 $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

languages/fr.lang

@@ -33,9 +33,9 @@ $PALANG['pLogin_login_users'] = 'Utilisateurs, cliquez ici pour rejoindre votre
 $PALANG['pMenu_main'] = 'Menu principal';
 
 $PALANG['pMenu_overview'] = 'Vue d\'ensemble';
-$PALANG['add-alias'] = 'Ajouter un alias';
-$PALANG['add-alias-domain'] = 'Ajouter un alias de domaine'; # XXX check text - should be 'Add Alias Domain'
-$PALANG['add-mailbox'] = 'Ajouter un compte courriel';
+$PALANG['add_alias'] = 'Ajouter un alias';
+$PALANG['add_alias_domain'] = 'Ajouter un alias de domaine'; # XXX check text - should be 'Add Alias Domain'
+$PALANG['add_mailbox'] = 'Ajouter un compte courriel';
 $PALANG['pMenu_fetchmail'] = 'Récupérer le courrier';
 $PALANG['pMenu_sendmail'] = 'Envoyer un courriel';
 $PALANG['pMenu_password'] = 'Mot de passe';
@@ -95,7 +95,7 @@ $PALANG['pCreate_alias_domain_error3'] = 'Insertion dans la base de donnée éch
 $PALANG['pCreate_alias_domain_error4'] = 'Tous les domaines sont déjà liés à un alias.';
 $PALANG['pCreate_alias_domain_success'] = 'L\'alias de domaine est déjà présent dans la table de domaine!';
 $PALANG['pCreate_alias_address_text_error1'] = 'Cet ALIAS n\'est pas valide!';
-$PALANG['email-address-already-exists'] = 'Ce compte courriel existe déjà, choisissez un autre libellé !'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Ce compte courriel existe déjà, choisissez un autre libellé !'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Vous avez atteint votre limite d\'alias créés !';
 $PALANG['pCreate_alias_goto'] = 'À';
 $PALANG['pCreate_alias_goto_text'] = 'Destinataires des courriels.';
@@ -145,7 +145,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Vous n\'avez pas fournit le
 $PALANG['pPassword_password'] = 'Nouveau mot de passe';
 $PALANG['pPassword_password2'] = 'Nouveau mot de passe (confirmation)';
 $PALANG['pPassword_password_text_error'] = 'Le mot de passe fournit ne correspond pas! Ou est vide!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Changer le mot de passe'; # XXX check text - should be 'Change Password'
+$PALANG['change_password'] = 'Changer le mot de passe'; # XXX check text - should be 'Change Password'
 $PALANG['pPassword_result_error'] = 'Impossible de changer votre mot de passe!';
 $PALANG['pPassword_result_success'] = 'Votre mot de passe a été change!';
 $PALANG['pEdit_vacation_set'] = 'Modifier le message';
@@ -253,7 +253,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'L\'administrateur a été ajout
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Modifier un domaine';
 $PALANG['pAdminEdit_admin_username'] = 'Administrateur';
-$PALANG['password-again'] = 'Mot de passe (confirmation)';
+$PALANG['password_again'] = 'Mot de passe (confirmation)';
 $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

languages/hr.lang

@@ -30,9 +30,9 @@ $PALANG['pLogin_login_users'] = 'Korisnici kliknite ovdje za prijavu u korisnič
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Pregled';
-$PALANG['add-alias'] = 'Dodaj alias';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Dodaj poštanski ormarić';
+$PALANG['add_alias'] = 'Dodaj alias';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Dodaj poštanski ormarić';
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = 'Pošlji e-poštu';
 $PALANG['pMenu_password'] = 'Lozinka';
@@ -93,7 +93,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS nije valjan!';
-$PALANG['email-address-already-exists'] = 'Ova adresa e-pošte već postoji, molimo izaberite drugu!';
+$PALANG['email_address_already_exists'] = 'Ova adresa e-pošte već postoji, molimo izaberite drugu!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Postigli ste maksimalan broj vaših aliasa!';
 $PALANG['pCreate_alias_goto'] = 'Za';
 $PALANG['pCreate_alias_goto_text'] = 'Kuda poslati e-poštu.';
@@ -143,7 +143,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Morate unijeti trenutačnu l
 $PALANG['pPassword_password'] = 'Nova lozinka';
 $PALANG['pPassword_password2'] = 'Nova lozinka (ponovi)';
 $PALANG['pPassword_password_text_error'] = 'Unešene lozinke se ne podudaraju ili su prazne!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Promijeni lozinku';
+$PALANG['change_password'] = 'Promijeni lozinku';
 $PALANG['pPassword_result_error'] = 'Lozinku nije bilo moguče promijeniti!';
 $PALANG['pPassword_result_success'] = 'Lozinka je uspješno promijenjena!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -250,7 +250,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je uspješno doda
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Uredi administratora domene';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['password-again'] = 'Lozinka (ponovi)';
+$PALANG['password_again'] = 'Lozinka (ponovi)';
 $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

languages/hu.lang

@@ -32,9 +32,9 @@ $PALANG['pLogin_login_users'] = 'A felhasználók kattintsanak ide a felhasznál
 
 $PALANG['pMenu_main'] = 'Főmenü';
 $PALANG['pMenu_overview'] = 'Áttekintés';
-$PALANG['add-alias'] = 'Alias felvétele';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Felhasználó felvétele'; # XXX check text - should be 'Add Mailbox'
+$PALANG['add_alias'] = 'Alias felvétele';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Felhasználó felvétele'; # XXX check text - should be 'Add Mailbox'
 $PALANG['pMenu_fetchmail'] = 'Email lehozása';
 $PALANG['pMenu_sendmail'] = 'Email küldése';
 $PALANG['pMenu_password'] = 'Jelszó';
@@ -96,7 +96,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Az ALIAS érvénytelen!';
-$PALANG['email-address-already-exists'] = 'Ez az email cím már létezik, kérlek válassz másikat!';
+$PALANG['email_address_already_exists'] = 'Ez az email cím már létezik, kérlek válassz másikat!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Elérted a maximális alias limitet!';
 $PALANG['pCreate_alias_goto'] = 'Hova';
 $PALANG['pCreate_alias_goto_text'] = 'Ahova a levélnek mennie kell.';
@@ -146,7 +146,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Nem adtad meg a régi jelsza
 $PALANG['pPassword_password'] = 'Új jelszó';
 $PALANG['pPassword_password2'] = 'Új jelszó (mégegyszer)';
 $PALANG['pPassword_password_text_error'] = 'A beírt jelszavak nem egyeznek! Vagy üresek!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Jelszó megváltoztatása';
+$PALANG['change_password'] = 'Jelszó megváltoztatása';
 $PALANG['pPassword_result_error'] = 'Nemsikerült megváltoztatni a jelszavad!';
 $PALANG['pPassword_result_success'] = 'A jelszavad megváltozott!';
 
@@ -257,7 +257,7 @@ $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['password-again'] = 'Jelszó (mégegyszer)';
+$PALANG['password_again'] = 'Jelszó (mégegyszer)';
 $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

languages/is.lang

@@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = 'Notendur smellið hér til að opna almennt not
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Yfirlit';
-$PALANG['add-alias'] = 'Bæta við alias';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Bæta við pósthólf'; # XXX check text - should be 'Add Mailbox'
+$PALANG['add_alias'] = 'Bæta við alias';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Bæta við pósthólf'; # XXX check text - should be 'Add Mailbox'
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = 'Senda Email';
 $PALANG['pMenu_password'] = 'Lykilorð';
@@ -94,7 +94,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliasinn er ekki í lagi!';
-$PALANG['email-address-already-exists'] = 'Þetta pósthólf er nú þegar til, veldu annað!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Þetta pósthólf er nú þegar til, veldu annað!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Þú hefur stofnað þann fjölda pósthólfa sem þú hefur heimild til!';
 $PALANG['pCreate_alias_goto'] = 'Til';
 $PALANG['pCreate_alias_goto_text'] = 'Þangað sem pósturinn á að sendast.';
@@ -144,7 +144,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Þú gafst ekki upp núveran
 $PALANG['pPassword_password'] = 'Nýtt lykilorð';
 $PALANG['pPassword_password2'] = 'Nýtt lykilorð (aftur)';
 $PALANG['pPassword_password_text_error'] = 'Lykilorðin sem þú gafst upp passa ekki saman! Eða þú gefur upp tómt lykilorð!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Breyta lykilorði';
+$PALANG['change_password'] = 'Breyta lykilorði';
 $PALANG['pPassword_result_error'] = 'Get ekki breytt lykilorði!';
 $PALANG['pPassword_result_success'] = 'Lykilorðinu hefur verið breytt!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -251,7 +251,7 @@ $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['password-again'] = 'Lykilorð (aftur)';
+$PALANG['password_again'] = 'Lykilorð (aftur)';
 $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

languages/it.lang

@@ -32,9 +32,9 @@ $PALANG['pLogin_login_users'] = 'Gli utenti devono cliccare qui per entrare nell
 
 $PALANG['pMenu_main'] = 'Principale';
 $PALANG['pMenu_overview'] = 'Resoconto';
-$PALANG['add-alias'] = 'Aggiungi Alias';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Aggiungi casella di posta';
+$PALANG['add_alias'] = 'Aggiungi Alias';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Aggiungi casella di posta';
 $PALANG['pMenu_fetchmail'] = 'Ricevi Email';
 $PALANG['pMenu_sendmail'] = 'Spedisci Email';
 $PALANG['pMenu_password'] = 'Password';
@@ -95,7 +95,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'L\' Alias non è valido!';
-$PALANG['email-address-already-exists'] = 'Questo indirizzo di posta esiste già, per favore sceglierne uno diverso!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Questo indirizzo di posta esiste già, per favore sceglierne uno diverso!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Hai raggiunto il tuo limite per creare alias!';
 $PALANG['pCreate_alias_goto'] = 'A';
 $PALANG['pCreate_alias_goto_text'] = 'Dove la mail deve essere spedita.';
@@ -145,7 +145,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Non hai fornito una password
 $PALANG['pPassword_password'] = 'Nuova Password';
 $PALANG['pPassword_password2'] = 'Nuova Password (ripeti)';
 $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['change-password'] = 'Cambia Password'; # XXX check text - should be 'Change Password'
+$PALANG['change_password'] = 'Cambia Password'; # XXX check text - should be 'Change Password'
 $PALANG['pPassword_result_error'] = 'Impossibile cambiare password!';
 $PALANG['pPassword_result_success'] = 'La tua password è stata modificata!';
 $PALANG['pEdit_vacation_set'] = 'Cambia / inserisci messaggio';
@@ -252,7 +252,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'L\'amministratore è stato aggiu
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Modifica l\'amministratore del dominio';
 $PALANG['pAdminEdit_admin_username'] = 'Amministratore';
-$PALANG['password-again'] = 'Password (ancora)';
+$PALANG['password_again'] = 'Password (ancora)';
 $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

languages/ja.lang

@@ -33,9 +33,9 @@ $PALANG['pLogin_login_users'] = '一般ユーザのログインはここをク
 
 $PALANG['pMenu_main'] = 'メイン';
 $PALANG['pMenu_overview'] = '概要';
-$PALANG['add-alias'] = '転送先の追加'; # XXX check text - should be 'Add Alias'
-$PALANG['add-alias-domain'] = 'エイリアスドメインの追加';
-$PALANG['add-mailbox'] = 'アドレスの追加'; # XXX check text - should be 'Add Mailbox'
+$PALANG['add_alias'] = '転送先の追加'; # XXX check text - should be 'Add Alias'
+$PALANG['add_alias_domain'] = 'エイリアスドメインの追加';
+$PALANG['add_mailbox'] = 'アドレスの追加'; # XXX check text - should be 'Add Mailbox'
 $PALANG['pMenu_fetchmail'] = 'メール取得';
 $PALANG['pMenu_sendmail'] = 'メール送信';
 $PALANG['pMenu_password'] = 'パスワード';
@@ -96,7 +96,7 @@ $PALANG['pCreate_alias_domain_error4'] = '全てのドメインがエイリア
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'メールアドレスが無効です。';
-$PALANG['email-address-already-exists'] = 'このメールアドレスは既に存在するので、 別のアドレスを選択してください。'; # XXX check/beautify - was split in two lines before
+$PALANG['email_address_already_exists'] = 'このメールアドレスは既に存在するので、 別のアドレスを選択してください。'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_alias_address_text_error3'] = '転送アドレスの制限数に達しました。';
 $PALANG['pCreate_alias_goto'] = '転送先アドレス';
 $PALANG['pCreate_alias_goto_text'] = 'メールを転送するアドレス';
@@ -146,7 +146,7 @@ $PALANG['pPassword_password_current_text_error'] = '現在のパスワードが
 $PALANG['pPassword_password'] = '新規パスワード';
 $PALANG['pPassword_password2'] = '新規パスワード (確認)';
 $PALANG['pPassword_password_text_error'] = 'パスワードが一致しません。 または空です。'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'パスワード変更';
+$PALANG['change_password'] = 'パスワード変更';
 $PALANG['pPassword_result_error'] = 'パスワードを変更できません！';
 $PALANG['pPassword_result_success'] = 'パスワードを変更しました。';
 
@@ -257,7 +257,7 @@ $PALANG['pAdminCreate_admin_result_success'] = '管理者を追加しました
 
 $PALANG['pAdminEdit_admin_welcome'] = 'ドメイン管理者の編集';
 $PALANG['pAdminEdit_admin_username'] = '管理者'; # XXX check / compare with pAdminCreate_admin_username - should be "admin"
-$PALANG['password-again'] = 'パスワード (確認)';
+$PALANG['password_again'] = 'パスワード (確認)';
 $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

languages/lt.lang

@@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = 'Pašto vartotojams jungtis prie vartotojų sekc
 
 $PALANG['pMenu_main'] = 'Pagrindinis';
 $PALANG['pMenu_overview'] = 'Peržiūra';
-$PALANG['add-alias'] = 'Naujas sinonimas';
-$PALANG['add-alias-domain'] = 'Naujas srities sinonimas'; # XXX check text - should be 'Add Alias Domain'
-$PALANG['add-mailbox'] = 'Nauja pašto dėžutė';
+$PALANG['add_alias'] = 'Naujas sinonimas';
+$PALANG['add_alias_domain'] = 'Naujas srities sinonimas'; # XXX check text - should be 'Add Alias Domain'
+$PALANG['add_mailbox'] = 'Nauja pašto dėžutė';
 $PALANG['pMenu_fetchmail'] = 'Atsisiųsti paštą';
 $PALANG['pMenu_sendmail'] = 'Siųsti laišką';
 $PALANG['pMenu_password'] = 'Slaptažodis';
@@ -94,7 +94,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Visos sritys jau turi sinonimus.';
 $PALANG['pCreate_alias_domain_success'] = 'Srities sinonimas užregistruotas!';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Netinkamas sinonimas!';
-$PALANG['email-address-already-exists'] = 'Šis el.pašto adresas jau yra, pasirinkite kitą pavadinimą!';
+$PALANG['email_address_already_exists'] = 'Šis el.pašto adresas jau yra, pasirinkite kitą pavadinimą!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Išnaudota visa pašto sinonimų kvota!';
 $PALANG['pCreate_alias_goto'] = 'Kam';
 $PALANG['pCreate_alias_goto_text'] = 'Adresas, kuriuo persiųsti paštą.';
@@ -145,7 +145,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Neįvedėte dabartinio slapt
 $PALANG['pPassword_password'] = 'Naujas slaptažodis';
 $PALANG['pPassword_password2'] = 'Naujas slaptažodis (dar kartą)';
 $PALANG['pPassword_password_text_error'] = 'Įvesti slaptažodžiai nesutampa arba tušti!';
-$PALANG['change-password'] = 'Keisti slaptažodį';
+$PALANG['change_password'] = 'Keisti slaptažodį';
 $PALANG['pPassword_result_error'] = 'Slaptažodžio pakeisti nepavyko!';
 $PALANG['pPassword_result_success'] = 'Slaptažodis pakeistas!';
 $PALANG['pEdit_vacation_set'] = 'Pakeisti / nustatyti atostogų pranešimą';
@@ -252,7 +252,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratorius užregistruotas
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Registruoti srities administratorių';
 $PALANG['pAdminEdit_admin_username'] = 'Administratorius';
-$PALANG['password-again'] = 'Slaptažodis (dar kartą)';
+$PALANG['password_again'] = 'Slaptažodis (dar kartą)';
 $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

languages/mk.lang

@@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = 'Логин за обични корисници
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Преглед';
-$PALANG['add-alias'] = 'Додавање на алијас'; # XXX check text - should be 'Add Alias'
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Додавање на поштенско сандаче'; # XXX check text - should be 'Add Mailbox'
+$PALANG['add_alias'] = 'Додавање на алијас'; # XXX check text - should be 'Add Alias'
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Додавање на поштенско сандаче'; # XXX check text - should be 'Add Mailbox'
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = 'Праќање порака';
 $PALANG['pMenu_password'] = 'Промена на лозинка';
@@ -94,7 +94,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Алијасот не е валиден!';
-$PALANG['email-address-already-exists'] = 'Оваа адреса веќе постои. Ве молам одберете друга!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Оваа адреса веќе постои. Ве молам одберете друга!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Го достигнавте вашиот лимит за креирање алијаси!';
 $PALANG['pCreate_alias_goto'] = 'До';
 $PALANG['pCreate_alias_goto_text'] = 'Каде треба да се испрати поштата.';
@@ -144,7 +144,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Ја немате венес
 $PALANG['pPassword_password'] = 'Нова лозинка';
 $PALANG['pPassword_password2'] = 'Нова лозинка (повторно)';
 $PALANG['pPassword_password_text_error'] = 'Внесените лозинки не одговараат! Или се празни!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Промена на лозинка';
+$PALANG['change_password'] = 'Промена на лозинка';
 $PALANG['pPassword_result_error'] = 'Не можам да ја променам вашата лозинка!';
 $PALANG['pPassword_result_success'] = 'Вашата лозинка е сменета!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -252,7 +252,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Администраторот
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Измена на администратор на домен';
 $PALANG['pAdminEdit_admin_username'] = 'Администратор';
-$PALANG['password-again'] = 'Лозинка (повторно)';
+$PALANG['password_again'] = 'Лозинка (повторно)';
 $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

languages/nb.lang

@@ -33,9 +33,9 @@ $PALANG['pLogin_login_users'] = 'Vanlige brukere kan klikke her for å gå til b
 
 $PALANG['pMenu_main'] = 'Hoved';
 $PALANG['pMenu_overview'] = 'Oversikt';
-$PALANG['add-alias'] = 'Legg til alias';
-$PALANG['add-alias-domain'] = 'Legg til aliasdomene';
-$PALANG['add-mailbox'] = 'Legg til e-postkonto'; # XXX check text - should be 'Add Mailbox'
+$PALANG['add_alias'] = 'Legg til alias';
+$PALANG['add_alias_domain'] = 'Legg til aliasdomene';
+$PALANG['add_mailbox'] = 'Legg til e-postkonto'; # XXX check text - should be 'Add Mailbox'
 $PALANG['pMenu_fetchmail'] = 'Hent e-post';
 $PALANG['pMenu_sendmail'] = 'Send e-post';
 $PALANG['pMenu_password'] = 'Passord';
@@ -96,7 +96,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Det er allerede opprettet alias for al
 $PALANG['pCreate_alias_domain_success'] = 'Domenealiaset har blitt lagt inn i tabellen over aliasdomener!';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldig!';
-$PALANG['email-address-already-exists'] = 'Denne e-postadressen eksisterer allerede, vennligst velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Denne e-postadressen eksisterer allerede, vennligst velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Du har nådd grensen for antall aliaser under dette domenet!';
 $PALANG['pCreate_alias_goto'] = 'Til';
 $PALANG['pCreate_alias_goto_text'] = 'Hvor e-postmeldingen skal videresendes til.';
@@ -145,7 +145,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Du oppga ikke ditt nåværen
 $PALANG['pPassword_password'] = 'Nytt passord';
 $PALANG['pPassword_password2'] = 'Nytt passord (bekreft)';
 $PALANG['pPassword_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['change-password'] = 'Endre passord';
+$PALANG['change_password'] = 'Endre passord';
 $PALANG['pPassword_result_error'] = 'Kunne ikke endre passordet ditt!';
 $PALANG['pPassword_result_success'] = 'Ditt passord er nå endret!';
 $PALANG['pEdit_vacation_set'] = 'Endre / angi fraværsmelding';
@@ -252,7 +252,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Endre domeneadministrator';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['password-again'] = 'Passord (bekreft)';
+$PALANG['password_again'] = 'Passord (bekreft)';
 $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

languages/nl.lang

@@ -32,9 +32,9 @@ $PALANG['pLogin_login_users'] = 'Gebruikers klik hier om in te loggen.';
 
 $PALANG['pMenu_main'] = 'Start';
 $PALANG['pMenu_overview'] = 'Overzicht';
-$PALANG['add-alias'] = 'Alias toevoegen'; # XXX check text - should be 'Add Alias'
-$PALANG['add-alias-domain'] = 'Domein alias toevoegen'; # XXX check text - should be 'Add Alias Domain'
-$PALANG['add-mailbox'] = 'Mailbox toevoegen';
+$PALANG['add_alias'] = 'Alias toevoegen'; # XXX check text - should be 'Add Alias'
+$PALANG['add_alias_domain'] = 'Domein alias toevoegen'; # XXX check text - should be 'Add Alias Domain'
+$PALANG['add_mailbox'] = 'Mailbox toevoegen';
 $PALANG['pMenu_fetchmail'] = 'Externe email ophalen';
 $PALANG['pMenu_sendmail'] = 'Verstuur E-mail';
 $PALANG['pMenu_password'] = 'Wachtwoord';
@@ -95,7 +95,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Alle domeinen hebben al een alias!';
 $PALANG['pCreate_alias_domain_success'] = 'De domein alias is toegevoegd aan de alias domein tabel!';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'De Alias is niet geldig!';
-$PALANG['email-address-already-exists'] = 'Dit e-mail aders bestaat al, kies aub een andere.'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Dit e-mail aders bestaat al, kies aub een andere.'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'U bezit het maximum aantal aliassen.';
 $PALANG['pCreate_alias_goto'] = 'Naar';
 $PALANG['pCreate_alias_goto_text'] = 'Waar de e-mails heen gestuurd worden.';
@@ -145,7 +145,7 @@ $PALANG['pPassword_password_current_text_error'] = 'U heeft uw huidige wachtwoor
 $PALANG['pPassword_password'] = 'Nieuw wachtwoord';
 $PALANG['pPassword_password2'] = 'Nieuw wachtwoord (nogmaals)';
 $PALANG['pPassword_password_text_error'] = 'De wachtwoorden die u opgaf komen niet overeen of zijn leeg.';
-$PALANG['change-password'] = 'Wijzig wachtwoord';
+$PALANG['change_password'] = 'Wijzig wachtwoord';
 $PALANG['pPassword_result_error'] = 'Mislukt om uw wachtwoord te veranderen.';
 $PALANG['pPassword_result_success'] = 'Uw wachtwoord is veranderd.';
 
@@ -255,7 +255,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Beheerder is toegevoegd.';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Bewerk een domein beheerder';
 $PALANG['pAdminEdit_admin_username'] = 'Beheerder';
-$PALANG['password-again'] = 'Wachtwoord (nogmaals)';
+$PALANG['password_again'] = 'Wachtwoord (nogmaals)';
 $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

languages/nn.lang

@@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = 'Brukare, trykk her for å gå til bruker-seksjo
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Oversikt';
-$PALANG['add-alias'] = 'Legg til Alias';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Legg til e-postkonto'; # XXX check text - should be 'Add Mailbox'
+$PALANG['add_alias'] = 'Legg til Alias';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Legg til e-postkonto'; # XXX check text - should be 'Add Mailbox'
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = 'Send E-Post';
 $PALANG['pMenu_password'] = 'Passord';
@@ -94,7 +94,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldig!';
-$PALANG['email-address-already-exists'] = 'Denne epostadressen eksisterer allerede, velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Denne epostadressen eksisterer allerede, velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Du er over grensen for antall aliaser i ditt domene!';
 $PALANG['pCreate_alias_goto'] = 'Mottaker';
 $PALANG['pCreate_alias_goto_text'] = 'Hvor skal e-posten videresendes?';
@@ -143,7 +143,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Oppgi det eksisterende passo
 $PALANG['pPassword_password'] = 'Nytt passord';
 $PALANG['pPassword_password2'] = 'Nytt passord (igjen)';
 $PALANG['pPassword_password_text_error'] = 'Passordene er ikke like! Eller feltene er tomme!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Endre Passord';
+$PALANG['change_password'] = 'Endre Passord';
 $PALANG['pPassword_result_error'] = 'Klarte ikke å endre passord!';
 $PALANG['pPassword_result_success'] = 'Passordet ditt er nå endret!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -250,7 +250,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Endre domene-administrator';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['password-again'] = 'Passord (igjen)';
+$PALANG['password_again'] = 'Passord (igjen)';
 $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

languages/pl.lang

@@ -34,9 +34,9 @@ $PALANG['pLogin_login_users'] = 'Sekcja przeznaczona dla użytkowników.';
 
 $PALANG['pMenu_main'] = 'Strona główna';
 $PALANG['pMenu_overview'] = 'Dane zbiorcze';
-$PALANG['add-alias'] = 'Dodaj alias';
-$PALANG['add-alias-domain'] = 'Dodaj alias domeny';
-$PALANG['add-mailbox'] = 'Dodaj konto';
+$PALANG['add_alias'] = 'Dodaj alias';
+$PALANG['add_alias_domain'] = 'Dodaj alias domeny';
+$PALANG['add_mailbox'] = 'Dodaj konto';
 $PALANG['pMenu_fetchmail'] = 'Pobierz Email';
 $PALANG['pMenu_sendmail'] = 'Wyślij Email';
 $PALANG['pMenu_password'] = 'Hasło';
@@ -97,7 +97,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Wszystkie domeny są już aliasowane.'
 $PALANG['pCreate_alias_domain_success'] = 'Alias domeny został dodany do tabeli aliasów domen!';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Alias jest niepoprawny!';
-$PALANG['email-address-already-exists'] = 'Taki adres email juz istnieje, proszę wybrać inny!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Taki adres email juz istnieje, proszę wybrać inny!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Twój limit aliasów został osiągniety!';
 $PALANG['pCreate_alias_goto'] = 'Do';
 $PALANG['pCreate_alias_goto_text'] = 'Gdzie ten mail powinien być wysłany.';
@@ -146,7 +146,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Nieprawidłowe aktualne has
 $PALANG['pPassword_password'] = 'Nowe hasło';
 $PALANG['pPassword_password2'] = 'Nowe hasło (ponownie)';
 $PALANG['pPassword_password_text_error'] = 'Podane hasło nie pasuje! Lub jest puste!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Zmień hasło';
+$PALANG['change_password'] = 'Zmień hasło';
 $PALANG['pPassword_result_error'] = 'Nie można zmienić Twojego hasła!';
 $PALANG['pPassword_result_success'] = 'Twoje hasło zostało zmienione!';
 
@@ -254,7 +254,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administrator został dodany!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Edytuj administratora domeny';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['password-again'] = 'Hasło (ponownie)';
+$PALANG['password_again'] = 'Hasło (ponownie)';
 $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

languages/pt-br.lang

@@ -33,9 +33,9 @@ $PALANG['pLogin_login_users'] = 'Usuários devem clicar aqui para acessar a seç
 
 $PALANG['pMenu_main'] = 'Menu Principal';
 $PALANG['pMenu_overview'] = 'Visão Geral';
-$PALANG['add-alias'] = 'Criar Alias';
-$PALANG['add-alias-domain'] = 'Criar Alias de Domínio';
-$PALANG['add-mailbox'] = 'Criar Conta de Email';
+$PALANG['add_alias'] = 'Criar Alias';
+$PALANG['add_alias_domain'] = 'Criar Alias de Domínio';
+$PALANG['add_mailbox'] = 'Criar Conta de Email';
 $PALANG['pMenu_fetchmail'] = 'Recuperar Mensagens';
 $PALANG['pMenu_sendmail'] = 'Enviar Mensagem';
 $PALANG['pMenu_password'] = 'Alterar Senha';
@@ -98,7 +98,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Todos os domínios já estão espelhad
 $PALANG['pCreate_alias_domain_success'] = 'Alias de domínio criado!';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Alias inválido!';
-$PALANG['email-address-already-exists'] = 'Endereço de email fornecido já existe. Por favor, escolha outro endereço!';
+$PALANG['email_address_already_exists'] = 'Endereço de email fornecido já existe. Por favor, escolha outro endereço!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Você alcançou seu limite de aliases!';
 $PALANG['pCreate_alias_goto'] = 'Para';
 $PALANG['pCreate_alias_goto_text'] = 'Para onde as mensagens serão enviadas.';
@@ -148,7 +148,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Você não digitou sua senha
 $PALANG['pPassword_password'] = 'Nova senha';
 $PALANG['pPassword_password2'] = 'Nova senha (confirmação)';
 $PALANG['pPassword_password_text_error'] = 'As senhas fornecidas são diferentes! Ou não foram digitadas!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Alterar Senha';
+$PALANG['change_password'] = 'Alterar Senha';
 $PALANG['pPassword_result_error'] = 'Não foi possível alterar sua senha!';
 $PALANG['pPassword_result_success'] = 'Senha alterada!';
 
@@ -259,7 +259,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administrador criado!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Edição de administrador de domínio.';
 $PALANG['pAdminEdit_admin_username'] = 'Administrador';
-$PALANG['password-again'] = 'Senha (confirmação)';
+$PALANG['password_again'] = 'Senha (confirmação)';
 $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

languages/ru.lang

@@ -34,9 +34,9 @@ $PALANG['pLogin_login_users'] = 'Вход для обычных пользова
 
 $PALANG['pMenu_main'] = 'Главная';
 $PALANG['pMenu_overview'] = 'Обзор';
-$PALANG['add-alias'] = 'Создать алиас';
-$PALANG['add-alias-domain'] = 'Создать домен-алиас';
-$PALANG['add-mailbox'] = 'Создать ящик';
+$PALANG['add_alias'] = 'Создать алиас';
+$PALANG['add_alias_domain'] = 'Создать домен-алиас';
+$PALANG['add_mailbox'] = 'Создать ящик';
 $PALANG['pMenu_fetchmail'] = 'Сбор почты';
 $PALANG['pMenu_sendmail'] = 'Послать письмо';
 $PALANG['pMenu_password'] = 'Пароль';
@@ -98,7 +98,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Все домены уже задей
 $PALANG['pCreate_alias_domain_success'] = 'Домен-алиас добавлен в таблицу доменов-алиасов!';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Неверное имя алиаса!';
-$PALANG['email-address-already-exists'] = 'Этот почтовый адрес уже существует, пожалуйста, выберите другой.'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Этот почтовый адрес уже существует, пожалуйста, выберите другой.'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Вы достигли лимита по созданным алиасам!';
 $PALANG['pCreate_alias_goto'] = 'Кому';
 $PALANG['pCreate_alias_goto_text'] = 'Куда должна доставляться почта.';
@@ -148,7 +148,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Вы не указали в
 $PALANG['pPassword_password'] = 'Новый пароль';
 $PALANG['pPassword_password2'] = 'Новый пароль (еще раз)';
 $PALANG['pPassword_password_text_error'] = 'Введенные вами пароли не совпадают либо пусты!';
-$PALANG['change-password'] = 'Изменить пароль';
+$PALANG['change_password'] = 'Изменить пароль';
 $PALANG['pPassword_result_error'] = 'Невозможно изменить ваш пароль!';
 $PALANG['pPassword_result_success'] = 'Ваш пароль был изменен!';
 
@@ -259,7 +259,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Администратор бы
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Редактирование администратора домена';
 $PALANG['pAdminEdit_admin_username'] = 'Администратор';
-$PALANG['password-again'] = 'Пароль (еще раз)';
+$PALANG['password_again'] = 'Пароль (еще раз)';
 $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

languages/sk.lang

@@ -32,9 +32,9 @@ $PALANG['pLogin_login_users'] = 'Vstup do užívateľskej sekcie';
 
 $PALANG['pMenu_main'] = 'Hlavné';
 $PALANG['pMenu_overview'] = 'Prehľad';
-$PALANG['add-alias'] = 'Nový alias'; # XXX check text - should be 'Add Alias'
-$PALANG['add-alias-domain'] = 'Nový alias domény'; # XXX check text - should be 'Add Alias Domain'
-$PALANG['add-mailbox'] = 'Nová schránka'; # XXX check text - should be 'Add Mailbox'
+$PALANG['add_alias'] = 'Nový alias'; # XXX check text - should be 'Add Alias'
+$PALANG['add_alias_domain'] = 'Nový alias domény'; # XXX check text - should be 'Add Alias Domain'
+$PALANG['add_mailbox'] = 'Nová schránka'; # XXX check text - should be 'Add Mailbox'
 $PALANG['pMenu_fetchmail'] = 'Sťahovanie emailu';
 $PALANG['pMenu_sendmail'] = 'Poslať email';
 $PALANG['pMenu_password'] = 'Zmeniť heslo';
@@ -95,7 +95,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'Všetky domény už majú aliasy.';
 $PALANG['pCreate_alias_domain_success'] = 'Alias domény bol pridaný do tabuľky!';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Adresa nie je platná!';
-$PALANG['email-address-already-exists'] = 'Takáto emailová adresa už existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Takáto emailová adresa už existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Dosiahli ste limit, nemôžete vytvárať ďalšie aliasy!';
 $PALANG['pCreate_alias_goto'] = 'Cieľ';
 $PALANG['pCreate_alias_goto_text'] = 'Kam má pošta chodiť';
@@ -145,7 +145,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Nezadali ste súčasné hesl
 $PALANG['pPassword_password'] = 'Nové heslo';
 $PALANG['pPassword_password2'] = 'Nové heslo (znovu)';
 $PALANG['pPassword_password_text_error'] = 'Zadané heslá sú rozdielne alebo prázdne!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Zmeniť heslo'; # XXX check text - should be 'Change Password'
+$PALANG['change_password'] = 'Zmeniť heslo'; # XXX check text - should be 'Change Password'
 $PALANG['pPassword_result_error'] = 'Nepodarilo sa zmeniť heslo!';
 $PALANG['pPassword_result_success'] = 'Heslo bolo zmenené!';
 $PALANG['pEdit_vacation_set'] = 'Zmeniť/nastaviť aut. odpoveď';
@@ -252,7 +252,7 @@ $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['password-again'] = 'Heslo (znovu)';
+$PALANG['password_again'] = 'Heslo (znovu)';
 $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

languages/sl.lang

@@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = 'Uporabniki kliknite tukaj, če želite nastavit
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Pregled';
-$PALANG['add-alias'] = 'Dodaj alias';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Dodaj predal';
+$PALANG['add_alias'] = 'Dodaj alias';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Dodaj predal';
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = 'Pošlji e-pošto';
 $PALANG['pMenu_password'] = 'Geslo';
@@ -94,7 +94,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Sintaksa aliasa je napačna!';
-$PALANG['email-address-already-exists'] = 'Ta e-poštni naslov že obstaja, prosimo izberite drugega!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Ta e-poštni naslov že obstaja, prosimo izberite drugega!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Maksimalno število aliasov je preseženo!';
 $PALANG['pCreate_alias_goto'] = 'Za';
 $PALANG['pCreate_alias_goto_text'] = 'Kamor želite nasloviti pošto.';
@@ -144,7 +144,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Vnesti morate trenutno geslo
 $PALANG['pPassword_password'] = 'Novo geslo';
 $PALANG['pPassword_password2'] = 'Novo geslo (ponovitev)';
 $PALANG['pPassword_password_text_error'] = 'Vnešeni gesli se ne ujemata ali pa sta prazni!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Spremeni geslo';
+$PALANG['change_password'] = 'Spremeni geslo';
 $PALANG['pPassword_result_error'] = 'Gesla ni bilo mogoče spremeniti!';
 $PALANG['pPassword_result_success'] = 'Geslo je bilo uspešno spremenjeno!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -251,7 +251,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je bil uspešno d
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Uredi domenskega administratorja';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['password-again'] = 'Geslo (ponovitev)';
+$PALANG['password_again'] = 'Geslo (ponovitev)';
 $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

languages/sv.lang

@@ -33,9 +33,9 @@ $PALANG['pLogin_login_users'] = 'Användare klickar här för att logga in på a
 
 $PALANG['pMenu_main'] = 'Huvudmeny';
 $PALANG['pMenu_overview'] = 'Sammanfattning';
-$PALANG['add-alias'] = 'Lägg till alias';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Lägg till brevlåda';
+$PALANG['add_alias'] = 'Lägg till alias';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Lägg till brevlåda';
 $PALANG['pMenu_fetchmail'] = 'Hämta mail';
 $PALANG['pMenu_sendmail'] = 'Skicka mail';
 $PALANG['pMenu_password'] = 'Lösenord';
@@ -96,7 +96,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Detta ALIAS är inte giltigt!';
-$PALANG['email-address-already-exists'] = 'Denna epostadress existerar redan, välj en annan epostadress!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Denna epostadress existerar redan, välj en annan epostadress!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Du har redan högsta tillåtna antal alias definierade!';
 $PALANG['pCreate_alias_goto'] = 'Till';
 $PALANG['pCreate_alias_goto_text'] = 'Vart skall mailen skickas.';
@@ -146,7 +146,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Du angav ej korrekt lösenor
 $PALANG['pPassword_password'] = 'Nytt Lösenord';
 $PALANG['pPassword_password2'] = 'Nytt Lösenord (igen)';
 $PALANG['pPassword_password_text_error'] = 'Lösenorden du angav var olika! Eller är tomma!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Ändra Lösenord';
+$PALANG['change_password'] = 'Ändra Lösenord';
 $PALANG['pPassword_result_error'] = 'Kan inte ändra ditt lösenord!';
 $PALANG['pPassword_result_success'] = 'Ditt lösenord har ändrats!';
 $PALANG['pEdit_vacation_set'] = 'Ändra / Aktivera meddelande för ledighet';
@@ -253,7 +253,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admin har lagts till!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Ändra en domänadmin';
 $PALANG['pAdminEdit_admin_username'] = 'Admin';
-$PALANG['password-again'] = 'Lösenord (igen)';
+$PALANG['password_again'] = 'Lösenord (igen)';
 $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

languages/tr.lang

@@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = 'Kullanýcý iþlemlerine girmek için burayý k
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Genel Bilgiler';
-$PALANG['add-alias'] = 'Alias Ekle';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = 'Posta kutusu ekle';
+$PALANG['add_alias'] = 'Alias Ekle';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = 'Posta kutusu ekle';
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = 'E-posta Gönder';
 $PALANG['pMenu_password'] = 'Þifre';
@@ -94,7 +94,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS uygun deðil!';
-$PALANG['email-address-already-exists'] = 'Bu e-posta zaten kullanýlýyor, lütfen baþka bir tane seçin!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
+$PALANG['email_address_already_exists'] = 'Bu e-posta zaten kullanýlýyor, lütfen baþka bir tane seçin!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Alias limitine ulaþtýnýz!';
 $PALANG['pCreate_alias_goto'] = 'kime';
 $PALANG['pCreate_alias_goto_text'] = 'E-postanýn gitmesi gereken yer.';
@@ -144,7 +144,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Þuanki þifrenizi vermedini
 $PALANG['pPassword_password'] = 'Yeni Þifre';
 $PALANG['pPassword_password2'] = 'Yeni þifre (tekrar)';
 $PALANG['pPassword_password_text_error'] = 'Verdiðiniz þifreler birbirini tutmuyor! Ya da boþ!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = 'Þifreyi deðiþtir'; # XXX check text - should be 'Change Password'
+$PALANG['change_password'] = 'Þifreyi deðiþtir'; # XXX check text - should be 'Change Password'
 $PALANG['pPassword_result_error'] = 'Þifreniz deðiþtirilemedi!';
 $PALANG['pPassword_result_success'] = 'þifreniz deðiþtirildi!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -251,7 +251,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Yönetici eklendi!';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'Domain yöneticisi düzenle';
 $PALANG['pAdminEdit_admin_username'] = 'Yönetici';
-$PALANG['password-again'] = 'Þifre (tekrar)';
+$PALANG['password_again'] = 'Þifre (tekrar)';
 $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

languages/tw.lang

@@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = '普通用戶點擊這裡進入用戶控制面
 
 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = '概覽';
-$PALANG['add-alias'] = '新建別名';
-$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
-$PALANG['add-mailbox'] = '新建郵箱'; # XXX check text - should be 'Add Mailbox'
+$PALANG['add_alias'] = '新建別名';
+$PALANG['add_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add_mailbox'] = '新建郵箱'; # XXX check text - should be 'Add Mailbox'
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = '發送郵件';
 $PALANG['pMenu_password'] = '修改密碼';
@@ -94,7 +94,7 @@ $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # X
 $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = '該別名非法!';
-$PALANG['email-address-already-exists'] = '郵件地址已經存在, 請重新選擇!';
+$PALANG['email_address_already_exists'] = '郵件地址已經存在, 請重新選擇!';
 $PALANG['pCreate_alias_address_text_error3'] = '你的別名已經達到上限!';
 $PALANG['pCreate_alias_goto'] = '轉到';
 $PALANG['pCreate_alias_goto_text'] = '郵件接收地址.';
@@ -144,7 +144,7 @@ $PALANG['pPassword_password_current_text_error'] = '你沒有填寫當前密碼!
 $PALANG['pPassword_password'] = '新密碼';
 $PALANG['pPassword_password2'] = '新密碼 (驗證)';
 $PALANG['pPassword_password_text_error'] = '你兩次輸入的新密碼不相同! 或者為空!'; # XXX check/beautify - was split in two lines before
-$PALANG['change-password'] = '更改密碼'; # XXX check text - should be 'Change Password'
+$PALANG['change_password'] = '更改密碼'; # XXX check text - should be 'Change Password'
 $PALANG['pPassword_result_error'] = '更改密碼失敗!';
 $PALANG['pPassword_result_success'] = '更改密碼成功!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@@ -251,7 +251,7 @@ $PALANG['pAdminCreate_admin_result_success'] = '新增管理員成功!';
 
 $PALANG['pAdminEdit_admin_welcome'] = '修改網域管理員';
 $PALANG['pAdminEdit_admin_username'] = '管理員';
-$PALANG['password-again'] = '密碼 (驗證)';
+$PALANG['password_again'] = '密碼 (驗證)';
 $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

model/AdminHandler.php

@@ -43,7 +43,7 @@ class AdminHandler extends PFAHandler {
             #                           editing?    form    list
             'username'        => pacol( $this->new, 1,      1,      'text', 'pAdminEdit_admin_username'    , 'pAdminCreate_admin_username_text' ),
             'password'        => pacol( 1,          1,      0,      'pass', 'password'                     , ''                                 ),
-            'password2'       => pacol( 1,          1,      0,      'pass', 'password-again'               , ''                                 , '', '',
+            'password2'       => pacol( 1,          1,      0,      'pass', 'password_again'               , ''                                 , '', '',
                 /*not_in_db*/ 0,
                 /*dont_write_to_db*/ 1,
                 /*select*/ 'password as password2'

model/AdminpasswordHandler.php

@@ -63,7 +63,7 @@ class AdminpasswordHandler extends PFAHandler {
             # $PALANG labels
             'formtitle_create' => 'pPassword_welcome',
             'formtitle_edit' => 'pPassword_welcome',
-            'create_button' => 'change-password',
+            'create_button' => 'change_password',
 
             # various settings
             'required_role' => 'admin',

model/AliasHandler.php

@@ -66,7 +66,7 @@ class AliasHandler extends PFAHandler {
     }
 
     protected function initMsg() {
-        $this->msg['error_already_exists'] = 'email-address-already-exists';
+        $this->msg['error_already_exists'] = 'email_address_already_exists';
         $this->msg['error_does_not_exist'] = 'pCreate_alias_address_text_error1'; # TODO: better error message
         if ($this->new) {
             $this->msg['logname'] = 'create_alias';
@@ -91,7 +91,7 @@ class AliasHandler extends PFAHandler {
             # $PALANG labels
             'formtitle_create'  => 'pMain_create_alias',
             'formtitle_edit'    => 'pEdit_alias_welcome',
-            'create_button'     => 'add-alias',
+            'create_button'     => 'add_alias',
 
             # various settings
             'required_role' => 'admin',

model/AliasdomainHandler.php

@@ -81,7 +81,7 @@ class AliasdomainHandler extends PFAHandler {
             # $PALANG labels
             'formtitle_create' => 'pCreate_alias_domain_welcome',
             'formtitle_edit' => 'pCreate_alias_domain_welcome',
-            'create_button' => 'add-alias-domain',
+            'create_button' => 'add_alias_domain',
 
             # various settings
             'required_role' => 'admin',

model/MailboxHandler.php

@@ -23,7 +23,7 @@ class MailboxHandler extends PFAHandler {
             # 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', 'password'                      , 'pCreate_mailbox_password_text'   , '' ),
-            'password2'     => pacol(   1,          1,      0,      'pass', 'password-again'                , ''                                 , '', 
+            'password2'     => pacol(   1,          1,      0,      'pass', 'password_again'                , ''                                 , '', 
                 /*options*/ '',
                 /*not_in_db*/ 0,
                 /*dont_write_to_db*/ 1,
@@ -83,7 +83,7 @@ class MailboxHandler extends PFAHandler {
     }
 
     protected function initMsg() {
-        $this->msg['error_already_exists'] = 'email-address-already-exists';
+        $this->msg['error_already_exists'] = 'email_address_already_exists';
         $this->msg['error_does_not_exist'] = 'pCreate_mailbox_username_text_error1';
         if ($this->new) {
             $this->msg['logname'] = 'create_mailbox';
@@ -107,7 +107,7 @@ class MailboxHandler extends PFAHandler {
             # $PALANG labels
             'formtitle_create' => 'pCreate_mailbox_welcome',
             'formtitle_edit' => 'pEdit_mailbox_welcome',
-            'create_button' => 'add-mailbox',
+            'create_button' => 'add_mailbox',
 
             # various settings
             'required_role' => 'admin',
@@ -140,7 +140,7 @@ class MailboxHandler extends PFAHandler {
         # check if an alias with this name already exists - if yes, don't allow to create the mailbox
         $handler = new AliasHandler(1);
         if (!$handler->init($this->id)) {
-            $this->errormsg[] = Lang::read('email-address-already-exists');
+            $this->errormsg[] = Lang::read('email_address_already_exists');
             return false;
         }
 

setup.php

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

templates/list-virtual.tpl

@@ -45,7 +45,7 @@
 	</table>
 	{$nav_bar_alias.bottom}
 	{if $tCanAddAlias}
-		<br /><a href="{#url_create_alias#}&amp;domain={$fDomain|escape:"url"}" class="button">{$PALANG.add-alias}</a><br />
+		<br /><a href="{#url_create_alias#}&amp;domain={$fDomain|escape:"url"}" class="button">{$PALANG.add_alias}</a><br />
 	{/if}
 {/if}
 {if $tab=='all'}<br />{/if}
@@ -64,7 +64,7 @@
 	{/if}
 	{$nav_bar_mailbox.bottom}
 	{if $tCanAddMailbox}
-		<br /><a href="{#url_create_mailbox#}&amp;domain={$fDomain|escape:"url"}" class="button">{$PALANG.add-mailbox}</a><br />
+		<br /><a href="{#url_create_mailbox#}&amp;domain={$fDomain|escape:"url"}" class="button">{$PALANG.add_mailbox}</a><br />
 	{/if}
 {/if}
 {if $CONF.show_status===YES && $CONF.show_status_key===YES}

templates/list-virtual_alias_domain.tpl

@@ -40,6 +40,6 @@
 </table>
 {if $can_create_alias_domain}
 	<br/>
-	<br /><a href="{#url_create_alias_domain#}&amp;target_domain={$fDomain|escape:"url"}" class="button">{$PALANG.add-alias-domain}</a><br />
+	<br /><a href="{#url_create_alias_domain#}&amp;target_domain={$fDomain|escape:"url"}" class="button">{$PALANG.add_alias_domain}</a><br />
 
 {/if}

templates/main.tpl

@@ -6,11 +6,11 @@
 		<td>{$PALANG.pMain_overview}</td>
 	</tr>
 	<tr>
-		<td nowrap="nowrap"><a target="_top" href="{#url_create_alias#}">{$PALANG.add-alias}</a></td>
+		<td nowrap="nowrap"><a target="_top" href="{#url_create_alias#}">{$PALANG.add_alias}</a></td>
 		<td>{$PALANG.pMain_create_alias}</td>
 	</tr>
 	<tr>
-		<td nowrap="nowrap"><a target="_top" href="{#url_create_mailbox#}">{$PALANG.add-mailbox}</a></td>
+		<td nowrap="nowrap"><a target="_top" href="{#url_create_mailbox#}">{$PALANG.add_mailbox}</a></td>
 		<td>{$PALANG.pMain_create_mailbox}</td>
 	</tr>
 {if $CONF.sendmail==='YES'}

templates/menu.tpl

@@ -37,10 +37,10 @@
 	<li><a target="_top" href="{#url_list_virtual#}">{$PALANG.pAdminMenu_list_virtual}</a>
 		<ul>
 			<li><a target="_top" href="{#url_list_virtual#}">{$PALANG.pAdminMenu_list_virtual}</a></li>
-			<li><a target="_top" href="{#url_create_mailbox#}{$url_domain}">{$PALANG.add-mailbox}</a></li>
-			<li><a target="_top" href="{#url_create_alias#}{$url_domain}">{$PALANG.add-alias}</a></li>
+			<li><a target="_top" href="{#url_create_mailbox#}{$url_domain}">{$PALANG.add_mailbox}</a></li>
+			<li><a target="_top" href="{#url_create_alias#}{$url_domain}">{$PALANG.add_alias}</a></li>
 {if $boolconf_alias_domain}
-			<li><a target="_top" href="{#url_create_alias_domain#}{$url_domain}">{$PALANG.add-alias-domain}</a></li>
+			<li><a target="_top" href="{#url_create_alias_domain#}{$url_domain}">{$PALANG.add_alias_domain}</a></li>
 {/if}
 		</ul>
 	</li>

templates/password.tpl

@@ -27,7 +27,7 @@
 	<tr>
 		<td class="label">&nbsp;</td>
 		<td>
-			<input class="button" type="submit" name="submit" value="{$PALANG.change-password}" />
+			<input class="button" type="submit" name="submit" value="{$PALANG.change_password}" />
 			{if $authentication_has_role.user}
 				<input class="button" type="submit" name="fCancel" value="{$PALANG.exit}" />
 			{/if}

templates/users_main.tpl

@@ -11,7 +11,7 @@
 		<td>{$PALANG.pUsersMain_edit_alias}</td>
 	</tr>
 	<tr>
-		<td nowrap="nowrap"><a target="_top" href="password.php">{$PALANG.change-password}</a></td>
+		<td nowrap="nowrap"><a target="_top" href="password.php">{$PALANG.change_password}</a></td>
 		<td>{$PALANG.pUsersMain_password}</td>
 	</tr>
 	<tr>

templates/users_menu.tpl

@@ -5,7 +5,7 @@
 	<li><a target="_top" href="{#url_user_vacation#}">{$PALANG.pUsersMenu_vacation}</a></li>
 {/if}
 	<li><a target="_top" href="{#url_user_edit_alias#}">{$PALANG.pUsersMenu_edit_alias}</a></li>
-	<li><a target="_top" href="{#url_user_password#}">{$PALANG.change-password}</a></li>
+	<li><a target="_top" href="{#url_user_password#}">{$PALANG.change_password}</a></li>
 	<li class="logout"><a target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></li>
 </ul>
 </div>