*.lang:

- rename various $PALANG texts: - pMenu_create_alias => add-alias - pMenu_create_alias_domain => add-alias-domain - pMenu_create_mailbox => add-mailbox - pOverview_get_mailboxes => mailboxes - pPassword_button => change-password - pAdminList_domain_description => description - pAdminList_domain_aliases => aliases - pAdminEdit_domain_transport => transport - pAdminEdit_admin_password2 => password-again - remove duplicate or unused $PALANG texts: - pOverview_alias_alias_count - pOverview_alias_mailbox_count - pOverview_get_aliases - pCreate_alias_domain_button - pCreate_alias_welcome - pCreate_alias_button - pCreate_mailbox_password2 - pCreate_mailbox_quota_text_error - pCreate_mailbox_button - pAdminMenu_viewlog - pAdminMenu_create_alias - pAdminMenu_create_mailbox - pAdminList_domain_mailboxes - pAdminList_domain_transport - pAdminList_virtual_welcome - pAdminList_virtual_alias_alias_count - pAdminList_virtual_alias_mailbox_count - pAdminList_virtual_mailbox_username - pAdminList_virtual_mailbox_quota - pAdminEdit_domain_description - pAdminEdit_domain_aliases - pAdminEdit_domain_mailboxes - pAdminEdit_domain_mailboxes_text - pUsersMenu_password model/*, seetup.php, templates/* - use changed $PALANG texts git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1510 a1433add-5e2c-0410-b055-b7f2511e0802
11 years ago · 9c0004a431
parent 61c5920c46
commit 9c0004a431
49 changed files with 336 additions and 1079 deletions
--- a/languages/bg.lang
+++ b/languages/bg.lang
@ -32,9 +32,9 @@ $PALANG['pLogin_login_users'] = 'Ако сте потребител натисн

 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Преглед';
-$PALANG['pMenu_create_alias'] = 'Създай нов Alias';
-$PALANG['pMenu_create_alias_domain'] = 'Добави Alias Domain';
-$PALANG['pMenu_create_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'] = 'Парола';
@ -43,7 +43,7 @@ $PALANG['pMenu_logout'] = 'Изход';

 $PALANG['pMain_welcome'] = 'Добре дошли!';
 $PALANG['pMain_overview'] = 'Преглед на alias-ите и пощенските кутии. Оттук можете да редактирате/триете.';
-$PALANG['pMain_create_alias'] = 'Създаване на нов alias за вашият домейн.';
+$PALANG['pMain_create_alias'] = 'Създаване на нов alias за вашият домейн.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Създаване на нова пощенска кутия за вашия домейн.';
 $PALANG['pMain_sendmail'] = 'Изпрати е-мейл до един от новосъздадени пощенски кутии.';
 $PALANG['pMain_password'] = 'Смяна на паролата за администраторския акаунт.';
@ -62,8 +62,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
 $PALANG['pOverview_button'] = 'Напред';
 $PALANG['pOverview_welcome'] = 'Преглед на ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Alias-и';
-$PALANG['pOverview_alias_mailbox_count'] = 'Пощенски кутии';
 $PALANG['pOverview_alias_address'] = 'От';
 $PALANG['pOverview_alias_goto'] = 'До';
 $PALANG['active'] = 'Активен';
@ -77,9 +75,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Домейн';
-$PALANG['pOverview_get_aliases'] = 'Alias-и';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Пощенски кутии';
+$PALANG['mailboxes'] = 'Пощенски кутии';
 $PALANG['pOverview_get_quota'] = 'Обем на пощенската кутия (MB)';

 $PALANG['pDelete_delete_error'] = 'Не мога да изтрия записа ';
@ -91,19 +88,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'Не ви е позволено да използвате избраната конфигурация.';
 $PALANG['pCreate_alias_domain_error2'] = 'Избраната конфигурация е невалидна. Изберете друга!';
 $PALANG['pCreate_alias_domain_error3'] = 'Възникна грешка при добавяне в базата.';
 $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_welcome'] = 'Създай нов alias за вашия домейн.';
 $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['pCreate_alias_address_text_error3'] = 'Достигнали сте лимита си за създаване на alias-и!';
 $PALANG['pCreate_alias_goto'] = 'Към';
-$PALANG['pCreate_alias_button'] = 'Добави Alias';
 $PALANG['pCreate_alias_goto_text'] = 'Накъде трябва да се изпраща писмото.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Избраният адрес в полето Към не е валиден!';
 $PALANG['pCreate_alias_result_error'] = 'Не мога да добавя alias-а към таблицата!';
@ -125,12 +119,9 @@ $PALANG['pEdit_alias_result_error'] = 'Не мога да модифицирам
 $PALANG['pCreate_mailbox_welcome'] = 'Създаване на нова пощенска кутия за вашия домейн.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Е-мейл-а не е валиден!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Вие сте достигнали своя лимит за създаване на пощенски кутии!';
-$PALANG['pCreate_mailbox_password2'] = 'Парола (отново)';
 $PALANG['pCreate_mailbox_password_text'] = 'Парола за POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Пълно име';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Обема, който сте задали е твърде голям!';
 $PALANG['pCreate_mailbox_mail'] = 'Създай пощенска кутия'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Добави пощенска кутия';
 $PALANG['pCreate_mailbox_result_error'] = 'Не мога да добавя пощенската кутия в таблицата!';
 $PALANG['pCreate_mailbox_result_success'] = 'Пощенската кутия бе успешно създадена и добавена в таблицата!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -154,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['pPassword_button'] = 'Смени парола';
+$PALANG['change-password'] = 'Смени парола';
 $PALANG['pPassword_result_error'] = 'Не мога да сменя паролата!';
 $PALANG['pPassword_result_success'] = 'Паролата ви бе сменена успешно!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@ -208,34 +199,24 @@ $PALANG['pSendmail_result_success'] = 'Съобщението беше изпр
 $PALANG['pAdminMenu_list_admin'] = 'Списък с админите';
 $PALANG['pAdminMenu_list_domain'] = 'Списък с домейните';
 $PALANG['pAdminMenu_list_virtual'] = 'Виртуален списък';
-$PALANG['pAdminMenu_viewlog'] = 'Преглед на лога';
 $PALANG['pAdminMenu_backup'] = 'Резервно копие';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Админи на домейни';
 $PALANG['pAdminMenu_create_admin'] = 'Нов админ';
 $PALANG['pAdminMenu_create_domain'] = 'Нов домейн';
-$PALANG['pAdminMenu_create_alias'] = 'Добави Alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Добави пощенска кутия';

 $PALANG['pAdminList_admin_username'] = 'Админ';
 $PALANG['pAdminList_admin_count'] = 'Домейни';

-$PALANG['pAdminList_domain_description'] = 'Описание';
-$PALANG['pAdminList_domain_aliases'] = 'Alias-и';
-$PALANG['pAdminList_domain_mailboxes'] = 'Пощенски кутии';
+$PALANG['description'] = 'Описание';
+$PALANG['aliases'] = 'Alias-и';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Последно модифициран'; # XXX check text - should be 'Last modified'

 $PALANG['pAdminList_virtual_button'] = 'Напред';
-$PALANG['pAdminList_virtual_welcome'] = 'Преглед на ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias-и';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Пощенски кутии';
 $PALANG['pAdminList_virtual_alias_address'] = 'От';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Към';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Е-мейл';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Име';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Обем (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Добавяне на нов домейн';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Този домейн вече съществува!';
@ -251,15 +232,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Грешка при изтриванет
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Редактиране на домейн';
-$PALANG['pAdminEdit_domain_description'] = 'Описание';
-$PALANG['pAdminEdit_domain_aliases'] = 'Alias-и';
 $PALANG['pAdminEdit_domain_aliases_text'] = '0 = изключени | -1 = неограничени';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Пощенски кутии';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '0 = изключени | -1 = неограничени';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Максимален обем';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | 0 = изключено | -1 = неограничен';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Мейл сървъра е резервен MX';
 $PALANG['pAdminEdit_domain_button'] = 'Редактирай домейн'; # XXX text no longer used
@ -275,7 +252,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Админа беше добав

 $PALANG['pAdminEdit_admin_welcome'] = 'Редакция на админ на домейн';
 $PALANG['pAdminEdit_admin_username'] = 'Админ';
-$PALANG['pAdminEdit_admin_password2'] = 'Парола (отново)';
+$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
@ -288,7 +265,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Вашата парола не е

 $PALANG['pUsersMenu_vacation'] = 'Автоматичен отговор';
 $PALANG['pUsersMenu_edit_alias'] = 'Смяна на пренасочването';
-$PALANG['pUsersMenu_password'] = 'Смени парола';

 $PALANG['pUsersMain_vacation'] = 'Настройване на "out of office" съобщение или автоматичен отговор за вашият е-мейл.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
--- a/languages/ca.lang
+++ b/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['pMenu_create_alias'] = 'Afegir àlies';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_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';
@ -41,7 +41,7 @@ $PALANG['pMenu_logout'] = 'Sortir';

 $PALANG['pMain_welcome'] = 'Benvingut al Postfix Admin!';
 $PALANG['pMain_overview'] = 'Llistat dels seus àlies i bústies. Pot editar-los / borrar-los des d\'aquí.';
-$PALANG['pMain_create_alias'] = 'Creació d\'un nou àlies pel seu domini.';
+$PALANG['pMain_create_alias'] = 'Creació d\'un nou àlies pel seu domini.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Creació d\'una nova bústia pel seu domini.';
 $PALANG['pMain_sendmail'] = 'Enviar un e-mail a una de les bústies acabades de crear.';
 $PALANG['pMain_password'] = 'Canviar la contrasenya per la seva compta d\'administració.';
@ -60,8 +60,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
 $PALANG['pOverview_button'] = 'Ves';
 $PALANG['pOverview_welcome'] = 'Resum de ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Àlies';
-$PALANG['pOverview_alias_mailbox_count'] = 'Bústies';
 $PALANG['pOverview_alias_address'] = 'De';
 $PALANG['pOverview_alias_goto'] = 'Destí';
 $PALANG['active'] = 'Actiu';
@ -75,9 +73,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domini';
-$PALANG['pOverview_get_aliases'] = 'Àlies';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Bústies';
+$PALANG['mailboxes'] = 'Bústies';
 $PALANG['pOverview_get_quota'] = 'Quota de bústia (MB)';

 $PALANG['pDelete_delete_error'] = 'Imposible borrar el registre ';
@ -89,19 +86,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Crear un nou àlies pel domini.';
 $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['pCreate_alias_address_text_error3'] = 'Has arribat al límit de creació d\'àlies!';
 $PALANG['pCreate_alias_goto'] = 'Destí';
-$PALANG['pCreate_alias_button'] = 'Afegir àlies';
 $PALANG['pCreate_alias_goto_text'] = 'A on ha de ser enviat l\'e-mail.';
 $PALANG['pCreate_alias_goto_text_error'] = 'El destí no és vàlid!';
 $PALANG['pCreate_alias_result_error'] = '¡No és posible afegir l\'àlies a la taula d\'àlies!';
@ -123,12 +117,9 @@ $PALANG['pEdit_alias_result_error'] = 'Imposible modificar l\'àlies!';
 $PALANG['pCreate_mailbox_welcome'] = 'Crear una nova bústia pel seu domini.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'L\'e-mail no és vàlido!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Has arribat al límit de creació de bústies!';
-$PALANG['pCreate_mailbox_password2'] = 'Contrasenya (repetir)';
 $PALANG['pCreate_mailbox_password_text'] = 'Contrasenya per a POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Nom complet';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'La quota especificada és massa alta!';
 $PALANG['pCreate_mailbox_mail'] = 'Crear bústia'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Afegir bústia';
 $PALANG['pCreate_mailbox_result_error'] = 'Imposible afegir una bústia a la taula de bústies!';
 $PALANG['pCreate_mailbox_result_success'] = 'La bústia ha estat afegida a la taula de bústies!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -152,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['pPassword_button'] = '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
@ -206,34 +197,24 @@ $PALANG['pSendmail_result_success'] = 'La bústia ha estat creada!'; # XXX text
 $PALANG['pAdminMenu_list_admin'] = 'Llistat d\'administradors';
 $PALANG['pAdminMenu_list_domain'] = 'Llistat de dominis';
 $PALANG['pAdminMenu_list_virtual'] = 'Llista de direccions virtuals';
-$PALANG['pAdminMenu_viewlog'] = 'Veure Logs';
 $PALANG['pAdminMenu_backup'] = 'Backup';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Administradors de domini';
 $PALANG['pAdminMenu_create_admin'] = 'Nou administrador';
 $PALANG['pAdminMenu_create_domain'] = 'Nou dominio';
-$PALANG['pAdminMenu_create_alias'] = 'Afegir àlies';
-$PALANG['pAdminMenu_create_mailbox'] = 'Afegir bústia';

 $PALANG['pAdminList_admin_username'] = 'Administrador';
 $PALANG['pAdminList_admin_count'] = 'Dominis';

-$PALANG['pAdminList_domain_description'] = 'Descripció';
-$PALANG['pAdminList_domain_aliases'] = 'Àlies';
-$PALANG['pAdminList_domain_mailboxes'] = 'Bústies';
+$PALANG['description'] = 'Descripció';
+$PALANG['aliases'] = 'Àlies';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Última Modificació';

 $PALANG['pAdminList_virtual_button'] = 'Ves';
-$PALANG['pAdminList_virtual_welcome'] = 'Resum de ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Àlies';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Bústies';
 $PALANG['pAdminList_virtual_alias_address'] = 'De';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Destí';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'E-mail';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nom';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Quota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Afegir nou domini';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'El domini ja existeix!';
@ -249,15 +230,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Editar un domini';
-$PALANG['pAdminEdit_domain_description'] = 'Descripció';
-$PALANG['pAdminEdit_domain_aliases'] = 'Àlies';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = ilimitat | 0 = deshabilitar';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Bústies';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = ilimitat | 0 = deshabilitar';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Quota màxima';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = ilimitat | 0 = deshabilitar';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
+$PALANG['transport'] = 'Transport'; # XXX
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX
 $PALANG['pAdminEdit_domain_button'] = 'Editar domini'; # XXX text no longer used
@ -274,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['pAdminEdit_admin_password2'] = '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
@ -287,7 +264,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'La seva contrasenya no és correcta

 $PALANG['pUsersMenu_vacation'] = 'Resposta automàtica';
 $PALANG['pUsersMenu_edit_alias'] = 'Canviar la redirecció';
-$PALANG['pUsersMenu_password'] = 'Canviar la contrasenya';

 $PALANG['pUsersMain_vacation'] = 'Configuri un missatge de "Fora de la feina" o una resposta automàtica pel seu correu.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
--- a/languages/cn.lang
+++ b/languages/cn.lang
@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = '普通用户点击这里进入用户控制面

 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = '概览';
-$PALANG['pMenu_create_alias'] = '新建别名';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_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'] = '修改密码';
@ -42,7 +42,7 @@ $PALANG['pMenu_logout'] = '退出';

 $PALANG['pMain_welcome'] = '欢迎来到Postfix Admin!';
 $PALANG['pMain_overview'] = '显示你的邮件别名和邮箱. 你可以在这儿进行编辑/删除操作.';
-$PALANG['pMain_create_alias'] = '在您的域中新建一个别名.';
+$PALANG['pMain_create_alias'] = '在您的域中新建一个别名.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = '在您的域中新建一个邮箱.';
 $PALANG['pMain_sendmail'] = '发一封邮件到你新建的一个邮箱中.';
 $PALANG['pMain_password'] = '修改你的管理员密码.';
@ -61,8 +61,6 @@ $PALANG['pOverview_mailbox_title'] = ':: 邮箱';
 $PALANG['pOverview_button'] = '执行';
 $PALANG['pOverview_welcome'] = '浏览 ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = '别名';
-$PALANG['pOverview_alias_mailbox_count'] = '邮箱';
 $PALANG['pOverview_alias_address'] = '前往';
 $PALANG['pOverview_alias_goto'] = '转到';
 $PALANG['active'] = '活动';
@ -76,9 +74,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = '域';
-$PALANG['pOverview_get_aliases'] = '别名';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = '邮箱';
+$PALANG['mailboxes'] = '邮箱数';
 $PALANG['pOverview_get_quota'] = '邮箱限制 (MB)';

 $PALANG['pDelete_delete_error'] = '不能删除本记录';
@ -90,19 +87,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = '在你的域中新建一个别名.';
 $PALANG['pCreate_alias_address_text_error1'] = '该别名非法!';
 $PALANG['email-address-already-exists'] = '邮件地址已经存在, 请重新选择!';
 $PALANG['pCreate_alias_address_text_error3'] = '你的别名已经达到上限!';
 $PALANG['pCreate_alias_goto'] = '转到';
-$PALANG['pCreate_alias_button'] = '新建别名';
 $PALANG['pCreate_alias_goto_text'] = '邮件接收地址.';
 $PALANG['pCreate_alias_goto_text_error'] = '接收地址不正确!';
 $PALANG['pCreate_alias_result_error'] = '不能将别名添加到别名表中!';
@ -124,12 +118,9 @@ $PALANG['pEdit_alias_result_error'] = '不能修改该别名!';
 $PALANG['pCreate_mailbox_welcome'] = '在你的域中新建一个本地邮箱.';
 $PALANG['pCreate_mailbox_username_text_error1'] = '邮件非法!';
 $PALANG['pCreate_mailbox_username_text_error3'] = '邮箱地址已经达到上限!';
-$PALANG['pCreate_mailbox_password2'] = '密码 (再次输入)';
 $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP 密码';
 $PALANG['pCreate_mailbox_name_text'] = '全名';
-$PALANG['pCreate_mailbox_quota_text_error'] = '你输入的容量限制超出范围!';
 $PALANG['pCreate_mailbox_mail'] = '新建邮箱'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = '增加邮箱';
 $PALANG['pCreate_mailbox_result_error'] = '不能将邮箱增加到邮箱表中!';
 $PALANG['pCreate_mailbox_result_success'] = '增加邮箱成功!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -153,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['pPassword_button'] = '更改密码';
+$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
@ -207,34 +198,24 @@ $PALANG['pSendmail_result_success'] = '建立邮箱成功!'; # XXX text change -
 $PALANG['pAdminMenu_list_admin'] = '管理员清单';
 $PALANG['pAdminMenu_list_domain'] = '域名清单';
 $PALANG['pAdminMenu_list_virtual'] = '虚拟用户清单';
-$PALANG['pAdminMenu_viewlog'] = '查看日志';
 $PALANG['pAdminMenu_backup'] = '备份';
 $PALANG['pAdminMenu_create_domain_admins'] = '域管理员';
 $PALANG['pAdminMenu_create_admin'] = '新建管理员';
 $PALANG['pAdminMenu_create_domain'] = '新建域';
-$PALANG['pAdminMenu_create_alias'] = '新建别名';
-$PALANG['pAdminMenu_create_mailbox'] = '新建邮箱';

 $PALANG['pAdminList_admin_username'] = '管理员';
 $PALANG['pAdminList_admin_count'] = '管理域数量';

-$PALANG['pAdminList_domain_description'] = '描述';
-$PALANG['pAdminList_domain_aliases'] = '别名数';
-$PALANG['pAdminList_domain_mailboxes'] = '邮箱数';
+$PALANG['description'] = '描述';
+$PALANG['aliases'] = '别名数'; # XXX check text - should be 'Aliases'
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = '最后修改日期';

 $PALANG['pAdminList_virtual_button'] = '执行';
-$PALANG['pAdminList_virtual_welcome'] = '域概览 域名: ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = '别名数量';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = '邮箱数';
 $PALANG['pAdminList_virtual_alias_address'] = '前往';
 $PALANG['pAdminList_virtual_alias_goto'] = '转到';
-$PALANG['pAdminList_virtual_mailbox_username'] = '邮箱';
 $PALANG['pAdminList_virtual_mailbox_name'] = '姓名';
-$PALANG['pAdminList_virtual_mailbox_quota'] = '限制 (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = '新建域';
 $PALANG['pAdminCreate_domain_domain_text_error'] = '该域已经存在!';
@ -250,15 +231,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = '修改域';
-$PALANG['pAdminEdit_domain_description'] = '描述';
-$PALANG['pAdminEdit_domain_aliases'] = '别名数';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = 禁止 | 0 = 无限制'; # XXX check / compare with pAdminCreate_domain_aliases_text - should be "-1 = disable | ..."
-$PALANG['pAdminEdit_domain_mailboxes'] = '邮箱数';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = 禁止 | 0 = 无限制'; # XXX check - should be "-1 = disable | 0 = unlimited"
 $PALANG['pAdminEdit_domain_maxquota'] = '最大容量限制';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = 禁止 | 0 = 无限制'; # XXX check - should be "MB | -1 = disable | 0 = unlimited"
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
+$PALANG['transport'] = 'Transport'; # XXX
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = '备份邮件服务器';
 $PALANG['pAdminEdit_domain_button'] = '修改'; # XXX text no longer used
@ -274,7 +251,7 @@ $PALANG['pAdminCreate_admin_result_success'] = '新增管理员成功!';

 $PALANG['pAdminEdit_admin_welcome'] = '修改域管理员';
 $PALANG['pAdminEdit_admin_username'] = '管理员';
-$PALANG['pAdminEdit_admin_password2'] = '密码 (验证)';
+$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
@ -287,7 +264,6 @@ $PALANG['pUsersLogin_password_incorrect'] = '登录密码不正确!';

 $PALANG['pUsersMenu_vacation'] = '自动回复';
 $PALANG['pUsersMenu_edit_alias'] = '修改转发';
-$PALANG['pUsersMenu_password'] = '修改密码';

 $PALANG['pUsersMain_vacation'] = '设置外出信息或自动回复.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
--- a/languages/cs.lang
+++ b/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['pMenu_create_alias'] = 'Přidat přesměrování';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_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';
@ -47,7 +47,7 @@ $PALANG['pMenu_logout'] = 'Odhlásit.';

 $PALANG['pMain_welcome'] = 'Vítejte v Postfix Adminu!';
 $PALANG['pMain_overview'] = 'Výpis přesměrování a schránek. Můžete je zde upravovat a mazat.';
-$PALANG['pMain_create_alias'] = 'Vytvořit přesměrování v této doméně.';
+$PALANG['pMain_create_alias'] = 'Vytvořit přesměrování v této doméně.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Vytvořit schránku v této doméně.';
 $PALANG['pMain_sendmail'] = 'Poslat email do jedné z nově vytvořených schránek.';
 $PALANG['pMain_password'] = 'Změnit heslo administrátorského účtu.';
@ -66,8 +66,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Schránky';
 $PALANG['pOverview_button'] = 'Přejít';
 $PALANG['pOverview_welcome'] = 'Přehled domény ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Přesměrování';
-$PALANG['pOverview_alias_mailbox_count'] = 'Schránek';
 $PALANG['pOverview_alias_address'] = 'Od';
 $PALANG['pOverview_alias_goto'] = 'Pro';
 $PALANG['active'] = 'Aktivní';
@ -81,9 +79,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Doména';
-$PALANG['pOverview_get_aliases'] = 'Přesměrování';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Schránky';
+$PALANG['mailboxes'] = 'Schránky';
 $PALANG['pOverview_get_quota'] = 'Místo pro schránku (MB)';

 $PALANG['pDelete_delete_error'] = 'Nelze smazat položku ';
@ -95,19 +92,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Vytvořit nové přesměrování ve Vaší doméně.';
 $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['pCreate_alias_address_text_error3'] = 'Dosáhli jste limitu, nemůžete vytvářet další aliasy!';
 $PALANG['pCreate_alias_goto'] = 'Cíl';
-$PALANG['pCreate_alias_button'] = 'Přidat';
 $PALANG['pCreate_alias_goto_text'] = 'Kam má pošta chodit.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Cíl není platný!';
 $PALANG['pCreate_alias_result_error'] = 'Nepodařilo se přidat přesměrování do tabulky aliasů!';
@ -129,12 +123,9 @@ $PALANG['pEdit_alias_result_error'] = 'Nepodařilo se upravit přesměrování!'
 $PALANG['pCreate_mailbox_welcome'] = 'Vytvořit novou lokální schránku v doméně.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa neni platná!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Dosáhli jste limitu, nemů&cedil;ete vytvářet další schránky!';
-$PALANG['pCreate_mailbox_password2'] = 'Heslo (znovu)';
 $PALANG['pCreate_mailbox_password_text'] = 'Heslo pro POP3/IMAP/SMTP';
 $PALANG['pCreate_mailbox_name_text'] = 'Celé jméno';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Zadané místo je příliš velké!';
 $PALANG['pCreate_mailbox_mail'] = 'Vytvořit schránku na disku (odešle uvítací email)'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Přidat schránku';
 $PALANG['pCreate_mailbox_result_error'] = 'Nepodařilo se přidat schránku do tabulky schránek!';
 $PALANG['pCreate_mailbox_result_success'] = 'Schránka byla přidána do tabulky schránek!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka byla přidána do tabulky schránek, ale žádné (nebo pouze některé) ze předdefinovaných podsložek bylo možné vytovořit';
@ -158,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['pPassword_button'] = 'Změnit heslo';
+$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!';

@ -215,34 +206,24 @@ $PALANG['pSendmail_result_success'] = 'Email odeslán!';
 $PALANG['pAdminMenu_list_admin'] = 'Administrátoři domén';
 $PALANG['pAdminMenu_list_domain'] = 'Domény';
 $PALANG['pAdminMenu_list_virtual'] = 'Schránky';
-$PALANG['pAdminMenu_viewlog'] = 'Prohlížet Log';
 $PALANG['pAdminMenu_backup'] = 'Vytvořit zálohu';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Administrátoři'; // unused
 $PALANG['pAdminMenu_create_admin'] = 'Nový Administrátor';
 $PALANG['pAdminMenu_create_domain'] = 'Nová Doména';
-$PALANG['pAdminMenu_create_alias'] = 'Nové Přesměrování';
-$PALANG['pAdminMenu_create_mailbox'] = 'Nová Schránka';

 $PALANG['pAdminList_admin_username'] = 'Administrátor';
 $PALANG['pAdminList_admin_count'] = 'Domény';

-$PALANG['pAdminList_domain_description'] = 'Popis';
-$PALANG['pAdminList_domain_aliases'] = 'Přesměrování';
-$PALANG['pAdminList_domain_mailboxes'] = 'Schránek';
+$PALANG['description'] = 'Popis';
+$PALANG['aliases'] = 'Přesměrování';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Záložní MX';
 $PALANG['last_modified'] = 'Naposledy Změněno';

 $PALANG['pAdminList_virtual_button'] = 'Jít';
-$PALANG['pAdminList_virtual_welcome'] = 'Přehled pro ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Přesměrování';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Schránek';
 $PALANG['pAdminList_virtual_alias_address'] = 'Od';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Cíl';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Název';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Celé Jméno';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Místo (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Přidat Novou Doménu';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Taková doména už existuje!';
@ -259,15 +240,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Nepodařilo se odstranit doménu!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Upravit doménu';
-$PALANG['pAdminEdit_domain_description'] = 'Popis';
-$PALANG['pAdminEdit_domain_aliases'] = 'Přesměrování';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = znepřístupnit | 0 = neomezeně';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Schránek';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = znepřístupnit | 0 = neomezeně';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Maximální místo';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = znepřístupnit | 0 = neomezeně';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Nastavit transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Tento server je záložní MX domény';
 $PALANG['pAdminEdit_domain_button'] = 'Upravit doménu'; # XXX text no longer used
@ -283,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['pAdminEdit_admin_password2'] = '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
@ -296,7 +273,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Nesprávné heslo!';

 $PALANG['pUsersMenu_vacation'] = 'Automatická Odpověď';
 $PALANG['pUsersMenu_edit_alias'] = 'Změna Přesměrování';
-$PALANG['pUsersMenu_password'] = 'Změna Hesla';

 $PALANG['pUsersMain_vacation'] = 'Nastavit ,,jsem pryč`` nebo podobnou automatickou odpověď.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' je NASTAVENA, klikněte na \'' . $PALANG['pUsersMenu_vacation'] . '\' pro odstranění nebo změnu';
--- a/languages/da.lang
+++ b/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['pMenu_create_alias'] = 'Tilføj alias';
-$PALANG['pMenu_create_alias_domain'] = 'Tilføje alias domæne';
-$PALANG['pMenu_create_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';
@ -46,7 +46,7 @@ $PALANG['pMenu_logout'] = 'Log ud';

 $PALANG['pMain_welcome'] = 'Velkommen til PostfixAdmin!';
 $PALANG['pMain_overview'] = 'Vis alle aliases og postbokse. Du kan redigere/slette dem herfra.';
-$PALANG['pMain_create_alias']   = 'Tilføj et nyt alias til et domæne.';
+$PALANG['pMain_create_alias']   = 'Tilføj et nyt alias til et domæne.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Tilføj en ny postboks til et domæne.';
 $PALANG['pMain_sendmail']       = 'Send en email til en eksisterende postboks.';
 $PALANG['pMain_password'] = 'Ændre adgangskoden til din administratorkonto.';
@ -65,8 +65,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Postbokse';
 $PALANG['pOverview_button'] = 'Vis';
 $PALANG['pOverview_welcome'] = 'Oversigt for ';
 $PALANG['pOverview_alias_domain_aliases']  = 'Alias domæner';
-$PALANG['pOverview_alias_alias_count'] = 'Alias';
-$PALANG['pOverview_alias_mailbox_count'] = 'Postbokse';
 $PALANG['pOverview_alias_address'] = 'Alias';
 $PALANG['pOverview_alias_goto'] = 'Modtager';
 $PALANG['active'] = 'Aktiv';
@ -81,9 +79,8 @@ $PALANG['no_domains_exist'] = 'You have to create at least one domain before you


 $PALANG['domain'] = 'Domæne';
-$PALANG['pOverview_get_aliases'] = 'Alias';
 $PALANG['pOverview_get_alias_domains']     = 'Domæne aliases';
-$PALANG['pOverview_get_mailboxes'] = 'Postbokse';
+$PALANG['mailboxes'] = 'Postbokse';
 $PALANG['pOverview_get_quota'] = 'Postboks Kvota (MB)';

 $PALANG['pDelete_delete_error'] = 'Kan ikke slette denne post ';
@ -95,19 +92,16 @@ $PALANG['pCreate_alias_domain_alias']       = 'Alias-domæne';
 $PALANG['pCreate_alias_domain_alias_text']  = 'Domæne som emails kommer fra.';
 $PALANG['pCreate_alias_domain_target']      = 'Modtager-domæne';
 $PALANG['pCreate_alias_domain_target_text'] = 'Domæne hvor emails skal sendes til.';
-$PALANG['pCreate_alias_domain_button']      = 'Tilføj alias domæne';
 $PALANG['pCreate_alias_domain_error1']      = 'Du har ikke tilladelse til at lave den valgte konfiguration';
 $PALANG['pCreate_alias_domain_error2']      = 'Den valgte konfiguration er ikke korrekt, vælg venligst en anden.';
 $PALANG['pCreate_alias_domain_error3']      = 'Indsætning i databasen fejlede.';
 $PALANG['pCreate_alias_domain_error4']      = 'Alle domænerne har allerede aliases.';
 $PALANG['pCreate_alias_domain_success']     = 'Domæne-alias blev tilføjet alias-tabellen.';

-$PALANG['pCreate_alias_welcome']             = 'Tilføj et nyt alias til domænet.';
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldigt.';
 $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_button'] = 'Tilføj alias';
 $PALANG['pCreate_alias_goto_text'] = 'Hvor emailen skal videresendes til.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Modtageradressen er ikke gyldig!';
 $PALANG['pCreate_alias_result_error'] = 'Kan ikke tilføje aliaset til alias-tabellen!';
@ -129,12 +123,9 @@ $PALANG['pEdit_alias_result_error']        = 'Kan ikke redigere aliaset.';
 $PALANG['pCreate_mailbox_welcome'] = 'Tilføj en ny lokal postboks til domænet.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Emailadressen er ikke gyldig!';
 $PALANG['pCreate_mailbox_username_text_error3']       = 'Du har nået grænsen for antallet af postbokse til domæne!';
-$PALANG['pCreate_mailbox_password2'] = 'Adgangskode (igen)';
 $PALANG['pCreate_mailbox_password_text'] = 'Adgangskode til POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Fulde navn';
-$PALANG['pCreate_mailbox_quota_text_error']           = 'Den valgte kvota er for høj.';
 $PALANG['pCreate_mailbox_mail'] = 'Send velkomsthilsen'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Tilføj postboks';
 $PALANG['pCreate_mailbox_result_error'] = 'Kan ikke tilføje postboksen til postboks-tabellen!';
 $PALANG['pCreate_mailbox_result_success'] = 'Postboksen er tilføjet til postboks-tabellen!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilføjet, men ingen (eller kun dele) af de foruddefinerede undermapper kunne oprettes.';
@ -158,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['pPassword_button'] = 'Ændr adgangskode';
+$PALANG['change-password'] = 'Ændr adgangskode';
 $PALANG['pPassword_result_error'] = 'Kan ikke ændre adgangskoden!';
 $PALANG['pPassword_result_success'] = 'Din adgangskode er ændret!';

@ -215,34 +206,24 @@ $PALANG['pSendmail_result_success'] = 'Email sendt!';
 $PALANG['pAdminMenu_list_admin'] = 'Administratorliste';
 $PALANG['pAdminMenu_list_domain']          = 'Domæne-liste';
 $PALANG['pAdminMenu_list_virtual'] = 'Virtuel Liste';
-$PALANG['pAdminMenu_viewlog'] = 'Vis Log';
 $PALANG['pAdminMenu_backup'] = 'Backup';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domæne-administrator';
 $PALANG['pAdminMenu_create_admin'] = 'Ny administrator';
 $PALANG['pAdminMenu_create_domain'] = 'Nyt domæne';
-$PALANG['pAdminMenu_create_alias']         = 'Nyt alias';
-$PALANG['pAdminMenu_create_mailbox']       = 'Ny postboks';

 $PALANG['pAdminList_admin_username'] = 'Administrator';
 $PALANG['pAdminList_admin_count'] = 'Domæner';

-$PALANG['pAdminList_domain_description'] = 'Beskrivelse';
-$PALANG['pAdminList_domain_aliases'] = 'Alias';
-$PALANG['pAdminList_domain_mailboxes'] = 'Postbokse';
+$PALANG['description'] = 'Beskrivelse';
+$PALANG['aliases'] = 'Alias';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Senest ændret';

 $PALANG['pAdminList_virtual_button'] = 'Vis';
-$PALANG['pAdminList_virtual_welcome'] = 'Oversigt for ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Postbokse';
 $PALANG['pAdminList_virtual_alias_address'] = 'Fra';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Til';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Tilføj et nyt domæne';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domænet eksisterer allerede!';
@ -259,15 +240,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Domænet kunne ikke slettes!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Domæne-aliaset kunne ikke slettes!';

 $PALANG['pAdminEdit_domain_welcome']        = 'Redigér et domæne';
-$PALANG['pAdminEdit_domain_description'] = 'Beskrivelse';
-$PALANG['pAdminEdit_domain_aliases'] = 'Alias';
 $PALANG['pAdminEdit_domain_aliases_text']   = '-1 = annullér | 0 = uendeligt';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Postbokse';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = annullér | 0 = uendeligt';
 $PALANG['pAdminEdit_domain_maxquota']       = 'Maksimal kvota';
 $PALANG['pAdminEdit_domain_maxquota_text']  = 'MB | -1 = annullér | 0 = uendeligt';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Præcisér transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mailserveren er backup MX';
 $PALANG['pAdminEdit_domain_button'] = 'Rediger domæne'; # XXX text no longer used
@ -283,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['pAdminEdit_admin_password2'] = '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
@ -296,7 +273,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Din adgangskode er ikke korrekt!';

 $PALANG['pUsersMenu_vacation'] = 'Autosvar';
 $PALANG['pUsersMenu_edit_alias'] = 'Redigér videresending';
-$PALANG['pUsersMenu_password']   = 'Ændr adgangskode';

 $PALANG['pUsersMain_vacation'] = 'Tilføj en "ikke tilstede" besked eller et autosvar til din emailadresse.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' er AKTIVERET, klik \'' . $PALANG['pUsersMenu_vacation'] . '\' for at ' . $PALANG['edit'] . '/fjerne';
--- a/languages/de.lang
+++ b/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['pMenu_create_alias'] = 'Alias hinzufügen';
-$PALANG['pMenu_create_alias_domain'] = 'Alias-Domain hinzufügen';
-$PALANG['pMenu_create_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';
@ -44,7 +44,7 @@ $PALANG['pMenu_logout'] = 'Logout';

 $PALANG['pMain_welcome'] = 'Willkommen zu Postfix Admin!';
 $PALANG['pMain_overview'] = 'Listet Ihre Aliase und Mailboxen auf. Sie können sie hier editieren und löschen.';
-$PALANG['pMain_create_alias'] = 'Fügt einen neuen Alias für Ihre Domain hinzu.';
+$PALANG['pMain_create_alias'] = 'Neuen Alias für Ihre Domain anlegen';
 $PALANG['pMain_create_mailbox'] = 'Legt eine neue Mailbox für Ihre Domain an.';
 $PALANG['pMain_sendmail'] = 'Versenden Sie eine Email.';
 $PALANG['pMain_password'] = 'Ändern Sie Ihr Admin-Passwort.';
@ -63,8 +63,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Mailboxen';
 $PALANG['pOverview_button'] = 'Los';
 $PALANG['pOverview_welcome'] = 'Überblick über ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias-Domains';
-$PALANG['pOverview_alias_alias_count'] = 'Aliase';
-$PALANG['pOverview_alias_mailbox_count'] = 'Mailboxen';
 $PALANG['pOverview_alias_address'] = 'Von';
 $PALANG['pOverview_alias_goto'] = 'An';
 $PALANG['active'] = 'Aktiv';
@ -78,9 +76,8 @@ $PALANG['no_domains_for_this_admin'] = 'Sie haben für keine Domain eine Berecht
 $PALANG['no_domains_exist'] = 'Sie müssen mindestens eine Domain erstellen, bevor Sie die Virtual Liste verwenden können.';

 $PALANG['domain'] = 'Domain';
-$PALANG['pOverview_get_aliases'] = 'Aliases';
 $PALANG['pOverview_get_alias_domains'] = 'Alias-Domains';
-$PALANG['pOverview_get_mailboxes'] = 'Mailboxen';
+$PALANG['mailboxes'] = 'Mailboxen';
 $PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)';

 $PALANG['pDelete_delete_error'] = 'Eintrag konnte nicht gelöscht werden ';
@ -92,19 +89,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias-Domain';
 $PALANG['pCreate_alias_domain_alias_text'] = 'Die Domain, für die Mails hereinkommen.';
 $PALANG['pCreate_alias_domain_target'] = 'Zieldomain';
 $PALANG['pCreate_alias_domain_target_text'] = 'Die Domain, an die die Mails gehen sollen.';
-$PALANG['pCreate_alias_domain_button'] = 'Alias-Domain hinzufügen';
 $PALANG['pCreate_alias_domain_error1'] = 'Sie dürfen die gewählte Konfiguration nicht erstellen.';
 $PALANG['pCreate_alias_domain_error2'] = 'Die gewählte Konfiguration ist ungültig, bitte wählen Sie eine andere';
 $PALANG['pCreate_alias_domain_error3'] = 'Datenbank-Eintrag fehlgeschlagen.';
 $PALANG['pCreate_alias_domain_error4'] = 'Alle Domains sind bereits Alias-Domains.';
 $PALANG['pCreate_alias_domain_success'] = 'Die Alias-Domain wurde in der Datenbank eingetragen!';

-$PALANG['pCreate_alias_welcome'] = 'Neuen Alias für Ihre Domain anlegen';
 $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['pCreate_alias_address_text_error3'] = 'Sie haben Ihr Limit für Aliase auf dieser Domain erreicht!';
 $PALANG['pCreate_alias_goto'] = 'An';
-$PALANG['pCreate_alias_button'] = 'Alias hinzufügen';
 $PALANG['pCreate_alias_goto_text'] = 'Wohin soll die eMail weitergeleitet werden?';
 $PALANG['pCreate_alias_goto_text_error'] = 'Das An-Feld ist falsch!';
 $PALANG['pCreate_alias_result_error'] = 'Unmöglich dieses Alias in die Alias-Tabelle einzutragen!';
@ -126,12 +120,9 @@ $PALANG['pEdit_alias_result_error'] = 'Ändern des Aliases nicht möglich!';
 $PALANG['pCreate_mailbox_welcome'] = 'Legen Sie eine neue Mailbox für Ihre Domain an.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Die EMAIL ist nicht korrekt!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Sie dürfen leider nicht mehr Mailboxen für diese Domain anlegen!';
-$PALANG['pCreate_mailbox_password2'] = 'Passwort (nochmal)';
 $PALANG['pCreate_mailbox_password_text'] = 'Passwort für POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Vollständiger Name';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Das angegebene Quota ist zu hoch!';
 $PALANG['pCreate_mailbox_mail'] = 'Begrüßungsmail senden';
-$PALANG['pCreate_mailbox_button'] = 'Mailbox hinzufügen';
 $PALANG['pCreate_mailbox_result_error'] = 'Unmöglich die Mailbox in die Mailbox-Tabelle einzutragen!';
 $PALANG['pCreate_mailbox_result_success'] = 'Die Mailbox wurde in die Mailbox-Tabelle eingetragen!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Die Mailbox wurde in der Mailbox-Tabelle eingetragen, aber keine (oder nur einige) der vorkonfigurierten Unterordner konnte erstellt werden';
@ -155,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['pPassword_button'] = '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!';

@ -212,34 +203,24 @@ $PALANG['pSendmail_result_success'] = 'Mail gesendet!';
 $PALANG['pAdminMenu_list_admin'] = 'Admin Liste';
 $PALANG['pAdminMenu_list_domain'] = 'Domain Liste';
 $PALANG['pAdminMenu_list_virtual'] = 'Virtual Liste';
-$PALANG['pAdminMenu_viewlog'] = 'Log ansehen';
 $PALANG['pAdminMenu_backup'] = 'Sicherung';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domain Admins';
 $PALANG['pAdminMenu_create_admin'] = 'Neuer Admin';
 $PALANG['pAdminMenu_create_domain'] = 'Neue Domain';
-$PALANG['pAdminMenu_create_alias'] = 'Alias hinzufügen';
-$PALANG['pAdminMenu_create_mailbox'] = 'Mailbox hinzufügen';

 $PALANG['pAdminList_admin_username'] = 'Admin';
 $PALANG['pAdminList_admin_count'] = 'Domains';

-$PALANG['pAdminList_domain_description'] = 'Beschreibung';
-$PALANG['pAdminList_domain_aliases'] = 'Aliase';
-$PALANG['pAdminList_domain_mailboxes'] = 'Mailboxen';
+$PALANG['description'] = 'Beschreibung';
+$PALANG['aliases'] = 'Aliase';
 $PALANG['pAdminList_domain_quota'] = 'Domain Quota (MB)';
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'zuletzt geändert';

 $PALANG['pAdminList_virtual_button'] = 'Los';
-$PALANG['pAdminList_virtual_welcome'] = 'Überblick für ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliase';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Mailboxen';
 $PALANG['pAdminList_virtual_alias_address'] = 'Von';
 $PALANG['pAdminList_virtual_alias_goto'] = 'An';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Name';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Quota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Domain hinzufügen';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Diese Domain existiert bereits!';
@ -256,15 +237,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Domain konnte nicht gelöscht werden!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Alias-Domain konnte nicht gelöscht werden!';

 $PALANG['pAdminEdit_domain_welcome'] = 'Domain editieren';
-$PALANG['pAdminEdit_domain_description'] = 'Beschreibung';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliase';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = ausschalten | 0 = kein Limit';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Mailboxen';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = ausschalten | 0 = kein Limit';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Max Quota';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = ausschalten | 0 = kein Limit';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota';
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX';
 $PALANG['pAdminEdit_domain_button'] = 'Domain editieren'; # obsolete
@ -280,7 +257,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admin angelegt!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Domain Admin editieren';
 $PALANG['pAdminEdit_admin_username'] = 'Admin';
-$PALANG['pAdminEdit_admin_password2'] = 'Passwort (nochmal)';
+$PALANG['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
@ -293,7 +270,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Falsches Passwort!';

 $PALANG['pUsersMenu_vacation'] = 'Automatische Antwort';
 $PALANG['pUsersMenu_edit_alias'] = 'Weiterleitung ändern';
-$PALANG['pUsersMenu_password'] = 'Passwort ändern';

 $PALANG['pUsersMain_vacation'] = 'Geben Sie eine "Automatische Antwort" ein. Sinnvoll z.B. während Sie im Urlaub sind';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' ist aktiv, \'' . $PALANG['pUsersMenu_vacation'] . '\' anklicken zum Bearbeiten oder Abschalten';
--- a/languages/en.lang
+++ b/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['pMenu_create_alias'] = 'Add Alias';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain';
-$PALANG['pMenu_create_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';
@ -63,8 +63,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Mailboxes';
 $PALANG['pOverview_button'] = 'Go';
 $PALANG['pOverview_welcome'] = 'Overview for ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains';
-$PALANG['pOverview_alias_alias_count'] = 'Aliases';
-$PALANG['pOverview_alias_mailbox_count'] = 'Mailboxes';
 $PALANG['pOverview_alias_address'] = 'From';
 $PALANG['pOverview_alias_goto'] = 'To';
 $PALANG['active'] = 'Active';
@ -78,9 +76,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual']

 $PALANG['domain'] = 'Domain';
-$PALANG['pOverview_get_aliases'] = 'Aliases';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases';
-$PALANG['pOverview_get_mailboxes'] = 'Mailboxes';
+$PALANG['mailboxes'] = 'Mailboxes';
 $PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)';

 $PALANG['pDelete_delete_error'] = 'Unable to delete the entry ';
@ -93,19 +90,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain';
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.';
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain';
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.';
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain';
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.';
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!';
 $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.';
 $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_welcome'] = 'Create a new alias for your domain.';
 $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['pCreate_alias_address_text_error3'] = 'You have reached your limit to create aliases!';
 $PALANG['pCreate_alias_goto'] = 'To';
-$PALANG['pCreate_alias_button'] = 'Add Alias';
 $PALANG['pCreate_alias_goto_text'] = 'Where the mail needs to be sent to.';
 $PALANG['pCreate_alias_goto_text_error'] = 'The To: is not valid!';
 $PALANG['pCreate_alias_result_error'] = 'Unable to add the alias to the alias table!';
@ -127,12 +121,9 @@ $PALANG['pEdit_alias_result_error'] = 'Unable to modify the alias!';
 $PALANG['pCreate_mailbox_welcome'] = 'Create a new mailbox for your domain.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'The EMAIL is not valid!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'You have reached your limit to create mailboxes!';
-$PALANG['pCreate_mailbox_password2'] = 'Password (again)';
 $PALANG['pCreate_mailbox_password_text'] = 'Password for POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Full name';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'The quota that you specified is too high!';
 $PALANG['pCreate_mailbox_mail'] = 'Send Welcome mail';
-$PALANG['pCreate_mailbox_button'] = 'Add Mailbox';
 $PALANG['pCreate_mailbox_result_error'] = 'Unable to add the mailbox to the mailbox table!';
 $PALANG['pCreate_mailbox_result_success'] = 'The mailbox has been added to the mailbox table!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created';
@ -156,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['pPassword_button'] = '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!';

@ -213,35 +204,25 @@ $PALANG['pSendmail_result_success'] = 'Email sent!';
 $PALANG['pAdminMenu_list_admin'] = 'Admin List';
 $PALANG['pAdminMenu_list_domain'] = 'Domain List';
 $PALANG['pAdminMenu_list_virtual'] = 'Virtual List';
-$PALANG['pAdminMenu_viewlog'] = 'View Log';
 $PALANG['pAdminMenu_backup'] = 'Backup';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domain Admins';
 $PALANG['pAdminMenu_create_admin'] = 'New Admin';
 $PALANG['pAdminMenu_create_domain'] = 'New Domain';
-$PALANG['pAdminMenu_create_alias'] = 'Add Alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Add Mailbox';

 $PALANG['pAdminList_admin_username'] = 'Admin';
 $PALANG['pAdminList_admin_count'] = 'Domains';

-$PALANG['pAdminList_domain_description'] = 'Description';
-$PALANG['pAdminList_domain_aliases'] = 'Aliases';
-$PALANG['pAdminList_domain_mailboxes'] = 'Mailboxes';
+$PALANG['description'] = 'Description';
+$PALANG['aliases'] = 'Aliases';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)';
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['pAdminList_domain_usercontrol'] = 'User Control';
 $PALANG['last_modified'] = 'Last modified';

 $PALANG['pAdminList_virtual_button'] = 'Go';
-$PALANG['pAdminList_virtual_welcome'] = 'Overview for ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliases';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Mailboxes';
 $PALANG['pAdminList_virtual_alias_address'] = 'From';
 $PALANG['pAdminList_virtual_alias_goto'] = 'To';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Name';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Quota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Add a new domain';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'The domain already exists!';
@ -259,15 +240,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!';

 $PALANG['pAdminEdit_domain_welcome'] = 'Edit a domain';
-$PALANG['pAdminEdit_domain_description'] = 'Description';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliases';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = disable | 0 = unlimited';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Mailboxes';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = disable | 0 = unlimited';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Max Mailbox Quota'; # TODO: add change comment in translation - or drop and use pAdminCreate_domain_maxquota
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = disable | 0 = unlimited';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota';
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX';
 $PALANG['pAdminEdit_domain_usercontrol'] = 'Allow user control';
@ -284,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['pAdminEdit_admin_password2'] = '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
@ -297,7 +274,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Your password is not correct!';

 $PALANG['pUsersMenu_vacation'] = 'Auto Response';
 $PALANG['pUsersMenu_edit_alias'] = 'Change your forward';
-$PALANG['pUsersMenu_password'] = 'Change Password';

 $PALANG['pUsersMain_vacation'] = 'Set an "out of office" message or auto responder for your mail.';
 $PALANG['pUsersMain_vacationSet'] = 'Auto Response is ON, click \'Auto Response\' to edit/remove';
--- a/languages/es.lang
+++ b/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['pMenu_create_alias'] = 'Añadir alias';
-$PALANG['pMenu_create_alias_domain'] = 'Añadir alias de dominio'; 
-$PALANG['pMenu_create_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';
@ -42,7 +42,7 @@ $PALANG['pMenu_logout'] = 'Salir';

 $PALANG['pMain_welcome'] = '¡Bienvenido a Postfix Admin!';
 $PALANG['pMain_overview'] = 'Listado de sus alias y buzones. Puede editarlos / borrarlos desde aquí.';
-$PALANG['pMain_create_alias'] = 'Creación de un nuevo alias para su dominio.';
+$PALANG['pMain_create_alias'] = 'Creación de un nuevo alias para su dominio.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Creación de un nuevo buzón para su dominio.';
 $PALANG['pMain_sendmail'] = 'Enviar un email a uno de los buzones recientemente creados.';
 $PALANG['pMain_password'] = 'Cambiar la contraseña para su cuenta de administración.';
@ -61,8 +61,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Buzones';
 $PALANG['pOverview_button'] = 'Ir';
 $PALANG['pOverview_welcome'] = 'Resumen de ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias de Dominios'; 
-$PALANG['pOverview_alias_alias_count'] = 'Alias'; 
-$PALANG['pOverview_alias_mailbox_count'] = 'Buzones';
 $PALANG['pOverview_alias_address'] = 'De';
 $PALANG['pOverview_alias_goto'] = 'Destino';
 $PALANG['active'] = 'Activo'; 
@ -76,9 +74,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Dominio';
-$PALANG['pOverview_get_aliases'] = 'Alias';
 $PALANG['pOverview_get_alias_domains'] = 'Alias de Dominios'; 
-$PALANG['pOverview_get_mailboxes'] = 'Buzones';
+$PALANG['mailboxes'] = 'Buzones';
 $PALANG['pOverview_get_quota'] = 'Cuota de buzón (MB)';

 $PALANG['pDelete_delete_error'] = 'Imposible borrar el registro ';
@ -90,19 +87,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias de Dominio';
 $PALANG['pCreate_alias_domain_alias_text'] = 'El dominio al que llega el email.'; 
 $PALANG['pCreate_alias_domain_target'] = 'Dominio de destino'; 
 $PALANG['pCreate_alias_domain_target_text'] = 'El dominio al que deberían ir los emails.'; 
-$PALANG['pCreate_alias_domain_button'] = 'Añadir Alias de Dominio'; 
 $PALANG['pCreate_alias_domain_error1'] = 'No estás autorizado a crear la configuración que has elegido.'; 
 $PALANG['pCreate_alias_domain_error2'] = '¡La configuración seleccionada no es válida, por favor elige una diferente!'; 
 $PALANG['pCreate_alias_domain_error3'] = 'Falló la inserción en la base de datos.'; 
 $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_welcome'] = 'Crear un nuevo alias para el dominio.';
 $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['pCreate_alias_address_text_error3'] = '¡Ha llegado a su límite de creación de alias!';
 $PALANG['pCreate_alias_goto'] = 'Destino';
-$PALANG['pCreate_alias_button'] = 'Añadir alias';
 $PALANG['pCreate_alias_goto_text'] = 'A donde debe de ser enviado el e-mail.';
 $PALANG['pCreate_alias_goto_text_error'] = '¡El PARA no es válido!';
 $PALANG['pCreate_alias_result_error'] = '¡No es posible añadir el alias a la tabla de alias!';
@ -124,12 +118,9 @@ $PALANG['pEdit_alias_result_error'] = '¡Imposible modificar el alias!';
 $PALANG['pCreate_mailbox_welcome'] = 'Crear un nuevo buzón para su dominio.';
 $PALANG['pCreate_mailbox_username_text_error1'] = '¡El e-mail no es válido!';
 $PALANG['pCreate_mailbox_username_text_error3'] = '¡Ha llegado al límite de creación de buzones!';
-$PALANG['pCreate_mailbox_password2'] = 'Contraseña (repetir)';
 $PALANG['pCreate_mailbox_password_text'] = 'Contraseña para POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Nombre completo';
-$PALANG['pCreate_mailbox_quota_text_error'] = '¡La cuota especificada es demasiado alta!';
 $PALANG['pCreate_mailbox_mail'] = 'Enviar correo bienvenida';
-$PALANG['pCreate_mailbox_button'] = 'Añadir buzón';
 $PALANG['pCreate_mailbox_result_error'] = '¡Imposible añadir un buzón a la tabla de buzones!';
 $PALANG['pCreate_mailbox_result_success'] = '¡El buzón ha sido añadido a la tabla de buzones!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -153,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['pPassword_button'] = 'Cambiar contraseña';
+$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!';

@ -208,34 +199,24 @@ $PALANG['pSendmail_result_success'] = '¡Email enviado!';
 $PALANG['pAdminMenu_list_admin'] = 'Lista de administradores';
 $PALANG['pAdminMenu_list_domain'] = 'Lista de dominios';
 $PALANG['pAdminMenu_list_virtual'] = 'Lista de direcciones virtuales';
-$PALANG['pAdminMenu_viewlog'] = 'Ver Logs';
 $PALANG['pAdminMenu_backup'] = 'Backup';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Administradores de dominio';
 $PALANG['pAdminMenu_create_admin'] = 'Nuevo administrador';
 $PALANG['pAdminMenu_create_domain'] = 'Nuevo dominio';
-$PALANG['pAdminMenu_create_alias'] = 'Añadir alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Añadir buzón';

 $PALANG['pAdminList_admin_username'] = 'Administrador';
 $PALANG['pAdminList_admin_count'] = 'Dominios';

-$PALANG['pAdminList_domain_description'] = 'Descripción';
-$PALANG['pAdminList_domain_aliases'] = 'Alias';
-$PALANG['pAdminList_domain_mailboxes'] = 'Buzones';
+$PALANG['description'] = 'Descripción';
+$PALANG['aliases'] = 'Alias';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transporte'; 
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Última Modificación';

 $PALANG['pAdminList_virtual_button'] = 'Ir';
-$PALANG['pAdminList_virtual_welcome'] = 'Resumen de ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Buzones';
 $PALANG['pAdminList_virtual_alias_address'] = 'De';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Destino';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'E-mail';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nombre';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Cuota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Añadir nuevo dominio';
 $PALANG['pAdminCreate_domain_domain_text_error'] = '¡El dominio ya existe!';
@ -251,15 +232,11 @@ $PALANG['pAdminDelete_domain_error'] = '¡No se pudo eliminar el dominio!';
 $PALANG['pAdminDelete_alias_domain_error'] = '¡No se pudo eliminar el alias de dominio!'; 

 $PALANG['pAdminEdit_domain_welcome'] = 'Editar un dominio';
-$PALANG['pAdminEdit_domain_description'] = 'Descripción';
-$PALANG['pAdminEdit_domain_aliases'] = 'Alias';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = deshabilitar | 0 = ilimitado';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Buzones';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = deshabilitar | 0 = ilimitado';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Cuota máxima';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = deshabilitar | 0 = ilimitado';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport'; # XXX check text - should be 'Transport'
 $PALANG['pAdminEdit_domain_transport_text'] = 'Definir transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = 'El servidor de correo es backup MX'; # XXX
 $PALANG['pAdminEdit_domain_button'] = 'Editar dominio'; # XXX text no longer used
@ -276,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['pAdminEdit_admin_password2'] = '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
@ -289,7 +266,6 @@ $PALANG['pUsersLogin_password_incorrect'] = '¡Su contraseña no es correcta!';

 $PALANG['pUsersMenu_vacation'] = 'Respuesta automática';
 $PALANG['pUsersMenu_edit_alias'] = 'Cambiar la redirección';
-$PALANG['pUsersMenu_password'] = 'Cambiar la contraseña';

 $PALANG['pUsersMain_vacation'] = 'Configure un mensaje de "fuera del trabajo" o una respuesta automática para su correo.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' está ACTIVADO, click \'' . $PALANG['pUsersMenu_vacation'] . '\' para ' . $PALANG['edit'] . '/eliminar'; 
--- a/languages/et.lang
+++ b/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['pMenu_create_alias'] = 'Lisa alias';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_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';
@ -42,7 +42,7 @@ $PALANG['pMenu_logout'] = 'Logi välja';

 $PALANG['pMain_welcome'] = 'Tere tulemast domeeni(de) administreerimise liidesesse!';
 $PALANG['pMain_overview'] = 'Loetelu aliastest ja postkastidest. Siin saab neid muuta ja kustutada.';
-$PALANG['pMain_create_alias'] = 'Loo uus alias domeenile.';
+$PALANG['pMain_create_alias'] = 'Loo uus alias domeenile.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Loo uus postkast domeenile.';
 $PALANG['pMain_sendmail'] = 'Saada kiri äsjaloodud postkasti.';
 $PALANG['pMain_password'] = 'Muuda haldamise konto parool.';
@ -61,8 +61,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Postkastid';
 $PALANG['pOverview_button'] = 'Mine';
 $PALANG['pOverview_welcome'] = 'Ülevaade domeenist: ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Aliasi';
-$PALANG['pOverview_alias_mailbox_count'] = 'Postkaste';
 $PALANG['pOverview_alias_address'] = 'Kellelt';
 $PALANG['pOverview_alias_goto'] = 'Kellele';
 $PALANG['active'] = 'Aktiivne';
@ -76,9 +74,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domeen';
-$PALANG['pOverview_get_aliases'] = 'Aliased';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Postkastid';
+$PALANG['mailboxes'] = 'Postkaste';
 $PALANG['pOverview_get_quota'] = 'Postkasti kettaruumi piirang (MB)';

 $PALANG['pDelete_delete_error'] = 'Kustutamine ebaõnnestus. Kirje: ';
@ -90,19 +87,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Loo uus alias domeenis.';
 $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['pCreate_alias_address_text_error3'] = 'Oled kasutanud kogu aliaste arvu!';
 $PALANG['pCreate_alias_goto'] = 'Kellele';
-$PALANG['pCreate_alias_button'] = 'Lisa alias';
 $PALANG['pCreate_alias_goto_text'] = 'Kuhu peab kirja saatma.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Kellele pole kehtiv!';
 $PALANG['pCreate_alias_result_error'] = 'Aliase lisamine tabelisse ebaõnnestus!';
@ -124,12 +118,9 @@ $PALANG['pEdit_alias_result_error'] = 'Aliase muutmine ebaõnnestus!';
 $PALANG['pCreate_mailbox_welcome'] = 'Loo uus postkast domeenis.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-posti aadress pole kehtiv!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Oled kasutanud kogu postkastide arvu!';
-$PALANG['pCreate_mailbox_password2'] = 'Parool (uuesti)';
 $PALANG['pCreate_mailbox_password_text'] = 'Parool POP3/IMAP\'le';
 $PALANG['pCreate_mailbox_name_text'] = 'Täielik nimi';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Sisestatud kettaruumi piirang on liiga kõrge!';
 $PALANG['pCreate_mailbox_mail'] = 'Loo postkast'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Lisa postkast';
 $PALANG['pCreate_mailbox_result_error'] = 'Postkasti lisamine tabelisse ebaõnnestus!';
 $PALANG['pCreate_mailbox_result_success'] = 'Postkast lisati postkastide tabelisse!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -153,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['pPassword_button'] = '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
@ -207,34 +198,24 @@ $PALANG['pSendmail_result_success'] = 'Postkast on loodud!'; # XXX text change -
 $PALANG['pAdminMenu_list_admin'] = 'Haldajad';
 $PALANG['pAdminMenu_list_domain'] = 'Domeenid';
 $PALANG['pAdminMenu_list_virtual'] = 'Aliased';
-$PALANG['pAdminMenu_viewlog'] = 'Vaata logi';
 $PALANG['pAdminMenu_backup'] = 'Varukoopia';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domeeni haldajad';
 $PALANG['pAdminMenu_create_admin'] = 'Lisa haldaja';
 $PALANG['pAdminMenu_create_domain'] = 'Lisa domeen';
-$PALANG['pAdminMenu_create_alias'] = 'Lisa alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Lisa postkast';

 $PALANG['pAdminList_admin_username'] = 'Haldaja';
 $PALANG['pAdminList_admin_count'] = 'Domeene';

-$PALANG['pAdminList_domain_description'] = 'Kirjeldus';
-$PALANG['pAdminList_domain_aliases'] = 'Aliased';
-$PALANG['pAdminList_domain_mailboxes'] = 'Postkastid';
+$PALANG['description'] = 'Kirjeldus';
+$PALANG['aliases'] = 'Aliased'; # XXX check text - should be 'Aliases'
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Viimati muudetud'; # XXX check text - should be 'Last modified'

 $PALANG['pAdminList_virtual_button'] = 'Mine';
-$PALANG['pAdminList_virtual_welcome'] = 'Ülevaade domeenist: ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliasi';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Postkaste';
 $PALANG['pAdminList_virtual_alias_address'] = 'Kellelt';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Kellele';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'E-posti aadress';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nimi';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kettaruumi piirang (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Lisa uus domeen';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Selline domeen on juba olemas!';
@ -250,15 +231,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Redigeeri domeeni';
-$PALANG['pAdminEdit_domain_description'] = 'Kirjeldus';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliasi';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = keelatud | 0 = piiramatult';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Postkaste';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = keelatud | 0 = piiramatult';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Maksimaalne kettaruum';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = keelatud | 0 = piiramatult';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Kirjelda transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'E-posti server on varuserver (backup MX)';
 $PALANG['pAdminEdit_domain_button'] = 'Muuda domeen'; # XXX text no longer used
@ -274,7 +251,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Haldaja on lisatud!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Muuda domeeni haldajat';
 $PALANG['pAdminEdit_admin_username'] = 'Haldaja';
-$PALANG['pAdminEdit_admin_password2'] = 'Parool (uuesti)';
+$PALANG['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
@ -287,7 +264,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Parool pole õige!';

 $PALANG['pUsersMenu_vacation'] = 'Automaatne vastus';
 $PALANG['pUsersMenu_edit_alias'] = 'Muuda edasisaatmist';
-$PALANG['pUsersMenu_password'] = 'Muuda parool';

 $PALANG['pUsersMain_vacation'] = 'Määra "kontorist väljas" teade või automaatne vastaja e-posti aadressile.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
--- a/languages/eu.lang
+++ b/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['pMenu_create_alias'] = 'Aliasa gehitu';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_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';
@ -41,7 +41,7 @@ $PALANG['pMenu_logout'] = 'Irten';

 $PALANG['pMain_welcome'] = 'Ongietorri Postfix Adminera!';
 $PALANG['pMain_overview'] = 'Alias eta postontzien zerrenda. Hemendik aldatu / ezabatu ditzakezu.';
-$PALANG['pMain_create_alias'] = 'Zure domeinuarentzako alias berri baten sorkuntza.';
+$PALANG['pMain_create_alias'] = 'Zure domeinuarentzako alias berri baten sorkuntza.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Zure domeinuarentzako postontzi berri baten sorkuntza.';
 $PALANG['pMain_sendmail'] = 'Duela gutxi sorturiko postontziren batera e-mail bat bidali.';
 $PALANG['pMain_password'] = 'Kudeatzaile konturako pasahitza aldatu.';
@ -60,8 +60,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
 $PALANG['pOverview_button'] = 'Joan';
 $PALANG['pOverview_welcome'] = 'Laburpena ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Aliasa';
-$PALANG['pOverview_alias_mailbox_count'] = 'Postontziak';
 $PALANG['pOverview_alias_address'] = 'Igorlea';
 $PALANG['pOverview_alias_goto'] = 'Norakoa';
 $PALANG['active'] = 'Aktibatua';
@ -75,9 +73,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domeinua';
-$PALANG['pOverview_get_aliases'] = 'Aliasa';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Postontziak';
+$PALANG['mailboxes'] = 'Postontziak';
 $PALANG['pOverview_get_quota'] = 'Postontzi kuota (MB)';

 $PALANG['pDelete_delete_error'] = 'Ezinezkoa sarrera ezabatzea ';
@ -89,18 +86,15 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Domeinuarentzat alias berri bat sortu.';
 $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['pCreate_alias_address_text_error3'] = 'Alias sortze mugara heldu zara!';
 $PALANG['pCreate_alias_goto'] = 'Norakoa';
-$PALANG['pCreate_alias_button'] = 'Aliasa gehitu';
 $PALANG['pCreate_alias_goto_text'] = 'Nora bidali behar den e-maila.';
 $PALANG['pCreate_alias_goto_text_error'] = 'NORAKO okerra!';
 $PALANG['pCreate_alias_result_error'] = 'Ezinezkoa aliasa alias taulan sartzea!';
@ -122,12 +116,9 @@ $PALANG['pEdit_alias_result_error'] = 'Ezinezkoa aliasa aldatzea!';
 $PALANG['pCreate_mailbox_welcome'] = 'Postontzi berri bat sortu domeinuarentzat.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-maila baliogabekoa da!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Postontzi sorkuntza mugara iritsi zara!';
-$PALANG['pCreate_mailbox_password2'] = 'Pasahitza (errepikatu)';
 $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP-entzat pasahitza';
 $PALANG['pCreate_mailbox_name_text'] = 'Izen osoa';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Zehazturiko kuota altuegia da!';
 $PALANG['pCreate_mailbox_mail'] = 'Postontzia sortu'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Postontzia gehitu';
 $PALANG['pCreate_mailbox_result_error'] = 'Ezinezkoa postontzi taulara postontzia gehitzea!';
 $PALANG['pCreate_mailbox_result_success'] = 'Postontzia postontzi taulara sartu da!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -151,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['pPassword_button'] = '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
@ -205,34 +196,24 @@ $PALANG['pSendmail_result_success'] = 'Postontzia sortuta!'; # XXX text change -
 $PALANG['pAdminMenu_list_admin'] = 'Kudeatzaile zerrenda';
 $PALANG['pAdminMenu_list_domain'] = 'Domeinu zerrenda';
 $PALANG['pAdminMenu_list_virtual'] = 'Helbide birtualen zerrenda';
-$PALANG['pAdminMenu_viewlog'] = 'Logak ikusi';
 $PALANG['pAdminMenu_backup'] = 'Segurtasun kopia';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domeinu kudeatzaileak';
 $PALANG['pAdminMenu_create_admin'] = 'Kudeatzaile berria';
 $PALANG['pAdminMenu_create_domain'] = 'Domeinu berria';
-$PALANG['pAdminMenu_create_alias'] = 'Aliasa gehitu';
-$PALANG['pAdminMenu_create_mailbox'] = 'Postontzia gehitu';

 $PALANG['pAdminList_admin_username'] = 'Kudeatzailea';
 $PALANG['pAdminList_admin_count'] = 'Domeinuak';

-$PALANG['pAdminList_domain_description'] = 'Deskripzioa';
-$PALANG['pAdminList_domain_aliases'] = 'Aliasa';
-$PALANG['pAdminList_domain_mailboxes'] = 'Postontziak';
+$PALANG['description'] = 'Deskripzioa';
+$PALANG['aliases'] = 'Aliasa';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Azken aldaketa';

 $PALANG['pAdminList_virtual_button'] = 'Joan';
-$PALANG['pAdminList_virtual_welcome'] = 'Laburpena ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliasa';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Postontziak';
 $PALANG['pAdminList_virtual_alias_address'] = 'Igorlea';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Norakoa';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'E-mail';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Izena';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kuota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Domeinu berria gehitu';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domeinua existitzen da!';
@ -248,15 +229,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Domeinu bat aldatu';
-$PALANG['pAdminEdit_domain_description'] = 'Deskripzioa';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliasa';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = desegokitu | 0 = mugagabea';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Postontziak';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = desegokitu | 0 = mugagabea';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Gehienezko kuota';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = desegokitu | 0 = mugagabea';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
+$PALANG['transport'] = 'Transport'; # XXX
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX
 $PALANG['pAdminEdit_domain_button'] = 'Domeinua aldatu'; # XXX text no longer used
@ -273,7 +250,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Kudeatzailea gehituta1';

 $PALANG['pAdminEdit_admin_welcome'] = 'Domeinu kudeatzaile bat aldatu';
 $PALANG['pAdminEdit_admin_username'] = 'Kudeatzailea';
-$PALANG['pAdminEdit_admin_password2'] = 'Pasahitza (errepikatu)';
+$PALANG['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
@ -286,7 +263,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Pasahitz okerra!';

 $PALANG['pUsersMenu_vacation'] = 'Erantzun automatikoa';
 $PALANG['pUsersMenu_edit_alias'] = 'Berbiderapen helbidea aldatu';
-$PALANG['pUsersMenu_password'] = 'Pasahitza aldatu';

 $PALANG['pUsersMain_vacation'] = 'Konfigura ezazu "lanetik kanpo" motako mezu bat edo erantzun automatikoa zure postarentzat.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
--- a/languages/fi.lang
+++ b/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['pMenu_create_alias'] = 'Lisää alias';
-$PALANG['pMenu_create_alias_domain'] = 'Lisää alias domain';
-$PALANG['pMenu_create_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';
@ -43,7 +43,7 @@ $PALANG['pMenu_logout'] = 'Kirjaudu ulos';

 $PALANG['pMain_welcome'] = 'Tervetuloa sähköpostin hallintaan.';
 $PALANG['pMain_overview'] = 'Listaa aliakset ja postilaatikot. Voit muokata ja poistaa niitä tästä.';
-$PALANG['pMain_create_alias'] = 'Luo uusi alias domainiin.';
+$PALANG['pMain_create_alias'] = 'Luo uusi alias domainiin.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Luo uusi postilaatikko domainiin.';
 $PALANG['pMain_sendmail'] = 'Lähetä sähköpostia juuri luotuun postilaatikkoon.';
 $PALANG['pMain_password'] = 'Vaihda hallintatunnuksen salasanaa.';
@ -62,8 +62,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Sähköpostilaatikot';
 $PALANG['pOverview_button'] = 'Siirry';
 $PALANG['pOverview_welcome'] = 'Yleisnäkymä ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domainit';
-$PALANG['pOverview_alias_alias_count'] = 'Aliakset';
-$PALANG['pOverview_alias_mailbox_count'] = 'Postilaatikot';
 $PALANG['pOverview_alias_address'] = 'Keneltä';
 $PALANG['pOverview_alias_goto'] = 'Kenelle';
 $PALANG['active'] = 'Aktiivinen';
@ -77,9 +75,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domain';
-$PALANG['pOverview_get_aliases'] = 'Aliakset';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliakset';
-$PALANG['pOverview_get_mailboxes'] = 'Postilaatikot';
+$PALANG['mailboxes'] = 'Postilaatikot';
 $PALANG['pOverview_get_quota'] = 'Postilaatikon kiintiö (MB)';

 $PALANG['pDelete_delete_error'] = 'Tietueen poisto ei onnistu ';
@ -91,19 +88,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domaini';
 $PALANG['pCreate_alias_domain_alias_text'] = 'Domaini johon sähköpostit tulevat.';
 $PALANG['pCreate_alias_domain_target'] = 'Kohde Domaini';
 $PALANG['pCreate_alias_domain_target_text'] = 'Domaini johon mailien pitäisi mennä.';
-$PALANG['pCreate_alias_domain_button'] = 'Lisää Alias Domaini';
 $PALANG['pCreate_alias_domain_error1'] = 'Sinulla ei ole oikeutta luoda valittua konfiguraatiota.';
 $PALANG['pCreate_alias_domain_error2'] = 'Valittu konfiguraatio on viallinen, ole hyvä ja valitse toinen!';
 $PALANG['pCreate_alias_domain_error3'] = 'Syöttö tietokantaan epäonnistui.';
 $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_welcome'] = 'Luo uusi alias.';
 $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['pCreate_alias_address_text_error3'] = 'Aliasten maksimimäärä saavutettu. Et voi lisätä aliaksia enää!';
 $PALANG['pCreate_alias_goto'] = 'Kenelle';
-$PALANG['pCreate_alias_button'] = 'Lisää alias';
 $PALANG['pCreate_alias_goto_text'] = 'Minne posti lähetetään.';
 $PALANG['pCreate_alias_goto_text_error'] = '"Kenelle" osoite ei ole oikean muotoinen!';
 $PALANG['pCreate_alias_result_error'] = 'Aliaksen lisäys alias tauluun epäonnistui!';
@ -124,12 +118,9 @@ $PALANG['pEdit_alias_result_error'] = 'Aliasta ei voi muokata!';
 $PALANG['pCreate_mailbox_welcome'] = 'Luo uusi paikallinen postilaatikko.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Sähköpostiosoite ei ole oikean muotoinen!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Postilaatikoiden maksimimäärä saavutettu!';
-$PALANG['pCreate_mailbox_password2'] = 'Salasana (toistamiseen)';
 $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP salasana';
 $PALANG['pCreate_mailbox_name_text'] = 'Koko nimi';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Antamasi kiintiö on liian korkea!';
 $PALANG['pCreate_mailbox_mail'] = 'Luo postilaatikko'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Lisää postilaatikko';
 $PALANG['pCreate_mailbox_result_error'] = 'Postilaatikon lisääminen ei onnistu!';
 $PALANG['pCreate_mailbox_result_success'] = 'Postilaatikko on lisätty!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Sähköpostilaatikko on lisätty tauluun, mutta ennaltamääriteltyjen alikansioiden luonneista yksi tai useampi epäonnistui';
@ -153,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['pPassword_button'] = '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';
@ -207,34 +198,24 @@ $PALANG['pSendmail_result_success'] = 'Sähköposti lähetetty!';
 $PALANG['pAdminMenu_list_admin'] = 'Ylläpitäjä Lista';
 $PALANG['pAdminMenu_list_domain'] = 'Domain Lista';
 $PALANG['pAdminMenu_list_virtual'] = 'Virtual Lista';
-$PALANG['pAdminMenu_viewlog'] = 'Näytä loki';
 $PALANG['pAdminMenu_backup'] = 'Varmistus';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domainin ylläpitäjät';
 $PALANG['pAdminMenu_create_admin'] = 'Uusi ylläpitäjä';
 $PALANG['pAdminMenu_create_domain'] = 'Uusi domain';
-$PALANG['pAdminMenu_create_alias'] = 'Lisää alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Lisää postilaatikko';

 $PALANG['pAdminList_admin_username'] = 'Ylläpitäjä';
 $PALANG['pAdminList_admin_count'] = 'Domainit';

-$PALANG['pAdminList_domain_description'] = 'Kuvaus';
-$PALANG['pAdminList_domain_aliases'] = 'Aliakset';
-$PALANG['pAdminList_domain_mailboxes'] = 'Postilaatikot';
+$PALANG['description'] = 'Kuvaus';
+$PALANG['aliases'] = 'Aliakset';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Vara MX';
 $PALANG['last_modified'] = 'Viimeksi muokattu';

 $PALANG['pAdminList_virtual_button'] = 'Siirry';
-$PALANG['pAdminList_virtual_welcome'] = 'Yleisnäkymä ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliakset';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Postilaatikot';
 $PALANG['pAdminList_virtual_alias_address'] = 'Keneltä';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Kenelle';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Sähköposti';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nimi';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kiintiö (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Lisää uusi domain';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domain on jo järjestelmässä!';
@ -250,15 +231,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Domainin voitu poistaa!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Domainin aliasta ei voitu poistaa!';

 $PALANG['pAdminEdit_domain_welcome'] = 'Muokkaa domainia';
-$PALANG['pAdminEdit_domain_description'] = 'Kuvaus';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliakset';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = ei käytössä | 0 = rajoittamaton';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Postilaatikot';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = ei käytössä | 0 = rajoittamaton';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Max kiintiö';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = ei käytössä | 0 = rajoittamaton';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Määritä transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Sähköpostipalvelin on vara MX';
 $PALANG['pAdminEdit_domain_button'] = 'Muokkaa domainia'; # XXX text no longer used
@ -274,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['pAdminEdit_admin_password2'] = '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
@ -287,7 +264,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Käyttäjätunnus tai salasana vä

 $PALANG['pUsersMenu_vacation'] = 'Automaattivastaus';
 $PALANG['pUsersMenu_edit_alias'] = 'Muokkaa uudelleenohjausta';
-$PALANG['pUsersMenu_password'] = 'Vaihda salasana';

 $PALANG['pUsersMain_vacation'] = 'Aseta lomavastaaja tai automaattivastaus sähköpostiisi.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' on päällä, paina \'' . $PALANG['pUsersMenu_vacation'] . '\' muokataksesi tai poistaaksesi';
--- a/languages/fo.lang
+++ b/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['pMenu_create_alias'] = 'Stovna Dulnevni';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_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ð';
@ -61,8 +61,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
 $PALANG['pOverview_button'] = 'Vel';
 $PALANG['pOverview_welcome'] = 'Yvirlit yvir ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Dulnevni';
-$PALANG['pOverview_alias_mailbox_count'] = 'Postkassar';
 $PALANG['pOverview_alias_address'] = 'Frá';
 $PALANG['pOverview_alias_goto'] = 'Til';
 $PALANG['active'] = 'Virkin';
@ -76,9 +74,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Navnaøki';
-$PALANG['pOverview_get_aliases'] = 'Dulnevni';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Postkassar';
+$PALANG['mailboxes'] = 'Postkassar';
 $PALANG['pOverview_get_quota'] = 'Postkassa kvota (MB)';

 $PALANG['pDelete_delete_error'] = 'Fái ikki strikað ';
@ -90,19 +87,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Stovna eitt nýtt dulnevni á tínum navnaøki.';
 $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['pCreate_alias_address_text_error3'] = 'Tú hevur nátt tínum marki at stovna dulnevni!';
 $PALANG['pCreate_alias_goto'] = 'Til';
-$PALANG['pCreate_alias_button'] = 'Stovna Dulnevni';
 $PALANG['pCreate_alias_goto_text'] = 'Har posturin skal sendast til.';
 $PALANG['pCreate_alias_goto_text_error'] = 'TIL er ógyldugt!';
 $PALANG['pCreate_alias_result_error'] = 'Fái ikki stovnað dulnevni!';
@ -124,12 +118,9 @@ $PALANG['pEdit_alias_result_error'] = 'Fái ikki broytt dulnevni!';
 $PALANG['pCreate_mailbox_welcome'] = 'Stovna ein nýggjan postkassa á tínum navnaøki.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-post adressan er ógyldug!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Tú hevur nýtt tínum marki at stovna postkassar!';
-$PALANG['pCreate_mailbox_password2'] = 'Loyniorð (umaftur)';
 $PALANG['pCreate_mailbox_password_text'] = 'Loyniorð til POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Fult navn';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Kvotan tú skrivaði er ov høg!';
 $PALANG['pCreate_mailbox_mail'] = 'Stovna postkassa'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Stovna postkassa';
 $PALANG['pCreate_mailbox_result_error'] = 'Fái ikki stovnað postkassa!';
 $PALANG['pCreate_mailbox_result_success'] = 'Postkassin er stovnaður!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -153,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['pPassword_button'] = '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
@ -207,34 +198,24 @@ $PALANG['pSendmail_result_success'] = 'Postkassin er stovnaður!'; # XXX text ch
 $PALANG['pAdminMenu_list_admin'] = 'Umsitara listi';
 $PALANG['pAdminMenu_list_domain'] = 'Navnaøkja listi';
 $PALANG['pAdminMenu_list_virtual'] = 'Virtual listi';
-$PALANG['pAdminMenu_viewlog'] = 'Vís logg';
 $PALANG['pAdminMenu_backup'] = 'Trygdaravrit';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Umsitarar fyri Navnaøki';
 $PALANG['pAdminMenu_create_admin'] = 'Nýggjan Umsitara';
 $PALANG['pAdminMenu_create_domain'] = 'Nýtt Navnaøki';
-$PALANG['pAdminMenu_create_alias'] = 'Stovna Dulnevni';
-$PALANG['pAdminMenu_create_mailbox'] = 'Stovna Postkassa';

 $PALANG['pAdminList_admin_username'] = 'Umsitari';
 $PALANG['pAdminList_admin_count'] = 'Navnaøki';

-$PALANG['pAdminList_domain_description'] = 'Frágreiðing';
-$PALANG['pAdminList_domain_aliases'] = 'Dulnevni';
-$PALANG['pAdminList_domain_mailboxes'] = 'Postkassar';
+$PALANG['description'] = 'Frágreiðing';
+$PALANG['aliases'] = 'Dulnevni';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Síðst broytt'; # XXX check text - should be 'Last modified'

 $PALANG['pAdminList_virtual_button'] = 'Vel';
-$PALANG['pAdminList_virtual_welcome'] = 'Yvirlit yvir ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Dulnevni';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Postkassar';
 $PALANG['pAdminList_virtual_alias_address'] = 'Frá';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Til';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'E-post';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Stova nýtt navnaøki';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Navnaøki finst longu!';
@ -250,15 +231,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Broyt navnaøki';
-$PALANG['pAdminEdit_domain_description'] = 'Frágreiðing';
-$PALANG['pAdminEdit_domain_aliases'] = 'Dulnevni';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = óvirkja | 0 = óavmarkað';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Postkassar';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = óvirkja | 0 = óavmarkað';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Hægsta kvota';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = óvirkja | 0 = óavmarkað';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
+$PALANG['transport'] = 'Transport'; # XXX
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = 'Post servari er "backup MX"';
 $PALANG['pAdminEdit_domain_button'] = 'Broyt navnaøki'; # XXX text no longer used
@ -274,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['pAdminEdit_admin_password2'] = '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
@ -287,7 +264,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Títt loyniorð er skeivt!';

 $PALANG['pUsersMenu_vacation'] = 'Frítíðarboð';
 $PALANG['pUsersMenu_edit_alias'] = 'Broyt víðarisending';
-$PALANG['pUsersMenu_password'] = 'Broyt loyniorð';

 $PALANG['pUsersMain_vacation'] = 'Set eini frítíðarboð ella svarboð fyri tín post.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
--- a/languages/fr.lang
+++ b/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['pMenu_create_alias'] = 'Ajouter un alias';
-$PALANG['pMenu_create_alias_domain'] = 'Ajouter un alias de domaine';
-$PALANG['pMenu_create_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';
@ -44,7 +44,7 @@ $PALANG['pMenu_logout'] = 'Sortir';

 $PALANG['pMain_welcome'] = 'Bienvenue sur Postfix Admin!';
 $PALANG['pMain_overview'] = 'Visualiser vos alias et comptes courriels. (Modifier/Effacer)';
-$PALANG['pMain_create_alias'] = 'Ajouter un nouvel alias à votre domaine.';
+$PALANG['pMain_create_alias'] = 'Ajouter un nouvel alias à votre domaine.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Ajouter un nouveau compte courriel Ã  votre domaine.';
 $PALANG['pMain_sendmail'] = 'Envoyer un courriel Ã  un de vos nouveaux comptes courriels.';
 $PALANG['pMain_password'] = 'Changer votre mot de passe pour le compte administrateur.';
@ -63,8 +63,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Comptes courriels';
 $PALANG['pOverview_button'] = 'Aller';
 $PALANG['pOverview_welcome'] = 'Vue d\'ensemble pour ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domaines';
-$PALANG['pOverview_alias_alias_count'] = 'Alias';
-$PALANG['pOverview_alias_mailbox_count'] = 'Comptes courriels';
 $PALANG['pOverview_alias_address'] = 'De';
 $PALANG['pOverview_alias_goto'] = 'A';
 $PALANG['active'] = 'Actif';
@ -78,9 +76,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domaine';
-$PALANG['pOverview_get_aliases'] = 'Alias';
 $PALANG['pOverview_get_alias_domains'] = 'Alias Domaine';
-$PALANG['pOverview_get_mailboxes'] = 'Comptes courriels';
+$PALANG['mailboxes'] = 'Comptes courriels';
 $PALANG['pOverview_get_quota'] = 'Limite compte courriels (MB)';

 $PALANG['pDelete_delete_error'] = 'Impossible d\'effacer cette entrÃ©e ';
@ -92,18 +89,15 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domaine';
 $PALANG['pCreate_alias_domain_alias_text'] = 'Le domaine dans lequel les courriels viennent.';
 $PALANG['pCreate_alias_domain_target'] = 'Domaine Cible';
 $PALANG['pCreate_alias_domain_target_text'] = 'Le domaine où les mails doivent aller.';
-$PALANG['pCreate_alias_domain_button'] = 'Ajouter un Alias de Domaine';
 $PALANG['pCreate_alias_domain_error1'] = 'Vous n\'etes pas autorisÃ© a crÃ©er la configuration choisie.';
 $PALANG['pCreate_alias_domain_error2'] = 'La configuration choisie est invalide, merci d\'en choisir une autre!';
 $PALANG['pCreate_alias_domain_error3'] = 'Insertion dans la base de donnÃ©e Ã©chouÃ©e.';
 $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_welcome'] = 'Créer un nouvel alias pour votre 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['pCreate_alias_address_text_error3'] = 'Vous avez atteint votre limite d\'alias crÃ©Ã©s !';
 $PALANG['pCreate_alias_goto'] = 'Ã€';
-$PALANG['pCreate_alias_button'] = 'Ajouter un alias';
 $PALANG['pCreate_alias_goto_text'] = 'Destinataires des courriels.';
 $PALANG['pCreate_alias_goto_text_error'] = 'le champ Ã€ contient des erreurs!';
 $PALANG['pCreate_alias_result_error'] = 'Impossible d\'ajouter cet alias dans la table !';
@ -125,12 +119,9 @@ $PALANG['pEdit_alias_result_error'] = 'Impossible de modifier cet alias!';
 $PALANG['pCreate_mailbox_welcome'] = 'Ajouter un nouveau compte courriel Ã  votre domaine.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'L\'adresse courriel est invalide!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Vous avez atteint le nombre maximum de compte courriel !';
-$PALANG['pCreate_mailbox_password2'] = 'Mot de passe (confirmation)';
 $PALANG['pCreate_mailbox_password_text'] = 'Mot de passe pour compte POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Nom complet';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'La limite que vous avez specifie est trop haute!';
 $PALANG['pCreate_mailbox_mail'] = 'Envoyer le message de bienvenue'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Ajouter le compte courriel';
 $PALANG['pCreate_mailbox_result_error'] = 'Impossible d\'ajouter un compte courriel dans la table!';
 $PALANG['pCreate_mailbox_result_success'] = 'Le compte courriel a Ã©tÃ© ajoutÃ©!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Le compte courriel a Ã©tÃ© ajoutÃ© Ã  la table, mais un ou plusieurs dossiers prÃ©dÃ©finis n\'ont pu Ãªtre crÃ©Ã©s !';
@ -154,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['pPassword_button'] = 'Changer le mot de passe';
+$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';
@ -208,34 +199,24 @@ $PALANG['pSendmail_result_success'] = 'Le message a été envoyé!';
 $PALANG['pAdminMenu_list_admin'] = 'Liste Administrateurs';
 $PALANG['pAdminMenu_list_domain'] = 'Liste Domaines';
 $PALANG['pAdminMenu_list_virtual'] = 'Liste Virtuels';
-$PALANG['pAdminMenu_viewlog'] = 'Visualiser événements';
 $PALANG['pAdminMenu_backup'] = 'Sauvegarde';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Administrateurs de domaines';
 $PALANG['pAdminMenu_create_admin'] = 'Nouvel administrateur';
 $PALANG['pAdminMenu_create_domain'] = 'Nouveau domaine';
-$PALANG['pAdminMenu_create_alias'] = 'Ajouter un Alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Ajouter un compte courriel';

 $PALANG['pAdminList_admin_username'] = 'Administrateur';
 $PALANG['pAdminList_admin_count'] = 'Domaines';

-$PALANG['pAdminList_domain_description'] = 'Description';
-$PALANG['pAdminList_domain_aliases'] = 'Alias';
-$PALANG['pAdminList_domain_mailboxes'] = 'Comptes courriels';
+$PALANG['description'] = 'Description';
+$PALANG['aliases'] = 'Alias';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'MX Backup';
 $PALANG['last_modified'] = 'DerniÃ¨re modification';

 $PALANG['pAdminList_virtual_button'] = 'Aller';
-$PALANG['pAdminList_virtual_welcome'] = 'Vue générale pour ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Comptes courriels';
 $PALANG['pAdminList_virtual_alias_address'] = 'De';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Ã€';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Adresse courriel';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nom';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Limite (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Ajouter un nouveau domaine';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Le domaine existe dÃ©jÃ !';
@ -252,15 +233,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Impossible de supprimer le domain!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Impossible de supprimÃ© cet alias de domaine!';

 $PALANG['pAdminEdit_domain_welcome'] = 'Modifier un domaine';
-$PALANG['pAdminEdit_domain_description'] = 'Description';
-$PALANG['pAdminEdit_domain_aliases'] = 'Alias';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = dÃ©sactivÃ© | 0 = illimitÃ©';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Comptes courriels';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = désactivé | 0 = illimité';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Limite maximum';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = dÃ©sactivÃ© | 0 = illimitÃ©';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Definir le transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Le serveur est un "backup MX"';
 $PALANG['pAdminEdit_domain_button'] = 'Modifier un domaine'; # XXX text no longer used
@ -276,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['pAdminEdit_admin_password2'] = '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
@ -289,7 +266,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Votre mot de passe est invalide!';

 $PALANG['pUsersMenu_vacation'] = 'RÃ©ponse Automatique';
 $PALANG['pUsersMenu_edit_alias'] = 'Modifier votre transfert';
-$PALANG['pUsersMenu_password'] = 'Modifier votre mot de passe';

 $PALANG['pUsersMain_vacation'] = 'Configurer votre rÃ©pondeur automatique.';
 $PALANG['pUsersMain_vacationSet'] = 'La ' . $PALANG['pUsersMenu_vacation'] . ' est activÃ©e, cliquer \'' . $PALANG['pUsersMenu_vacation'] . '\' pour ' . $PALANG['edit'] . '/effacer';
--- a/languages/hr.lang
+++ b/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['pMenu_create_alias'] = 'Dodaj alias';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_mailbox'] = 'Dodaj potanski ormarić';
+$PALANG['add-alias'] = 'Dodaj alias';
+$PALANG['add-alias-domain'] = 'Add Alias Domain'; # XXX
+$PALANG['add-mailbox'] = 'Dodaj potanski ormarić';
 $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
 $PALANG['pMenu_sendmail'] = 'Polji e-potu';
 $PALANG['pMenu_password'] = 'Lozinka';
@ -60,8 +60,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Potanski ormarići';
 $PALANG['pOverview_button'] = 'Idi';
 $PALANG['pOverview_welcome'] = 'Pregled za ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Aliasi';
-$PALANG['pOverview_alias_mailbox_count'] = 'Potanski ormarići';
 $PALANG['pOverview_alias_address'] = 'Od';
 $PALANG['pOverview_alias_goto'] = 'Za';
 $PALANG['active'] = 'Aktivan';
@ -75,9 +73,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domena';
-$PALANG['pOverview_get_aliases'] = 'Aliasi';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Potanski ormarići';
+$PALANG['mailboxes'] = 'Potanski ormarići';
 $PALANG['pOverview_get_quota'] = 'Kvota za potanske ormariće (MB)';

 $PALANG['pDelete_delete_error'] = 'Unos nije bilo moguče izbrisati ';
@ -89,19 +86,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Stvori novi alias za domenu.';
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS nije valjan!';
 $PALANG['email-address-already-exists'] = 'Ova adresa e-pote već postoji, molimo izaberite drugu!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Postigli ste maksimalan broj vaih aliasa!';
 $PALANG['pCreate_alias_goto'] = 'Za';
-$PALANG['pCreate_alias_button'] = 'Dodaj alias';
 $PALANG['pCreate_alias_goto_text'] = 'Kuda poslati e-potu.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Unos "Za" je nepravilan!'; # XXX check - should be   The To: is not valid!
 $PALANG['pCreate_alias_result_error'] = 'Nije bilo moguće dodati alias u tablicu aliasa!';
@ -123,12 +117,9 @@ $PALANG['pEdit_alias_result_error'] = 'Alias nije bilo moguče promjeniti!';
 $PALANG['pCreate_mailbox_welcome'] = 'Stvori novi potanski ormarić za izbranu domenu.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa e-pote nije pravilna!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Dostigli ste va limit potanskih ormarića!';
-$PALANG['pCreate_mailbox_password2'] = 'Lozinka (ponovi)';
 $PALANG['pCreate_mailbox_password_text'] = 'Lozinka za POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Puno ime';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Uneena kvota je prevelika!';
 $PALANG['pCreate_mailbox_mail'] = 'Stvori potanski ormarić'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Dodaj potanski ormarić';
 $PALANG['pCreate_mailbox_result_error'] = 'Potanski ormarić nije moguče stvoriti!';
 $PALANG['pCreate_mailbox_result_success'] = 'Potanski ormarić je uspjeno stvoren!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -152,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'] = 'Uneene lozinke se ne podudaraju ili su prazne!'; # XXX check/beautify - was split in two lines before
-$PALANG['pPassword_button'] = 'Promijeni lozinku';
+$PALANG['change-password'] = 'Promijeni lozinku';
 $PALANG['pPassword_result_error'] = 'Lozinku nije bilo moguče promijeniti!';
 $PALANG['pPassword_result_success'] = 'Lozinka je uspjeno promijenjena!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@ -206,34 +197,24 @@ $PALANG['pSendmail_result_success'] = 'Potanski ormarić je uspjeno stvoren!
 $PALANG['pAdminMenu_list_admin'] = 'Lista administratora';
 $PALANG['pAdminMenu_list_domain'] = 'Lista domena';
 $PALANG['pAdminMenu_list_virtual'] = 'Lista aliasa in potanskih ormarića';
-$PALANG['pAdminMenu_viewlog'] = 'Pregled zapisa';
 $PALANG['pAdminMenu_backup'] = 'Arhiviraj';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domenski administratori';
 $PALANG['pAdminMenu_create_admin'] = 'Novi administrator';
 $PALANG['pAdminMenu_create_domain'] = 'Nova domena';
-$PALANG['pAdminMenu_create_alias'] = 'Dodaj alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Dodaj potanski ormarić';

 $PALANG['pAdminList_admin_username'] = 'Administrator';
 $PALANG['pAdminList_admin_count'] = 'Domene';

-$PALANG['pAdminList_domain_description'] = 'Opis';
-$PALANG['pAdminList_domain_aliases'] = 'Aliasi';
-$PALANG['pAdminList_domain_mailboxes'] = 'Potanski ormarići';
+$PALANG['description'] = 'Opis';
+$PALANG['aliases'] = 'Aliasi';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Zadnja promjena';

 $PALANG['pAdminList_virtual_button'] = 'Idi';
-$PALANG['pAdminList_virtual_welcome'] = 'Pregled za: ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliasi';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Potanski ormarići';
 $PALANG['pAdminList_virtual_alias_address'] = 'Od';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Za';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'E-pota';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Ime';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Dodaj novu domenu';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Uneena domena već postoji!';
@ -249,15 +230,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Uredi domenu';
-$PALANG['pAdminEdit_domain_description'] = 'Opis';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliasi';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = onemogući | 0 = bezgranično';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Potanski ormarići';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = onemogući | 0 = bezgranično'; # XXX check - should be "-1 = disable | 0 = unlimited"
 $PALANG['pAdminEdit_domain_maxquota'] = 'Maksimalna kvota';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = onemogući | 0 = bezgranično';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Prijenos';
+$PALANG['transport'] = 'Prijenos'; # XXX check text - should be 'Transport'
 $PALANG['pAdminEdit_domain_transport_text'] = 'Definiraj prijenos';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Posluitelj e-pote je sekundarni MX';
 $PALANG['pAdminEdit_domain_button'] = 'Uredi domenu'; # XXX text no longer used
@ -273,7 +250,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je uspjeno doda

 $PALANG['pAdminEdit_admin_welcome'] = 'Uredi administratora domene';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['pAdminEdit_admin_password2'] = '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
@ -286,7 +263,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Lozinka nije pravilna!';

 $PALANG['pUsersMenu_vacation'] = 'Obavijest o odsutnosti';
 $PALANG['pUsersMenu_edit_alias'] = 'Promijeni preusmjerenje';
-$PALANG['pUsersMenu_password'] = 'Promijeni lozinku';

 $PALANG['pUsersMain_vacation'] = 'Promijenite obvijest o odsutnosti.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
--- a/languages/hu.lang
+++ b/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['pMenu_create_alias'] = 'Alias felvétele';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_mailbox'] = 'Felhasználó felvétele';
+$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ó';
@ -43,7 +43,7 @@ $PALANG['pMenu_logout'] = 'Kilépés';

 $PALANG['pMain_welcome'] = 'Üdvözöllek a Postfix Adminisztrációs rendszerben!';
 $PALANG['pMain_overview'] = 'Listázd az alias-okat és a postafiókokat. Innen tudod õket törölni / módosítani.';
-$PALANG['pMain_create_alias'] = 'Új alias készítése az adott domainhez.';
+$PALANG['pMain_create_alias'] = 'Új alias készítése az adott domainhez.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Új felhasználó felvétele az adott domainhez.';
 $PALANG['pMain_sendmail'] = 'Küldjön a rendszer emailt minden egyes új felhasználónak.';
 $PALANG['pMain_password'] = 'Admin jelszó megváltoztatása.';
@ -62,8 +62,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Mailbox-ok';
 $PALANG['pOverview_button'] = 'Gyerünk';
 $PALANG['pOverview_welcome'] = 'Áttekintés: ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Alias-ok';
-$PALANG['pOverview_alias_mailbox_count'] = 'Postafiókok';
 $PALANG['pOverview_alias_address'] = 'Honnan';
 $PALANG['pOverview_alias_goto'] = 'Hova';
 $PALANG['active'] = 'Aktív';
@ -78,9 +76,8 @@ $PALANG['no_domains_exist'] = 'You have to create at least one domain before you


 $PALANG['domain'] = 'Domain';
-$PALANG['pOverview_get_aliases'] = 'Alias-ok';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Postafiókok';
+$PALANG['mailboxes'] = 'Postafiókok';
 $PALANG['pOverview_get_quota'] = 'Postafiók Quota (MB)';

 $PALANG['pDelete_delete_error'] = 'Nem sikerült törölni a bejegyzést ';
@ -92,19 +89,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Új alias készítése az adott domainhez';
 $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['pCreate_alias_address_text_error3'] = 'Elérted a maximális alias limitet!';
 $PALANG['pCreate_alias_goto'] = 'Hova';
-$PALANG['pCreate_alias_button'] = 'Alias felvétele';
 $PALANG['pCreate_alias_goto_text'] = 'Ahova a levélnek mennie kell.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Érvénytelen a HOVA mezõ!';
 $PALANG['pCreate_alias_result_error'] = 'Nemsikerült hozzáadni az aliast az alias táblához!';
@ -126,12 +120,9 @@ $PALANG['pEdit_alias_result_error'] = 'Nemsikerült módosítani az Aliast!';
 $PALANG['pCreate_mailbox_welcome'] = 'Új postafiók létrehozása az adott domainhez.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Érvénytelen EMAIL !';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Elérted a maximális postafiók számot!';
-$PALANG['pCreate_mailbox_password2'] = 'Jelszó (mégegyszer)';
 $PALANG['pCreate_mailbox_password_text'] = 'Jelszó a POP3/IMAP -hoz';
 $PALANG['pCreate_mailbox_name_text'] = 'Teljes név';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Túl magas quota értéket adtál meg!';
 $PALANG['pCreate_mailbox_mail'] = 'Postafiók létrehozása'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Postafiók létrehozása';
 $PALANG['pCreate_mailbox_result_error'] = 'Nemsikerült a postafiókot felvenni a mailbox adatbázis táblába!';
 $PALANG['pCreate_mailbox_result_success'] = 'A postafiókot sikeresen felvettük a mailbox adatbázis táblába!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'A postafiókot hozzáadtuk a postafiók táblához, de egyik előre definiált alkönyvtárat sem tudtuk létrehozni (vagy csak néhányat)';
@ -155,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['pPassword_button'] = '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!';

@ -212,34 +203,24 @@ $PALANG['pSendmail_result_success'] = 'A postafiók sikeresen elkészült!'; # X
 $PALANG['pAdminMenu_list_admin'] = 'Admin Lista';
 $PALANG['pAdminMenu_list_domain'] = 'Domain Lista';
 $PALANG['pAdminMenu_list_virtual'] = 'Postafiók Lista';
-$PALANG['pAdminMenu_viewlog'] = 'Napló';
 $PALANG['pAdminMenu_backup'] = 'Adatbázis mentés';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domain Adminok';
 $PALANG['pAdminMenu_create_admin'] = 'Új Admin';
 $PALANG['pAdminMenu_create_domain'] = 'Új Domain';
-$PALANG['pAdminMenu_create_alias'] = 'Új Alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Új Postafiók';

 $PALANG['pAdminList_admin_username'] = 'Admin';
 $PALANG['pAdminList_admin_count'] = 'Domain-ek';

-$PALANG['pAdminList_domain_description'] = 'Leírás';
-$PALANG['pAdminList_domain_aliases'] = 'Alias-ok';
-$PALANG['pAdminList_domain_mailboxes'] = 'Postafiókok';
+$PALANG['description'] = 'Leírás';
+$PALANG['aliases'] = 'Alias-ok';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Utolsó módosítás';

 $PALANG['pAdminList_virtual_button'] = 'Tovább';
-$PALANG['pAdminList_virtual_welcome'] = 'Áttekintés: ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias-ok';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Postafiókok';
 $PALANG['pAdminList_virtual_alias_address'] = 'Honnan';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Hova';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Név';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Quota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Új domain felvétele';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'A domain már létezik!';
@ -256,15 +237,11 @@ $PALANG['pAdminDelete_domain_error'] = 'A domain törlése nem sikerült!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Domain szerkesztése';
-$PALANG['pAdminEdit_domain_description'] = 'Leírás';
-$PALANG['pAdminEdit_domain_aliases'] = 'Alias-ok';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = kikapcsol | 0 = végtelen';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Postafiókok';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = kikapcsol | 0 = végtelen';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Max Quota'; # XXX
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = kikapcsol | 0 = végtelen';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Transport definiálása';
 $PALANG['pAdminEdit_domain_backupmx'] = 'A mail szerver egy backup MX';
 $PALANG['pAdminEdit_domain_button'] = 'Domain szerkesztése'; # XXX text no longer used
@ -280,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['pAdminEdit_admin_password2'] = '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
@ -293,7 +270,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Nem megfelelõ a jelszavad!';

 $PALANG['pUsersMenu_vacation'] = 'Automatikus Válasz';
 $PALANG['pUsersMenu_edit_alias'] = 'Átirányítás beállítása';
-$PALANG['pUsersMenu_password'] = 'Jelszó megváltoztatása';

 $PALANG['pUsersMain_vacation'] = 'Itt lehet beállítani az automatikus válasz levél szövegét, ha az ember távol van.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' bekapcsolva, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove';
--- a/languages/is.lang
+++ b/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['pMenu_create_alias'] = 'Bæta við alias';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_mailbox'] = 'Bæta við pósthólf';
+$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ð';
@ -42,7 +42,7 @@ $PALANG['pMenu_logout'] = 'Aftengjast';

 $PALANG['pMain_welcome'] = 'Velkomin í Postfix Kerfistólin!';
 $PALANG['pMain_overview'] = 'Lista út aliasa og póstföng. Þú getur breytt / eytt og lagað hérna.';
-$PALANG['pMain_create_alias'] = 'Stofna nýjan alias fyrir lénið þitt.';
+$PALANG['pMain_create_alias'] = 'Stofna nýjan alias fyrir lénið þitt.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Stofna nýtt póstfang fyrir lénið þitt.';
 $PALANG['pMain_sendmail'] = 'Senda tölvupóst til eins af nýju pósthólfin.';
 $PALANG['pMain_password'] = 'Breyta lykilorðinu fyrir kerfisstjóra aðganginn.';
@ -61,8 +61,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
 $PALANG['pOverview_button'] = 'Áfram';
 $PALANG['pOverview_welcome'] = 'Yfirlit fyrir ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Aliasar';
-$PALANG['pOverview_alias_mailbox_count'] = 'Pósthólf';
 $PALANG['pOverview_alias_address'] = 'Póstur fyrir';
 $PALANG['pOverview_alias_goto'] = 'Áframsendist til';
 $PALANG['active'] = 'Virkt';
@ -76,9 +74,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Lén';
-$PALANG['pOverview_get_aliases'] = 'Aliasar';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Pósthólf';
+$PALANG['mailboxes'] = 'Póstbox';
 $PALANG['pOverview_get_quota'] = 'Pósthólfs kvóti (MB)';

 $PALANG['pDelete_delete_error'] = 'Get ekki eytt færslunni ';
@ -90,7 +87,6 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
@ -101,7 +97,6 @@ $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['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_button'] = 'Bæta við alias';
 $PALANG['pCreate_alias_goto_text'] = 'Þangað sem pósturinn á að sendast.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Til línan er ekki gild!';
 $PALANG['pCreate_alias_result_error'] = 'Get ekki bætt við alias í alias töflu!';
@ -123,12 +118,9 @@ $PALANG['pEdit_alias_result_error'] = 'Get ekki breytt alias!';
 $PALANG['pCreate_mailbox_welcome'] = 'Create a new local mailbox for your domain.'; # XXX
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Netfangið er ekki til!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Þú hefur stofnað þau póstholf sem þú hefur heimild til!';
-$PALANG['pCreate_mailbox_password2'] = 'Lykilorð (aftur)';
 $PALANG['pCreate_mailbox_password_text'] = 'Lykilorð til að opna POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Fullt nafn';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Kvótinn sem þú skilgreindir er meiri en heimild þín gefur!';
 $PALANG['pCreate_mailbox_mail'] = 'Stofna pósthólf'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'bæta við pósthólfi';
 $PALANG['pCreate_mailbox_result_error'] = 'Get ekki bætt við pósthólfi í mailbox töfluna!';
 $PALANG['pCreate_mailbox_result_success'] = 'Pósthólfinu hefur verið bætt við mailbox töfluna!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -152,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['pPassword_button'] = '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
@ -206,34 +198,24 @@ $PALANG['pSendmail_result_success'] = 'Pósthólfið hefur verið stofnað!'; #
 $PALANG['pAdminMenu_list_admin'] = 'Kerfisstjóralisti';
 $PALANG['pAdminMenu_list_domain'] = 'Lénalisti';
 $PALANG['pAdminMenu_list_virtual'] = 'Virtual Listi';
-$PALANG['pAdminMenu_viewlog'] = 'Skoða Log';
 $PALANG['pAdminMenu_backup'] = 'Afritun';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Lén kerfisstjórar';
 $PALANG['pAdminMenu_create_admin'] = 'Nýr kerfisstjóri';
 $PALANG['pAdminMenu_create_domain'] = 'Nýtt lén';
-$PALANG['pAdminMenu_create_alias'] = 'Bæta við alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Bæta við pósthólfi';

 $PALANG['pAdminList_admin_username'] = 'Notandi';
 $PALANG['pAdminList_admin_count'] = 'Lén';

-$PALANG['pAdminList_domain_description'] = 'Lýsing';
-$PALANG['pAdminList_domain_aliases'] = 'Aliasar';
-$PALANG['pAdminList_domain_mailboxes'] = 'Póstbox';
+$PALANG['description'] = 'Lýsing';
+$PALANG['aliases'] = 'Aliasar';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Síðast breytt';

 $PALANG['pAdminList_virtual_button'] = 'Áfram';
-$PALANG['pAdminList_virtual_welcome'] = 'Yfirlit fyrir ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliasar';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Póstbox';
 $PALANG['pAdminList_virtual_alias_address'] = 'Frá';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Til';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nafn';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvóti (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Bæta við léni';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Lénið er til nú þegar!';
@ -249,15 +231,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Breyta léni';
-$PALANG['pAdminEdit_domain_description'] = 'Lýsing';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliasar';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = óvirkt | 0 = ótakmarkað';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Póstbox';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = óvirkt | 0 = ótakmarkað';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Hámarks kvóti';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = óvirkt | 0 = ótakmarkað';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
+$PALANG['transport'] = 'Transport'; # XXX
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX
 $PALANG['pAdminEdit_domain_button'] = 'Breyta léni'; # XXX text no longer used
@ -273,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['pAdminEdit_admin_password2'] = '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
@ -286,7 +264,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Lykilorð þitt er rangt!';

 $PALANG['pUsersMenu_vacation'] = 'Sjálfvirk svörun';
 $PALANG['pUsersMenu_edit_alias'] = 'Breyta áframsendingu';
-$PALANG['pUsersMenu_password'] = 'Breyta lykilorði';

 $PALANG['pUsersMain_vacation'] = 'Setja "er ekki við" skilaboð sem sjálfvikt svörun í pósthólfið þitt.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
--- a/languages/it.lang
+++ b/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['pMenu_create_alias'] = 'Aggiungi Alias';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_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';
@ -43,7 +43,7 @@ $PALANG['pMenu_logout'] = 'Esci';

 $PALANG['pMain_welcome'] = 'Benvenuti a Postfix Admin!';
 $PALANG['pMain_overview'] = 'Elenco dei tuoi alias e delle caselle di posta. Puoi modificarli / aggiungerli da qui.';
-$PALANG['pMain_create_alias'] = 'Crea nuovi alias per il tuo dominio.';
+$PALANG['pMain_create_alias'] = 'Crea nuovi alias per il tuo dominio.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Crea una nuova casella di posta per il tuo dominio.';
 $PALANG['pMain_sendmail'] = 'Spedisci una email ad una delle nuove casella di posta che hai creato.';
 $PALANG['pMain_password'] = 'Cambia la password per il tuo account di amministratore.';
@ -62,8 +62,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Caselle di posta';
 $PALANG['pOverview_button'] = 'Vai';
 $PALANG['pOverview_welcome'] = 'Resoconto per ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Alias';
-$PALANG['pOverview_alias_mailbox_count'] = 'Caselle di posta';
 $PALANG['pOverview_alias_address'] = 'Da';
 $PALANG['pOverview_alias_goto'] = 'a';
 $PALANG['active'] = 'Attivo';
@ -77,9 +75,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Dominio';
-$PALANG['pOverview_get_aliases'] = 'Alias';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Caselle di posta';
+$PALANG['mailboxes'] = 'Caselle di posta';
 $PALANG['pOverview_get_quota'] = 'Quota delle caselle di posta (MB)';

 $PALANG['pDelete_delete_error'] = 'Impossibile cancellare ';
@ -91,19 +88,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Crea un nuovo alias per il tuo dominio.';
 $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['pCreate_alias_address_text_error3'] = 'Hai raggiunto il tuo limite per creare alias!';
 $PALANG['pCreate_alias_goto'] = 'A';
-$PALANG['pCreate_alias_button'] = 'Aggiungi Alias';
 $PALANG['pCreate_alias_goto_text'] = 'Dove la mail deve essere spedita.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Il campo A non è valido!';
 $PALANG['pCreate_alias_result_error'] = 'Non sono riuscito ad aggiungere l\'alias alla tabella degli alias!';
@ -125,12 +119,9 @@ $PALANG['pEdit_alias_result_error'] = 'Impossibile modificare alias!';
 $PALANG['pCreate_mailbox_welcome'] = 'Crea una nuova casella di posta locale per il tuo dominio.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'L\'indirizzo EMAIL non è valido!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Hai raggiunto il limite per creare caselle di posta!';
-$PALANG['pCreate_mailbox_password2'] = 'Password (ripeti)';
 $PALANG['pCreate_mailbox_password_text'] = 'Password per POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Nome completo';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'La quota che hai specificato è troppo alta!';
 $PALANG['pCreate_mailbox_mail'] = 'Crea casella di posta'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Aggiungi casella di posta';
 $PALANG['pCreate_mailbox_result_error'] = 'Impossibile aggiungere la casella di posta alla tabella delle caselle di posta!';
 $PALANG['pCreate_mailbox_result_success'] = 'La casella di posta è stata aggiunta alla tabella!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'La casella è stata aggiunta, ma non sono riuscito ad aggiungere (tutte) le sottocartelle definite';
@ -154,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['pPassword_button'] = 'Cambia 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';
@ -208,34 +199,24 @@ $PALANG['pSendmail_result_success'] = 'La casella di posta è stata creata!'; #
 $PALANG['pAdminMenu_list_admin'] = 'Lista degli amministratori';
 $PALANG['pAdminMenu_list_domain'] = 'Lista dei domini';
 $PALANG['pAdminMenu_list_virtual'] = 'Lista virtuale';
-$PALANG['pAdminMenu_viewlog'] = 'Vedi Log';
 $PALANG['pAdminMenu_backup'] = 'Fai Backup';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Amministratori del dominio';
 $PALANG['pAdminMenu_create_admin'] = 'Nuovo Amministratore';
 $PALANG['pAdminMenu_create_domain'] = 'Nuovo Dominio';
-$PALANG['pAdminMenu_create_alias'] = 'Aggiungi Alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Aggiungi casella di posta';

 $PALANG['pAdminList_admin_username'] = 'Amministratori';
 $PALANG['pAdminList_admin_count'] = 'Domini';

-$PALANG['pAdminList_domain_description'] = 'Descrizione';
-$PALANG['pAdminList_domain_aliases'] = 'Alias';
-$PALANG['pAdminList_domain_mailboxes'] = 'Caselle di posta';
+$PALANG['description'] = 'Descrizione';
+$PALANG['aliases'] = 'Alias';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Trasporto';
 $PALANG['pAdminList_domain_backupmx'] = 'MX secondario';
 $PALANG['last_modified'] = 'Ultima modifica';

 $PALANG['pAdminList_virtual_button'] = 'Vai';
-$PALANG['pAdminList_virtual_welcome'] = 'Resoconto per ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Caselle di posta';
 $PALANG['pAdminList_virtual_alias_address'] = 'Da';
 $PALANG['pAdminList_virtual_alias_goto'] = 'A';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nome';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Quota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Aggiungi nuovo dominio';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Il dominio esiste già!';
@ -251,15 +232,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Impossibile cancellare il dominio!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Modifica un domain';
-$PALANG['pAdminEdit_domain_description'] = 'Descrizione';
-$PALANG['pAdminEdit_domain_aliases'] = 'Alias';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = disabilita | 0 = illimitati';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Caselle di posta';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = disabilita | 0 = illimitate';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Quota massima';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = disabilita | 0 = illimitato'; # XXX check - should be "MB | -1 = disable | 0 = unlimited"
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Trasporto';
+$PALANG['transport'] = 'Trasporto';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Definisci il trasporto'; # XXX check / compare with pAdminCreate_domain_transport_text - should be "Define transport"
 $PALANG['pAdminEdit_domain_backupmx'] = 'Questo server è un MX secondario';
 $PALANG['pAdminEdit_domain_button'] = 'Modifica dominio'; # XXX text no longer used
@ -275,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['pAdminEdit_admin_password2'] = '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
@ -288,7 +265,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'La tua password non è corretta!';

 $PALANG['pUsersMenu_vacation'] = 'Risposta automatica';
 $PALANG['pUsersMenu_edit_alias'] = 'Cambia il tuo inoltro';
-$PALANG['pUsersMenu_password'] = 'Cambia password';

 $PALANG['pUsersMain_vacation'] = 'Setta un messaggio di "Fuori ufficio" o un autorisponditore per la tua posta';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' è attivo, fai clic su \'' . $PALANG['pUsersMenu_vacation'] . '\' per ' . $PALANG['edit'] . '/rimuovere';
--- a/languages/ja.lang
+++ b/languages/ja.lang
@ -33,9 +33,9 @@ $PALANG['pLogin_login_users'] = '一般ユーザのログインはここをク

 $PALANG['pMenu_main'] = 'メイン';
 $PALANG['pMenu_overview'] = '概要';
-$PALANG['pMenu_create_alias'] = '転送先の追加';
-$PALANG['pMenu_create_alias_domain'] = 'エイリアスドメインの追加';
-$PALANG['pMenu_create_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'] = 'パスワード';
@ -44,7 +44,7 @@ $PALANG['pMenu_logout'] = 'ログアウト';

 $PALANG['pMain_welcome'] = 'Postfix Admin へようこそ！';
 $PALANG['pMain_overview'] = '転送アドレスとメールアドレスの一覧を表示します。ここから編集と削除ができます。';
-$PALANG['pMain_create_alias'] = '新しい転送アドレスを作成します。';
+$PALANG['pMain_create_alias'] = '新しい転送アドレスを作成します。'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = '新しいメールアドレスを作成します。';
 $PALANG['pMain_sendmail'] = '新しいメールアドレスにメールを送信します。';
 $PALANG['pMain_password'] = 'パスワードを変更します。';
@ -63,8 +63,6 @@ $PALANG['pOverview_mailbox_title'] = ':: メールアドレス';
 $PALANG['pOverview_button'] = '表示';
 $PALANG['pOverview_welcome'] = '概要 ';
 $PALANG['pOverview_alias_domain_aliases'] = 'エイリアスドメイン';
-$PALANG['pOverview_alias_alias_count'] = '転送数';
-$PALANG['pOverview_alias_mailbox_count'] = 'アドレス数';
 $PALANG['pOverview_alias_address'] = '転送元';
 $PALANG['pOverview_alias_goto'] = '転送先';
 $PALANG['active'] = 'アクティブ';
@ -79,9 +77,8 @@ $PALANG['no_domains_exist'] = 'You have to create at least one domain before you


 $PALANG['domain'] = 'ドメイン';
-$PALANG['pOverview_get_aliases'] = '転送';
 $PALANG['pOverview_get_alias_domains'] = 'ドメインエイリアス';
-$PALANG['pOverview_get_mailboxes'] = 'アドレス';
+$PALANG['mailboxes'] = 'アドレス数';
 $PALANG['pOverview_get_quota'] = '容量制限 (MB)';
 $PALANG['pDelete_delete_error'] = 'エントリを削除できません。 ';
 $PALANG['pDelete_delete_success'] = '%s を削除しました。';
@ -92,19 +89,16 @@ $PALANG['pCreate_alias_domain_alias'] = '別名ドメイン';
 $PALANG['pCreate_alias_domain_alias_text'] = 'メールがこのドメイン宛に来ます。';
 $PALANG['pCreate_alias_domain_target'] = '宛先ドメイン';
 $PALANG['pCreate_alias_domain_target_text'] = 'メールをこのドメイン宛に届けます。';
-$PALANG['pCreate_alias_domain_button'] = 'エイリアスドメインの追加';
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
 $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_welcome'] = '新しい転送先の作成';
 $PALANG['pCreate_alias_address_text_error1'] = 'メールアドレスが無効です。';
 $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_button'] = '転送先追加';
 $PALANG['pCreate_alias_goto_text'] = 'メールを転送するアドレス';
 $PALANG['pCreate_alias_goto_text_error'] = '転送先が無効です。';
 $PALANG['pCreate_alias_result_error'] = '転送先を追加できません！';
@ -126,12 +120,9 @@ $PALANG['pEdit_alias_result_error'] = '修正できません！';
 $PALANG['pCreate_mailbox_welcome'] = '新しいメールアドレスの作成';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'メールアドレスが無効です。';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'メールアドレスの制限数に達しました。';
-$PALANG['pCreate_mailbox_password2'] = 'パスワード (確認)';
 $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAPのパスワード';
 $PALANG['pCreate_mailbox_name_text'] = 'フルネーム';
-$PALANG['pCreate_mailbox_quota_text_error'] = '指定された容量制限が大きすぎます。';
 $PALANG['pCreate_mailbox_mail'] = 'ようこそメールの送信'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'メールアドレス追加';
 $PALANG['pCreate_mailbox_result_error'] = 'メールアドレスを追加できません！';
 $PALANG['pCreate_mailbox_result_success'] = 'メールアドレスを追加しました。';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'メールアドレスを追加しました。しかし、いくつかのサブフォルダの作成に失敗しました。';
@ -155,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['pPassword_button'] = 'パスワード変更';
+$PALANG['change-password'] = 'パスワード変更';
 $PALANG['pPassword_result_error'] = 'パスワードを変更できません！';
 $PALANG['pPassword_result_success'] = 'パスワードを変更しました。';

@ -212,34 +203,24 @@ $PALANG['pSendmail_result_success'] = 'メールが送信されました。';
 $PALANG['pAdminMenu_list_admin'] = '管理者一覧';
 $PALANG['pAdminMenu_list_domain'] = 'ドメイン一覧';
 $PALANG['pAdminMenu_list_virtual'] = 'アドレス一覧';
-$PALANG['pAdminMenu_viewlog'] = 'ログ表示';
 $PALANG['pAdminMenu_backup'] = 'バックアップ';
 $PALANG['pAdminMenu_create_domain_admins'] = 'ドメイン管理者';
 $PALANG['pAdminMenu_create_admin'] = '新しい管理者';
 $PALANG['pAdminMenu_create_domain'] = '新しいドメイン';
-$PALANG['pAdminMenu_create_alias'] = '転送先の追加';
-$PALANG['pAdminMenu_create_mailbox'] = 'アドレスの追加';

 $PALANG['pAdminList_admin_username'] = '管理者';
 $PALANG['pAdminList_admin_count'] = 'ドメイン数';

-$PALANG['pAdminList_domain_description'] = '説明';
-$PALANG['pAdminList_domain_aliases'] = '転送数';
-$PALANG['pAdminList_domain_mailboxes'] = 'アドレス数';
+$PALANG['description'] = '説明';
+$PALANG['aliases'] = '転送数'; # XXX check text - should be 'Aliases'
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = '配送方法';
 $PALANG['pAdminList_domain_backupmx'] = 'バックアップ MX';
 $PALANG['last_modified'] = '最終更新日';

 $PALANG['pAdminList_virtual_button'] = '表示';
-$PALANG['pAdminList_virtual_welcome'] = '概要 ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = '転送数';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'アドレス数';
 $PALANG['pAdminList_virtual_alias_address'] = '転送元';
 $PALANG['pAdminList_virtual_alias_goto'] = '転送先';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'メールアドレス';
 $PALANG['pAdminList_virtual_mailbox_name'] = '名前';
-$PALANG['pAdminList_virtual_mailbox_quota'] = '容量制限 (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = '新しいドメインの追加';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'ドメインが既に存在します。';
@ -256,15 +237,11 @@ $PALANG['pAdminDelete_domain_error'] = 'ドメインが削除できません！'
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'ドメインの修正';
-$PALANG['pAdminEdit_domain_description'] = '説明';
-$PALANG['pAdminEdit_domain_aliases'] = '最大転送先数';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = 無効 | 0 = 無制限';
-$PALANG['pAdminEdit_domain_mailboxes'] = '最大メールアドレス'; # XXX check / compare with pAdminCreate_domain_mailboxes - should be "Mailboxes"
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = 無効 | 0 = 無制限';
 $PALANG['pAdminEdit_domain_maxquota'] = '最大容量制限';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = 無効 | 0 = 無制限';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = '配送方法';
+$PALANG['transport'] = '配送方法';
 $PALANG['pAdminEdit_domain_transport_text'] = '配送方法の定義';
 $PALANG['pAdminEdit_domain_backupmx'] = 'バックアップ MXサーバ';
 $PALANG['pAdminEdit_domain_button'] = 'ドメイン修正'; # XXX text no longer used
@ -280,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['pAdminEdit_admin_password2'] = 'パスワード (確認)';
+$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
@ -293,7 +270,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'パスワードが違います。';

 $PALANG['pUsersMenu_vacation'] = '自動応答';
 $PALANG['pUsersMenu_edit_alias'] = '転送先変更';
-$PALANG['pUsersMenu_password'] = 'パスワード変更';

 $PALANG['pUsersMain_vacation'] = '不在メッセージまたは自動応答を設定します';
 $PALANG['pUsersMain_vacationSet'] = '自動応答を利用中です。「自動応答」をクリックして編集／解除できます。';
--- a/languages/lt.lang
+++ b/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['pMenu_create_alias'] = 'Naujas sinonimas';
-$PALANG['pMenu_create_alias_domain'] = 'Naujas srities sinonimas';
-$PALANG['pMenu_create_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';
@ -42,7 +42,7 @@ $PALANG['pMenu_logout'] = 'Atsijungti';

 $PALANG['pMain_welcome'] = 'Sveiki prisijungę prie pašto administratoriaus!';
 $PALANG['pMain_overview'] = 'Pežiūrėti visas pašto dėžutes ir sinonimus. Čionai atliekami pakeitimai, šalinimas.';
-$PALANG['pMain_create_alias'] = 'Naujas pašto sinonimas.';
+$PALANG['pMain_create_alias'] = 'Naujas pašto sinonimas.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Nauja pašto dėžutė.';
 $PALANG['pMain_sendmail'] = 'Siųsti laišką į vieną naujai sukurtą pašto dėžutę.';
 $PALANG['pMain_password'] = 'Keisti administratoriaus slaptažodį.';
@ -61,8 +61,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Pašto dėžutės';
 $PALANG['pOverview_button'] = 'Eiti';
 $PALANG['pOverview_welcome'] = 'Peržiūra ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Srities sinonimai';
-$PALANG['pOverview_alias_alias_count'] = 'sinonimų';
-$PALANG['pOverview_alias_mailbox_count'] = 'pašto dėžučių';
 $PALANG['pOverview_alias_address'] = 'Iš';
 $PALANG['pOverview_alias_goto'] = 'Į';
 $PALANG['active'] = 'Įjungtas'; # XXX check text - should be 'Active'
@ -76,9 +74,8 @@ $PALANG['no_domains_for_this_admin'] = 'Jūs neturite teisių jokiai sričiai.';
 $PALANG['no_domains_exist'] = 'Jūs turite sukurti bent vieną sritį prieš naudodami virtualų sąrašą.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual']

 $PALANG['domain'] = 'Sritis';
-$PALANG['pOverview_get_aliases'] = 'Sinonimai';
 $PALANG['pOverview_get_alias_domains'] = 'Srities sinonimai';
-$PALANG['pOverview_get_mailboxes'] = 'Pašto dėžutės';
+$PALANG['mailboxes'] = 'Pašto dėžutės'; # XXX check text - should be 'Mailboxes'
 $PALANG['pOverview_get_quota'] = 'Pašto dėžutės kvota (MB)';

 $PALANG['pDelete_delete_error'] = 'Nepavyko pašalinti įrašo ';
@ -90,19 +87,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Srities sinonimas';
 $PALANG['pCreate_alias_domain_alias_text'] = 'Sritis, kuriai ateina laiškai.';
 $PALANG['pCreate_alias_domain_target'] = 'Nukreipta sritis';
 $PALANG['pCreate_alias_domain_target_text'] = 'Sritis, į kurią turi būti nukreipti laiškai.';
-$PALANG['pCreate_alias_domain_button'] = 'Pridėti srities sinonimą';
 $PALANG['pCreate_alias_domain_error1'] = 'Jūs negalite sukurti pasirinktos konfigūracijos.';
 $PALANG['pCreate_alias_domain_error2'] = 'Pasirinkta neteisinga konfigūracija, pasirinkite kitą!';
 $PALANG['pCreate_alias_domain_error3'] = 'Duomenų bazės papildyti nepavyko.';
 $PALANG['pCreate_alias_domain_error4'] = 'Visos sritys jau turi sinonimus.';
 $PALANG['pCreate_alias_domain_success'] = 'Srities sinonimas užregistruotas!';

-$PALANG['pCreate_alias_welcome'] = 'Naujas sinonimas.';
 $PALANG['pCreate_alias_address_text_error1'] = 'Netinkamas sinonimas!';
 $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_button'] = 'Naujas sinonimas';
 $PALANG['pCreate_alias_goto_text'] = 'Adresas, kuriuo persiųsti paštą.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Kam: įvestas neteisingai!';
 $PALANG['pCreate_alias_result_error'] = 'Sinonimo registruoti nepavyko!';
@ -125,12 +119,9 @@ $PALANG['pEdit_alias_result_error'] = 'Sinonimo pakeisti nepavyko!';
 $PALANG['pCreate_mailbox_welcome'] = 'Nauja pašto dėžutė.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Šis el.pašto adresas neteisingas!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Išnaudota srities pašto dėžučių kvota!';
-$PALANG['pCreate_mailbox_password2'] = 'Slaptažodis (dar kartą)';
 $PALANG['pCreate_mailbox_password_text'] = 'Slaptažodis jungtis prie POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Vardas Pavardė';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Įvesta per didelė kvota!';
 $PALANG['pCreate_mailbox_mail'] = 'Siųsti pasveikinimo žinutę';
-$PALANG['pCreate_mailbox_button'] = 'Nauja pašto dėžutė';
 $PALANG['pCreate_mailbox_result_error'] = 'Pašto dėžutės užregistruoti nepavyko!';
 $PALANG['pCreate_mailbox_result_success'] = 'Pašto dėžutė užregistruota!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Pašto dėžutė užregistruota, bet nepavyko sukurti (galbūt kai kurių) nustatytų subdirektorijų';
@ -154,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['pPassword_button'] = '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ą';
@ -208,34 +199,24 @@ $PALANG['pSendmail_result_success'] = 'Žinutė išsiųsta!';
 $PALANG['pAdminMenu_list_admin'] = 'Administratoriai';
 $PALANG['pAdminMenu_list_domain'] = 'Sritys';
 $PALANG['pAdminMenu_list_virtual'] = 'Virtualus sąrašas';
-$PALANG['pAdminMenu_viewlog'] = 'Žurnalas';
 $PALANG['pAdminMenu_backup'] = 'Kopijos';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Sričių administratoriai';
 $PALANG['pAdminMenu_create_admin'] = 'Naujas administratorius';
 $PALANG['pAdminMenu_create_domain'] = 'Nauja sritis';
-$PALANG['pAdminMenu_create_alias'] = 'Naujas sinonimas';
-$PALANG['pAdminMenu_create_mailbox'] = 'Nauja pašto dėžutė';

 $PALANG['pAdminList_admin_username'] = 'Administratorius';
 $PALANG['pAdminList_admin_count'] = 'Sritys';

-$PALANG['pAdminList_domain_description'] = 'Aprašymas';
-$PALANG['pAdminList_domain_aliases'] = 'Sinonimai';
-$PALANG['pAdminList_domain_mailboxes'] = 'Pašto dėžutės';
+$PALANG['description'] = 'Aprašymas';
+$PALANG['aliases'] = 'Sinonimai'; # XXX check text - should be 'Aliases'
 $PALANG['pAdminList_domain_quota'] = 'Srities kvota (MB)';
-$PALANG['pAdminList_domain_transport'] = 'Srities transportas';
 $PALANG['pAdminList_domain_backupmx'] = 'Atsarginis MX';
 $PALANG['last_modified'] = 'Paskutinį kartą keista(s)'; # XXX check text - should be "Last modified"

 $PALANG['pAdminList_virtual_button'] = 'Eiti';
-$PALANG['pAdminList_virtual_welcome'] = 'Peržiūrėti ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'sinonimus';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'pašto dėžutes';
 $PALANG['pAdminList_virtual_alias_address'] = 'Iš';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Į';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'El.paštas';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Vardas';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Nauja sritis';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Tokia sritis jau yra!';
@ -251,15 +232,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Nepavyko panaikinti srities!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Nepavyko panaikinti srities sinonimo!';

 $PALANG['pAdminEdit_domain_welcome'] = 'Keisti sritį';
-$PALANG['pAdminEdit_domain_description'] = 'Aprašymas';
-$PALANG['pAdminEdit_domain_aliases'] = 'Sinonimai';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = išjungta(s) | 0 = neribota(s)';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Pašto dėžutės';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = išjungta(s) | 0 = neribota(s)';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Maksimali kvota';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = išjungta(s) | 0 = neribota(s)';
 $PALANG['pAdminEdit_domain_quota'] = 'Srities kvota';
-$PALANG['pAdminEdit_domain_transport'] = 'Srities transportas';
+$PALANG['transport'] = 'Srities transportas';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Nustatyti transportą';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Tai atsarginis pašto serveris (MX)';
 $PALANG['pAdminEdit_domain_button'] = 'Keisti sritį'; # XXX text no longer used
@ -275,7 +252,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratorius užregistruotas

 $PALANG['pAdminEdit_admin_welcome'] = 'Registruoti srities administratorių';
 $PALANG['pAdminEdit_admin_username'] = 'Administratorius';
-$PALANG['pAdminEdit_admin_password2'] = 'Slaptažodis (dar kartą)';
+$PALANG['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
@ -288,7 +265,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Slaptažodis neteisingas!';

 $PALANG['pUsersMenu_vacation'] = 'Automatinis (atostogų) atsakymas';
 $PALANG['pUsersMenu_edit_alias'] = 'Keisti laiškų peradresaciją';
-$PALANG['pUsersMenu_password'] = 'Keisti slaptažodį';

 $PALANG['pUsersMain_vacation'] = 'Nustatyti "Esu išvykęs" automatinį atsakymą visiems ateinantiems laiškams.';
 $PALANG['pUsersMain_vacationSet'] = 'Automatinis atsakymas ĮJUNGTAS, paspauskite \'Automatinis (atostogų) atsakymas\' pakeisti ar ištrinti';
--- a/languages/mk.lang
+++ b/languages/mk.lang
@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = 'Логин за обични корисници

 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = 'Преглед';
-$PALANG['pMenu_create_alias'] = 'Додавање на алијас';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_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'] = 'Промена на лозинка';
@ -61,8 +61,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
 $PALANG['pOverview_button'] = 'Оди';
 $PALANG['pOverview_welcome'] = 'Преглед за ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Алијаси';
-$PALANG['pOverview_alias_mailbox_count'] = 'Поштенски сандачиња';
 $PALANG['pOverview_alias_address'] = 'Од';
 $PALANG['pOverview_alias_goto'] = 'До';
 $PALANG['active'] = 'Активен';
@ -76,9 +74,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Домен';
-$PALANG['pOverview_get_aliases'] = 'Алијаси';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Поштенски сандачиња';
+$PALANG['mailboxes'] = 'Поштенски сандачиња';
 $PALANG['pOverview_get_quota'] = 'Квота на сандаче (MB)';

 $PALANG['pDelete_delete_error'] = 'Не можам да го избришам записот ';
@ -90,19 +87,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Креирање на нов алијас за вашиот домен.';
 $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['pCreate_alias_address_text_error3'] = 'Го достигнавте вашиот лимит за креирање алијаси!';
 $PALANG['pCreate_alias_goto'] = 'До';
-$PALANG['pCreate_alias_button'] = 'Додавање алијас';
 $PALANG['pCreate_alias_goto_text'] = 'Каде треба да се испрати поштата.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Полето ДО не е валидно!';
 $PALANG['pCreate_alias_result_error'] = 'Не можам да го додадам алијасот на табелата со алијаси!';
@ -124,12 +118,9 @@ $PALANG['pEdit_alias_result_error'] = 'Не можам да го промена
 $PALANG['pCreate_mailbox_welcome'] = 'Креирање на ново поштенско сандаче.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'EMAIL не е валиден!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Достигнат е лимитот на поштенски сандачиња!';
-$PALANG['pCreate_mailbox_password2'] = 'Лозинка (лозинка)';
 $PALANG['pCreate_mailbox_password_text'] = 'Лозинка за POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Цело име';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Внесената квота е превисока!';
 $PALANG['pCreate_mailbox_mail'] = 'Креирање на поштенско сандаче'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Додавање на сандаче';
 $PALANG['pCreate_mailbox_result_error'] = 'Не можам да додадам ново сандаче на табелата!';
 $PALANG['pCreate_mailbox_result_success'] = 'Поштенското сандаче е додадено на табелата!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -153,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['pPassword_button'] = 'Промена на лозинка';
+$PALANG['change-password'] = 'Промена на лозинка';
 $PALANG['pPassword_result_error'] = 'Не можам да ја променам вашата лозинка!';
 $PALANG['pPassword_result_success'] = 'Вашата лозинка е сменета!';
 $PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
@ -207,34 +198,24 @@ $PALANG['pSendmail_result_success'] = 'Сандачето е креирано!';
 $PALANG['pAdminMenu_list_admin'] = 'Листа на администратори';
 $PALANG['pAdminMenu_list_domain'] = 'Листа на домени';
 $PALANG['pAdminMenu_list_virtual'] = 'Листа на виртуелни домени';
-$PALANG['pAdminMenu_viewlog'] = 'Преглед на записи';
 $PALANG['pAdminMenu_backup'] = 'Backup';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Администратори на домен';
 $PALANG['pAdminMenu_create_admin'] = 'Нов администратор';
 $PALANG['pAdminMenu_create_domain'] = 'Нов домен';
-$PALANG['pAdminMenu_create_alias'] = 'Нов алијас';
-$PALANG['pAdminMenu_create_mailbox'] = 'Ново сандаче';

 $PALANG['pAdminList_admin_username'] = 'Корисничко име';
 $PALANG['pAdminList_admin_count'] = 'Домени';

-$PALANG['pAdminList_domain_description'] = 'Опис';
-$PALANG['pAdminList_domain_aliases'] = 'Алијаси';
-$PALANG['pAdminList_domain_mailboxes'] = 'Поштенски сандачиња';
+$PALANG['description'] = 'Опис';
+$PALANG['aliases'] = 'Алијаси';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Последна промена';

 $PALANG['pAdminList_virtual_button'] = 'Оди';
-$PALANG['pAdminList_virtual_welcome'] = 'Преглед за ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Алијаси';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Поштенски сандачиња';
 $PALANG['pAdminList_virtual_alias_address'] = 'Од';
 $PALANG['pAdminList_virtual_alias_goto'] = 'До';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Емејл';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Име';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Квота (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Додади нов домен';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Доменот веќе постои!';
@ -251,15 +232,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Измена на домен';
-$PALANG['pAdminEdit_domain_description'] = 'Опис';
-$PALANG['pAdminEdit_domain_aliases'] = 'Алијаси';
 $PALANG['pAdminEdit_domain_aliases_text'] = '0 = забрането | -1 = неограничено';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Поштенски сандачиња';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '0 = забрането | -1 = неограничено';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Максимална квота';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | 0 = исклучена | -1 = неограничена'; # XXX check - should be "MB | -1 = disable | 0 = unlimited"
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
+$PALANG['transport'] = 'Transport'; # XXX
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail серверот е backup MX';
 $PALANG['pAdminEdit_domain_button'] = 'Едитирај домен'; # XXX text no longer used
@ -275,7 +252,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Администраторот

 $PALANG['pAdminEdit_admin_welcome'] = 'Измена на администратор на домен';
 $PALANG['pAdminEdit_admin_username'] = 'Администратор';
-$PALANG['pAdminEdit_admin_password2'] = 'Лозинка (повторно)';
+$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
@ -288,7 +265,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Погрешна лозинка!';

 $PALANG['pUsersMenu_vacation'] = 'Автоматски одговор';
 $PALANG['pUsersMenu_edit_alias'] = 'Промена на препраќање (forward)';
-$PALANG['pUsersMenu_password'] = 'Промена на лозинка';

 $PALANG['pUsersMain_vacation'] = 'Подесување на автоматски одговор за почтенското сандаче.';
 $PALANG['pUsersMain_vacationSet'] = 'Auto Response is ON, click \'Auto Response\' to edit/remove'; # XXX
--- a/languages/nb.lang
+++ b/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['pMenu_create_alias'] = 'Legg til alias';
-$PALANG['pMenu_create_alias_domain'] = 'Legg til aliasdomene';
-$PALANG['pMenu_create_mailbox'] = 'Legg til e-postkonto';
+$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';
@ -63,8 +63,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Epostkontoer';
 $PALANG['pOverview_button'] = 'Vis';
 $PALANG['pOverview_welcome'] = 'Oversikt for ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Aliasdomener';
-$PALANG['pOverview_alias_alias_count'] = 'Alias';
-$PALANG['pOverview_alias_mailbox_count'] = 'Epostkontoer';
 $PALANG['pOverview_alias_address'] = 'Fra';
 $PALANG['pOverview_alias_goto'] = 'Til';
 $PALANG['active'] = 'Aktiv';
@ -78,9 +76,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domene';
-$PALANG['pOverview_get_aliases'] = 'Alias';
 $PALANG['pOverview_get_alias_domains'] = 'Domenealias';
-$PALANG['pOverview_get_mailboxes'] = 'Epostkontoer';
+$PALANG['mailboxes'] = 'E-postkontoer';
 $PALANG['pOverview_get_quota'] = 'Kvote for e-postkonto (MB)';

 $PALANG['pDelete_delete_error'] = 'Kan ikke slette oppføringen ';
@ -92,19 +89,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Aliasdomene';
 $PALANG['pCreate_alias_domain_alias_text'] = 'Domenet de innkommende e-postmeldingene er adressert til.';
 $PALANG['pCreate_alias_domain_target'] = 'Destinasjonsdomene';
 $PALANG['pCreate_alias_domain_target_text'] = 'Domenet e-postmeldingene skal videresendes til.';
-$PALANG['pCreate_alias_domain_button'] = 'Legg til aliasdomene';
 $PALANG['pCreate_alias_domain_error1'] = 'Du har ikke tillatelse til å opprette den valgte konfigurasjonen.';
 $PALANG['pCreate_alias_domain_error2'] = 'Den valgte konfigurasjonen er ugyldig, vennligst endre den!';
 $PALANG['pCreate_alias_domain_error3'] = 'Det mislyktes å lagre informasjonen i databasen.';
 $PALANG['pCreate_alias_domain_error4'] = 'Det er allerede opprettet alias for alle domenene.';
 $PALANG['pCreate_alias_domain_success'] = 'Domenealiaset har blitt lagt inn i tabellen over aliasdomener!';

-$PALANG['pCreate_alias_welcome'] = 'Opprett et nytt alias.';
 $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['pCreate_alias_address_text_error3'] = 'Du har nådd grensen for antall aliaser under dette domenet!';
 $PALANG['pCreate_alias_goto'] = 'Til';
-$PALANG['pCreate_alias_button'] = 'Legg til alias';
 $PALANG['pCreate_alias_goto_text'] = 'Hvor e-postmeldingen skal videresendes til.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Til-adressen er ikke gyldig!';
 $PALANG['pCreate_alias_result_error'] = 'Kunne ikke legge til aliaset i alias-tabellen!';
@ -125,12 +119,9 @@ $PALANG['pEdit_alias_result_error'] = 'Kan ikke endre aliaset!';
 $PALANG['pCreate_mailbox_welcome'] = 'Opprett en ny e-postkonto.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-postadressen er ikke gyldig!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Du har nådd grensen for antall e-postkontoer under dette domenet!';
-$PALANG['pCreate_mailbox_password2'] = 'Passord (bekreft)';
 $PALANG['pCreate_mailbox_password_text'] = 'Passord for POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Fullt navn';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Kvoten du har angitt er for høy!';
 $PALANG['pCreate_mailbox_mail'] = 'Send velkomstmelding'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Opprett e-postkonto';
 $PALANG['pCreate_mailbox_result_error'] = 'Kunne ikke legge til e-postkontoen i mailbox-tabellen!';
 $PALANG['pCreate_mailbox_result_success'] = 'E-postkontoen er blitt opprettet i mailbox-tabellen!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'E-postkontoen er blitt opprettet i mailbox-tabellen, men ingen (eller kun noen) av de forhåndsdefinerte undermappene kunne opprettes.';
@ -154,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['pPassword_button'] = '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';
@ -208,34 +199,24 @@ $PALANG['pSendmail_result_success'] = 'E-postmeldingen er sendt!';
 $PALANG['pAdminMenu_list_admin'] = 'Administratorer';
 $PALANG['pAdminMenu_list_domain'] = 'Domener';
 $PALANG['pAdminMenu_list_virtual'] = 'Virtuell oversikt';
-$PALANG['pAdminMenu_viewlog'] = 'Vis logg';
 $PALANG['pAdminMenu_backup'] = 'Sikkerhetskopi';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domeneadministratorer';
 $PALANG['pAdminMenu_create_admin'] = 'Ny administrator';
 $PALANG['pAdminMenu_create_domain'] = 'Nytt domene';
-$PALANG['pAdminMenu_create_alias'] = 'Legg til alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Legg til e-postkonto';

 $PALANG['pAdminList_admin_username'] = 'Administrator';
 $PALANG['pAdminList_admin_count'] = 'Domener';

-$PALANG['pAdminList_domain_description'] = 'Beskrivelse';
-$PALANG['pAdminList_domain_aliases'] = 'Alias';
-$PALANG['pAdminList_domain_mailboxes'] = 'Epostkontoer';
+$PALANG['description'] = 'Beskrivelse';
+$PALANG['aliases'] = 'Alias';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup-MX';
 $PALANG['last_modified'] = 'Sist endret';

 $PALANG['pAdminList_virtual_button'] = 'Vis';
-$PALANG['pAdminList_virtual_welcome'] = 'Oversikt for ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'E-postkontoer';
 $PALANG['pAdminList_virtual_alias_address'] = 'Fra';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Til';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'E-post';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvote (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Legg til et nytt domene';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domenet finnes allerede!';
@ -251,15 +232,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Kunne ikke fjerne domenet!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Kunne ikke fjerne domenealias!';

 $PALANG['pAdminEdit_domain_welcome'] = 'Endre et domene';
-$PALANG['pAdminEdit_domain_description'] = 'Beskrivelse';
-$PALANG['pAdminEdit_domain_aliases'] = 'Alias';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = deaktiver | 0 = ubegrenset';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'E-postkontoer';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = deaktiver | 0 = ubegrenset';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Makskvote';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = deaktiver | 0 = ubegrenset';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Definer transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'E-postserveren er backup-MX';
 $PALANG['pAdminEdit_domain_button'] = 'Endre domene'; # XXX text no longer used
@ -275,7 +252,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Endre domeneadministrator';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['pAdminEdit_admin_password2'] = 'Passord (bekreft)';
+$PALANG['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
@ -288,7 +265,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Feil passord!';

 $PALANG['pUsersMenu_vacation'] = 'Automatisk svar';
 $PALANG['pUsersMenu_edit_alias'] = 'Endre videresending';
-$PALANG['pUsersMenu_password'] = 'Endre passord';

 $PALANG['pUsersMain_vacation'] = 'Angi en fraværsmelding eller annet automatisk svar.';
 $PALANG['pUsersMain_vacationSet'] = 'Automatisk svar er PÅ, klikk \'Automatisk svar\' for å endre/fjerne';
--- a/languages/nl.lang
+++ b/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['pMenu_create_alias'] = 'Alias toevoegen';
-$PALANG['pMenu_create_alias_domain'] = 'Domein alias toevoegen';
-$PALANG['pMenu_create_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';
@ -43,7 +43,7 @@ $PALANG['pMenu_logout'] = 'Uitloggen';

 $PALANG['pMain_welcome'] = 'Welkom bij Postfix Admin!';
 $PALANG['pMain_overview'] = 'Laat uw aliassen en mailboxen zien. U kunt ze vanaf hier bewerken / verwijderen.';
-$PALANG['pMain_create_alias'] = 'Maak een nieuwe alias aan voor uw domein.';
+$PALANG['pMain_create_alias'] = 'Maak een nieuwe alias aan voor uw domein.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Maak een nieuwe mailbox aan voor uw domein.';
 $PALANG['pMain_sendmail'] = 'Verstuur een e-mail naar een van de nieuwe mailboxen.';
 $PALANG['pMain_password'] = 'Wijzig uw wachtwoord.';
@ -62,8 +62,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Mailboxen';
 $PALANG['pOverview_button'] = 'Ga';
 $PALANG['pOverview_welcome'] = 'Overzicht voor ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias domeinen';
-$PALANG['pOverview_alias_alias_count'] = 'Aliasen';
-$PALANG['pOverview_alias_mailbox_count'] = 'Mailboxes';
 $PALANG['pOverview_alias_address'] = 'Van';
 $PALANG['pOverview_alias_goto'] = 'Naar';
 $PALANG['active'] = 'Actief';
@ -77,9 +75,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domein';
-$PALANG['pOverview_get_aliases'] = 'Aliassen';
 $PALANG['pOverview_get_alias_domains'] = 'Domein aliasen';
-$PALANG['pOverview_get_mailboxes'] = 'Mailboxen';
+$PALANG['mailboxes'] = 'Mailboxen';
 $PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)';

 $PALANG['pDelete_delete_error'] = 'Mislukt te verwijderen ';
@ -91,19 +88,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias domein';
 $PALANG['pCreate_alias_domain_alias_text'] = 'Het domein waar mail voor binnen komt.';
 $PALANG['pCreate_alias_domain_target'] = 'Doel domein';
 $PALANG['pCreate_alias_domain_target_text'] = 'Domein waar de mail naar toe moet.';
-$PALANG['pCreate_alias_domain_button'] = 'Voeg alias domein toe';
 $PALANG['pCreate_alias_domain_error1'] = 'U heeft niet genoeg rechten om de huidige configuratie te maken.';
 $PALANG['pCreate_alias_domain_error2'] = 'De huidige configuratie is ongeldig, slecteer een andere!';
 $PALANG['pCreate_alias_domain_error3'] = 'Fout bij vullen database.';
 $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_welcome'] = 'Maak een nieuw alias aan voor uw domein.';
 $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['pCreate_alias_address_text_error3'] = 'U bezit het maximum aantal aliassen.';
 $PALANG['pCreate_alias_goto'] = 'Naar';
-$PALANG['pCreate_alias_button'] = 'Voeg alias toe';
 $PALANG['pCreate_alias_goto_text'] = 'Waar de e-mails heen gestuurd worden.';
 $PALANG['pCreate_alias_goto_text_error'] = 'De NAAR is niet geldig.';
 $PALANG['pCreate_alias_result_error'] = 'Mislukt om de alias toe te voegen.';
@ -125,12 +119,9 @@ $PALANG['pEdit_alias_result_error'] = 'Mislukt om de alias te bewerken!';
 $PALANG['pCreate_mailbox_welcome'] = 'Maak een nieuw lokale mailbox voor uw domein.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Het e-mail adres is niet geldig.';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'U bezit het maximum aantal mailboxen.';
-$PALANG['pCreate_mailbox_password2'] = 'Wachtwoord nogmaals';
 $PALANG['pCreate_mailbox_password_text'] = 'Wachtwoord voor POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Volledige naam';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'De quota die opgaf is te hoog.';
 $PALANG['pCreate_mailbox_mail'] = 'Mailbox toevoegen'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Mailbox toevoegen';
 $PALANG['pCreate_mailbox_result_error'] = 'Mislukt om de mailbox toe te voegen.';
 $PALANG['pCreate_mailbox_result_success'] = 'De mailbox is toegevoegd.';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'De mailbox is aan de mailbox tabel toegevoegd, maar geen (of sommige) van de vooraf gedefinieerde sub-folders kon aangemaakt worden';
@ -154,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['pPassword_button'] = '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.';

@ -209,34 +200,24 @@ $PALANG['pSendmail_result_success'] = 'E-mail verstuurd!';
 $PALANG['pAdminMenu_list_admin'] = 'Beheerders overzicht';
 $PALANG['pAdminMenu_list_domain'] = 'Domein overzicht';
 $PALANG['pAdminMenu_list_virtual'] = 'Virtueel overzicht';
-$PALANG['pAdminMenu_viewlog'] = 'Laat Log zien';
 $PALANG['pAdminMenu_backup'] = 'Backup';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domein Beheerders';
 $PALANG['pAdminMenu_create_admin'] = 'Nieuwe beheerder';
 $PALANG['pAdminMenu_create_domain'] = 'Voeg Domein toe';
-$PALANG['pAdminMenu_create_alias'] = 'Voeg Alias toe';
-$PALANG['pAdminMenu_create_mailbox'] = 'Voeg Mailbox toe';

 $PALANG['pAdminList_admin_username'] = 'Beheerder';
 $PALANG['pAdminList_admin_count'] = 'Domeinen';

-$PALANG['pAdminList_domain_description'] = 'Omschrijving';
-$PALANG['pAdminList_domain_aliases'] = 'Aliassen';
-$PALANG['pAdminList_domain_mailboxes'] = 'Mailboxen';
+$PALANG['description'] = 'Omschrijving';
+$PALANG['aliases'] = 'Aliassen'; # XXX check text - should be 'Aliases'
 $PALANG['pAdminList_domain_quota'] = 'Domein quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Back-up MX';
 $PALANG['last_modified'] = 'Laatst bewerkt';

 $PALANG['pAdminList_virtual_button'] = 'Ga';
-$PALANG['pAdminList_virtual_welcome'] = 'Overzicht voor ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliassen';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Mailboxen';
 $PALANG['pAdminList_virtual_alias_address'] = 'Van';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Naar';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'e-mail';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Naam';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Quota (MB)';
 $PALANG['pAdminList_domain_userscontrol'] = 'Gebruikers<br />Beheer';

 $PALANG['pAdminCreate_domain_welcome'] = 'Voeg een nieuw domein toe';
@ -253,15 +234,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Niet in staat domein te verwijderen!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Niet in staat domein alias te verwijderen!';

 $PALANG['pAdminEdit_domain_welcome'] = 'Bewerk een domein';
-$PALANG['pAdminEdit_domain_description'] = 'Omschrijving';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliassen';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = uit | 0 = onbeperkt';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Mailboxen';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = uit | 0 = onbeperkt';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Max Quota';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = uit | 0 = onbeperkt';
 $PALANG['pAdminEdit_domain_quota'] = 'Domein Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Definieer transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is back-up MX';
 $PALANG['pAdminEdit_domain_button'] = 'Bewerk domein'; # XXX text no longer used
@ -278,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['pAdminEdit_admin_password2'] = '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
@ -291,7 +268,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Uw wachtwoord is niet correct.';

 $PALANG['pUsersMenu_vacation'] = 'Automatisch beantwoorden';
 $PALANG['pUsersMenu_edit_alias'] = 'Wijzig uw forward';
-$PALANG['pUsersMenu_password'] = 'Wijzig wachtwoord';

 $PALANG['pUsersMain_vacation'] = 'Stel een "out of office" bericht of automatisch beantwoorden voor uw e-mail in.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is actief, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/verwijderen';
--- a/languages/nn.lang
+++ b/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['pMenu_create_alias'] = 'Legg til Alias';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_mailbox'] = 'Legg til e-postkonto';
+$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';
@ -42,7 +42,7 @@ $PALANG['pMenu_logout'] = 'Logg ut';

 $PALANG['pMain_welcome'] = 'Velkommen Til Postfix Admin!';
 $PALANG['pMain_overview'] = 'Vis alle alias og epostkontoer. Her kan du endre.';
-$PALANG['pMain_create_alias'] = 'Opprett nytt alias.';
+$PALANG['pMain_create_alias'] = 'Opprett nytt alias.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Opprett ny e-postkonto.';
 $PALANG['pMain_sendmail'] = 'Send e-post til en av de nyopprettede e-postkontoene.';
 $PALANG['pMain_password'] = 'Skift passord til din administratorkonto.';
@ -61,8 +61,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Epostkontoer';
 $PALANG['pOverview_button'] = 'Vis';
 $PALANG['pOverview_welcome'] = 'Oversikt for ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Alias';
-$PALANG['pOverview_alias_mailbox_count'] = 'Epostkontoer';
 $PALANG['pOverview_alias_address'] = 'Fra';
 $PALANG['pOverview_alias_goto'] = 'Mottaker';
 $PALANG['active'] = 'Aktiv'; # XXX check text - should be 'Active'
@ -76,9 +74,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domene';
-$PALANG['pOverview_get_aliases'] = 'Alias';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Epostkontoer';
+$PALANG['mailboxes'] = 'Epostkontoer';
 $PALANG['pOverview_get_quota'] = 'Epostkonto Kvote (MB)';

 $PALANG['pDelete_delete_error'] = 'Kan ikke slette';
@ -90,19 +87,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Opprett et nytt alias.';
 $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['pCreate_alias_address_text_error3'] = 'Du er over grensen for antall aliaser i ditt domene!';
 $PALANG['pCreate_alias_goto'] = 'Mottaker';
-$PALANG['pCreate_alias_button'] = 'Legg til Alias';
 $PALANG['pCreate_alias_goto_text'] = 'Hvor skal e-posten videresendes?';
 $PALANG['pCreate_alias_goto_text_error'] = 'Mottakerfeltet er ikke gyldig!';
 $PALANG['pCreate_alias_result_error'] = 'Klarte ikke legge til aliaset!';
@ -123,12 +117,9 @@ $PALANG['pEdit_alias_result_error'] = 'Kan ikke endre Aliaset!';
 $PALANG['pCreate_mailbox_welcome'] = 'Opprett en ny epostkonto.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-postadressen er ugyldig!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Du er over grensen for antall e-postkontoer!';
-$PALANG['pCreate_mailbox_password2'] = 'Passord (igjen)';
 $PALANG['pCreate_mailbox_password_text'] = 'Passord for POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Fornavn og etternavn';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Den ønskede kvoten er for høy!';
 $PALANG['pCreate_mailbox_mail'] = 'Opprett epostkonto'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Opprett Alias';
 $PALANG['pCreate_mailbox_result_error'] = 'Klarte ikke å legge til e-postkontoen!';
 $PALANG['pCreate_mailbox_result_success'] = 'E-postkontoen er opprettet!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -152,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['pPassword_button'] = '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
@ -206,34 +197,24 @@ $PALANG['pSendmail_result_success'] = 'E-postkontoen er opprettet!'; # XXX text
 $PALANG['pAdminMenu_list_admin'] = 'Administrator-liste';
 $PALANG['pAdminMenu_list_domain'] = 'Domene-liste';
 $PALANG['pAdminMenu_list_virtual'] = 'Virtuell Liste';
-$PALANG['pAdminMenu_viewlog'] = 'Vis logg';
 $PALANG['pAdminMenu_backup'] = 'Backup';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domene-administratorer';
 $PALANG['pAdminMenu_create_admin'] = 'Ny Administrator';
 $PALANG['pAdminMenu_create_domain'] = 'Nytt Domene';
-$PALANG['pAdminMenu_create_alias'] = 'Legg til Alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Legg til e-postkonto';

 $PALANG['pAdminList_admin_username'] = 'Administrator';
 $PALANG['pAdminList_admin_count'] = 'Domener';

-$PALANG['pAdminList_domain_description'] = 'Beskrivelse';
-$PALANG['pAdminList_domain_aliases'] = 'Alias';
-$PALANG['pAdminList_domain_mailboxes'] = 'Epostkontoer';
+$PALANG['description'] = 'Beskrivelse';
+$PALANG['aliases'] = 'Alias';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Sist endret';

 $PALANG['pAdminList_virtual_button'] = 'Vis';
-$PALANG['pAdminList_virtual_welcome'] = 'Oversikt for ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Epostkontoer';
 $PALANG['pAdminList_virtual_alias_address'] = 'Fra';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Til';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'E-post';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvote (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Legg til et nytt domene';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domenet eksisterer!';
@ -250,15 +231,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Endre domenet';
-$PALANG['pAdminEdit_domain_description'] = 'Beskrivelse';
-$PALANG['pAdminEdit_domain_aliases'] = 'Alias';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = deaktivere | 0 = ubegrenset';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Epost kontoer'; # XXX check / compare with pAdminCreate_domain_mailboxes - should be "Mailboxes"
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = deaktivere | 0 = ubegrenset';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Maks kvote';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = deaktivere | 0 = ubegrenset';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Definer transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'E-postservereb er backup-MX';
 $PALANG['pAdminEdit_domain_button'] = 'Endre'; # XXX text no longer used
@ -273,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['pAdminEdit_admin_password2'] = '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
@ -286,7 +263,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Feil passord!';

 $PALANG['pUsersMenu_vacation'] = 'Automatisk Svar';
 $PALANG['pUsersMenu_edit_alias'] = 'Endre videresending';
-$PALANG['pUsersMenu_password'] = 'Endre Passord';

 $PALANG['pUsersMain_vacation'] = 'Legg til en beskjed når du har status "ikke tilstede" eller et annet automatisk svar.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
--- a/languages/pl.lang
+++ b/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['pMenu_create_alias'] = 'Dodaj alias';
-$PALANG['pMenu_create_alias_domain'] = 'Dodaj alias domeny';
-$PALANG['pMenu_create_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';
@ -64,8 +64,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Konta pocztowe';
 $PALANG['pOverview_button'] = 'Idź';
 $PALANG['pOverview_welcome'] = 'Dane zbiorcze dla domeny ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Domeny aliasowe';
-$PALANG['pOverview_alias_alias_count'] = 'Alias';
-$PALANG['pOverview_alias_mailbox_count'] = 'Konta';
 $PALANG['pOverview_alias_address'] = 'Od';
 $PALANG['pOverview_alias_goto'] = 'Do';
 $PALANG['active'] = 'Aktywny';
@ -79,9 +77,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domena';
-$PALANG['pOverview_get_aliases'] = 'Aliasy';
 $PALANG['pOverview_get_alias_domains'] = 'Aliasy domenowe';
-$PALANG['pOverview_get_mailboxes'] = 'Konta';
+$PALANG['mailboxes'] = 'Konta';
 $PALANG['pOverview_get_quota'] = 'Udział (MB)';

 $PALANG['pDelete_delete_error'] = 'Nie można usunąć tego wpisu ';
@ -93,19 +90,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Domena aliasowana/źródłowa';
 $PALANG['pCreate_alias_domain_alias_text'] = 'Domena do której przychodzą maile.';
 $PALANG['pCreate_alias_domain_target'] = 'Domena docelowa';
 $PALANG['pCreate_alias_domain_target_text'] = 'Domena do której powinny przychodzić maile.';
-$PALANG['pCreate_alias_domain_button'] = 'Dodaj alias domeny';
 $PALANG['pCreate_alias_domain_error1'] = 'Nie masz uprawnień do tworzenia takiej konfiguracji.';
 $PALANG['pCreate_alias_domain_error2'] = 'Wybrana konfiguracja jest nieprawidłowa, proszę wybrać inną!';
 $PALANG['pCreate_alias_domain_error3'] = 'Dodanie do bazy nie powiodło się.';
 $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_welcome'] = 'Utwórz nowy alias dla Twojej domeny.';
 $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['pCreate_alias_address_text_error3'] = 'Twój limit aliasów został osiągniety!';
 $PALANG['pCreate_alias_goto'] = 'Do';
-$PALANG['pCreate_alias_button'] = 'Dodaj alias';
 $PALANG['pCreate_alias_goto_text'] = 'Gdzie ten mail powinien być wysłany.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Pole TO jest niepoprawne!';
 $PALANG['pCreate_alias_result_error'] = 'Nie można dodać aliasu do tabeli aliasów!';
@ -126,12 +120,9 @@ $PALANG['pEdit_alias_result_error'] = 'Nie można zmodyfikować aliasu!';
 $PALANG['pCreate_mailbox_welcome'] = 'Utwórz lokalne konto pocztowe dla Twojej domeny.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Adres EMAIL jest niepoprawny!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Twój limit kont pocztowych został osiągniety!';
-$PALANG['pCreate_mailbox_password2'] = 'Hasło (ponownie)';
 $PALANG['pCreate_mailbox_password_text'] = 'Hasło do POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Pełna nazwa';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Podany udział jest za wysoki!';
 $PALANG['pCreate_mailbox_mail'] = 'Utwórz konto'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Dodaj konto';
 $PALANG['pCreate_mailbox_result_error'] = 'Nie można dodać konta do tabeli kont!';
 $PALANG['pCreate_mailbox_result_success'] = 'Konto zostało dodane do tabeli kont!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Konto zostało dodane do tabeli kont, ale żadne (lub tylko niektóre) z predefiniowanych folderów nie zostały utworzone';
@ -155,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['pPassword_button'] = '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!';

@ -210,34 +201,24 @@ $PALANG['pSendmail_result_success'] = 'Email wysłany!';
 $PALANG['pAdminMenu_list_admin'] = 'Lista administratorów';
 $PALANG['pAdminMenu_list_domain'] = 'Lista domen';
 $PALANG['pAdminMenu_list_virtual'] = 'Lista zbiorcza';
-$PALANG['pAdminMenu_viewlog'] = 'Logi';
 $PALANG['pAdminMenu_backup'] = 'Kopia bezpieczeństwa';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Administratorzy domeny';
 $PALANG['pAdminMenu_create_admin'] = 'Nowy administrator';
 $PALANG['pAdminMenu_create_domain'] = 'Nowa domena';
-$PALANG['pAdminMenu_create_alias'] = 'Dodaj alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Dodaj konto';

 $PALANG['pAdminList_admin_username'] = 'Admin';
 $PALANG['pAdminList_admin_count'] = 'Domeny';

-$PALANG['pAdminList_domain_description'] = 'Opis';
-$PALANG['pAdminList_domain_aliases'] = 'Aliasy';
-$PALANG['pAdminList_domain_mailboxes'] = 'Konta';
+$PALANG['description'] = 'Opis';
+$PALANG['aliases'] = 'Aliasy'; # XXX check text - should be 'Aliases'
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Zapasowy MX';
 $PALANG['last_modified'] = 'Ostatnio zmodyfikowane'; # XXX check text - should be 'Last modified'

 $PALANG['pAdminList_virtual_button'] = 'Idź';
-$PALANG['pAdminList_virtual_welcome'] = 'Podsumowanie dla ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliasy';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Konta';
 $PALANG['pAdminList_virtual_alias_address'] = 'Od';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Do';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nazwa';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Udział (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Dodaj nową domenę';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Podana domena już istnieje!';
@ -253,15 +234,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Nie można usunąć domeny!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Nie można usunąć aliasu domeny!';

 $PALANG['pAdminEdit_domain_welcome'] = 'Edytuj domenę';
-$PALANG['pAdminEdit_domain_description'] = 'Opis';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliasy';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = wyłączone | 0 = bez limitów';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Konta';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = wyłączone | 0 = bez limitów';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Max udział';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = wyłączone | 0 = bez limitów';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Zdefiniuj transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Serwer pocztowy jest zapasowym MX';
 $PALANG['pAdminEdit_domain_button'] = 'Edytuj domenę'; # XXX text no longer used
@ -277,7 +254,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administrator został dodany!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Edytuj administratora domeny';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['pAdminEdit_admin_password2'] = 'Hasło (ponownie)';
+$PALANG['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
@ -290,7 +267,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Podane hasło jest nieprawidłowe!'

 $PALANG['pUsersMenu_vacation'] = 'Auto odpowiedź';
 $PALANG['pUsersMenu_edit_alias'] = 'Zmień przekierowania';
-$PALANG['pUsersMenu_password'] = 'Zmień hasło';

 $PALANG['pUsersMain_vacation'] = 'Ustaw automatyczną odpowiedź.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' jest WŁACZONA,
--- a/languages/pt-br.lang
+++ b/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['pMenu_create_alias'] = 'Criar Alias';
-$PALANG['pMenu_create_alias_domain'] = 'Criar Alias de Domínio';
-$PALANG['pMenu_create_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';
@ -44,7 +44,7 @@ $PALANG['pMenu_logout'] = 'Sair';

 $PALANG['pMain_welcome'] = 'Bem-vindo ao Postfix Admin!';
 $PALANG['pMain_overview'] = 'Liste seus aliases (redirecionadores) e contas de email. Você pode editá-los / removê-los aqui.';
-$PALANG['pMain_create_alias'] = 'Crie um novo alias (redirecionador) para o seu domínio.';
+$PALANG['pMain_create_alias'] = 'Crie um novo alias (redirecionador) para o seu domínio.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Crie uma nova conta de email para o seu domínio.';
 $PALANG['pMain_sendmail'] = 'Envie uma mensagem para uma conta recém-criada.';
 $PALANG['pMain_password'] = 'Altere a senha da sua conta de administrador.';
@ -63,8 +63,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Contas de email';
 $PALANG['pOverview_button'] = 'Acessar';
 $PALANG['pOverview_welcome'] = 'Visão geral de ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Aliases de Domínio';
-$PALANG['pOverview_alias_alias_count'] = 'Aliases';
-$PALANG['pOverview_alias_mailbox_count'] = 'Contas de email';
 $PALANG['pOverview_alias_address'] = 'De';
 $PALANG['pOverview_alias_goto'] = 'Para';
 $PALANG['active'] = 'Habilitado';
@ -79,9 +77,8 @@ $PALANG['no_domains_exist'] = 'You have to create at least one domain before you


 $PALANG['domain'] = 'Domínio';
-$PALANG['pOverview_get_aliases'] = 'Aliases';
 $PALANG['pOverview_get_alias_domains'] = 'Aliases de Domínio';
-$PALANG['pOverview_get_mailboxes'] = 'Contas de email';
+$PALANG['mailboxes'] = 'Contas de email';
 $PALANG['pOverview_get_quota'] = 'Cota de Espaço (MB)';

 $PALANG['pDelete_delete_error'] = 'Não foi possível remover o registro ';
@ -94,19 +91,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias de Domínio';
 $PALANG['pCreate_alias_domain_alias_text'] = 'O domínio para o qual as mensagens são enviadas.';
 $PALANG['pCreate_alias_domain_target'] = 'Domínio Destino';
 $PALANG['pCreate_alias_domain_target_text'] = 'O domínio para onde as mensagens devem ir.';
-$PALANG['pCreate_alias_domain_button'] = 'Criar Alias de Domínio';
 $PALANG['pCreate_alias_domain_error1'] = 'Você não possui permissão para criar a configuração desejada.';
 $PALANG['pCreate_alias_domain_error2'] = 'Configuração inválida. Por favor, defina outra configuração!';
 $PALANG['pCreate_alias_domain_error3'] = 'Não foi possível criar o alias de domínio.';
 $PALANG['pCreate_alias_domain_error4'] = 'Todos os domínios já estão espelhados.';
 $PALANG['pCreate_alias_domain_success'] = 'Alias de domínio criado!';

-$PALANG['pCreate_alias_welcome'] = 'Criação de um novo alias para o domínio.';
 $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['pCreate_alias_address_text_error3'] = 'Você alcançou seu limite de aliases!';
 $PALANG['pCreate_alias_goto'] = 'Para';
-$PALANG['pCreate_alias_button'] = 'Criar Alias';
 $PALANG['pCreate_alias_goto_text'] = 'Para onde as mensagens serão enviadas.';
 $PALANG['pCreate_alias_goto_text_error'] = 'O endereço no campo Para é inválido!';
 $PALANG['pCreate_alias_result_error'] = 'Não foi possível criar o alias!';
@ -128,12 +122,9 @@ $PALANG['pEdit_alias_result_error'] = 'Não foi possível editar o alias!';
 $PALANG['pCreate_mailbox_welcome'] = 'Criação de uma nova conta de email para o domínio.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Email inválido!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Você alcançou o limite de contas de email!';
-$PALANG['pCreate_mailbox_password2'] = 'Senha (confirmação)';
 $PALANG['pCreate_mailbox_password_text'] = 'Senha para POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Nome completo';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'A cota de espaço especificada é muito alta!';
 $PALANG['pCreate_mailbox_mail'] = 'Enviar mensagem de boas-vindas'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Criar Conta de Email';
 $PALANG['pCreate_mailbox_result_error'] = 'Não foi possível criar a conta de email!';
 $PALANG['pCreate_mailbox_result_success'] = 'Conta de email criada!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Conta de email criada, mas nenhum (ou apenas alguns) dos subdiretórios pré-definidos puderam ser criados';
@ -157,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['pPassword_button'] = '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!';

@ -214,34 +205,24 @@ $PALANG['pSendmail_result_success'] = 'Mensagem enviada!';
 $PALANG['pAdminMenu_list_admin'] = 'Administradores';
 $PALANG['pAdminMenu_list_domain'] = 'Domínios';
 $PALANG['pAdminMenu_list_virtual'] = 'Virtual';
-$PALANG['pAdminMenu_viewlog'] = 'Histórico';
 $PALANG['pAdminMenu_backup'] = 'Backup';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Administradores de Domínio';
 $PALANG['pAdminMenu_create_admin'] = 'Criar Administrador';
 $PALANG['pAdminMenu_create_domain'] = 'Criar Domínio';
-$PALANG['pAdminMenu_create_alias'] = 'Criar Alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Criar Conta de Email';

 $PALANG['pAdminList_admin_username'] = 'Administrador';
 $PALANG['pAdminList_admin_count'] = 'Domínios';

-$PALANG['pAdminList_domain_description'] = 'Descrição';
-$PALANG['pAdminList_domain_aliases'] = 'Aliases';
-$PALANG['pAdminList_domain_mailboxes'] = 'Contas de Email';
+$PALANG['description'] = 'Descrição';
+$PALANG['aliases'] = 'Aliases';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transporte';
 $PALANG['pAdminList_domain_backupmx'] = 'MX de Backup';
 $PALANG['last_modified'] = 'Última Modificação';

 $PALANG['pAdminList_virtual_button'] = 'Acessar';
-$PALANG['pAdminList_virtual_welcome'] = 'Visão geral de ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliases';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Contas de email';
 $PALANG['pAdminList_virtual_alias_address'] = 'De';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Para';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nome';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Cota de Espaço (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Criação de um novo domínio.';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'O domínio já existe!';
@ -258,15 +239,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Não foi possível remover o domínio!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Não foi possível remover o alias de domínio!';

 $PALANG['pAdminEdit_domain_welcome'] = 'Edição de domínio.';
-$PALANG['pAdminEdit_domain_description'] = 'Descrição';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliases';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = desativar | 0 = ilimitado';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Contas de email';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = desativar | 0 = ilimitado';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Cota de espaço máxima';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = desativar | 0 = ilimitado';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transporte';
+$PALANG['transport'] = 'Transporte';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Definir transporte';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Servidor de email é um MX de backup';
 $PALANG['pAdminEdit_domain_button'] = 'Editar Domínio'; # XXX text no longer used
@ -282,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['pAdminEdit_admin_password2'] = '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
@ -295,7 +272,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Senha inválida!';

 $PALANG['pUsersMenu_vacation'] = 'Resposta Automática';
 $PALANG['pUsersMenu_edit_alias'] = 'Configurar Redirecionamento';
-$PALANG['pUsersMenu_password'] = 'Alterar Senha';

 $PALANG['pUsersMain_vacation'] = 'Configure uma mensagem de ausente ou outra resposta automática.';
 $PALANG['pUsersMain_vacationSet'] = 'Resposta automática HABILITADA. Clique em \'Resposta Automática\' para editar/remover.';
--- a/languages/ru.lang
+++ b/languages/ru.lang
@ -34,9 +34,9 @@ $PALANG['pLogin_login_users'] = 'Вход для обычных пользова

 $PALANG['pMenu_main'] = 'Главная';
 $PALANG['pMenu_overview'] = 'Обзор';
-$PALANG['pMenu_create_alias'] = 'Создать алиас';
-$PALANG['pMenu_create_alias_domain'] = 'Создать домен-алиас';
-$PALANG['pMenu_create_mailbox'] = 'Создать ящик';
+$PALANG['add-alias'] = 'Создать алиас';
+$PALANG['add-alias-domain'] = 'Создать домен-алиас';
+$PALANG['add-mailbox'] = 'Создать ящик';
 $PALANG['pMenu_fetchmail'] = 'Сбор почты';
 $PALANG['pMenu_sendmail'] = 'Послать письмо';
 $PALANG['pMenu_password'] = 'Пароль';
@ -64,8 +64,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Ящики';
 $PALANG['pOverview_button'] = 'Выбрать';
 $PALANG['pOverview_welcome'] = 'Обзор для ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Домены-алиасы';
-$PALANG['pOverview_alias_alias_count'] = 'Алиасы';
-$PALANG['pOverview_alias_mailbox_count'] = 'Ящики';
 $PALANG['pOverview_alias_address'] = 'От';
 $PALANG['pOverview_alias_goto'] = 'Кому';
 $PALANG['active'] = 'Активен';
@ -79,9 +77,8 @@ $PALANG['no_domains_for_this_admin'] = 'У вас нет разрешений н
 $PALANG['no_domains_exist'] = 'Вам нужно создать хотя бы один домен, чтобы использовать обзор.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual']

 $PALANG['domain'] = 'Домен';
-$PALANG['pOverview_get_aliases'] = 'Алиасы';
 $PALANG['pOverview_get_alias_domains'] = 'Домены-алиасы';
-$PALANG['pOverview_get_mailboxes'] = 'Ящики';
+$PALANG['mailboxes'] = 'Ящики';
 $PALANG['pOverview_get_quota'] = 'Квота ящика (МБ)';

 $PALANG['pDelete_delete_error'] = 'Невозможно удалить запись ';
@ -94,19 +91,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Домен-алиас';
 $PALANG['pCreate_alias_domain_alias_text'] = 'Домен, в который приходит почта.';
 $PALANG['pCreate_alias_domain_target'] = 'Целевой домен';
 $PALANG['pCreate_alias_domain_target_text'] = 'Домен, куда должна направляться почта.';
-$PALANG['pCreate_alias_domain_button'] = 'Создать домен-алиас';
 $PALANG['pCreate_alias_domain_error1'] = 'Вам не разрешено создавать выбранную конфигурацию.';
 $PALANG['pCreate_alias_domain_error2'] = 'Выбранная конфигурация некорректна, пожалуйста, выберите другую!';
 $PALANG['pCreate_alias_domain_error3'] = 'Не удалось добавить запись в базу данных.';
 $PALANG['pCreate_alias_domain_error4'] = 'Все домены уже задействованы в доменах-алиасах.';
 $PALANG['pCreate_alias_domain_success'] = 'Домен-алиас добавлен в таблицу доменов-алиасов!';

-$PALANG['pCreate_alias_welcome'] = 'Создание нового алиаса в вашем домене.';
 $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['pCreate_alias_address_text_error3'] = 'Вы достигли лимита по созданным алиасам!';
 $PALANG['pCreate_alias_goto'] = 'Кому';
-$PALANG['pCreate_alias_button'] = 'Создать алиас';
 $PALANG['pCreate_alias_goto_text'] = 'Куда должна доставляться почта.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Неверное поле Кому!';
 $PALANG['pCreate_alias_result_error'] = 'Невозможно добавить алиас в список!';
@ -128,12 +122,9 @@ $PALANG['pEdit_alias_result_error'] = 'Невозможно изменить а
 $PALANG['pCreate_mailbox_welcome'] = 'Создание нового почтового ящика для вашего домена.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Неверное имя!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Вы достигли лимита по созданию почтовых ящиков!';
-$PALANG['pCreate_mailbox_password2'] = 'Пароль (еще раз)';
 $PALANG['pCreate_mailbox_password_text'] = 'Пароль для POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Полное имя';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Квота, выставленная вами, слишком велика!';
 $PALANG['pCreate_mailbox_mail'] = 'Отправить приветственное письмо';
-$PALANG['pCreate_mailbox_button'] = 'Создать ящик';
 $PALANG['pCreate_mailbox_result_error'] = 'Невозможно добавить ящик в список существующих ящиков!';
 $PALANG['pCreate_mailbox_result_success'] = 'Почтовый ящик был успешно создан!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Почтовый ящик был успешно создан, но в нем не удалось создать (некоторые) стандартные папки';
@ -157,7 +148,7 @@ $PALANG['pPassword_password_current_text_error'] = 'Вы не указали в
 $PALANG['pPassword_password'] = 'Новый пароль';
 $PALANG['pPassword_password2'] = 'Новый пароль (еще раз)';
 $PALANG['pPassword_password_text_error'] = 'Введенные вами пароли не совпадают либо пусты!';
-$PALANG['pPassword_button'] = 'Изменить пароль';
+$PALANG['change-password'] = 'Изменить пароль';
 $PALANG['pPassword_result_error'] = 'Невозможно изменить ваш пароль!';
 $PALANG['pPassword_result_success'] = 'Ваш пароль был изменен!';

@ -214,34 +205,24 @@ $PALANG['pSendmail_result_success'] = 'Сообщение отправлено!'
 $PALANG['pAdminMenu_list_admin'] = 'Список админов';
 $PALANG['pAdminMenu_list_domain'] = 'Список доменов';
 $PALANG['pAdminMenu_list_virtual'] = 'Обзор';
-$PALANG['pAdminMenu_viewlog'] = 'Журнал';
 $PALANG['pAdminMenu_backup'] = 'Бэкап';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Админы доменов';
 $PALANG['pAdminMenu_create_admin'] = 'Новый админ';
 $PALANG['pAdminMenu_create_domain'] = 'Новый домен';
-$PALANG['pAdminMenu_create_alias'] = 'Создать алиас';
-$PALANG['pAdminMenu_create_mailbox'] = 'Создать ящик';

 $PALANG['pAdminList_admin_username'] = 'Админ';
 $PALANG['pAdminList_admin_count'] = 'Домены';

-$PALANG['pAdminList_domain_description'] = 'Описание';
-$PALANG['pAdminList_domain_aliases'] = 'Алиасы';
-$PALANG['pAdminList_domain_mailboxes'] = 'Ящики';
+$PALANG['description'] = 'Описание';
+$PALANG['aliases'] = 'Алиасы';
 $PALANG['pAdminList_domain_quota'] = 'Квота домена (МБ)';
-$PALANG['pAdminList_domain_transport'] = 'Транспорт';
 $PALANG['pAdminList_domain_backupmx'] = 'Резервный MX';
 $PALANG['last_modified'] = 'Последнее изменение';

 $PALANG['pAdminList_virtual_button'] = 'Выбрать';
-$PALANG['pAdminList_virtual_welcome'] = 'Обзор для ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Алиасы';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Ящики';
 $PALANG['pAdminList_virtual_alias_address'] = 'От';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Кому';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Ящик';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Имя';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Квота (МБ)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Добавление нового домена';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Домен уже существует!';
@ -258,15 +239,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Невозможно удалить до
 $PALANG['pAdminDelete_alias_domain_error'] = 'Невозможно удалить домен-алиас!';

 $PALANG['pAdminEdit_domain_welcome'] = 'Редактирование домена';
-$PALANG['pAdminEdit_domain_description'] = 'Описание';
-$PALANG['pAdminEdit_domain_aliases'] = 'Алиасы';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = отключить | 0 = неограниченное';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Ящики';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = отключить | 0 = неограниченное';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Макс. квота ящика';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'МБ | -1 = отключить | 0 = неограниченное';
 $PALANG['pAdminEdit_domain_quota'] = 'Квота домена';
-$PALANG['pAdminEdit_domain_transport'] = 'Транспорт';
+$PALANG['transport'] = 'Транспорт';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Укажите транспорт';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Почтовый сервер является резервным MX';
 $PALANG['pAdminEdit_domain_button'] = 'Редактировать домен'; # XXX text no longer used
@ -282,7 +259,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Администратор бы

 $PALANG['pAdminEdit_admin_welcome'] = 'Редактирование администратора домена';
 $PALANG['pAdminEdit_admin_username'] = 'Администратор';
-$PALANG['pAdminEdit_admin_password2'] = 'Пароль (еще раз)';
+$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
@ -295,7 +272,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Введен неверный па

 $PALANG['pUsersMenu_vacation'] = 'Автоответчик';
 $PALANG['pUsersMenu_edit_alias'] = 'Изменить пересылку почты';
-$PALANG['pUsersMenu_password'] = 'Изменить пароль';

 $PALANG['pUsersMain_vacation'] = 'Настроить сообщение "вне офиса" либо автоответчик для вашей почты.';
 $PALANG['pUsersMain_vacationSet'] = 'Автоответчик ВКЛЮЧЕН, щелкните \'Автоответчик\', чтобы его редактировать/убрать';
--- a/languages/sk.lang
+++ b/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['pMenu_create_alias'] = 'Nový alias';
-$PALANG['pMenu_create_alias_domain'] = 'Nový alias domény';
-$PALANG['pMenu_create_mailbox'] = 'Nová schránka';
+$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';
@ -43,7 +43,7 @@ $PALANG['pMenu_logout'] = 'Odhlásiť';

 $PALANG['pMain_welcome'] = 'Vitajte v Postfix Admine!';
 $PALANG['pMain_overview'] = 'Výpis aliasov a schránok. Môžete ich tu upravovať a mazať.';
-$PALANG['pMain_create_alias'] = 'Vytvoriť alias v tejto doméne.';
+$PALANG['pMain_create_alias'] = 'Vytvoriť alias v tejto doméne.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Vytvoriť schránku v tejto doméne.';
 $PALANG['pMain_sendmail'] = 'Poslať email do jednej zo schránok.';
 $PALANG['pMain_password'] = 'Zmeniť heslo administrátorského účtu.';
@ -62,8 +62,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Mailové schránky';
 $PALANG['pOverview_button'] = 'Prejsť';
 $PALANG['pOverview_welcome'] = 'Prehľad pre doménu ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Aliasy domén';
-$PALANG['pOverview_alias_alias_count'] = 'Aliasov';
-$PALANG['pOverview_alias_mailbox_count'] = 'Schránok';
 $PALANG['pOverview_alias_address'] = 'Od';
 $PALANG['pOverview_alias_goto'] = 'Doručenie';
 $PALANG['active'] = 'Aktívny'; # XXX check text - should be 'Active'
@ -77,9 +75,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Doména';
-$PALANG['pOverview_get_aliases'] = 'Aliasy';
 $PALANG['pOverview_get_alias_domains'] = 'Aliasy domén';
-$PALANG['pOverview_get_mailboxes'] = 'Schránky';
+$PALANG['mailboxes'] = 'Schránky';
 $PALANG['pOverview_get_quota'] = 'Kvóta (MB)';

 $PALANG['pDelete_delete_error'] = 'Nie je možné zmazať položku ';
@ -91,19 +88,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias';
 $PALANG['pCreate_alias_domain_alias_text'] = 'Kam príde email';
 $PALANG['pCreate_alias_domain_target'] = 'Cieľová doména';
 $PALANG['pCreate_alias_domain_target_text'] = 'Kam sa email presmeruje';
-$PALANG['pCreate_alias_domain_button'] = 'Vytvoriť alias domény';
 $PALANG['pCreate_alias_domain_error1'] = 'Nie ste oprávnení vytvoriť zvolenú konfiguráciu.';
 $PALANG['pCreate_alias_domain_error2'] = 'Zvolená konfigurácia nie je platná, zvoľte inú!';
 $PALANG['pCreate_alias_domain_error3'] = 'Chyba pri vkladaní do databázy.';
 $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_welcome'] = 'Vytvoriť nový alias v doméne';
 $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['pCreate_alias_address_text_error3'] = 'Dosiahli ste limit, nemôžete vytvárať ďalšie aliasy!';
 $PALANG['pCreate_alias_goto'] = 'Cieľ';
-$PALANG['pCreate_alias_button'] = 'Vytvoriť alias';
 $PALANG['pCreate_alias_goto_text'] = 'Kam má pošta chodiť';
 $PALANG['pCreate_alias_goto_text_error'] = 'Cieľ nie je platný!';
 $PALANG['pCreate_alias_result_error'] = 'Nepodarilo sa pridať alias do tabuľky!';
@ -125,12 +119,9 @@ $PALANG['pEdit_alias_result_error'] = 'Nepodarilo se upraviť alias!';
 $PALANG['pCreate_mailbox_welcome'] = 'Vytvoriť novú schránku v doméne';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa nie je platná!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Dosiahli ste limit, nemôžete vytvárať ďalšie schránky!';
-$PALANG['pCreate_mailbox_password2'] = 'Heslo (znovu)';
 $PALANG['pCreate_mailbox_password_text'] = 'Heslo pre POP3/IMAP/SMTP';
 $PALANG['pCreate_mailbox_name_text'] = 'Celé meno';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Zadané miesto je príliš velké!';
 $PALANG['pCreate_mailbox_mail'] = 'Poslať uvítací email'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Vytvoriť schránku';
 $PALANG['pCreate_mailbox_result_error'] = 'Nepodarilo sa pridať schránku do tabuľky!';
 $PALANG['pCreate_mailbox_result_success'] = 'Schránka bola pridaná do tabuľky!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka bola pridaná do tabuľky, ale nepodarilo sa vytvoriť (niektoré) definované adresáre';
@ -154,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['pPassword_button'] = 'Zmeniť heslo';
+$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ď';
@ -208,34 +199,24 @@ $PALANG['pSendmail_result_success'] = 'Email odoslaný!';
 $PALANG['pAdminMenu_list_admin'] = 'Administrátori';
 $PALANG['pAdminMenu_list_domain'] = 'Domény';
 $PALANG['pAdminMenu_list_virtual'] = 'Aliasy';
-$PALANG['pAdminMenu_viewlog'] = 'Záznamy';
 $PALANG['pAdminMenu_backup'] = 'Zálohovať';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Doménoví administrátori';
 $PALANG['pAdminMenu_create_admin'] = 'Nový admin';
 $PALANG['pAdminMenu_create_domain'] = 'Nová doména';
-$PALANG['pAdminMenu_create_alias'] = 'Pridať alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Pridať schránku';

 $PALANG['pAdminList_admin_username'] = 'Administrátor';
 $PALANG['pAdminList_admin_count'] = 'Domény';

-$PALANG['pAdminList_domain_description'] = 'Popis';
-$PALANG['pAdminList_domain_aliases'] = 'Aliasov';
-$PALANG['pAdminList_domain_mailboxes'] = 'Schránok';
+$PALANG['description'] = 'Popis';
+$PALANG['aliases'] = 'Aliasov'; # XXX check text - should be 'Aliases'
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Záložný MX';
 $PALANG['last_modified'] = 'Posledná zmena';

 $PALANG['pAdminList_virtual_button'] = 'Prejsť';
-$PALANG['pAdminList_virtual_welcome'] = 'Prehľad pre ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliasov';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Schránok';
 $PALANG['pAdminList_virtual_alias_address'] = 'Od';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Cieľ';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Emailová adresa';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Meno';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvóta (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Pridať novú doménu';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Takáto doména už existuje!';
@ -251,15 +232,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Nepodarilo sa odstrániť doménu!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Nepodario sa odstrániť alias domény!';

 $PALANG['pAdminEdit_domain_welcome'] = 'Upraviť doménu';
-$PALANG['pAdminEdit_domain_description'] = 'Popis';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliasov';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = zakázať | 0 = neobmedzene';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Schránok';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = zakázať | 0 = neobmedzene';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Maximálna kvóta';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = vypnúť | 0 = neobmedzene'; # XXX check - should be "MB | -1 = disable | 0 = unlimited"
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Použiť transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server je záložný MX';
 $PALANG['pAdminEdit_domain_button'] = 'Upraviť doménu'; # XXX text no longer used
@ -275,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['pAdminEdit_admin_password2'] = '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
@ -288,7 +265,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Nesprávne heslo!';

 $PALANG['pUsersMenu_vacation'] = 'Automatická odpoveď';
 $PALANG['pUsersMenu_edit_alias'] = 'Presmerovanie';
-$PALANG['pUsersMenu_password'] = 'Zmena hesla';

 $PALANG['pUsersMain_vacation'] = 'Nastaviť automatickú odpoveď (dovolenka a pod.).';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' zapnutá, kliknite na \'' . $PALANG['pUsersMenu_vacation'] . '\', ak ju chcete ' . $PALANG['edit'] . '/odstrániť';
--- a/languages/sl.lang
+++ b/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['pMenu_create_alias'] = 'Dodaj alias';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_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';
@ -61,8 +61,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Predali';
 $PALANG['pOverview_button'] = 'Pojdi';
 $PALANG['pOverview_welcome'] = 'Pregled za ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Aliasi';
-$PALANG['pOverview_alias_mailbox_count'] = 'Predali';
 $PALANG['pOverview_alias_address'] = 'Od';
 $PALANG['pOverview_alias_goto'] = 'Za';
 $PALANG['active'] = 'Aktiven';
@ -76,9 +74,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domena';
-$PALANG['pOverview_get_aliases'] = 'Aliasi';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Predali';
+$PALANG['mailboxes'] = 'Predali';
 $PALANG['pOverview_get_quota'] = 'Kvota za predale (MB)';

 $PALANG['pDelete_delete_error'] = 'Vnosa ni bilo mogoče izbrisati ';
@ -90,19 +87,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Ustvari nov alias za določeno domeno.';
 $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['pCreate_alias_address_text_error3'] = 'Maksimalno število aliasov je preseženo!';
 $PALANG['pCreate_alias_goto'] = 'Za';
-$PALANG['pCreate_alias_button'] = 'Dodaj alias';
 $PALANG['pCreate_alias_goto_text'] = 'Kamor želite nasloviti pošto.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Vnos "Za" je napačen!'; # XXX check - should be   The To: is not valid!
 $PALANG['pCreate_alias_result_error'] = 'Aliasa ni bilo mogoče dodati!';
@ -124,12 +118,9 @@ $PALANG['pEdit_alias_result_error'] = 'Aliasa ni bilo mogoče spremeniti!';
 $PALANG['pCreate_mailbox_welcome'] = 'Ustvari nov predal za izbrano domeno.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-poštni naslov ni pravilen!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Maksimalno število predalov je preseženo!';
-$PALANG['pCreate_mailbox_password2'] = 'Geslo (ponovitev)';
 $PALANG['pCreate_mailbox_password_text'] = 'Geslo za POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Polno ime';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Vnešena kvota je prevelika!';
 $PALANG['pCreate_mailbox_mail'] = 'Ustvari predal'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Dodaj predal';
 $PALANG['pCreate_mailbox_result_error'] = 'Predala ni bilo mogoče ustvariti!';
 $PALANG['pCreate_mailbox_result_success'] = 'Predal je bil uspešno ustvarjen!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -153,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['pPassword_button'] = '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
@ -207,34 +198,24 @@ $PALANG['pSendmail_result_success'] = 'Predal je bil uspešno ustvarjen!'; # XXX
 $PALANG['pAdminMenu_list_admin'] = 'Seznam administratorjev';
 $PALANG['pAdminMenu_list_domain'] = 'Seznam domen';
 $PALANG['pAdminMenu_list_virtual'] = 'Seznam aliasov in predalov';
-$PALANG['pAdminMenu_viewlog'] = 'Pregled dnevnika';
 $PALANG['pAdminMenu_backup'] = 'Rezervna kopija';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domenski administratorji';
 $PALANG['pAdminMenu_create_admin'] = 'Nov administrator';
 $PALANG['pAdminMenu_create_domain'] = 'Nova domena';
-$PALANG['pAdminMenu_create_alias'] = 'Dodaj alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Dodaj predal';

 $PALANG['pAdminList_admin_username'] = 'Administrator';
 $PALANG['pAdminList_admin_count'] = 'Domene';

-$PALANG['pAdminList_domain_description'] = 'Opis';
-$PALANG['pAdminList_domain_aliases'] = 'Aliasi';
-$PALANG['pAdminList_domain_mailboxes'] = 'Predali';
+$PALANG['description'] = 'Opis';
+$PALANG['aliases'] = 'Aliasi';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Zadnjič spremenjeno';

 $PALANG['pAdminList_virtual_button'] = 'Pojdi';
-$PALANG['pAdminList_virtual_welcome'] = 'Pregled za: ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliasi';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Predali';
 $PALANG['pAdminList_virtual_alias_address'] = 'Od';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Za';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'E-pošta';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Ime';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Dodaj novo domeno';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Vnešena domena že obstaja!';
@ -250,15 +231,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Uredi domeno';
-$PALANG['pAdminEdit_domain_description'] = 'Opis';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliasi';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = onemogoči | 0 = neomejeno';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Predali';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = onemogoči | 0 = neomejeno';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Maksimalna kvota';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = onemogoči | 0 = neomejeno';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Definiraj transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Poštni strežnik je sekundarni MX';
 $PALANG['pAdminEdit_domain_button'] = 'Shrani'; # XXX text no longer used
@ -274,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['pAdminEdit_admin_password2'] = '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
@ -287,7 +264,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Geslo ni pravilno!';

 $PALANG['pUsersMenu_vacation'] = 'Obvestilo o odsotnosti';
 $PALANG['pUsersMenu_edit_alias'] = 'Nastavi preusmeritev';
-$PALANG['pUsersMenu_password'] = 'Spremeni geslo';

 $PALANG['pUsersMain_vacation'] = 'Nastavite obvestilo o odsotnosti.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
--- a/languages/sv.lang
+++ b/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['pMenu_create_alias'] = 'Lägg till alias';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_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';
@ -44,7 +44,7 @@ $PALANG['pMenu_logout'] = 'Logga ut';

 $PALANG['pMain_welcome'] = 'Välkommen till Postfix Admin!';
 $PALANG['pMain_overview'] = 'Lista dina alias och brevlådan. Du kan ändra / radera dem här.';
-$PALANG['pMain_create_alias'] = 'Skapa nytt alias i din domän.';
+$PALANG['pMain_create_alias'] = 'Skapa nytt alias i din domän.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Skapa ny brevlåda i din domän.';
 $PALANG['pMain_sendmail'] = 'Skicka ett mail till en av mailadresserna.';
 $PALANG['pMain_password'] = 'Ändra lösenord för adminkontot.';
@ -63,8 +63,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Brevlådor';
 $PALANG['pOverview_button'] = 'Visa';
 $PALANG['pOverview_welcome'] = 'Sammanfattning för ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Alias';
-$PALANG['pOverview_alias_mailbox_count'] = 'Brevlådor';
 $PALANG['pOverview_alias_address'] = 'Från';
 $PALANG['pOverview_alias_goto'] = 'Till';
 $PALANG['active'] = 'Aktiv';
@ -78,9 +76,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domän';
-$PALANG['pOverview_get_aliases'] = 'Alias';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Brevlåda';
+$PALANG['mailboxes'] = 'Brevlåda';
 $PALANG['pOverview_get_quota'] = 'Kvot för brevlåda (MB)';

 $PALANG['pDelete_delete_error'] = 'Kan inte radera data för ';
@ -92,19 +89,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Skapa nytt alias för din domän.';
 $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['pCreate_alias_address_text_error3'] = 'Du har redan högsta tillåtna antal alias definierade!';
 $PALANG['pCreate_alias_goto'] = 'Till';
-$PALANG['pCreate_alias_button'] = 'Lägg till alias';
 $PALANG['pCreate_alias_goto_text'] = 'Vart skall mailen skickas.';
 $PALANG['pCreate_alias_goto_text_error'] = 'TILL data är felaktigt!';
 $PALANG['pCreate_alias_result_error'] = 'Kan inte lägga till detta alias i aliastabellen!';
@ -126,12 +120,9 @@ $PALANG['pEdit_alias_result_error'] = 'Kan inte modifiera detta alias!';
 $PALANG['pCreate_mailbox_welcome'] = 'Skapa ett nytt lokalt brevlåda i din domän.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'EPOSTADRESSEN är inte korrekt!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Du har redan skapat max tillåtet antal brevlådan!';
-$PALANG['pCreate_mailbox_password2'] = 'Lösenord (igen)';
 $PALANG['pCreate_mailbox_password_text'] = 'Lösenord för POP3/IMAP';
 $PALANG['pCreate_mailbox_name_text'] = 'Fullständigt namn';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Quotan du angivit är för stor!';
 $PALANG['pCreate_mailbox_mail'] = 'Skicka välkomstbrev'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Lägg till brevlåda';
 $PALANG['pCreate_mailbox_result_error'] = 'Kan ej lägga till brevlådat i tabellen för konton!';
 $PALANG['pCreate_mailbox_result_success'] = 'Mailkontot har lagts till!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Brevlådan har lagts till i tabellen mailbox, men inga (eller få) av de fördefinierade underkatalogerna kunde skapas';
@ -155,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['pPassword_button'] = 'Ä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';
@ -209,34 +200,24 @@ $PALANG['pSendmail_result_success'] = 'Mailet har skickats!';
 $PALANG['pAdminMenu_list_admin'] = 'Administratörer';
 $PALANG['pAdminMenu_list_domain'] = 'Domäner';
 $PALANG['pAdminMenu_list_virtual'] = 'Epostadresser';
-$PALANG['pAdminMenu_viewlog'] = 'Visa loggfil';
 $PALANG['pAdminMenu_backup'] = 'Backup';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domän admins';
 $PALANG['pAdminMenu_create_admin'] = 'Ny admin';
 $PALANG['pAdminMenu_create_domain'] = 'Ny domän';
-$PALANG['pAdminMenu_create_alias'] = 'Lägg till alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Lägg till brevlåda';

 $PALANG['pAdminList_admin_username'] = 'Admin';
 $PALANG['pAdminList_admin_count'] = 'Domäner';

-$PALANG['pAdminList_domain_description'] = 'Beskrivning';
-$PALANG['pAdminList_domain_aliases'] = 'Alias';
-$PALANG['pAdminList_domain_mailboxes'] = 'Brevlåda';
+$PALANG['description'] = 'Beskrivning';
+$PALANG['aliases'] = 'Alias';
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Senast modifierad'; # XXX check text - should be "Last modified"

 $PALANG['pAdminList_virtual_button'] = 'Kör';
-$PALANG['pAdminList_virtual_welcome'] = 'Sammanfattning för ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Mailboxar';
 $PALANG['pAdminList_virtual_alias_address'] = 'Från';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Till';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Epostadress';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Namn';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Quota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Lägg till ny domän';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Den domänen finns redan!';
@ -252,15 +233,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Kunde inte tabort domän!';
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Ändra en domän';
-$PALANG['pAdminEdit_domain_description'] = 'Beskrivning';
-$PALANG['pAdminEdit_domain_aliases'] = 'Alias';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = avaktivera | 0 = obegränsat';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Brevlåda';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = avaktivera | 0 = obegränsat';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Max Quota';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = avaktivera | 0 = obegränsat';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Definiera transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX untranslated? compare with pAdminCreate_domain_backupmx
 $PALANG['pAdminEdit_domain_button'] = 'Ändra domän'; # XXX text no longer used
@ -276,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['pAdminEdit_admin_password2'] = '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
@ -289,7 +266,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Ditt lösenord är felaktigt!';

 $PALANG['pUsersMenu_vacation'] = 'Autosvar';
 $PALANG['pUsersMenu_edit_alias'] = 'Ändra din forwardadress';
-$PALANG['pUsersMenu_password'] = 'Ändra Lösenord';

 $PALANG['pUsersMain_vacation'] = 'Ställ in ett "out of office" meddelande eller autosvar för din epost.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' är AKTIVERAT, klicka \'' . $PALANG['pUsersMenu_vacation'] . '\' för att ' . $PALANG['edit'] . '/tabort';
--- a/languages/tr.lang
+++ b/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['pMenu_create_alias'] = 'Alias Ekle';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_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';
@ -42,7 +42,7 @@ $PALANG['pMenu_logout'] = 'Çýkýþ';

 $PALANG['pMain_welcome'] = 'Postfix Admin\'e hoþ geldiniz!';
 $PALANG['pMain_overview'] = 'posta kutularýnýzýn ve aliaslarýnýzýn listesi. buradan silip düzenleyebilirsiniz.';
-$PALANG['pMain_create_alias'] = 'Domaininiz icin yeni bir alias yaratýn.';
+$PALANG['pMain_create_alias'] = 'Domaininiz icin yeni bir alias yaratýn.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = 'Domaininiz için yeni bir posta kutusu yaratýn.';
 $PALANG['pMain_sendmail'] = 'Yeni yaratmýþ olduðunuz posta kutularýndan birine posta gönderin.';
 $PALANG['pMain_password'] = 'Yönetici hesabýnýzýn þifresini deðiþtirin.';
@ -61,8 +61,6 @@ $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
 $PALANG['pOverview_button'] = 'Git';
 $PALANG['pOverview_welcome'] = 'Genel Bilgiler: ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = 'Aliaselar';
-$PALANG['pOverview_alias_mailbox_count'] = 'Posta kutularý';
 $PALANG['pOverview_alias_address'] = 'Kimden';
 $PALANG['pOverview_alias_goto'] = 'Kime';
 $PALANG['active'] = 'Aktif';
@ -76,9 +74,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = 'Domain';
-$PALANG['pOverview_get_aliases'] = 'Aliaslar';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Postakutularý';
+$PALANG['mailboxes'] = 'Postakutularý'; # XXX check / compare with pAdminCreate_domain_mailboxes - should be "Mailboxes"
 $PALANG['pOverview_get_quota'] = 'Posta kutusu Kotasý (MB)';

 $PALANG['pDelete_delete_error'] = 'Kayýt silinemiyor ';
@ -90,19 +87,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = 'Domaininiz için yeni bir alias yaratýn.';
 $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['pCreate_alias_address_text_error3'] = 'Alias limitine ulaþtýnýz!';
 $PALANG['pCreate_alias_goto'] = 'kime';
-$PALANG['pCreate_alias_button'] = 'Alias Ekle';
 $PALANG['pCreate_alias_goto_text'] = 'E-postanýn gitmesi gereken yer.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Kime alaný uygun deðil!';
 $PALANG['pCreate_alias_result_error'] = 'Alias\'ý alias tabþlosuna eklenemedi!';
@ -124,12 +118,9 @@ $PALANG['pEdit_alias_result_error'] = 'Alias düzenlenemiyor!';
 $PALANG['pCreate_mailbox_welcome'] = 'Domaininiz için yeni bir lokal e-posta yaratýn.';
 $PALANG['pCreate_mailbox_username_text_error1'] = 'E-POSTA uygun deðil!';
 $PALANG['pCreate_mailbox_username_text_error3'] = 'Posta kutusu yaratma limitinize eriþtiniz!';
-$PALANG['pCreate_mailbox_password2'] = 'þifre (tekrar)';
 $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP için þifre';
 $PALANG['pCreate_mailbox_name_text'] = 'Tam isim';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'Veridðiniz kota çok yüksek!';
 $PALANG['pCreate_mailbox_mail'] = 'Posta kutusu yarat'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = 'Posta kutusu ekle';
 $PALANG['pCreate_mailbox_result_error'] = 'Posta kutusu posta kutusu tablosuna eklenemiyor!';
 $PALANG['pCreate_mailbox_result_success'] = 'Posta kutusu tabloya eklendi!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -153,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['pPassword_button'] = 'Þifreyi deðiþtir';
+$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
@ -207,34 +198,24 @@ $PALANG['pSendmail_result_success'] = 'Posta kutusu yaratýldý!'; # XXX text ch
 $PALANG['pAdminMenu_list_admin'] = 'Yönetici Listesi';
 $PALANG['pAdminMenu_list_domain'] = 'Domain Listesi';
 $PALANG['pAdminMenu_list_virtual'] = 'Sanal Liste';
-$PALANG['pAdminMenu_viewlog'] = 'Log Ýzle';
 $PALANG['pAdminMenu_backup'] = 'Yedek';
 $PALANG['pAdminMenu_create_domain_admins'] = 'Domain Yöneticileri';
 $PALANG['pAdminMenu_create_admin'] = 'Yeni Yönetici';
 $PALANG['pAdminMenu_create_domain'] = 'Yeni Domain';
-$PALANG['pAdminMenu_create_alias'] = 'Alias ekle';
-$PALANG['pAdminMenu_create_mailbox'] = 'Postakutusu ekle';

 $PALANG['pAdminList_admin_username'] = 'Yönetici';
 $PALANG['pAdminList_admin_count'] = 'Domainler';

-$PALANG['pAdminList_domain_description'] = 'Açýklama';
-$PALANG['pAdminList_domain_aliases'] = 'Aliaslar';
-$PALANG['pAdminList_domain_mailboxes'] = 'Posta kutularý';
+$PALANG['description'] = 'Açýklama';
+$PALANG['aliases'] = 'Aliaslar'; # XXX check text - should be 'Aliases'
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Son Düzenleme';

 $PALANG['pAdminList_virtual_button'] = 'Git';
-$PALANG['pAdminList_virtual_welcome'] = 'Genel Bilgiler:';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliaslar';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Postakutularý';
 $PALANG['pAdminList_virtual_alias_address'] = 'Kimden';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Kime';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Eposta';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Ýsim';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'kota (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = 'Yeni domain ekle';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Bu Domain halen bulunmakta!';
@ -250,15 +231,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = 'Domain düzenle';
-$PALANG['pAdminEdit_domain_description'] = 'Açýklama';
-$PALANG['pAdminEdit_domain_aliases'] = 'Aliaslar';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = iptal | 0 = limitsiz'; # XXX check - "limisiz" or "limi_t_siz"?
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Posta kutularý'; # XXX check / compare with pAdminCreate_domain_mailboxes - should be "Mailboxes"
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = iptal | 0 = limitsiz';
 $PALANG['pAdminEdit_domain_maxquota'] = 'Max Kota';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = iptal | 0 = limitsiz';
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
+$PALANG['transport'] = 'Transport'; # XXX
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX
 $PALANG['pAdminEdit_domain_button'] = 'Domain düzenle'; # XXX text no longer used
@ -274,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['pAdminEdit_admin_password2'] = 'Þ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
@ -287,7 +264,6 @@ $PALANG['pUsersLogin_password_incorrect'] = 'Þifreniz doðru deðil!';

 $PALANG['pUsersMenu_vacation'] = 'Otomatik cevaplama';
 $PALANG['pUsersMenu_edit_alias'] = 'Yönlendirmen deðiþtir';
-$PALANG['pUsersMenu_password'] = 'þifre deðiþtir';

 $PALANG['pUsersMain_vacation'] = 'Posta kutunuz için "ofis dýþý" mesajý veya otomatik cevaplama ekleyin.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
--- a/languages/tw.lang
+++ b/languages/tw.lang
@ -31,9 +31,9 @@ $PALANG['pLogin_login_users'] = '普通用戶點擊這裡進入用戶控制面

 $PALANG['pMenu_main'] = 'Main'; # XXX
 $PALANG['pMenu_overview'] = '概覽';
-$PALANG['pMenu_create_alias'] = '新建別名';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_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'] = '修改密碼';
@ -42,7 +42,7 @@ $PALANG['pMenu_logout'] = '退出';

 $PALANG['pMain_welcome'] = '歡迎來到Postfix Admin!';
 $PALANG['pMain_overview'] = '顯示你的郵件別名和郵箱. 你可以在這兒進行編輯/刪除操作.';
-$PALANG['pMain_create_alias'] = '在您的網域中新建一個別名.';
+$PALANG['pMain_create_alias'] = '在您的網域中新建一個別名.'; # XXX check text - should be 'Create a new alias for your domain.'
 $PALANG['pMain_create_mailbox'] = '在您的網域中新建一個郵箱.';
 $PALANG['pMain_sendmail'] = '發一封郵件到你新建的一個郵箱中.';
 $PALANG['pMain_password'] = '修改你的管理員密碼.';
@ -61,8 +61,6 @@ $PALANG['pOverview_mailbox_title'] = ':: 郵箱';
 $PALANG['pOverview_button'] = '執行';
 $PALANG['pOverview_welcome'] = '瀏覽 ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_alias_count'] = '別名';
-$PALANG['pOverview_alias_mailbox_count'] = '郵箱';
 $PALANG['pOverview_alias_address'] = '前往';
 $PALANG['pOverview_alias_goto'] = '轉到';
 $PALANG['active'] = '活動';
@ -76,9 +74,8 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma
 $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] # XXX

 $PALANG['domain'] = '網域';
-$PALANG['pOverview_get_aliases'] = '別名';
 $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = '郵箱';
+$PALANG['mailboxes'] = '郵箱數';
 $PALANG['pOverview_get_quota'] = '郵箱限制 (MB)';

 $PALANG['pDelete_delete_error'] = '不能刪除本記錄';
@ -90,19 +87,16 @@ $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
 $PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
 $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
 $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
 $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
 $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_welcome'] = '在你的網域中新建一個別名.';
 $PALANG['pCreate_alias_address_text_error1'] = '該別名非法!';
 $PALANG['email-address-already-exists'] = '郵件地址已經存在, 請重新選擇!';
 $PALANG['pCreate_alias_address_text_error3'] = '你的別名已經達到上限!';
 $PALANG['pCreate_alias_goto'] = '轉到';
-$PALANG['pCreate_alias_button'] = '新建別名';
 $PALANG['pCreate_alias_goto_text'] = '郵件接收地址.';
 $PALANG['pCreate_alias_goto_text_error'] = '接收地址不正確!';
 $PALANG['pCreate_alias_result_error'] = '不能將別名添加到別名表中!';
@ -124,12 +118,9 @@ $PALANG['pEdit_alias_result_error'] = '不能修改該別名!';
 $PALANG['pCreate_mailbox_welcome'] = '在你的網域中新建一個本地郵箱.';
 $PALANG['pCreate_mailbox_username_text_error1'] = '郵件非法!';
 $PALANG['pCreate_mailbox_username_text_error3'] = '郵箱地址已經達到上限!';
-$PALANG['pCreate_mailbox_password2'] = '密碼 (再次輸入)';
 $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP 密碼';
 $PALANG['pCreate_mailbox_name_text'] = '全名';
-$PALANG['pCreate_mailbox_quota_text_error'] = '你輸入的容量限制超出範圍!';
 $PALANG['pCreate_mailbox_mail'] = '新建郵箱'; # XXX Text change to 'Send Welcome mail'
-$PALANG['pCreate_mailbox_button'] = '增加郵箱';
 $PALANG['pCreate_mailbox_result_error'] = '不能將郵箱增加到郵箱表中!';
 $PALANG['pCreate_mailbox_result_success'] = '增加郵箱成功!';
 $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
@ -153,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['pPassword_button'] = '更改密碼';
+$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
@ -207,34 +198,24 @@ $PALANG['pSendmail_result_success'] = '建立郵箱成功!'; # XXX text change -
 $PALANG['pAdminMenu_list_admin'] = '管理員清單';
 $PALANG['pAdminMenu_list_domain'] = '網域名清單';
 $PALANG['pAdminMenu_list_virtual'] = '虛擬用戶清單';
-$PALANG['pAdminMenu_viewlog'] = '查看日誌';
 $PALANG['pAdminMenu_backup'] = '備份';
 $PALANG['pAdminMenu_create_domain_admins'] = '網域管理員';
 $PALANG['pAdminMenu_create_admin'] = '新建管理員';
 $PALANG['pAdminMenu_create_domain'] = '新建網域';
-$PALANG['pAdminMenu_create_alias'] = '新建別名';
-$PALANG['pAdminMenu_create_mailbox'] = '新建郵箱';

 $PALANG['pAdminList_admin_username'] = '管理員';
 $PALANG['pAdminList_admin_count'] = '管理網域數量';

-$PALANG['pAdminList_domain_description'] = '描述';
-$PALANG['pAdminList_domain_aliases'] = '別名數';
-$PALANG['pAdminList_domain_mailboxes'] = '郵箱數';
+$PALANG['description'] = '描述';
+$PALANG['aliases'] = '別名數'; # XXX check text - should be 'Aliases'
 $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
-$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = '最後修改日期';

 $PALANG['pAdminList_virtual_button'] = '執行';
-$PALANG['pAdminList_virtual_welcome'] = '網域概覽 網域名: ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = '別名數量';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = '郵箱數';
 $PALANG['pAdminList_virtual_alias_address'] = '前往';
 $PALANG['pAdminList_virtual_alias_goto'] = '轉到';
-$PALANG['pAdminList_virtual_mailbox_username'] = '郵箱';
 $PALANG['pAdminList_virtual_mailbox_name'] = '姓名';
-$PALANG['pAdminList_virtual_mailbox_quota'] = '限制 (MB)';

 $PALANG['pAdminCreate_domain_welcome'] = '新建網域';
 $PALANG['pAdminCreate_domain_domain_text_error'] = '該網域已經存在!';
@ -250,15 +231,11 @@ $PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
 $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX

 $PALANG['pAdminEdit_domain_welcome'] = '修改網域';
-$PALANG['pAdminEdit_domain_description'] = '描述';
-$PALANG['pAdminEdit_domain_aliases'] = '別名數';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = 禁止 | 0 = 無限制'; # XXX check / compare with pAdminCreate_domain_aliases_text - should be "-1 = disable | ..."
-$PALANG['pAdminEdit_domain_mailboxes'] = '郵箱數';
-$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = 禁止 | 0 = 無限制'; # XXX check - should be "-1 = disable | 0 = unlimited"
 $PALANG['pAdminEdit_domain_maxquota'] = '最大容量限制';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB | -1 = 禁止 | 0 = 無限制'; # XXX check - should be "MB | -1 = disable | 0 = unlimited"
 $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
-$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
+$PALANG['transport'] = 'Transport'; # XXX
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = '備份郵件服務器';
 $PALANG['pAdminEdit_domain_button'] = '修改'; # XXX text no longer used
@ -274,7 +251,7 @@ $PALANG['pAdminCreate_admin_result_success'] = '新增管理員成功!';

 $PALANG['pAdminEdit_admin_welcome'] = '修改網域管理員';
 $PALANG['pAdminEdit_admin_username'] = '管理員';
-$PALANG['pAdminEdit_admin_password2'] = '密碼 (驗證)';
+$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
@ -287,7 +264,6 @@ $PALANG['pUsersLogin_password_incorrect'] = '登錄密碼不正確!';

 $PALANG['pUsersMenu_vacation'] = '自動回復';
 $PALANG['pUsersMenu_edit_alias'] = '修改轉發';
-$PALANG['pUsersMenu_password'] = '修改密碼';

 $PALANG['pUsersMain_vacation'] = '設置外出信息或自動回復.';
 $PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
--- a/model/AdminHandler.php
+++ b/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', 'pAdminEdit_admin_password2'   , ''                                 , '', '',
+            'password2'       => pacol( 1,          1,      0,      'pass', 'password-again'               , ''                                 , '', '',
                /*not_in_db*/ 0,
                /*dont_write_to_db*/ 1,
                /*select*/ 'password as password2'
--- a/model/AdminpasswordHandler.php
+++ b/model/AdminpasswordHandler.php
@ -63,7 +63,7 @@ class AdminpasswordHandler extends PFAHandler {
            # $PALANG labels
            'formtitle_create' => 'pPassword_welcome',
            'formtitle_edit' => 'pPassword_welcome',
-            'create_button' => 'pPassword_button',
+            'create_button' => 'change-password',

            # various settings
            'required_role' => 'admin',
--- a/model/AliasHandler.php
+++ b/model/AliasHandler.php
@ -89,9 +89,9 @@ class AliasHandler extends PFAHandler {

        return array(
            # $PALANG labels
-            'formtitle_create'  => 'pCreate_alias_welcome',
+            'formtitle_create'  => 'pMain_create_alias',
            'formtitle_edit'    => 'pEdit_alias_welcome',
-            'create_button'     => 'pCreate_alias_button',
+            'create_button'     => 'add-alias',

            # various settings
            'required_role' => 'admin',
--- a/model/AliasdomainHandler.php
+++ b/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' => 'pCreate_alias_domain_button',
+            'create_button' => 'add-alias-domain',

            # various settings
            'required_role' => 'admin',
--- a/model/DomainHandler.php
+++ b/model/DomainHandler.php
@ -38,15 +38,15 @@ class DomainHandler extends PFAHandler {
            # field name                allow       display in...   type    $PALANG label                    $PALANG description                 default / options / ...
            #                           editing?    form    list
           'domain'          => pacol(  $this->new, 1,      1,      'text', 'domain'                       , ''                                 ),
-           'description'     => pacol(  1,          1,      1,      'text', 'pAdminEdit_domain_description', ''                                 ),
-           'aliases'         => pacol(  1,          1,      1,      'num' , 'pAdminEdit_domain_aliases'    , 'pAdminEdit_domain_aliases_text'   , Config::read('aliases')   ),
+           'description'     => pacol(  1,          1,      1,      'text', 'description'                  , ''                                 ),
+           'aliases'         => pacol(  1,          1,      1,      'num' , 'aliases'                      , 'pAdminEdit_domain_aliases_text'   , Config::read('aliases')   ),
           'alias_count'     => pacol(  0,          0,      1,      'vnum', ''                             , ''                                 , '', '',
               /*not_in_db*/ 0,
               /*dont_write_to_db*/ 1,
               /*select*/ 'coalesce(__alias_count,0) - coalesce(__mailbox_count,0)  as alias_count',
               /*extrafrom*/ 'left join ( select count(*) as __alias_count, domain as __alias_domain from ' . table_by_key('alias') .
                             ' group by domain) as __alias on domain = __alias_domain'),
-           'mailboxes'       => pacol(  1,          1,      1,      'num' , 'pAdminEdit_domain_mailboxes'  , 'pAdminEdit_domain_mailboxes_text' , Config::read('mailboxes') ),
+           'mailboxes'       => pacol(  1,          1,      1,      'num' , 'mailboxes'                    , 'pAdminEdit_domain_aliases_text'   , Config::read('mailboxes') ),
           'mailbox_count'   => pacol(  0,          0,      1,      'vnum', ''                             , ''                                 , '', '',
               /*not_in_db*/ 0,
               /*dont_write_to_db*/ 1,
@ -59,7 +59,7 @@ class DomainHandler extends PFAHandler {
               /*dont_write_to_db*/ 1,
               /*select*/ 'round(coalesce(__total_quota/' . intval(Config::read('quota_multiplier')) . ',0)) as total_quota' /*extrafrom*//* already in mailbox_count */ ),
           'quota'           => pacol(  $dom_q,     $dom_q, $dom_q, 'num' , 'pAdminEdit_domain_quota'      , 'pAdminEdit_domain_maxquota_text'  , Config::read('domain_quota_default') ),
-           'transport'       => pacol(  $transp,    $transp,$transp,'enum', 'pAdminEdit_domain_transport'  , 'pAdminEdit_domain_transport_text' , Config::read('transport_default')     ,
+           'transport'       => pacol(  $transp,    $transp,$transp,'enum', 'transport'                    , 'pAdminEdit_domain_transport_text' , Config::read('transport_default')     ,
               /*options*/ Config::read('transport_options')    ),
           'backupmx'        => pacol(  1,          1,      1,      'bool', 'pAdminEdit_domain_backupmx'   , ''                                 ),
           'active'          => pacol(  1,          1,      1,      'bool', 'active'                       , ''                                 , 1                         ),
--- a/model/MailboxHandler.php
+++ b/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', 'pCreate_mailbox_password2'    , ''                                 , '', 
+            'password2'     => pacol(   1,          1,      0,      'pass', 'password-again'                , ''                                 , '', 
                /*options*/ '',
                /*not_in_db*/ 0,
                /*dont_write_to_db*/ 1,
@ -107,7 +107,7 @@ class MailboxHandler extends PFAHandler {
            # $PALANG labels
            'formtitle_create' => 'pCreate_mailbox_welcome',
            'formtitle_edit' => 'pEdit_mailbox_welcome',
-            'create_button' => 'pCreate_mailbox_button',
+            'create_button' => 'add-mailbox',

            # various settings
            'required_role' => 'admin',
--- a/setup.php
+++ b/setup.php
@ -421,7 +421,7 @@ else
      <td><?php if (isset($errormsg['password'])) print $errormsg['password']; ?></td>
   </tr>
   <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_password2'] . ":"; ?></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>
--- a/templates/adminlistdomain.tpl
+++ b/templates/adminlistdomain.tpl
@ -11,12 +11,12 @@
 	<table id="admin_table">
 		{#tr_header#}
 			<td>{$PALANG.domain}</td>
-			<td>{$PALANG.pAdminList_domain_description}</td>
-			<td>{$PALANG.pAdminList_domain_aliases}</td>
-			<td>{$PALANG.pAdminList_domain_mailboxes}</td>
+			<td>{$PALANG.description}</td>
+			<td>{$PALANG.aliases}</td>
+			<td>{$PALANG.mailboxes}</td>
 			{if $CONF.quota==YES}<td>{$PALANG.pOverview_get_quota}</td>{/if}
 			{if $CONF.domain_quota==YES}<td>{$PALANG.pAdminList_domain_quota}</td>{/if}
-			{if $CONF.transport==YES}<td>{$PALANG.pAdminList_domain_transport}</td>{/if}
+			{if $CONF.transport==YES}<td>{$PALANG.transport}</td>{/if}
 			<td>{$PALANG.pAdminList_domain_backupmx}</td>
 			<td>{$PALANG.last_modified}</td>
 			<td>{$PALANG.active}</td>
--- a/templates/list-virtual.tpl
+++ b/templates/list-virtual.tpl
@ -8,8 +8,8 @@
 	<input class="button" type="submit" name="go" value="{$PALANG.pOverview_button}" />
 </form>
 <h4>{$PALANG.pOverview_welcome}{$fDomain}</h4>
-<p>{$PALANG.pOverview_alias_alias_count}: {$limit.alias_count} / {$limit.aliases}</p>
-<p>{$PALANG.pOverview_alias_mailbox_count}: {$limit.mailbox_count} / {$limit.mailboxes}</p>
+<p>{$PALANG.aliases}: {$limit.alias_count} / {$limit.aliases}</p>
+<p>{$PALANG.mailboxes}: {$limit.mailbox_count} / {$limit.mailboxes}</p>
 {#form_search#}
 </div>
 <div class='subnav'><p>{$PALANG.show}
@ -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.pMenu_create_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.pMenu_create_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}
--- a/templates/list-virtual_alias.tpl
+++ b/templates/list-virtual_alias.tpl
@ -41,7 +41,7 @@
 				>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</a></td>
 			<td><a href="{#url_create_alias#}&amp;edit={$item.address|escape:"url"}">{$PALANG.edit}</a></td>
 			<td><a href="delete.php?table=alias&amp;delete={$item.address|escape:"url"}&amp;domain={$fDomain|escape:"url"}" 
-				onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_aliases}: {$item.address}');">{$PALANG.del}</a></td>
+				onclick="return confirm ('{$PALANG.confirm}{$PALANG.aliases}: {$item.address}');">{$PALANG.del}</a></td>
 		{else}
 			<td>{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if}</td>
 			<td>&nbsp;</td>
--- a/templates/list-virtual_alias_domain.tpl
+++ b/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.pMenu_create_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}
--- a/templates/list-virtual_mailbox.tpl
+++ b/templates/list-virtual_mailbox.tpl
@ -87,7 +87,7 @@
 				<td><a href="edit.php?table=alias&amp;edit={$item.username|escape:"url"}">{$PALANG.alias}</a></td>
 			{/if}
 			<td><a href="edit.php?table=mailbox&amp;edit={$item.username|escape:"url"}">{$PALANG.edit}</a></td>
-			<td><a href="delete.php?table=mailbox&amp;delete={$item.username|escape:"url"}&amp;domain={$fDomain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_mailboxes}: {$item.username}');">{$PALANG.del}</a></td>
+			<td><a href="delete.php?table=mailbox&amp;delete={$item.username|escape:"url"}&amp;domain={$fDomain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.mailboxes}: {$item.username}');">{$PALANG.del}</a></td>
 		</tr>
 	{/foreach}
 </table>
--- a/templates/main.tpl
+++ b/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.pMenu_create_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.pMenu_create_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'}
@ -32,4 +32,4 @@
 		<td>{$PALANG.pMain_logout}</td>
 	</tr>
 </table>
-</div>
+</div>
--- a/templates/menu.tpl
+++ b/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.pMenu_create_mailbox}</a></li>
-			<li><a target="_top" href="{#url_create_alias#}{$url_domain}">{$PALANG.pMenu_create_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.pMenu_create_alias_domain}</a></li>
+			<li><a target="_top" href="{#url_create_alias_domain#}{$url_domain}">{$PALANG.add-alias-domain}</a></li>
 {/if}
 		</ul>
 	</li>
--- a/templates/overview-get.tpl
+++ b/templates/overview-get.tpl
@ -13,8 +13,8 @@
 	</tr>
 	{#tr_header#}
 		<td>{$PALANG.domain}</td>
-		<td>{$PALANG.pOverview_get_aliases}</td>
-		<td>{$PALANG.pOverview_get_mailboxes}</td>
+		<td>{$PALANG.aliases}</td>
+		<td>{$PALANG.mailboxes}</td>
 		{if $CONF.quota===YES}<td>{$PALANG.pOverview_get_quota}</td>{/if}
 		{if $CONF.domain_quota===YES}<td>{$PALANG.pAdminList_domain_quota}</td>{/if}
 	</tr>
--- a/templates/password.tpl
+++ b/templates/password.tpl
@ -27,7 +27,7 @@
 	<tr>
 		<td class="label">&nbsp;</td>
 		<td>
-			<input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" />
+			<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}
--- a/templates/users_main.tpl
+++ b/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.pUsersMenu_password}</a></td>
+		<td nowrap="nowrap"><a target="_top" href="password.php">{$PALANG.change-password}</a></td>
 		<td>{$PALANG.pUsersMain_password}</td>
 	</tr>
 	<tr>
--- a/templates/users_menu.tpl
+++ b/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.pUsersMenu_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>