*.lang:

- renamed some $PALANG texts: - pOverview_button => go - pOverview_mailbox_name => name - pSendmail_admin => from - pAdminEdit_admin_username => admin - pEdit_alias_goto => to - deleted obsolete or duplicate $PALANG texts: - pOverview_alias_goto - pCreate_alias_goto - pEdit_alias_button - pEdit_mailbox_name - pEdit_mailbox_button - pViewlog_username - pViewlog_button - pAdminList_admin_username - pAdminList_virtual_button - pAdminList_virtual_alias_address - pAdminList_virtual_alias_goto - pAdminList_virtual_mailbox_name - pAdminEdit_domain_button - pAdminEdit_admin_button - pBroadcast_from - pBroadcast_send model/*, setup.php, templates/*, users/edit-alias.php: - update to use the renamed $PALANG texts git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1513 a1433add-5e2c-0410-b055-b7f2511e0802
11 years ago · 08c9b4e49f
parent 1c16c52086
commit 08c9b4e49f
48 changed files with 176 additions and 674 deletions
--- a/languages/bg.lang
+++ b/languages/bg.lang
@ -59,15 +59,14 @@ $PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
 $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
-$PALANG['pOverview_button'] = 'Напред';
+$PALANG['go'] = 'Напред';
 $PALANG['pOverview_welcome'] = 'Преглед на ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'От';
-$PALANG['pOverview_alias_goto'] = 'До';
 $PALANG['active'] = 'Активен';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'Е-мейл';
-$PALANG['pOverview_mailbox_name'] = 'Име';
+$PALANG['name'] = 'Име';
 $PALANG['pOverview_mailbox_quota'] = 'Обем (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -97,7 +96,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_goto_text'] = 'Накъде трябва да се изпраща писмото.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Избраният адрес в полето Към не е валиден!';
 $PALANG['pCreate_alias_result_error'] = 'Не мога да добавя alias-а към таблицата!';
@ -107,13 +105,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'За да създадете catch-all
 $PALANG['pEdit_alias_welcome'] = 'Редактиране на alias за вашия домейн.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Един запис на ред.'; # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Към';
+$PALANG['to'] = 'Към'; # XXX check text - should be 'To'
 $PALANG['pEdit_alias_goto_text_error1'] = 'Не сте въвели нищо в полето Към';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Е-мейл адреса, който сте въвели не е валиден: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = 'Редактирай Alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Не мога да модифицирам този alias!';

 $PALANG['pCreate_mailbox_welcome'] = 'Създаване на нова пощенска кутия за вашия домейн.';
@ -129,13 +126,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Редакция на пощенска кутия за вашия домейн.';
 $PALANG['pEdit_mailbox_username'] = 'Логин';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Паролите, които сте дали не съвпадат!';
-$PALANG['pEdit_mailbox_name'] = 'Име';
 $PALANG['pEdit_mailbox_quota'] = 'Обем';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Обема, който сте дали е твърде голям!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Този домейн не е ваш: ';
-$PALANG['pEdit_mailbox_button'] = 'Редакция на пощенска кутия'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Не мога да модифицирам пощенската кутия!';

 $PALANG['pPassword_welcome'] = 'Смяна на парола.';
@ -159,7 +154,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Разглеждане на последните 10 действия за ';
 $PALANG['pViewlog_timestamp'] = 'Дата';
-$PALANG['pViewlog_username'] = 'Админ';
 $PALANG['pViewlog_action'] = 'Действие';
 $PALANG['pViewlog_data'] = 'Данни';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -182,11 +176,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Напред';
 $PALANG['pViewlog_result_error'] = 'Не мога да открия логовете!';

 $PALANG['pSendmail_welcome'] = 'Изпращане на е-мейл.';
-$PALANG['pSendmail_admin'] = 'От';
+$PALANG['from'] = 'От';
 $PALANG['pSendmail_to'] = 'До';
 $PALANG['pSendmail_to_text_error'] = 'Полето До е празен или невалиден е-мейл адрес!';
 $PALANG['subject'] = 'Заглавие';
@ -204,7 +197,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Админи на домейни';
 $PALANG['pAdminMenu_create_admin'] = 'Нов админ';
 $PALANG['pAdminMenu_create_domain'] = 'Нов домейн';

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

 $PALANG['description'] = 'Описание';
@ -213,10 +205,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # 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_alias_address'] = 'От';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Към';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Име';

 $PALANG['pAdminCreate_domain_welcome'] = 'Добавяне на нов домейн';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Този домейн вече съществува!';
@ -239,7 +227,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $PALANG['transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Мейл сървъра е резервен MX';
-$PALANG['pAdminEdit_domain_button'] = 'Редактирай домейн'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'Не мога да модифицирам домейна!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Добави нов админ на домейна';
@ -251,11 +238,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Не мога да добавя а
 $PALANG['pAdminCreate_admin_result_success'] = 'Админа беше добавен успешно!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Редакция на админ на домейн';
-$PALANG['pAdminEdit_admin_username'] = 'Админ';
+$PALANG['admin'] = 'Админ';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Не мога да модифицирам админа!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Админ-а беше модифициран!';

@ -289,9 +275,7 @@ $PALANG['pSearch'] = 'search'; # XXX
 $PALANG['pSearch_welcome'] = 'Searching for: '; # XXX
 $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Съобщение до всички';
-$PALANG['pBroadcast_from'] = 'От';
 $PALANG['pBroadcast_name'] = 'Име';
-$PALANG['pBroadcast_send'] = 'Изпрати';
 $PALANG['pBroadcast_success'] = 'Вашето съобщение беше изпратено.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Съобщение до всички';
 $PALANG['pBroadcast_error_empty'] = 'Полетата Име, Заглавие и Съобщение са задължителни!';
--- a/languages/ca.lang
+++ b/languages/ca.lang
@ -57,15 +57,14 @@ $PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
 $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
-$PALANG['pOverview_button'] = 'Ves';
+$PALANG['go'] = 'Ves';
 $PALANG['pOverview_welcome'] = 'Resum de ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'De';
-$PALANG['pOverview_alias_goto'] = 'Destí';
 $PALANG['active'] = 'Actiu';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-mail'; # XXX
-$PALANG['pOverview_mailbox_name'] = 'Nom';
+$PALANG['name'] = 'Nom';
 $PALANG['pOverview_mailbox_quota'] = 'Quota (MB)'; # XXX
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -95,7 +94,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -105,13 +103,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Per crear un àlies general usi "*" co
 $PALANG['pEdit_alias_welcome'] = 'Editi un àlies pel seu domini.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Una entrada per línia.'; # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Àlies';
-$PALANG['pEdit_alias_goto'] = 'Destí';
+$PALANG['to'] = 'Destí';
 $PALANG['pEdit_alias_goto_text_error1'] = 'No has introduït res al destí';
 $PALANG['pEdit_alias_goto_text_error2'] = 'L\'adreça d\'e-mail introduida no és vàlida: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = 'Editar àlies'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Imposible modificar l\'àlies!';

 $PALANG['pCreate_mailbox_welcome'] = 'Crear una nova bústia pel seu domini.';
@ -127,13 +124,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Editar una bústia pel seu domini.';
 $PALANG['pEdit_mailbox_username'] = 'Usuari';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Les contrasenyes introduides no coincideixen!';
-$PALANG['pEdit_mailbox_name'] = 'Nom';
 $PALANG['pEdit_mailbox_quota'] = 'Quota'; # XXX
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'La quota especificada és massa alta!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Aquest domini no et pertany: ';
-$PALANG['pEdit_mailbox_button'] = 'Editar bústia'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Imposible canviar la contrasenya!';

 $PALANG['pPassword_welcome'] = 'Canvia la teva contrasenya de login.';
@ -157,7 +152,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Veure les últimes 10 accions per ';
 $PALANG['pViewlog_timestamp'] = 'Data/Hora';
-$PALANG['pViewlog_username'] = 'Administrador';
 $PALANG['pViewlog_action'] = 'Acció';
 $PALANG['pViewlog_data'] = 'Dades';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -180,11 +174,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Ves';
 $PALANG['pViewlog_result_error'] = 'Imposible trobar els logs!';

 $PALANG['pSendmail_welcome'] = 'Enviar un e-mail.';
-$PALANG['pSendmail_admin'] = 'De';
+$PALANG['from'] = 'De';
 $PALANG['pSendmail_to'] = 'Destí';
 $PALANG['pSendmail_to_text_error'] = 'La direcció de destí està buida o és una direcció invàlida!';
 $PALANG['subject'] = 'Assumpte';
@ -202,7 +195,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Administradors de domini';
 $PALANG['pAdminMenu_create_admin'] = 'Nou administrador';
 $PALANG['pAdminMenu_create_domain'] = 'Nou dominio';

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

 $PALANG['description'] = 'Descripció';
@ -211,10 +203,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Última Modificació';

-$PALANG['pAdminList_virtual_button'] = 'Ves';
-$PALANG['pAdminList_virtual_alias_address'] = 'De';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Destí';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Nom';

 $PALANG['pAdminCreate_domain_welcome'] = 'Afegir nou domini';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'El domini ja existeix!';
@ -237,7 +225,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # 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
 $PALANG['pAdminEdit_domain_result_error'] = 'Imposible modificar el domini!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Afegir un nou administrador de domini';
@ -250,11 +237,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Imposible afegir l\'administrador!
 $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['admin'] = 'Administrador';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Imposible modificar l\'administrador!';
 $PALANG['pAdminEdit_admin_result_success'] = 'L\'administrador ha estat modificat!';

@ -288,9 +274,7 @@ $PALANG['pSearch'] = 'search'; # XXX
 $PALANG['pSearch_welcome'] = 'Searching for: '; # XXX
 $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
--- a/languages/cn.lang
+++ b/languages/cn.lang
@ -58,15 +58,14 @@ $PALANG['pOverview_left_arrow'] = '上一页';
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: 别名';
 $PALANG['pOverview_mailbox_title'] = ':: 邮箱';
-$PALANG['pOverview_button'] = '执行';
+$PALANG['go'] = '执行';
 $PALANG['pOverview_welcome'] = '浏览 ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = '前往';
-$PALANG['pOverview_alias_goto'] = '转到';
 $PALANG['active'] = '活动';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = '邮件地址';
-$PALANG['pOverview_mailbox_name'] = '姓名';
+$PALANG['name'] = '姓名';
 $PALANG['pOverview_mailbox_quota'] = '限制 (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -96,7 +95,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $PALANG['pCreate_alias_address_text_error1'] = '该别名非法!';
 $PALANG['email_address_already_exists'] = '邮件地址已经存在, 请重新选择!';
 $PALANG['pCreate_alias_address_text_error3'] = '你的别名已经达到上限!';
-$PALANG['pCreate_alias_goto'] = '转到';
 $PALANG['pCreate_alias_goto_text'] = '邮件接收地址.';
 $PALANG['pCreate_alias_goto_text_error'] = '接收地址不正确!';
 $PALANG['pCreate_alias_result_error'] = '不能将别名添加到别名表中!';
@ -106,13 +104,12 @@ $PALANG['pCreate_alias_catchall_text'] = '要将所有的邮件全部转发请
 $PALANG['pEdit_alias_welcome'] = '编辑你域名中的别名.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = '每行一条记录.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = '别名';
-$PALANG['pEdit_alias_goto'] = '转到';
+$PALANG['to'] = '转到';
 $PALANG['pEdit_alias_goto_text_error1'] = '你没有填写收信人';
 $PALANG['pEdit_alias_goto_text_error2'] = '邮件地址非法: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = '编辑别名'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = '不能修改该别名!';

 $PALANG['pCreate_mailbox_welcome'] = '在你的域中新建一个本地邮箱.';
@ -128,13 +125,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = '编辑你域中的邮箱.';
 $PALANG['pEdit_mailbox_username'] = '用户名';
 $PALANG['pEdit_mailbox_password_text_error'] = '你输入的两个新密码不相同!';
-$PALANG['pEdit_mailbox_name'] = '姓名'; # XXX check / compare with pCreate_mailbox_name - should be ""
 $PALANG['pEdit_mailbox_quota'] = '限制';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = '你输入的容量限制超出范围!';
 $PALANG['pEdit_mailbox_domain_error'] = '你没有该域的管理权限: ';
-$PALANG['pEdit_mailbox_button'] = '编辑邮箱'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = '不能编辑该邮箱!';

 $PALANG['pPassword_welcome'] = '更改你的登录密码.';
@ -158,7 +153,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = '查看最新的10项操作日志 域名: ';
 $PALANG['pViewlog_timestamp'] = '时间';
-$PALANG['pViewlog_username'] = '管理员';
 $PALANG['pViewlog_action'] = '操作';
 $PALANG['pViewlog_data'] = '内容';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -181,11 +175,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = '执行';
 $PALANG['pViewlog_result_error'] = '未找到相关的日志!';

 $PALANG['pSendmail_welcome'] = '发送邮件.';
-$PALANG['pSendmail_admin'] = '发件人';
+$PALANG['from'] = '发件人';
 $PALANG['pSendmail_to'] = '收件人';
 $PALANG['pSendmail_to_text_error'] = '收件人为空或者收件人地址不正确!';
 $PALANG['subject'] = '主题';
@ -203,7 +196,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = '域管理员';
 $PALANG['pAdminMenu_create_admin'] = '新建管理员';
 $PALANG['pAdminMenu_create_domain'] = '新建域';

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

 $PALANG['description'] = '描述';
@ -212,10 +204,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = '最后修改日期';

-$PALANG['pAdminList_virtual_button'] = '执行';
-$PALANG['pAdminList_virtual_alias_address'] = '前往';
-$PALANG['pAdminList_virtual_alias_goto'] = '转到';
-$PALANG['pAdminList_virtual_mailbox_name'] = '姓名';

 $PALANG['pAdminCreate_domain_welcome'] = '新建域';
 $PALANG['pAdminCreate_domain_domain_text_error'] = '该域已经存在!';
@ -238,7 +226,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # 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
 $PALANG['pAdminEdit_domain_result_error'] = '修改域失败!';

 $PALANG['pAdminCreate_admin_welcome'] = '新增域管理员';
@ -250,11 +237,10 @@ $PALANG['pAdminCreate_admin_result_error'] = '新增管理员失败!';
 $PALANG['pAdminCreate_admin_result_success'] = '新增管理员成功!';

 $PALANG['pAdminEdit_admin_welcome'] = '修改域管理员';
-$PALANG['pAdminEdit_admin_username'] = '管理员';
+$PALANG['admin'] = '管理员';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = '编辑域管理员失败!';
 $PALANG['pAdminEdit_admin_result_success'] = '编辑域管理员成功!';

@ -288,9 +274,7 @@ $PALANG['pSearch'] = 'search'; # XXX
 $PALANG['pSearch_welcome'] = '搜索: ';
 $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
--- a/languages/cs.lang
+++ b/languages/cs.lang
@ -63,15 +63,14 @@ $PALANG['pOverview_left_arrow'] = 'Předchozí Stránka';
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Přesměrování';
 $PALANG['pOverview_mailbox_title'] = ':: Schránky';
-$PALANG['pOverview_button'] = 'Přejít';
+$PALANG['go'] = 'Přejít'; # XXX check text - should be 'Go'
 $PALANG['pOverview_welcome'] = 'Přehled domény ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Od';
-$PALANG['pOverview_alias_goto'] = 'Pro';
 $PALANG['active'] = 'Aktivní';
 $PALANG['and_x_more'] = '[a %s dalších...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
-$PALANG['pOverview_mailbox_name'] = 'Jméno';
+$PALANG['name'] = 'Jméno'; # XXX check text - should be 'Name'
 $PALANG['pOverview_mailbox_quota'] = 'Místo (MB)';
 $PALANG['pOverview_vacation_edit'] = 'ZAPNUTO';
 $PALANG['pOverview_vacation_option'] = 'vypnuto';
@ -101,7 +100,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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ů!';
@ -111,13 +109,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Pro vytvoření doménového koše pou
 $PALANG['pEdit_alias_welcome'] = 'Upravit přesměrování.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Jeden záznam na řádku.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Přesměrování';
-$PALANG['pEdit_alias_goto'] = 'Cíl';
+$PALANG['to'] = 'Cíl'; # XXX check text - should be 'To'
 $PALANG['pEdit_alias_goto_text_error1'] = 'Nezadali jste cíl';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Emailová adresa kterou jste zadali není platná: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Doručovat i do schránky.';
 $PALANG['pEdit_alias_forward_only'] = 'Přesměrovat pouze na dané adresy.';
-$PALANG['pEdit_alias_button'] = 'Upravit'; # XXX text no longer used
 $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ě.';
@ -133,13 +130,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka byla přidán
 $PALANG['pEdit_mailbox_welcome'] = 'Upravit lokální chránku v doméně.';
 $PALANG['pEdit_mailbox_username'] = 'Uživatelské jméno';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Zadaná hesla se neshodují!';
-$PALANG['pEdit_mailbox_name'] = 'Jméno';
 $PALANG['pEdit_mailbox_quota'] = 'Místo';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Zadané místo je příliš velké!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Tato doména není vaše: ';
-$PALANG['pEdit_mailbox_button'] = 'Upravit schránku'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Nepodařilo se upravit schránku!';

 $PALANG['pPassword_welcome'] = 'Změnit heslo.';
@ -165,7 +160,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Prohlížet 10 posledních akcí pro ';
 $PALANG['pViewlog_timestamp'] = 'Časová značka';
-$PALANG['pViewlog_username'] = 'Administrátor';
 $PALANG['pViewlog_action'] = 'Akce';
 $PALANG['pViewlog_data'] = 'Poznámka';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -189,11 +183,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Jít';
 $PALANG['pViewlog_result_error'] = 'Nepodařilo se najít záznamy!';

 $PALANG['pSendmail_welcome'] = 'Poslat email.';
-$PALANG['pSendmail_admin'] = 'Od';
+$PALANG['from'] = 'Od';
 $PALANG['pSendmail_to'] = 'Komu';
 $PALANG['pSendmail_to_text_error'] = 'V poli "Komu" není zadaná platná emailová adresa!';
 $PALANG['subject'] = 'Předmět';
@ -211,7 +204,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Administrátoři'; // unused
 $PALANG['pAdminMenu_create_admin'] = 'Nový Administrátor';
 $PALANG['pAdminMenu_create_domain'] = 'Nová Doména';

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

 $PALANG['description'] = 'Popis';
@ -220,10 +212,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Záložní MX';
 $PALANG['last_modified'] = 'Naposledy Změněno';

-$PALANG['pAdminList_virtual_button'] = 'Jít';
-$PALANG['pAdminList_virtual_alias_address'] = 'Od';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Cíl';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Celé Jméno';

 $PALANG['pAdminCreate_domain_welcome'] = 'Přidat Novou Doménu';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Taková doména už existuje!';
@ -247,7 +235,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Nepodařilo se upravit doménu!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Přidat nového doménového administrátora';
@ -259,11 +246,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Nepodařilo se přidat administrá
 $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['admin'] = 'Uživatelské jméno'; # XXX check text - should be 'Admin'
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Nepodařilo se upravit administrátora!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Administrátor byl upraven!';

@ -299,9 +285,7 @@ $PALANG['pSearch_welcome'] = 'Vyhledávání: ';
 $PALANG['pReturn_to'] = 'Odpovědět komu';

 $PALANG['pBroadcast_title'] = 'Odeslat zprávu do všech schránek';
-$PALANG['pBroadcast_from'] = 'Od';
 $PALANG['pBroadcast_name'] = 'Vaše jméno';
-$PALANG['pBroadcast_send'] = 'Odeslat zprávu';
 $PALANG['pBroadcast_success'] = 'Zpráva pro všechny schránky byla odeslána.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Poslat email všem';
 $PALANG['pBroadcast_error_empty'] = 'Pole Od, Předmět a Zpráva by neměly být prázdné !';
--- a/languages/da.lang
+++ b/languages/da.lang
@ -62,15 +62,14 @@ $PALANG['pOverview_left_arrow'] = 'Foregående side';
 $PALANG['pOverview_alias_domain_title']    = ':: Domæne aliases';
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Postbokse';
-$PALANG['pOverview_button'] = 'Vis';
+$PALANG['go'] = 'Vis';
 $PALANG['pOverview_welcome'] = 'Oversigt for ';
 $PALANG['pOverview_alias_domain_aliases']  = 'Alias domæner';
 $PALANG['pOverview_alias_address'] = 'Alias';
-$PALANG['pOverview_alias_goto'] = 'Modtager';
 $PALANG['active'] = 'Aktiv';
 $PALANG['and_x_more'] = '[og %s til...]';
 $PALANG['pOverview_mailbox_username'] = 'Emailadresse';
-$PALANG['pOverview_mailbox_name'] = 'Navn';
+$PALANG['name'] = 'Navn';
 $PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'Autosvar er aktiveret';
 $PALANG['pOverview_vacation_option'] = 'Angiv autosvar';
@ -101,7 +100,6 @@ $PALANG['pCreate_alias_domain_success']     = 'Domæne-alias blev tilføjet alia
 $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_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!';
@ -111,13 +109,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'For at tilføje et stjerne-alias, brug
 $PALANG['pEdit_alias_welcome'] = 'Rediger alias.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'En modtager pr. linje.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Modtager(e)'; # XXX check / compare with pCreate_alias_goto - should be "To"
+$PALANG['to'] = 'Modtager(e)'; # XXX check text - should be 'To'
 $PALANG['pEdit_alias_goto_text_error1'] = 'Du udfyldte ikke noget i Modtager(e)';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Den tilføjede emailadresse er ikke gyldig: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Kan ikke ændre alias-domænet.';
 $PALANG['pEdit_alias_forward_and_store']   = 'Aflever email til den lokale postboks.';
 $PALANG['pEdit_alias_forward_only']        = 'Videresend til angivene emailadresse uden lokal kopi.';
-$PALANG['pEdit_alias_button']              = 'Ret alias';
 $PALANG['pEdit_alias_result_error']        = 'Kan ikke redigere aliaset.';

 $PALANG['pCreate_mailbox_welcome'] = 'Tilføj en ny lokal postboks til domænet.';
@ -133,13 +130,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilføjet
 $PALANG['pEdit_mailbox_welcome'] = 'Rediger postboks.';
 $PALANG['pEdit_mailbox_username'] = 'Brugernavn';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Adgangskoderne er ikke ens!';
-$PALANG['pEdit_mailbox_name'] = 'Navn';
 $PALANG['pEdit_mailbox_quota'] = 'Kvota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Den ønskede kvota er for høj!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Dette domæne er ikke dit: ';
-$PALANG['pEdit_mailbox_button'] = 'Ret postboks'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Kan ikke ændre adgangskoden!';

 $PALANG['pPassword_welcome']                     = 'Ændr din adgangskode.';
@ -165,7 +160,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Vis de sidste 10 poster for ';
 $PALANG['pViewlog_timestamp'] = 'Tidsstempel';
-$PALANG['pViewlog_username'] = 'Administrator';
 $PALANG['pViewlog_action'] = 'Handling';
 $PALANG['pViewlog_data'] = 'Data';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -189,11 +183,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Vis';
 $PALANG['pViewlog_result_error'] = 'Loggen kan ikke findes.';

 $PALANG['pSendmail_welcome'] = 'Send en email.';
-$PALANG['pSendmail_admin'] = 'Afsender';
+$PALANG['from'] = 'Afsender';
 $PALANG['pSendmail_to'] = 'Modtager';
 $PALANG['pSendmail_to_text_error']  = 'Modtager er tom, eller har en ugyldig emailadresse.';
 $PALANG['subject'] = 'Emne';
@ -211,7 +204,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domæne-administrator';
 $PALANG['pAdminMenu_create_admin'] = 'Ny administrator';
 $PALANG['pAdminMenu_create_domain'] = 'Nyt domæne';

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

 $PALANG['description'] = 'Beskrivelse';
@ -220,10 +212,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Senest ændret';

-$PALANG['pAdminList_virtual_button'] = 'Vis';
-$PALANG['pAdminList_virtual_alias_address'] = 'Fra';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Til';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';

 $PALANG['pAdminCreate_domain_welcome'] = 'Tilføj et nyt domæne';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domænet eksisterer allerede!';
@ -247,7 +235,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Kan ikke rette domænet!';

 $PALANG['pAdminCreate_admin_welcome']              = 'Tilføj en ny domæneadministrator';
@ -259,11 +246,10 @@ $PALANG['pAdminCreate_admin_result_error']         = 'Administratoren kunne ikke
 $PALANG['pAdminCreate_admin_result_success']       = 'Administratoren er tilføjet!';

 $PALANG['pAdminEdit_admin_welcome']             = 'Redigér en domæneadministrator';
-$PALANG['pAdminEdit_admin_username'] = 'Administrator';
+$PALANG['admin'] = 'Administrator';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Kunne ikke rette administrator!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Administrator er rettet!';

@ -299,9 +285,7 @@ $PALANG['pSearch_welcome'] = 'Søg efter: ';
 $PALANG['pReturn_to'] = 'Tilbage til';

 $PALANG['pBroadcast_title'] = 'Rundsend meddelelse';
-$PALANG['pBroadcast_from'] = 'Afsender';
 $PALANG['pBroadcast_name'] = 'Dit navn';
-$PALANG['pBroadcast_send'] = 'Send meddelelse';
 $PALANG['pBroadcast_success'] = 'Din meddelelse er rundsendt.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Rundsend meddelse';
 $PALANG['pBroadcast_error_empty']       = 'Felterne "Dit navn", "Emne" og "Meddelelse" skal alle udfyldes.';
--- a/languages/de.lang
+++ b/languages/de.lang
@ -60,15 +60,14 @@ $PALANG['pOverview_left_arrow'] = 'Vorherige Seite';
 $PALANG['pOverview_alias_domain_title'] = ':: Alias-Domains';
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Mailboxen';
-$PALANG['pOverview_button'] = 'Los';
+$PALANG['go'] = 'Los';
 $PALANG['pOverview_welcome'] = 'Überblick über ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias-Domains';
 $PALANG['pOverview_alias_address'] = 'Von';
-$PALANG['pOverview_alias_goto'] = 'An';
 $PALANG['active'] = 'Aktiv';
 $PALANG['and_x_more'] = '[und %s weitere...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
-$PALANG['pOverview_mailbox_name'] = 'Name';
+$PALANG['name'] = 'Name';
 $PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'AUTOMATISCHE ANTWORT IST AKTIV';
 $PALANG['pOverview_vacation_option'] = 'Automatische Antwort einrichten';
@ -98,7 +97,6 @@ $PALANG['pCreate_alias_domain_success'] = 'Die Alias-Domain wurde in der Datenba
 $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_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!';
@ -108,13 +106,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Um alle Adressen abzudecken benutzen S
 $PALANG['pEdit_alias_welcome'] = 'Weiterleitungs-Einstellungen ändern';
 $PALANG['pEdit_alias_help'] = 'Angabe mehrerer Ziele möglich, ein Eintrag pro Zeile.';
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'An';
+$PALANG['to'] = 'An';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Sie haben im "To"-Feld nichts angegeben!';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Die angegebene eMail-Adresse ist nicht korrekt: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Alias-Domain kann nicht geändert werden!';
 $PALANG['pEdit_alias_forward_and_store'] = 'Mail in der lokalen Mailbox ablegen.';
 $PALANG['pEdit_alias_forward_only'] = 'Nur zur angegebenen Adresse weiterleiten.';
-$PALANG['pEdit_alias_button'] = 'Alias ändern'; # obsolete
 $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.';
@ -130,13 +127,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Die Mailbox wurde in de
 $PALANG['pEdit_mailbox_welcome'] = 'Ändern Sie ihre Mailbox hier.';
 $PALANG['pEdit_mailbox_username'] = 'Benutzername';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Die beiden Passwörter sind nicht identisch!';
-$PALANG['pEdit_mailbox_name'] = 'Name';
 $PALANG['pEdit_mailbox_quota'] = 'Quota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)';
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Das angegebene Quota ist zu hoch!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Diese Domain gehört nicht Ihnen: ';
-$PALANG['pEdit_mailbox_button'] = 'Mailbox editieren'; # obsolete
 $PALANG['pEdit_mailbox_result_error'] = 'Mailbox kann nicht geändert werden!';

 $PALANG['pPassword_welcome'] = 'Ändern Sie Ihr Login-Passwort.';
@ -162,7 +157,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Zeigt die letzten 10 Aktionen für ';
 $PALANG['pViewlog_timestamp'] = 'Zeitpunkt';
-$PALANG['pViewlog_username'] = 'Admin';
 $PALANG['pViewlog_action'] = 'Aktion';
 $PALANG['pViewlog_data'] = 'Daten';

@ -186,17 +180,16 @@ $PALANG['pViewlog_action_create_admin'] = 'Admin erstellen';
 $PALANG['pViewlog_action_edit_admin'] = 'Admin ändern';
 $PALANG['pViewlog_action_edit_vacation'] = 'Automatische Antwort ändern';

-$PALANG['pViewlog_button'] = 'Los';
 $PALANG['pViewlog_result_error'] = 'Kann keine Einträge finden!';

 $PALANG['pSendmail_welcome'] = 'eMail versenden.';
-$PALANG['pSendmail_admin'] = 'Von';
+$PALANG['from'] = 'Von';
 $PALANG['pSendmail_to'] = 'An';
 $PALANG['pSendmail_to_text_error'] = 'Das "An"-Feld ist leer bzw. ungültig!';
 $PALANG['subject'] = 'Betreff';
 $PALANG['pSendmail_subject_text'] = 'Willkommen';
 $PALANG['pSendmail_body'] = 'Text';
-$PALANG['pSendmail_button'] = 'Versende Nachricht';
+$PALANG['pSendmail_button'] = 'Nachricht versenden';
 $PALANG['pSendmail_result_error'] = 'Mail konnte nicht gesendet werden!';
 $PALANG['pSendmail_result_success'] = 'Mail gesendet!';

@ -208,7 +201,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domain Admins';
 $PALANG['pAdminMenu_create_admin'] = 'Neuer Admin';
 $PALANG['pAdminMenu_create_domain'] = 'Neue Domain';

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

 $PALANG['description'] = 'Beschreibung';
@ -217,10 +209,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain Quota (MB)';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'zuletzt geändert';

-$PALANG['pAdminList_virtual_button'] = 'Los';
-$PALANG['pAdminList_virtual_alias_address'] = 'Von';
-$PALANG['pAdminList_virtual_alias_goto'] = 'An';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Name';

 $PALANG['pAdminCreate_domain_welcome'] = 'Domain hinzufügen';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Diese Domain existiert bereits!';
@ -244,7 +232,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota';
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Konnte Domain nicht editieren!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Neuen Domain-Admin hinzufügen';
@ -256,11 +243,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Konnte den Admin nicht anlegen!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Admin angelegt!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Domain Admin editieren';
-$PALANG['pAdminEdit_admin_username'] = 'Admin';
+$PALANG['admin'] = 'Admin';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Konnte Admin nicht ändern';
 $PALANG['pAdminEdit_admin_result_success'] = 'Admin geändert!';

@ -297,9 +283,7 @@ $PALANG['pSearch_welcome'] = 'Suche nach: ';
 $PALANG['pReturn_to'] = 'Zurück zu';

 $PALANG['pBroadcast_title'] = 'Rundmail senden';
-$PALANG['pBroadcast_from'] = 'Von';
 $PALANG['pBroadcast_name'] = 'Ihr Name';
-$PALANG['pBroadcast_send'] = 'Nachricht senden';
 $PALANG['pBroadcast_success'] = 'Ihre Rundmail wurde gesendet.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Rundmail';
 $PALANG['pBroadcast_error_empty'] = 'Die Felder Name, Betreff und Nachricht dürfen nicht leer sein!';
--- a/languages/en.lang
+++ b/languages/en.lang
@ -60,15 +60,14 @@ $PALANG['pOverview_left_arrow'] = 'Previous Page';
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases';
 $PALANG['pOverview_alias_title'] = ':: Aliases';
 $PALANG['pOverview_mailbox_title'] = ':: Mailboxes';
-$PALANG['pOverview_button'] = 'Go';
+$PALANG['go'] = 'Go';
 $PALANG['pOverview_welcome'] = 'Overview for ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains';
 $PALANG['pOverview_alias_address'] = 'From';
-$PALANG['pOverview_alias_goto'] = 'To';
 $PALANG['active'] = 'Active';
 $PALANG['and_x_more'] = '[and %s more...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
-$PALANG['pOverview_mailbox_name'] = 'Name';
+$PALANG['name'] = 'Name';
 $PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON';
 $PALANG['pOverview_vacation_option'] = 'Set Vacation';
@ -99,7 +98,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -109,13 +107,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'To create a catch-all use an "*" as al
 $PALANG['pEdit_alias_welcome'] = 'Edit forwarding settings';
 $PALANG['pEdit_alias_help'] = 'Accepts multiple targets, one entry per line.';
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'To';
+$PALANG['to'] = 'To';
 $PALANG['pEdit_alias_goto_text_error1'] = 'You didn\'t enter anything at To';
 $PALANG['pEdit_alias_goto_text_error2'] = 'The email address that you have entered is not valid: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!';
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.';
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.';
-$PALANG['pEdit_alias_button'] = 'Edit Alias'; # text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Unable to modify the alias!';

 $PALANG['pCreate_mailbox_welcome'] = 'Create a new mailbox for your domain.';
@ -131,13 +128,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Edit a mailbox for your domain.';
 $PALANG['pEdit_mailbox_username'] = 'Username';
 $PALANG['pEdit_mailbox_password_text_error'] = 'The passwords that you supplied don\'t match!';
-$PALANG['pEdit_mailbox_name'] = 'Name';
 $PALANG['pEdit_mailbox_quota'] = 'Quota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)';
 $PALANG['pEdit_mailbox_quota_text_error'] = 'The quota that you specified is too high!';
 $PALANG['pEdit_mailbox_domain_error'] = 'This domain is not yours: ';
-$PALANG['pEdit_mailbox_button'] = 'Edit Mailbox'; # text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Unable to modify the mailbox!';

 $PALANG['pPassword_welcome'] = 'Change your login password.';
@ -163,7 +158,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds';

 $PALANG['pViewlog_welcome'] = 'View the last 10 actions for ';
 $PALANG['pViewlog_timestamp'] = 'Timestamp';
-$PALANG['pViewlog_username'] = 'Admin';
 $PALANG['pViewlog_action'] = 'Action';
 $PALANG['pViewlog_data'] = 'Data';

@ -187,11 +181,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin';
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin';
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation';
 
-$PALANG['pViewlog_button'] = 'Go';
 $PALANG['pViewlog_result_error'] = 'Unable to find the logs!';

 $PALANG['pSendmail_welcome'] = 'Send an email.';
-$PALANG['pSendmail_admin'] = 'From';
+$PALANG['from'] = 'From';
 $PALANG['pSendmail_to'] = 'To';
 $PALANG['pSendmail_to_text_error'] = 'To is empty or is not a valid email address!';
 $PALANG['subject'] = 'Subject';
@ -209,7 +202,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domain Admins';
 $PALANG['pAdminMenu_create_admin'] = 'New Admin';
 $PALANG['pAdminMenu_create_domain'] = 'New Domain';

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

 $PALANG['description'] = 'Description';
@ -219,10 +211,6 @@ $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_alias_address'] = 'From';
-$PALANG['pAdminList_virtual_alias_goto'] = 'To';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Name';

 $PALANG['pAdminCreate_domain_welcome'] = 'Add a new domain';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'The domain already exists!';
@ -248,7 +236,6 @@ $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';
-$PALANG['pAdminEdit_domain_button'] = 'Edit Domain'; # text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'Unable to modify domain!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Add a new domain admin';
@ -260,11 +247,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Unable to add admin!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Admin has been added!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Edit a domain admin';
-$PALANG['pAdminEdit_admin_username'] = 'Admin';
+$PALANG['admin'] = 'Admin';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Unable to modify admin!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Admin has been modified!';

@ -300,9 +286,7 @@ $PALANG['pSearch_welcome'] = 'Searching for: ';
 $PALANG['pReturn_to'] = 'Return to';

 $PALANG['pBroadcast_title'] = 'Send broadcast message';
-$PALANG['pBroadcast_from'] = 'From';
 $PALANG['pBroadcast_name'] = 'Your name';
-$PALANG['pBroadcast_send'] = 'Send message';
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message';
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!';
--- a/languages/es.lang
+++ b/languages/es.lang
@ -58,15 +58,14 @@ $PALANG['pOverview_left_arrow'] = 'Página anterior';
 $PALANG['pOverview_alias_domain_title'] = ':: Alias de Dominios'; 
 $PALANG['pOverview_alias_title'] = ':: Alias'; 
 $PALANG['pOverview_mailbox_title'] = ':: Buzones'; 
-$PALANG['pOverview_button'] = 'Ir';
+$PALANG['go'] = 'Ir';
 $PALANG['pOverview_welcome'] = 'Resumen de ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias de Dominios'; 
 $PALANG['pOverview_alias_address'] = 'De';
-$PALANG['pOverview_alias_goto'] = 'Destino';
 $PALANG['active'] = 'Activo'; 
 $PALANG['and_x_more'] = '[y %s más...]'; 
 $PALANG['pOverview_mailbox_username'] = 'E-mail';
-$PALANG['pOverview_mailbox_name'] = 'Nombre';
+$PALANG['name'] = 'Nombre';
 $PALANG['pOverview_mailbox_quota'] = 'Cuota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION ESTÁ ACTIVADO'; 
 $PALANG['pOverview_vacation_option'] = 'Establecer Vacation'; 
@ -96,7 +95,6 @@ $PALANG['pCreate_alias_domain_success'] = '¡El alias de dominio se insertó en
 $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_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!';
@ -106,13 +104,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Para crear un alias general use "*" co
 $PALANG['pEdit_alias_welcome'] = 'Edite un alias para su dominio.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Una entrada por línea.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Destino';
+$PALANG['to'] = 'Destino';
 $PALANG['pEdit_alias_goto_text_error1'] = 'No ha introducido nada en el destino';
 $PALANG['pEdit_alias_goto_text_error2'] = 'La dirección de e-mail introducida no es válida: ';
 $PALANG['pEdit_alias_domain_result_error'] = '¡No se pudo modificar el alias de dominio!'; 
 $PALANG['pEdit_alias_forward_and_store'] = 'Entregar al  buzón local.'; 
 $PALANG['pEdit_alias_forward_only'] = 'Reenviar sólo al email especificado.'; 
-$PALANG['pEdit_alias_button'] = 'Editar alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = '¡Imposible modificar el alias!';

 $PALANG['pCreate_mailbox_welcome'] = 'Crear un nuevo buzón para su dominio.';
@ -128,13 +125,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Editar un buzón para su dominio.';
 $PALANG['pEdit_mailbox_username'] = 'Usuario';
 $PALANG['pEdit_mailbox_password_text_error'] = '¡Las contraseñas introducidas no coinciden!';
-$PALANG['pEdit_mailbox_name'] = 'Nombre';
 $PALANG['pEdit_mailbox_quota'] = 'Cuota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = '¡La cuota especificada es demasiado alta!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Este dominio no le pertenece: ';
-$PALANG['pEdit_mailbox_button'] = 'Editar buzón'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = '¡Imposible cambiar la contraseña!';

 $PALANG['pPassword_welcome'] = 'Cambie su contraseña de login.';
@ -159,7 +154,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Ver las últimas 10 acciones para ';
 $PALANG['pViewlog_timestamp'] = 'Fecha/Hora';
-$PALANG['pViewlog_username'] = 'Administrador';
 $PALANG['pViewlog_action'] = 'Acción';
 $PALANG['pViewlog_data'] = 'Datos';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -182,11 +176,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Ir';
 $PALANG['pViewlog_result_error'] = '¡Imposible encontrar los logs!';

 $PALANG['pSendmail_welcome'] = 'Enviar un e-mail.';
-$PALANG['pSendmail_admin'] = 'De';
+$PALANG['from'] = 'De';
 $PALANG['pSendmail_to'] = 'Destino';
 $PALANG['pSendmail_to_text_error'] = '¡La dirección destino está vacía o es una dirección inválida!';
 $PALANG['subject'] = 'Asunto';
@ -204,7 +197,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Administradores de dominio';
 $PALANG['pAdminMenu_create_admin'] = 'Nuevo administrador';
 $PALANG['pAdminMenu_create_domain'] = 'Nuevo dominio';

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

 $PALANG['description'] = 'Descripción';
@ -213,10 +205,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Última Modificación';

-$PALANG['pAdminList_virtual_button'] = 'Ir';
-$PALANG['pAdminList_virtual_alias_address'] = 'De';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Destino';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Nombre';

 $PALANG['pAdminCreate_domain_welcome'] = 'Añadir nuevo dominio';
 $PALANG['pAdminCreate_domain_domain_text_error'] = '¡El dominio ya existe!';
@ -239,7 +227,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = '¡Imposible modificar el dominio!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Añadir un nuevo administrador de dominio';
@ -252,11 +239,10 @@ $PALANG['pAdminCreate_admin_result_error'] = '¡Imposible añadir el administrad
 $PALANG['pAdminCreate_admin_result_success'] = '¡El administrador ha sido añadido!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Editar un administrador de dominio';
-$PALANG['pAdminEdit_admin_username'] = 'Administrador';
+$PALANG['admin'] = 'Administrador';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = '¡Imposible modificar el administrador!';
 $PALANG['pAdminEdit_admin_result_success'] = '¡El administrador ha sido modificado!';

@ -290,9 +276,7 @@ $PALANG['pSearch'] = 'buscar';
 $PALANG['pSearch_welcome'] = 'Buscando: '; 
 $PALANG['pReturn_to'] = 'Volver a'; 
 $PALANG['pBroadcast_title'] = 'Enviar mensaje a todos'; # XXX
-$PALANG['pBroadcast_from'] = 'De'; 
 $PALANG['pBroadcast_name'] = 'Tu nombre'; 
-$PALANG['pBroadcast_send'] = 'Enviar mensaje'; 
 $PALANG['pBroadcast_success'] = 'Se ha enviado el mensaje.'; 
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = '¡Los campos Nombre, Asunto y Mensaje no pueden estar vacíos!'; 
--- a/languages/et.lang
+++ b/languages/et.lang
@ -58,15 +58,14 @@ $PALANG['pOverview_left_arrow'] = 'Eelmine leht';
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Postkastid';
-$PALANG['pOverview_button'] = 'Mine';
+$PALANG['go'] = 'Mine';
 $PALANG['pOverview_welcome'] = 'Ülevaade domeenist: ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Kellelt';
-$PALANG['pOverview_alias_goto'] = 'Kellele';
 $PALANG['active'] = 'Aktiivne';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-posti aadress';
-$PALANG['pOverview_mailbox_name'] = 'Nimi';
+$PALANG['name'] = 'Nimi';
 $PALANG['pOverview_mailbox_quota'] = 'Kettaruumi piirang (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -96,7 +95,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -106,13 +104,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Loomaks püüa-kõik aadressi kasuta a
 $PALANG['pEdit_alias_welcome'] = 'Muuda aliast.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Üks kirje rea kohta.'; # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Kellele';
+$PALANG['to'] = 'Kellele';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Kellele väli on tühi.';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Sisestatud e/posti aadress pole kehtiv: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = 'Muuda alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Aliase muutmine ebaõnnestus!';

 $PALANG['pCreate_mailbox_welcome'] = 'Loo uus postkast domeenis.';
@ -128,13 +125,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Muuda postkasti.';
 $PALANG['pEdit_mailbox_username'] = 'Kasutajanimi';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Sisestatud paroolid ei kattu!';
-$PALANG['pEdit_mailbox_name'] = 'Nimi';
 $PALANG['pEdit_mailbox_quota'] = 'Kettaruumi piirang';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Sisestatud kettaruumi piirang on liiga kõrge!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Puuduvad õigused. Domeen: ';
-$PALANG['pEdit_mailbox_button'] = 'Muuda postkast'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Postkasti muutmine ebaõnnestus!';

 $PALANG['pPassword_welcome'] = 'Muuda kasutajanime parool.';
@ -158,7 +153,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Vaata 10 viimast muudatust domeeniga ';
 $PALANG['pViewlog_timestamp'] = 'Ajatempel';
-$PALANG['pViewlog_username'] = 'Haldaja';
 $PALANG['pViewlog_action'] = 'Toiming';
 $PALANG['pViewlog_data'] = 'Andmed';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -181,11 +175,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Mine';
 $PALANG['pViewlog_result_error'] = 'Logi ei leitud!';

 $PALANG['pSendmail_welcome'] = 'Saada kiri.';
-$PALANG['pSendmail_admin'] = 'Kellelt';
+$PALANG['from'] = 'Kellelt';
 $PALANG['pSendmail_to'] = 'Kellele';
 $PALANG['pSendmail_to_text_error'] = 'Kellele on tühi või ei sisalda kehtivat aadressi!';
 $PALANG['subject'] = 'Teema';
@ -203,7 +196,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domeeni haldajad';
 $PALANG['pAdminMenu_create_admin'] = 'Lisa haldaja';
 $PALANG['pAdminMenu_create_domain'] = 'Lisa domeen';

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

 $PALANG['description'] = 'Kirjeldus';
@ -212,10 +204,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $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_alias_address'] = 'Kellelt';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Kellele';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Nimi';

 $PALANG['pAdminCreate_domain_welcome'] = 'Lisa uus domeen';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Selline domeen on juba olemas!';
@ -238,7 +226,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Domeeni muutmine ebaõnnestus!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Lisa uus domeeni haldaja';
@ -250,11 +237,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Haldaja lisamine ebaõnnestus!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Haldaja on lisatud!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Muuda domeeni haldajat';
-$PALANG['pAdminEdit_admin_username'] = 'Haldaja';
+$PALANG['admin'] = 'Haldaja';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Haldaja muutmine ebaõnnestus!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Haldaja on muudetud!';

@ -291,9 +277,7 @@ $PALANG['pSearch_welcome'] = 'Otsi: ';
 $PALANG['pReturn_to'] = 'Return to'; # XXX

 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX

--- a/languages/eu.lang
+++ b/languages/eu.lang
@ -57,15 +57,14 @@ $PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
 $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
-$PALANG['pOverview_button'] = 'Joan';
+$PALANG['go'] = 'Joan';
 $PALANG['pOverview_welcome'] = 'Laburpena ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Igorlea';
-$PALANG['pOverview_alias_goto'] = 'Norakoa';
 $PALANG['active'] = 'Aktibatua';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-mail';
-$PALANG['pOverview_mailbox_name'] = 'Izena';
+$PALANG['name'] = 'Izena';
 $PALANG['pOverview_mailbox_quota'] = 'Kuota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -94,7 +93,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -104,13 +102,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Alias orokor bat sortzeko "*" erabil e
 $PALANG['pEdit_alias_welcome'] = 'Domeinuarentzat aliasa aldatu.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Lerroko sarrera bat.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Aliasa';
-$PALANG['pEdit_alias_goto'] = 'Norakoa';
+$PALANG['to'] = 'Norakoa';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Norakoan ez duzu ezer jarri';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Sartutako e-mail helbidea baliiogabekoa da: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = 'Aliasa aldatu'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Ezinezkoa aliasa aldatzea!';

 $PALANG['pCreate_mailbox_welcome'] = 'Postontzi berri bat sortu domeinuarentzat.';
@ -126,13 +123,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Domeinuarentzat postontzi bat aldatu.';
 $PALANG['pEdit_mailbox_username'] = 'Erabiltzailea';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Sartutako pasahitzak ez datoz bat!';
-$PALANG['pEdit_mailbox_name'] = 'Izena';
 $PALANG['pEdit_mailbox_quota'] = 'Kuota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Zehazturiko kuota altuegia da!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Ez zara domeinu honen jabe: ';
-$PALANG['pEdit_mailbox_button'] = 'Postontzia aldatu'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Ezinezkoa pasahitza aldatzea!';

 $PALANG['pPassword_welcome'] = 'Login pasahitza aldatu.';
@ -156,7 +151,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Honen azken 10 ekintzak ikusi ';
 $PALANG['pViewlog_timestamp'] = 'Data/ordua';
-$PALANG['pViewlog_username'] = 'Kudeatzailea';
 $PALANG['pViewlog_action'] = 'Ekintza';
 $PALANG['pViewlog_data'] = 'Datuak';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -179,11 +173,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Joan';
 $PALANG['pViewlog_result_error'] = 'Ezinezkoa logak aurkitzea!';

 $PALANG['pSendmail_welcome'] = 'e-mail bat bidali.';
-$PALANG['pSendmail_admin'] = 'Igorlea';
+$PALANG['from'] = 'Igorlea';
 $PALANG['pSendmail_to'] = 'Norakoa';
 $PALANG['pSendmail_to_text_error'] = 'Norako helbidea hutsa dago edo okerra da!';
 $PALANG['subject'] = 'Gaia';
@ -201,7 +194,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domeinu kudeatzaileak';
 $PALANG['pAdminMenu_create_admin'] = 'Kudeatzaile berria';
 $PALANG['pAdminMenu_create_domain'] = 'Domeinu berria';

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

 $PALANG['description'] = 'Deskripzioa';
@ -210,10 +202,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Azken aldaketa';

-$PALANG['pAdminList_virtual_button'] = 'Joan';
-$PALANG['pAdminList_virtual_alias_address'] = 'Igorlea';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Norakoa';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Izena';

 $PALANG['pAdminCreate_domain_welcome'] = 'Domeinu berria gehitu';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domeinua existitzen da!';
@ -236,7 +224,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # 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
 $PALANG['pAdminEdit_domain_result_error'] = 'Ezinezkoa domeinua aldatzea!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Domeinu kudeatzaile berri bat gehitu';
@ -249,11 +236,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Ezinezkoa kudeatzailea gehitzea!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Kudeatzailea gehituta1';

 $PALANG['pAdminEdit_admin_welcome'] = 'Domeinu kudeatzaile bat aldatu';
-$PALANG['pAdminEdit_admin_username'] = 'Kudeatzailea';
+$PALANG['admin'] = 'Kudeatzailea';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Ezinezkoa kudeatzailea aldatzea!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Kudeatzailea aldatu da!';

@ -287,9 +273,7 @@ $PALANG['pSearch'] = 'search'; # XXX
 $PALANG['pSearch_welcome'] = 'Searching for: '; # XXX
 $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
--- a/languages/fi.lang
+++ b/languages/fi.lang
@ -59,15 +59,14 @@ $PALANG['pOverview_left_arrow'] = 'Edellinen sivu';
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliakset';
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Sähköpostilaatikot';
-$PALANG['pOverview_button'] = 'Siirry';
+$PALANG['go'] = 'Siirry';
 $PALANG['pOverview_welcome'] = 'Yleisnäkymä ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domainit';
 $PALANG['pOverview_alias_address'] = 'Keneltä';
-$PALANG['pOverview_alias_goto'] = 'Kenelle';
 $PALANG['active'] = 'Aktiivinen';
 $PALANG['and_x_more'] = '[ja %s lisää...]';
 $PALANG['pOverview_mailbox_username'] = 'Sähköposti';
-$PALANG['pOverview_mailbox_name'] = 'Nimi';
+$PALANG['name'] = 'Nimi';
 $PALANG['pOverview_mailbox_quota'] = 'Kiintiö (MB)';
 $PALANG['pOverview_vacation_edit'] = 'Lomavastaaja on päällä';
 $PALANG['pOverview_vacation_option'] = 'Aseta lomavastaaja';
@ -97,7 +96,6 @@ $PALANG['pCreate_alias_domain_success'] = 'Domainin alias on lisätty domain ali
 $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_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!';
@ -106,13 +104,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Jos haluat luoda catch-all osoitteen k
 $PALANG['pEdit_alias_welcome'] = 'Muokkaa aliasta.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Yksi kohta per rivi.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Kenelle';
+$PALANG['to'] = 'Kenelle';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Et kirjoitanut mitään Kenelle: -riville';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Antamasi sähköpostiosoite ei ole oikean muotoinen: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Alias domainia ei voitu muokata!';
 $PALANG['pEdit_alias_forward_and_store'] = 'Toimita paikalliseen laatikkoon.';
 $PALANG['pEdit_alias_forward_only'] = 'Edelleenlähetä ainoastaan annettuun sähköpostiosoitteeseen.';
-$PALANG['pEdit_alias_button'] = 'Muokkaa aliasta'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Aliasta ei voi muokata!';

 $PALANG['pCreate_mailbox_welcome'] = 'Luo uusi paikallinen postilaatikko.';
@ -128,13 +125,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Sähköpostilaatikko on
 $PALANG['pEdit_mailbox_welcome'] = 'Muokkaa postilaatikkoa.';
 $PALANG['pEdit_mailbox_username'] = 'Käyttäjätunnus';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Antamasi salasanat eivät täsmää!';
-$PALANG['pEdit_mailbox_name'] = 'Nimi';
 $PALANG['pEdit_mailbox_quota'] = 'Kiintiö';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Antamasi kiintiö on liian korkea!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Tämä domaini ei ole sinun: ';
-$PALANG['pEdit_mailbox_button'] = 'Muokkaa postilaatikkoa'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Postilaatikon muokkaus ei onnistunut!';

 $PALANG['pPassword_welcome'] = 'Vaihda tunnuksesi salasana.';
@ -158,7 +153,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Näytä viimeiset kymmenen tapahtumaa domainille ';
 $PALANG['pViewlog_timestamp'] = 'Aikaleima';
-$PALANG['pViewlog_username'] = 'Admin';
 $PALANG['pViewlog_action'] = 'Tapahtuma';
 $PALANG['pViewlog_data'] = 'Tiedot';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -181,11 +175,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Siirry';
 $PALANG['pViewlog_result_error'] = 'Lokeja ei löydy!';

 $PALANG['pSendmail_welcome'] = 'Lähetä sähköpostia.';
-$PALANG['pSendmail_admin'] = 'Keneltä';
+$PALANG['from'] = 'Keneltä';
 $PALANG['pSendmail_to'] = 'Kenelle';
 $PALANG['pSendmail_to_text_error'] = 'Kenelle on tyhjä tai osoite ei ole toimiva sähköpostiosoite!';
 $PALANG['subject'] = 'Otsikko';
@ -203,7 +196,6 @@ $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['pAdminList_admin_username'] = 'Ylläpitäjä';
 $PALANG['pAdminList_admin_count'] = 'Domainit';

 $PALANG['description'] = 'Kuvaus';
@ -212,10 +204,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Vara MX';
 $PALANG['last_modified'] = 'Viimeksi muokattu';

-$PALANG['pAdminList_virtual_button'] = 'Siirry';
-$PALANG['pAdminList_virtual_alias_address'] = 'Keneltä';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Kenelle';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Nimi';

 $PALANG['pAdminCreate_domain_welcome'] = 'Lisää uusi domain';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domain on jo järjestelmässä!';
@ -238,7 +226,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Domainin muokkaus ei onnistu!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Lisää uusi domainin ylläpitäjä';
@ -250,11 +237,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Ylläpitäjän lisäys ei onnistu!
 $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['admin'] = 'Ylläpitäjä'; # XXX check text - should be 'Admin'
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Ylläpitäjän muokkaaminen ei onnistu!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Ylläpitäjän muokkaus onnistui!';

@ -288,9 +274,7 @@ $PALANG['pSearch'] = 'hae';
 $PALANG['pSearch_welcome'] = 'Haetaan: ';
 $PALANG['pReturn_to'] = 'Palaa osoitteeseen';
 $PALANG['pBroadcast_title'] = 'Lähetä tiedotusviesti';
-$PALANG['pBroadcast_from'] = 'Lähettäjä';
 $PALANG['pBroadcast_name'] = 'Nimesi';
-$PALANG['pBroadcast_send'] = 'Lähetä viesti';
 $PALANG['pBroadcast_success'] = 'Tiedostusviestisi on lähetetty.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Tiedotusviesti';
 $PALANG['pBroadcast_error_empty'] = 'Nimi, Aihe tai Viesti kenttien ei pidä olla tyhjiä!';
--- a/languages/fo.lang
+++ b/languages/fo.lang
@ -58,15 +58,14 @@ $PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
 $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
-$PALANG['pOverview_button'] = 'Vel';
+$PALANG['go'] = 'Vel';
 $PALANG['pOverview_welcome'] = 'Yvirlit yvir ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Frá';
-$PALANG['pOverview_alias_goto'] = 'Til';
 $PALANG['active'] = 'Virkin';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-post';
-$PALANG['pOverview_mailbox_name'] = 'Navn';
+$PALANG['name'] = 'Navn';
 $PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -96,7 +95,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -106,13 +104,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Fyri at stovna eitt ið fangar alt, br
 $PALANG['pEdit_alias_welcome'] = 'Broyt eitt dulnevni á tínum navnaøki.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Eina adressu pr. linju.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Dulnevni';
-$PALANG['pEdit_alias_goto'] = 'Til';
+$PALANG['to'] = 'Til';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Tú skrivaði onki í Til teigin';
 $PALANG['pEdit_alias_goto_text_error2'] = 'E-post adressan tú skrivaði er ógyldug: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = 'Broyt Dulnevni'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Fái ikki broytt dulnevni!';

 $PALANG['pCreate_mailbox_welcome'] = 'Stovna ein nýggjan postkassa á tínum navnaøki.';
@ -128,13 +125,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Broyt postkassa á tínum navnaøki.';
 $PALANG['pEdit_mailbox_username'] = 'Brúkaranavn';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Loyniorðini tú skrivaði samsvara ikki!';
-$PALANG['pEdit_mailbox_name'] = 'Navn';
 $PALANG['pEdit_mailbox_quota'] = 'Kvota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Kvotan tú skrivaði er ov høg!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Hetta navnaøki er ikki títt: ';
-$PALANG['pEdit_mailbox_button'] = 'Broyt postkassa'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Fái ikki broytt loyniorðið!';

 $PALANG['pPassword_welcome'] = 'Broyt títt login loyniorð.';
@ -158,7 +153,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Vís seinastu 10 hendingarnar fyri ';
 $PALANG['pViewlog_timestamp'] = 'Tíðarstempul';
-$PALANG['pViewlog_username'] = 'Umsitari';
 $PALANG['pViewlog_action'] = 'Hending';
 $PALANG['pViewlog_data'] = 'Dáta';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -181,11 +175,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Vel';
 $PALANG['pViewlog_result_error'] = 'Finni ikki loggarnar!';

 $PALANG['pSendmail_welcome'] = 'Send ein e-post.';
-$PALANG['pSendmail_admin'] = 'Frá';
+$PALANG['from'] = 'Frá';
 $PALANG['pSendmail_to'] = 'Til';
 $PALANG['pSendmail_to_text_error'] = 'Til er tómt ella ógyldug e-post adressa!';
 $PALANG['subject'] = 'Evni';
@ -203,7 +196,6 @@ $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['pAdminList_admin_username'] = 'Umsitari';
 $PALANG['pAdminList_admin_count'] = 'Navnaøki';

 $PALANG['description'] = 'Frágreiðing';
@ -212,10 +204,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # 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_alias_address'] = 'Frá';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Til';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';

 $PALANG['pAdminCreate_domain_welcome'] = 'Stova nýtt navnaøki';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Navnaøki finst longu!';
@ -238,7 +226,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # 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
 $PALANG['pAdminEdit_domain_result_error'] = 'Fái ikki broytt navnaøki!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Stovna navnaøki umsitara';
@ -250,11 +237,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Fái ikki stovnað umsitara!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Umsitari er stovnaður!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Broyt navnaøki umsitara';
-$PALANG['pAdminEdit_admin_username'] = 'Umsitari';
+$PALANG['admin'] = 'Umsitari';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Fái ikki broytt umsitara!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Umsitari er broyttur!';

@ -293,9 +279,7 @@ $PALANG['pSearch'] = 'search'; # XXX
 $PALANG['pSearch_welcome'] = 'Searching for: '; # XXX
 $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
--- a/languages/fr.lang
+++ b/languages/fr.lang
@ -60,15 +60,14 @@ $PALANG['pOverview_left_arrow'] = 'Page précédente';
 $PALANG['pOverview_alias_domain_title'] = ':: Alias Domaine';
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Comptes courriels';
-$PALANG['pOverview_button'] = 'Aller';
+$PALANG['go'] = 'Aller';
 $PALANG['pOverview_welcome'] = 'Vue d\'ensemble pour ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domaines';
 $PALANG['pOverview_alias_address'] = 'De';
-$PALANG['pOverview_alias_goto'] = 'A';
 $PALANG['active'] = 'Actif';
 $PALANG['and_x_more'] = '[et %s en plus...]';
 $PALANG['pOverview_mailbox_username'] = 'courriel';
-$PALANG['pOverview_mailbox_name'] = 'Nom';
+$PALANG['name'] = 'Nom';
 $PALANG['pOverview_mailbox_quota'] = 'Limite (MB)';
 $PALANG['pOverview_vacation_edit'] = 'REPONDEUR ACTIVE';
 $PALANG['pOverview_vacation_option'] = 'Configurer le répondeur';
@ -97,7 +96,6 @@ $PALANG['pCreate_alias_domain_success'] = 'L\'alias de domaine est déj
 $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_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 !';
@ -107,13 +105,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Pour ajouter un alias global, utilisez
 $PALANG['pEdit_alias_welcome'] = 'Modifier un alias dans votre domaine.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Une entrée par ligne.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'À';
+$PALANG['to'] = 'À'; # XXX check text - should be 'To'
 $PALANG['pEdit_alias_goto_text_error1'] = 'Vous devez entrer quelques choses dans le champ À';
 $PALANG['pEdit_alias_goto_text_error2'] = 'L\'adresse courriel que vous avez entré est invalide: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Impossible de modifier cet alias de domaine!';
 $PALANG['pEdit_alias_forward_and_store'] = 'Transferer une copie.';
 $PALANG['pEdit_alias_forward_only'] = 'Transferer les messages sans conserver de copie.';
-$PALANG['pEdit_alias_button'] = 'Modifier cet alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Impossible de modifier cet alias!';

 $PALANG['pCreate_mailbox_welcome'] = 'Ajouter un nouveau compte courriel à votre domaine.';
@ -129,13 +126,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Le compte courriel a é
 $PALANG['pEdit_mailbox_welcome'] = 'Modifier un compte courriel.';
 $PALANG['pEdit_mailbox_username'] = 'Nom d\'utilisateur';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Le mot de passe entré ne correspond pas!';
-$PALANG['pEdit_mailbox_name'] = 'Nom';
 $PALANG['pEdit_mailbox_quota'] = 'Limite';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'La limite fournit est trop haute!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Ce domaine n\'est pas le votre: ';
-$PALANG['pEdit_mailbox_button'] = 'Modifier un compte courriel'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Impossible de modifier le compte courriel !';

 $PALANG['pPassword_welcome'] = 'Changer votre mot de passe.';
@ -159,7 +154,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Visualiser les 10 dernières action pour ';
 $PALANG['pViewlog_timestamp'] = 'Date/Heure';
-$PALANG['pViewlog_username'] = 'Administrateur';
 $PALANG['pViewlog_action'] = 'Action';
 $PALANG['pViewlog_data'] = 'Information';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -182,11 +176,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Aller';
 $PALANG['pViewlog_result_error'] = 'Impossible de trouver le journal des événements!';

 $PALANG['pSendmail_welcome'] = 'Envoyer un courriel.';
-$PALANG['pSendmail_admin'] = 'De';
+$PALANG['from'] = 'De';
 $PALANG['pSendmail_to'] = 'À';
 $PALANG['pSendmail_to_text_error'] = 'À est vide ou ce n\'est pas une adresse courriel valide!';
 $PALANG['subject'] = 'Sujet';
@ -204,7 +197,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Administrateurs de domaines';
 $PALANG['pAdminMenu_create_admin'] = 'Nouvel administrateur';
 $PALANG['pAdminMenu_create_domain'] = 'Nouveau domaine';

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

 $PALANG['description'] = 'Description';
@ -213,10 +205,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'MX Backup';
 $PALANG['last_modified'] = 'Dernière modification';

-$PALANG['pAdminList_virtual_button'] = 'Aller';
-$PALANG['pAdminList_virtual_alias_address'] = 'De';
-$PALANG['pAdminList_virtual_alias_goto'] = 'À';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Nom';

 $PALANG['pAdminCreate_domain_welcome'] = 'Ajouter un nouveau domaine';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Le domaine existe déjà!';
@ -240,7 +228,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Impossible de modifier le domain!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Ajouter un nouvel administrateur de domaine';
@ -252,11 +239,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Impossible d\'ajouter un administr
 $PALANG['pAdminCreate_admin_result_success'] = 'L\'administrateur a été ajouté!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Modifier un domaine';
-$PALANG['pAdminEdit_admin_username'] = 'Administrateur';
+$PALANG['admin'] = 'Administrateur';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Impossible de modifier l\'administrateur !';
 $PALANG['pAdminEdit_admin_result_success'] = 'L\'administrateur a été ajouté!';

@ -290,9 +276,7 @@ $PALANG['pSearch'] = 'Rechercher';
 $PALANG['pSearch_welcome'] = 'Recherche : ';
 $PALANG['pReturn_to'] = 'Réponse à';
 $PALANG['pBroadcast_title'] = 'Envoyer un message général';
-$PALANG['pBroadcast_from'] = 'De';
 $PALANG['pBroadcast_name'] = 'Votre nom';
-$PALANG['pBroadcast_send'] = 'Envoyer le message';
 $PALANG['pBroadcast_success'] = 'Votre message général a été envoyé.';
 $PALANG['pAdminMenu_broadcast_message'] = 'message général';
 $PALANG['pBroadcast_error_empty'] = 'Les champs Nom, Sujet et Message ne peuvent pas être vides!';
--- a/languages/hr.lang
+++ b/languages/hr.lang
@ -57,15 +57,14 @@ $PALANG['pOverview_left_arrow'] = 'Prijanja stranica';
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Potanski ormarići';
-$PALANG['pOverview_button'] = 'Idi';
+$PALANG['go'] = 'Idi';
 $PALANG['pOverview_welcome'] = 'Pregled za ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Od';
-$PALANG['pOverview_alias_goto'] = 'Za';
 $PALANG['active'] = 'Aktivan';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-pota';
-$PALANG['pOverview_mailbox_name'] = 'Ime';
+$PALANG['name'] = 'Ime';
 $PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -95,7 +94,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -105,13 +103,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Ukoliko elite stvoriti "sveprimajuć
 $PALANG['pEdit_alias_welcome'] = 'Uredi alias za domenu.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Jedan unos po liniji.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Za';
+$PALANG['to'] = 'Za';
 $PALANG['pEdit_alias_goto_text_error1'] = 'U polje "Za" niste unijeli nita!';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Adresa e-pote, koju ste unijeli nije pravilna: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = 'Uredi alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Alias nije bilo moguče promjeniti!';

 $PALANG['pCreate_mailbox_welcome'] = 'Stvori novi potanski ormarić za izbranu domenu.';
@ -127,13 +124,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Uredi potanski ormarić za domenu.';
 $PALANG['pEdit_mailbox_username'] = 'Korisničko ime';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Uneene lozinke se ne podudaraju!';
-$PALANG['pEdit_mailbox_name'] = 'Ime';
 $PALANG['pEdit_mailbox_quota'] = 'Kvota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Uneena kvota je prevelika!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Izbrana domena nije pod vaim nadzorom: ';
-$PALANG['pEdit_mailbox_button'] = 'Uredi potanski ormarić'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Potanski ormarić nije bilo moguče promjeniti!';

 $PALANG['pPassword_welcome'] = 'Promijeni lozinku.';
@ -157,7 +152,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Pogledaj zadnjih 10 akcija za ';
 $PALANG['pViewlog_timestamp'] = 'Vrijeme';
-$PALANG['pViewlog_username'] = 'Administrator';
 $PALANG['pViewlog_action'] = 'Akcija';
 $PALANG['pViewlog_data'] = 'Podaci';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -180,11 +174,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Idi';
 $PALANG['pViewlog_result_error'] = 'Zapise nije bilo moguče naći!';

 $PALANG['pSendmail_welcome'] = 'Polji e-potu.';
-$PALANG['pSendmail_admin'] = 'Od';
+$PALANG['from'] = 'Od';
 $PALANG['pSendmail_to'] = 'Za';
 $PALANG['pSendmail_to_text_error'] = 'Polje "Za" ne sadri valjanu adresu e-pote!';
 $PALANG['subject'] = 'Subjekt';
@ -202,7 +195,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domenski administratori';
 $PALANG['pAdminMenu_create_admin'] = 'Novi administrator';
 $PALANG['pAdminMenu_create_domain'] = 'Nova domena';

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

 $PALANG['description'] = 'Opis';
@ -211,10 +203,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Zadnja promjena';

-$PALANG['pAdminList_virtual_button'] = 'Idi';
-$PALANG['pAdminList_virtual_alias_address'] = 'Od';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Za';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Ime';

 $PALANG['pAdminCreate_domain_welcome'] = 'Dodaj novu domenu';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Uneena domena već postoji!';
@ -237,7 +225,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Domenu nije bilo moguće premeniti!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj administratora domene';
@ -249,11 +236,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Administratora nije bilo moguće d
 $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je uspjeno dodan';

 $PALANG['pAdminEdit_admin_welcome'] = 'Uredi administratora domene';
-$PALANG['pAdminEdit_admin_username'] = 'Administrator';
+$PALANG['admin'] = 'Administrator';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Administratora nije bilo moguće promjeniti!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Admininstrator je uspjeno promjenjen!';

@ -286,9 +272,7 @@ $PALANG['pSearch'] = 'trai';
 $PALANG['pSearch_welcome'] = 'Trai: ';
 $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
--- a/languages/hu.lang
+++ b/languages/hu.lang
@ -59,15 +59,14 @@ $PALANG['pOverview_left_arrow'] = 'Előző oldal';
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Mailbox-ok';
-$PALANG['pOverview_button'] = 'Gyerünk';
+$PALANG['go'] = 'Gyerünk'; # XXX check text - should be 'Go'
 $PALANG['pOverview_welcome'] = 'Áttekintés: ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Honnan';
-$PALANG['pOverview_alias_goto'] = 'Hova';
 $PALANG['active'] = 'Aktív';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'Email';
-$PALANG['pOverview_mailbox_name'] = 'Név';
+$PALANG['name'] = 'Név';
 $PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'SZABADSÁG EKKOR';
 $PALANG['pOverview_vacation_option'] = 'Szabadság beállítása';
@ -98,7 +97,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -108,13 +106,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'A catch-all (*@valami.hu) beállítás
 $PALANG['pEdit_alias_welcome'] = 'Alias szerkesztése a domainhez.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Soronként egy.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Hova';
+$PALANG['to'] = 'Hova';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Nem írtál semmit a \'Hova\' mezõbe';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Az email cím amit beírtál érvénytelen: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Kézbesítés helyi mailbox-ba.';
 $PALANG['pEdit_alias_forward_only'] = 'Továbbítás csak az adott email címre.';
-$PALANG['pEdit_alias_button'] = 'Alias szerkesztése'; # XXX text no longer used
 $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.';
@ -130,13 +127,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'A postafiókot hozzáad
 $PALANG['pEdit_mailbox_welcome'] = 'Postafiók szerkesztése az adott domainhez.';
 $PALANG['pEdit_mailbox_username'] = 'Felhasználónév';
 $PALANG['pEdit_mailbox_password_text_error'] = 'A beírt jelszavak nem egyeznek!';
-$PALANG['pEdit_mailbox_name'] = 'Név';
 $PALANG['pEdit_mailbox_quota'] = 'Quota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'A megadott quota érték túl magas!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Ehhez a domainhez nincs jogosultságod: ';
-$PALANG['pEdit_mailbox_button'] = 'Postafiók szerkesztése'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Nemsikerült megváltoztatni a jelszót!';

 $PALANG['pPassword_welcome'] = 'Bejelentkezési jelszó megváltoztatása';
@ -162,7 +157,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Az utolsó 10 esemény megtekintése: ';
 $PALANG['pViewlog_timestamp'] = 'Idõbélyeg';
-$PALANG['pViewlog_username'] = 'Admin';
 $PALANG['pViewlog_action'] = 'Akció';
 $PALANG['pViewlog_data'] = 'Adat';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -186,11 +180,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Gyerünk';
 $PALANG['pViewlog_result_error'] = 'Nemsikerült megtalálni a napló fájlokat!';

 $PALANG['pSendmail_welcome'] = 'Email küldése.';
-$PALANG['pSendmail_admin'] = 'Feladó';
+$PALANG['from'] = 'Feladó';
 $PALANG['pSendmail_to'] = 'Címzett';
 $PALANG['pSendmail_to_text_error'] = 'Ez egy üres, vagy nem megfelelõ email cím!';
 $PALANG['subject'] = 'Tárgy';
@ -208,7 +201,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domain Adminok';
 $PALANG['pAdminMenu_create_admin'] = 'Új Admin';
 $PALANG['pAdminMenu_create_domain'] = 'Új Domain';

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

 $PALANG['description'] = 'Leírás';
@ -217,10 +209,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # 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_alias_address'] = 'Honnan';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Hova';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Név';

 $PALANG['pAdminCreate_domain_welcome'] = 'Új domain felvétele';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'A domain már létezik!';
@ -244,7 +232,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'A domain módosítása sikertelen!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Új domain admin felvétele';
@ -256,11 +243,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Nemsikerült az Admint felvenni!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Az Admin sikeresen bekerült az adatbázisba!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Domain admin szerkesztése';
-$PALANG['pAdminEdit_admin_username'] = 'Admin';
+$PALANG['admin'] = 'Admin';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Nemsikerült módosítani az admint!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Az Admin módosítása megtörtént!';

@ -298,9 +284,7 @@ $PALANG['pSearch_welcome'] = 'Keresendõ kulcsszó: ';
 $PALANG['pReturn_to'] = 'Válasz ide';

 $PALANG['pBroadcast_title'] = 'Broadcast üzenet küldése';
-$PALANG['pBroadcast_from'] = 'Feladó';
 $PALANG['pBroadcast_name'] = 'Neved';
-$PALANG['pBroadcast_send'] = 'Üzenet küldése';
 $PALANG['pBroadcast_success'] = 'Broadcast üzeneted elküldve.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast üzenet'; # XXX partly translated
 $PALANG['pBroadcast_error_empty'] = 'A név, téma és üzenet mezők nem lehetnek üresek !';
--- a/languages/is.lang
+++ b/languages/is.lang
@ -58,15 +58,14 @@ $PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
 $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
-$PALANG['pOverview_button'] = 'Áfram';
+$PALANG['go'] = 'Áfram';
 $PALANG['pOverview_welcome'] = 'Yfirlit fyrir ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Póstur fyrir';
-$PALANG['pOverview_alias_goto'] = 'Áframsendist til';
 $PALANG['active'] = 'Virkt';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'Póstfang';
-$PALANG['pOverview_mailbox_name'] = 'Nafn notanda';
+$PALANG['name'] = 'Nafn notanda'; # XXX check text - should be 'Name'
 $PALANG['pOverview_mailbox_quota'] = 'Heimild kvóta (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -96,7 +95,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -106,13 +104,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Til að útbúa alias fyrir öll netf
 $PALANG['pEdit_alias_welcome'] = 'Breyta alias í léninu.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Ein færsla í einu.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'To'; # XXX check / compare with pCreate_alias_goto - should be "To"
+$PALANG['to'] = 'To'; # XXX check text - should be 'To'
 $PALANG['pEdit_alias_goto_text_error1'] = 'þú gafst ekki upp neitt í Til';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Pósthólfið sem þú reynir að nota er ekki til: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = 'Breyta Alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Get ekki breytt alias!';

 $PALANG['pCreate_mailbox_welcome'] = 'Create a new local mailbox for your domain.'; # XXX
@ -128,13 +125,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Breyta pósthólfi i léninu þínu.';
 $PALANG['pEdit_mailbox_username'] = 'Auðkenni'; # XXX check / compare with pCreate_mailbox_username - should be "Username"
 $PALANG['pEdit_mailbox_password_text_error'] = 'Lykilorðið sem þú skrifaðir inn passar ekki saman!';
-$PALANG['pEdit_mailbox_name'] = 'Nafn';
 $PALANG['pEdit_mailbox_quota'] = 'kvóti';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Kvótinn sem þú skilgreindir er of hár fyrir heimildina þína!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Þetta lén er ekki á þínum vegum: ';
-$PALANG['pEdit_mailbox_button'] = 'Breyta pósthólfi'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Get ekki breytt lykilorðinu!';

 $PALANG['pPassword_welcome'] = 'Breyta auðkenninu þínu til að tengjast.';
@ -158,7 +153,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Skoða síðustu 10 aðgerðir fyrir ';
 $PALANG['pViewlog_timestamp'] = 'Tími';
-$PALANG['pViewlog_username'] = 'kerfisstjóri';
 $PALANG['pViewlog_action'] = 'aðgerð';
 $PALANG['pViewlog_data'] = 'gögn';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -181,11 +175,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Áfram';
 $PALANG['pViewlog_result_error'] = 'Get ekki fundið log skráningu!';

 $PALANG['pSendmail_welcome'] = 'sendu tölvupóst.';
-$PALANG['pSendmail_admin'] = 'frá';
+$PALANG['from'] = 'frá';
 $PALANG['pSendmail_to'] = 'til';
 $PALANG['pSendmail_to_text_error'] = 'til er tómt eða ekki uppgefið gilt netfang!';
 $PALANG['subject'] = 'Efni bréfs'; # XXX check text - should be 'Subject'
@ -203,7 +196,6 @@ $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['pAdminList_admin_username'] = 'Notandi';
 $PALANG['pAdminList_admin_count'] = 'Lén';

 $PALANG['description'] = 'Lýsing';
@ -212,10 +204,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Síðast breytt';

-$PALANG['pAdminList_virtual_button'] = 'Áfram';
-$PALANG['pAdminList_virtual_alias_address'] = 'Frá';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Til';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Nafn';

 $PALANG['pAdminCreate_domain_welcome'] = 'Bæta við léni';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Lénið er til nú þegar!';
@ -238,7 +226,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # 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
 $PALANG['pAdminEdit_domain_result_error'] = 'Get ekki breytt léni!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Bæta nýju léni við';
@ -250,11 +237,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Get ekki bætt við kerfisstjóra!
 $PALANG['pAdminCreate_admin_result_success'] = 'Kerfisstjórinn hefur verið skráður!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Breyta kerfisstjóra léns';
-$PALANG['pAdminEdit_admin_username'] = 'Kerfisstjóri';
+$PALANG['admin'] = 'Kerfisstjóri'; # XXX check text - should be 'Admin'
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Get ekki breytt kerfisstjóra!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Kerfisstjórinn hefur verið breyttur!';

@ -288,9 +274,7 @@ $PALANG['pSearch'] = 'search'; # XXX
 $PALANG['pSearch_welcome'] = 'Searching for: '; # XXX
 $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
--- a/languages/it.lang
+++ b/languages/it.lang
@ -59,15 +59,14 @@ $PALANG['pOverview_left_arrow'] = 'Pagina precedente';
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Caselle di posta';
-$PALANG['pOverview_button'] = 'Vai';
+$PALANG['go'] = 'Vai';
 $PALANG['pOverview_welcome'] = 'Resoconto per ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Da';
-$PALANG['pOverview_alias_goto'] = 'a';
 $PALANG['active'] = 'Attivo';
 $PALANG['and_x_more'] = '[più %s altri...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
-$PALANG['pOverview_mailbox_name'] = 'Nome';
+$PALANG['name'] = 'Nome';
 $PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'AUTORISPONDITORE ATTIVO';
 $PALANG['pOverview_vacation_option'] = 'Attiva autorisponditore';
@ -97,7 +96,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -107,13 +105,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Per creare un account universale, usar
 $PALANG['pEdit_alias_welcome'] = 'Modifica un alias per il tuo dominio.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Un indirizzo per linea.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'A';
+$PALANG['to'] = 'A'; # XXX check text - should be 'To'
 $PALANG['pEdit_alias_goto_text_error1'] = 'Non hai inserito nulla nel campo To';
 $PALANG['pEdit_alias_goto_text_error2'] = 'L\'indirizzo email che hai inserito non è valido : ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Consegna anche a una casella su questo server.';
 $PALANG['pEdit_alias_forward_only'] = 'Inoltra solo a un altro server.';
-$PALANG['pEdit_alias_button'] = 'Modifica Alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Impossibile modificare alias!';

 $PALANG['pCreate_mailbox_welcome'] = 'Crea una nuova casella di posta locale per il tuo dominio.';
@ -129,13 +126,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'La casella è stata agg
 $PALANG['pEdit_mailbox_welcome'] = 'Modifica una casella di posta per il tuo dominio.';
 $PALANG['pEdit_mailbox_username'] = 'Nome utente';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Le password che hai fornito non sono uguali!';
-$PALANG['pEdit_mailbox_name'] = 'Nome';
 $PALANG['pEdit_mailbox_quota'] = 'Quota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'La quota che hai specificato è troppo alta!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Questo dominio non è tuo: ';
-$PALANG['pEdit_mailbox_button'] = 'Modifica casella di posta'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Impossibile cambiare la password!';

 $PALANG['pPassword_welcome'] = 'Cambia la tua password per entrare.';
@ -159,7 +154,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Elenca gli ultimi dieci eventi per ';
 $PALANG['pViewlog_timestamp'] = 'Orario';
-$PALANG['pViewlog_username'] = 'Amministratore';
 $PALANG['pViewlog_action'] = 'Azione';
 $PALANG['pViewlog_data'] = 'Dati';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -182,11 +176,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Vai';
 $PALANG['pViewlog_result_error'] = 'Impossibile trovare i file di log!';

 $PALANG['pSendmail_welcome'] = 'Spedisci una email.';
-$PALANG['pSendmail_admin'] = 'Da';
+$PALANG['from'] = 'Da';
 $PALANG['pSendmail_to'] = 'A';
 $PALANG['pSendmail_to_text_error'] = 'Il campo "A" è vuoto o non è un indirizzo valido!';
 $PALANG['subject'] = 'Oggetto'; # XXX check text - should be 'Subject'
@ -204,7 +197,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Amministratori del dominio';
 $PALANG['pAdminMenu_create_admin'] = 'Nuovo Amministratore';
 $PALANG['pAdminMenu_create_domain'] = 'Nuovo Dominio';

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

 $PALANG['description'] = 'Descrizione';
@ -213,10 +205,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'MX secondario';
 $PALANG['last_modified'] = 'Ultima modifica';

-$PALANG['pAdminList_virtual_button'] = 'Vai';
-$PALANG['pAdminList_virtual_alias_address'] = 'Da';
-$PALANG['pAdminList_virtual_alias_goto'] = 'A';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Nome';

 $PALANG['pAdminCreate_domain_welcome'] = 'Aggiungi nuovo dominio';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Il dominio esiste già!';
@ -239,7 +227,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Impossibile modificare il dominio!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Aggiungi un nuovo amministratore per il dominio';
@ -251,11 +238,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Impossibile aggiungere amministrat
 $PALANG['pAdminCreate_admin_result_success'] = 'L\'amministratore è stato aggiunto!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Modifica l\'amministratore del dominio';
-$PALANG['pAdminEdit_admin_username'] = 'Amministratore';
+$PALANG['admin'] = 'Amministratore'; # XXX check text - should be 'Admin'
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Impossibile modificare amministratore!';
 $PALANG['pAdminEdit_admin_result_success'] = 'L\'amministratore è stato modificato!';

@ -289,9 +275,7 @@ $PALANG['pSearch'] = 'cerca';
 $PALANG['pSearch_welcome'] = 'Stiamo cercando: ';
 $PALANG['pReturn_to'] = 'Ritorna a';
 $PALANG['pBroadcast_title'] = 'Invio di gruppo';
-$PALANG['pBroadcast_from'] = 'Da';
 $PALANG['pBroadcast_name'] = 'Il tuo nome';
-$PALANG['pBroadcast_send'] = 'Invia';
 $PALANG['pBroadcast_success'] = 'Il tuo messaggio è stato inoltrato a tutto il gruppo.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Invio di gruppo';
 $PALANG['pBroadcast_error_empty'] = 'Nome, oggetto e testo del messaggio non possono restare vuoti!';
--- a/languages/ja.lang
+++ b/languages/ja.lang
@ -60,15 +60,14 @@ $PALANG['pOverview_left_arrow'] = '前ページ';
 $PALANG['pOverview_alias_domain_title'] = ':: ドメインエイリアス';
 $PALANG['pOverview_alias_title'] = ':: 転送アドレス';
 $PALANG['pOverview_mailbox_title'] = ':: メールアドレス';
-$PALANG['pOverview_button'] = '表示';
+$PALANG['go'] = '表示';
 $PALANG['pOverview_welcome'] = '概要 ';
 $PALANG['pOverview_alias_domain_aliases'] = 'エイリアスドメイン';
 $PALANG['pOverview_alias_address'] = '転送元';
-$PALANG['pOverview_alias_goto'] = '転送先';
 $PALANG['active'] = 'アクティブ';
 $PALANG['and_x_more'] = '[その他 %s 個]';
 $PALANG['pOverview_mailbox_username'] = 'メールアドレス';
-$PALANG['pOverview_mailbox_name'] = '名前';
+$PALANG['name'] = '名前';
 $PALANG['pOverview_mailbox_quota'] = '容量制限 (MB)';
 $PALANG['pOverview_vacation_edit'] = '自動応答 利用中';
 $PALANG['pOverview_vacation_option'] = '自動応答';
@ -98,7 +97,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_goto_text'] = 'メールを転送するアドレス';
 $PALANG['pCreate_alias_goto_text_error'] = '転送先が無効です。';
 $PALANG['pCreate_alias_result_error'] = '転送先を追加できません！';
@ -108,13 +106,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'すべてのメールを受け取る
 $PALANG['pEdit_alias_welcome'] = '転送先アドレスの編集'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = '1行に1エントリです。'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = '転送元'; # XXX check text - should be 'Alias'
-$PALANG['pEdit_alias_goto'] = '転送先'; # XXX check / compare with pCreate_alias_goto - should be "To"
+$PALANG['to'] = '転送先'; # XXX check text - should be 'To'
 $PALANG['pEdit_alias_goto_text_error1'] = '転送先が入力されていません。';
 $PALANG['pEdit_alias_goto_text_error2'] = 'このメールアドレスは無効です: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'ローカルのメールボックスに残す';
 $PALANG['pEdit_alias_forward_only'] = '指定された転送アドレスのみ';
-$PALANG['pEdit_alias_button'] = '転送先修正'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = '修正できません！';

 $PALANG['pCreate_mailbox_welcome'] = '新しいメールアドレスの作成';
@ -130,13 +127,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'メールアドレス
 $PALANG['pEdit_mailbox_welcome'] = 'メールアドレスの編集';
 $PALANG['pEdit_mailbox_username'] = 'メールアドレス'; # XXX check / compare with pCreate_mailbox_username - should be "Username"
 $PALANG['pEdit_mailbox_password_text_error'] = 'パスワードが一致しません。';
-$PALANG['pEdit_mailbox_name'] = '名前';
 $PALANG['pEdit_mailbox_quota'] = '容量制限';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = '指定された容量制限が大きすぎます。';
 $PALANG['pEdit_mailbox_domain_error'] = 'このドメインは管理外です: ';
-$PALANG['pEdit_mailbox_button'] = 'メールアドレス修正'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = '修正できません！';

 $PALANG['pPassword_welcome'] = 'パスワードの変更';
@ -162,7 +157,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = '過去10個のアクション ';
 $PALANG['pViewlog_timestamp'] = 'タイムスタンプ';
-$PALANG['pViewlog_username'] = '管理者';
 $PALANG['pViewlog_action'] = 'アクション';
 $PALANG['pViewlog_data'] = 'データ';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -186,11 +180,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX
 
-$PALANG['pViewlog_button'] = '表示';
 $PALANG['pViewlog_result_error'] = 'ログが見つかりません！';

 $PALANG['pSendmail_welcome'] = 'メール送信';
-$PALANG['pSendmail_admin'] = '差出人';
+$PALANG['from'] = '差出人';
 $PALANG['pSendmail_to'] = '宛先';
 $PALANG['pSendmail_to_text_error'] = '宛先が空欄か無効です。';
 $PALANG['subject'] = '件名';
@ -208,7 +201,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'ドメイン管理者';
 $PALANG['pAdminMenu_create_admin'] = '新しい管理者';
 $PALANG['pAdminMenu_create_domain'] = '新しいドメイン';

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

 $PALANG['description'] = '説明';
@ -217,10 +209,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'バックアップ MX';
 $PALANG['last_modified'] = '最終更新日';

-$PALANG['pAdminList_virtual_button'] = '表示';
-$PALANG['pAdminList_virtual_alias_address'] = '転送元';
-$PALANG['pAdminList_virtual_alias_goto'] = '転送先';
-$PALANG['pAdminList_virtual_mailbox_name'] = '名前';

 $PALANG['pAdminCreate_domain_welcome'] = '新しいドメインの追加';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'ドメインが既に存在します。';
@ -244,7 +232,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $PALANG['transport'] = '配送方法';
 $PALANG['pAdminEdit_domain_transport_text'] = '配送方法の定義';
 $PALANG['pAdminEdit_domain_backupmx'] = 'バックアップ MXサーバ';
-$PALANG['pAdminEdit_domain_button'] = 'ドメイン修正'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'ドメインが修正できません！';

 $PALANG['pAdminCreate_admin_welcome'] = '新しいドメイン管理者の追加';
@ -256,11 +243,10 @@ $PALANG['pAdminCreate_admin_result_error'] = '管理者を追加できません
 $PALANG['pAdminCreate_admin_result_success'] = '管理者を追加しました。';

 $PALANG['pAdminEdit_admin_welcome'] = 'ドメイン管理者の編集';
-$PALANG['pAdminEdit_admin_username'] = '管理者'; # XXX check / compare with pAdminCreate_admin_username - should be "admin"
+$PALANG['admin'] = '管理者'; # XXX check / compare with pAdminCreate_admin_username - should be "admin"
 $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
 $PALANG['pAdminEdit_admin_result_error'] = '管理者を修正できません！';
 $PALANG['pAdminEdit_admin_result_success'] = '管理者を修正しました。';

@ -296,9 +282,7 @@ $PALANG['pSearch_welcome'] = '検索文字列: ';
 $PALANG['pReturn_to'] = '戻る: ';

 $PALANG['pBroadcast_title'] = 'ブロードキャストメッセージの送信';
-$PALANG['pBroadcast_from'] = '差出人';
 $PALANG['pBroadcast_name'] = '名前';
-$PALANG['pBroadcast_send'] = 'メッセージ送信';
 $PALANG['pBroadcast_success'] = 'ブロードキャストメッセージは送信されました。';
 $PALANG['pAdminMenu_broadcast_message'] = 'ブロードキャスト';
 $PALANG['pBroadcast_error_empty'] = '名前、件名、メッセージは入力が必要です。';
--- a/languages/lt.lang
+++ b/languages/lt.lang
@ -58,15 +58,14 @@ $PALANG['pOverview_left_arrow'] = 'Ankstesnis puslapis';
 $PALANG['pOverview_alias_domain_title'] = ':: Srities sinonimai';
 $PALANG['pOverview_alias_title'] = ':: Sinonimai';
 $PALANG['pOverview_mailbox_title'] = ':: Pašto dėžutės';
-$PALANG['pOverview_button'] = 'Eiti';
+$PALANG['go'] = 'Eiti';
 $PALANG['pOverview_welcome'] = 'Peržiūra ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Srities sinonimai';
 $PALANG['pOverview_alias_address'] = 'Iš';
-$PALANG['pOverview_alias_goto'] = 'Į';
 $PALANG['active'] = 'Įjungtas'; # XXX check text - should be 'Active'
 $PALANG['and_x_more'] = '[ir %s daugiau...]';
 $PALANG['pOverview_mailbox_username'] = 'El.paštas';
-$PALANG['pOverview_mailbox_name'] = 'Vardas';
+$PALANG['name'] = 'Vardas';
 $PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'ATOSTOGOS ĮJUNGTOS';
 $PALANG['pOverview_vacation_option'] = 'Atostogų nustatymai';
@ -96,7 +95,6 @@ $PALANG['pCreate_alias_domain_success'] = 'Srities sinonimas užregistruotas!';
 $PALANG['pCreate_alias_address_text_error1'] = 'Netinkamas sinonimas!';
 $PALANG['email_address_already_exists'] = 'Šis el.pašto adresas jau yra, pasirinkite kitą pavadinimą!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Išnaudota visa pašto sinonimų kvota!';
-$PALANG['pCreate_alias_goto'] = 'Kam';
 $PALANG['pCreate_alias_goto_text'] = 'Adresas, kuriuo persiųsti paštą.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Kam: įvestas neteisingai!';
 $PALANG['pCreate_alias_result_error'] = 'Sinonimo registruoti nepavyko!';
@ -107,13 +105,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Jei norite sukurti sinonimą, kuris ga
 $PALANG['pEdit_alias_welcome'] = 'Keisti persiuntimo nustatymus';
 $PALANG['pEdit_alias_help'] = 'Gali būti keli įrašai, vienas įrašas eilutėje.';
 $PALANG['alias'] = 'Sinonimas';
-$PALANG['pEdit_alias_goto'] = 'Kam';
+$PALANG['to'] = 'Kam'; # XXX check text - should be 'To'
 $PALANG['pEdit_alias_goto_text_error1'] = 'Neužpildėte lauko "Kam"';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Įvestas neteisingas pašto adresas: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Nepavyko pakeisti srities sinonimo!';
 $PALANG['pEdit_alias_forward_and_store'] = 'Pristatyti į vietinę pašto dėžutę.';
 $PALANG['pEdit_alias_forward_only'] = 'Persiųsti nurodytiems el. pašto adresams.';
-$PALANG['pEdit_alias_button'] = 'Keisti sinonimą'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Sinonimo pakeisti nepavyko!';

 $PALANG['pCreate_mailbox_welcome'] = 'Nauja pašto dėžutė.';
@ -129,13 +126,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Pašto dėžutė užreg
 $PALANG['pEdit_mailbox_welcome'] = 'Keisti pašto dėžutę.';
 $PALANG['pEdit_mailbox_username'] = 'Vartotojas';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Įvesti slaptažodžiai nesutampa!';
-$PALANG['pEdit_mailbox_name'] = 'Vardas';
 $PALANG['pEdit_mailbox_quota'] = 'Kvota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)';
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Įvesta per didelė kvota!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Ne jūsų sritis: ';
-$PALANG['pEdit_mailbox_button'] = 'Keisti pašto dėžutę'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Pašto dėžutės pakeisti nepavyko!';

 $PALANG['pPassword_welcome'] = 'Pakeiskite prisijungimo slaptažodį.';
@ -159,7 +154,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Laikas sekundėmis';

 $PALANG['pViewlog_welcome'] = 'Peržiūrėti paskutinius 10 vartotojo veiksmų ';
 $PALANG['pViewlog_timestamp'] = 'Laikas';
-$PALANG['pViewlog_username'] = 'Vartotojas';
 $PALANG['pViewlog_action'] = 'Veiksmas';
 $PALANG['pViewlog_data'] = 'Duomenys';
 $PALANG['pViewlog_action_create_domain'] = 'sukurta sritis';
@ -182,11 +176,10 @@ $PALANG['pViewlog_action_create_admin'] = 'sukurtas adminas';
 $PALANG['pViewlog_action_edit_admin'] = 'pakeistas adminas';
 $PALANG['pViewlog_action_edit_vacation'] = 'pakeistas atostogų nust.';

-$PALANG['pViewlog_button'] = 'Eiti';
 $PALANG['pViewlog_result_error'] = 'Įvykių žurnalas nerastas!';

 $PALANG['pSendmail_welcome'] = 'Siųsti laišką';
-$PALANG['pSendmail_admin'] = 'Nuo';
+$PALANG['from'] = 'Nuo';
 $PALANG['pSendmail_to'] = 'Kam';
 $PALANG['pSendmail_to_text_error'] = 'Adresatas neįvestas arba neteisingas pašto adresas!';
 $PALANG['subject'] = 'Tema';
@ -204,7 +197,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Sričių administratoriai';
 $PALANG['pAdminMenu_create_admin'] = 'Naujas administratorius';
 $PALANG['pAdminMenu_create_domain'] = 'Nauja sritis';

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

 $PALANG['description'] = 'Aprašymas';
@ -213,10 +205,6 @@ $PALANG['pAdminList_domain_quota'] = 'Srities kvota (MB)';
 $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_alias_address'] = 'Iš';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Į';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Vardas';

 $PALANG['pAdminCreate_domain_welcome'] = 'Nauja sritis';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Tokia sritis jau yra!';
@ -239,7 +227,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Srities kvota';
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Srities pakeisti nepavyko!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Registruoti naują srities administratorių';
@ -251,11 +238,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Administratoriaus užregistruoti n
 $PALANG['pAdminCreate_admin_result_success'] = 'Administratorius užregistruotas!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Registruoti srities administratorių';
-$PALANG['pAdminEdit_admin_username'] = 'Administratorius';
+$PALANG['admin'] = 'Administratorius'; # XXX check text - should be 'Admin'
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Administratoriaus pakeisti nepavyko!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Administratorius pakeistas!';

@ -294,9 +280,7 @@ $PALANG['pSearch_welcome'] = 'Ieškoti: ';
 $PALANG['pReturn_to'] = 'Grįžti į';

 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
--- a/languages/mk.lang
+++ b/languages/mk.lang
@ -58,15 +58,14 @@ $PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
 $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
-$PALANG['pOverview_button'] = 'Оди';
+$PALANG['go'] = 'Оди';
 $PALANG['pOverview_welcome'] = 'Преглед за ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Од';
-$PALANG['pOverview_alias_goto'] = 'До';
 $PALANG['active'] = 'Активен';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'Адреса';
-$PALANG['pOverview_mailbox_name'] = 'Име';
+$PALANG['name'] = 'Име';
 $PALANG['pOverview_mailbox_quota'] = 'Квота (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -96,7 +95,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_goto_text'] = 'Каде треба да се испрати поштата.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Полето ДО не е валидно!';
 $PALANG['pCreate_alias_result_error'] = 'Не можам да го додадам алијасот на табелата со алијаси!';
@ -106,13 +104,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'За да креираш catch-all к
 $PALANG['pEdit_alias_welcome'] = 'Едитирање на алијас за вашиот домен.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Еден запис по линија.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Алијас';
-$PALANG['pEdit_alias_goto'] = 'До';
+$PALANG['to'] = 'До';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Немате ништо внесено во полето ДО';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Адресата која ја имате внесено не е валидна: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = 'Едитирање на алијас'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Не можам да го променам алијасот!';

 $PALANG['pCreate_mailbox_welcome'] = 'Креирање на ново поштенско сандаче.';
@ -128,13 +125,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Измена на поштенско сандаче на доменот.';
 $PALANG['pEdit_mailbox_username'] = 'Корисничко име';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Внесените лозинки не одговараат!';
-$PALANG['pEdit_mailbox_name'] = 'Име';
 $PALANG['pEdit_mailbox_quota'] = 'Квота'; # XXX check / compare with pCreate_mailbox_quota - should be "Quota"
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Внесената квота е превисока!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Овој домен не е ваш: ';
-$PALANG['pEdit_mailbox_button'] = 'Измена на сандаче'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Не можам да го променан сандачето!';

 $PALANG['pPassword_welcome'] = 'Промена на лозинка за најавување.';
@ -158,7 +153,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Преглед на последните 10 операции за: ';
 $PALANG['pViewlog_timestamp'] = 'Маркер (Timestamp)';
-$PALANG['pViewlog_username'] = 'Админ';
 $PALANG['pViewlog_action'] = 'Операција';
 $PALANG['pViewlog_data'] = 'Датум';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -181,11 +175,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Оди';
 $PALANG['pViewlog_result_error'] = 'Не можам да ги пронајдам записите!';

 $PALANG['pSendmail_welcome'] = 'Прати порака.';
-$PALANG['pSendmail_admin'] = 'Од';
+$PALANG['from'] = 'Од';
 $PALANG['pSendmail_to'] = 'До';
 $PALANG['pSendmail_to_text_error'] = 'ДО полето е празно или адресата не е валидна!';
 $PALANG['subject'] = 'Тема';
@ -203,7 +196,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Администратори на
 $PALANG['pAdminMenu_create_admin'] = 'Нов администратор';
 $PALANG['pAdminMenu_create_domain'] = 'Нов домен';

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

 $PALANG['description'] = 'Опис';
@ -212,10 +204,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Последна промена';

-$PALANG['pAdminList_virtual_button'] = 'Оди';
-$PALANG['pAdminList_virtual_alias_address'] = 'Од';
-$PALANG['pAdminList_virtual_alias_goto'] = 'До';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Име';

 $PALANG['pAdminCreate_domain_welcome'] = 'Додади нов домен';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Доменот веќе постои!';
@ -239,7 +227,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # 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
 $PALANG['pAdminEdit_domain_result_error'] = 'Не можам да го модифицирам доменот!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Додади нов администратор на домен';
@ -251,11 +238,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Не можам да додада
 $PALANG['pAdminCreate_admin_result_success'] = 'Администраторот е додаден!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Измена на администратор на домен';
-$PALANG['pAdminEdit_admin_username'] = 'Администратор';
+$PALANG['admin'] = 'Администратор'; # XXX check text - should be 'Admin'
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Не можам да го модифицирам администраторот!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Администраторот е модифициран!';

@ -289,9 +275,7 @@ $PALANG['pSearch'] = 'search'; # XXX
 $PALANG['pSearch_welcome'] = 'Searching for: '; # XXX
 $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
--- a/languages/nb.lang
+++ b/languages/nb.lang
@ -60,15 +60,14 @@ $PALANG['pOverview_left_arrow'] = 'Forrige side';
 $PALANG['pOverview_alias_domain_title'] = ':: Domenealias';
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Epostkontoer';
-$PALANG['pOverview_button'] = 'Vis';
+$PALANG['go'] = 'Vis';
 $PALANG['pOverview_welcome'] = 'Oversikt for ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Aliasdomener';
 $PALANG['pOverview_alias_address'] = 'Fra';
-$PALANG['pOverview_alias_goto'] = 'Til';
 $PALANG['active'] = 'Aktiv';
 $PALANG['and_x_more'] = '[og %s flere...]';
 $PALANG['pOverview_mailbox_username'] = 'E-post';
-$PALANG['pOverview_mailbox_name'] = 'Navn';
+$PALANG['name'] = 'Navn';
 $PALANG['pOverview_mailbox_quota'] = 'Kvote (MB)';
 $PALANG['pOverview_vacation_edit'] = 'FRAVÆRSMELDING ER PÅ';
 $PALANG['pOverview_vacation_option'] = 'Sett fraværsmelding';
@ -98,7 +97,6 @@ $PALANG['pCreate_alias_domain_success'] = 'Domenealiaset har blitt lagt inn i ta
 $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_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!';
@ -107,13 +105,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'For å opprette et "catch-all"-alias,
 $PALANG['pEdit_alias_welcome'] = 'Endre et alias.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Én e-postadresse per linje.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Til';
+$PALANG['to'] = 'Til';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Du skrev ingenting i Til-feltet';
 $PALANG['pEdit_alias_goto_text_error2'] = 'E-postadressen er ikke gyldig: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Kan ikke endre aliasdomenet!';
 $PALANG['pEdit_alias_forward_and_store'] = 'Lever til den lokale e-postkontoen i tillegg.';
 $PALANG['pEdit_alias_forward_only'] = 'Bare videresend til de angitte e-postadressene.';
-$PALANG['pEdit_alias_button'] = 'Endre alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Kan ikke endre aliaset!';

 $PALANG['pCreate_mailbox_welcome'] = 'Opprett en ny e-postkonto.';
@ -129,13 +126,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'E-postkontoen er blitt
 $PALANG['pEdit_mailbox_welcome'] = 'Endre en e-postkonto.';
 $PALANG['pEdit_mailbox_username'] = 'Brukernavn';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Passordene du oppga stemmer ikke overens!';
-$PALANG['pEdit_mailbox_name'] = 'Navn';
 $PALANG['pEdit_mailbox_quota'] = 'Kvote';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Kvoten du har angitt er for høy!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Dette domenet tilhører deg ikke: ';
-$PALANG['pEdit_mailbox_button'] = 'Endre e-postkonto'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Kunne ikke endre e-postkontoen!';

 $PALANG['pPassword_welcome'] = 'Endring av passord.';
@ -159,7 +154,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Vis de 10 siste handlingene for ';
 $PALANG['pViewlog_timestamp'] = 'Klokkeslett';
-$PALANG['pViewlog_username'] = 'Administrator';
 $PALANG['pViewlog_action'] = 'Handling';
 $PALANG['pViewlog_data'] = 'Data';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -182,11 +176,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Vis';
 $PALANG['pViewlog_result_error'] = 'Finner ikke den aktuelle loggen!';

 $PALANG['pSendmail_welcome'] = 'Send en e-postmelding.';
-$PALANG['pSendmail_admin'] = 'Fra';
+$PALANG['from'] = 'Fra';
 $PALANG['pSendmail_to'] = 'Til';
 $PALANG['pSendmail_to_text_error'] = 'Til-feltet er ikke fylt ut eller inneholder en ugyldig e-postadresse!';
 $PALANG['subject'] = 'Emne';
@ -204,7 +197,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domeneadministratorer';
 $PALANG['pAdminMenu_create_admin'] = 'Ny administrator';
 $PALANG['pAdminMenu_create_domain'] = 'Nytt domene';

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

 $PALANG['description'] = 'Beskrivelse';
@ -213,10 +205,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup-MX';
 $PALANG['last_modified'] = 'Sist endret';

-$PALANG['pAdminList_virtual_button'] = 'Vis';
-$PALANG['pAdminList_virtual_alias_address'] = 'Fra';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Til';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';

 $PALANG['pAdminCreate_domain_welcome'] = 'Legg til et nytt domene';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domenet finnes allerede!';
@ -239,7 +227,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Kunne ikke endre domenet!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Legg til en ny domeneadministrator';
@ -251,11 +238,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Kunne ikke legge til administrator
 $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Endre domeneadministrator';
-$PALANG['pAdminEdit_admin_username'] = 'Administrator';
+$PALANG['admin'] = 'Administrator';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Klarte ikke å endre administratoren!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Administratoren er blitt endret!';

@ -288,9 +274,7 @@ $PALANG['pSearch'] = 'søk';
 $PALANG['pSearch_welcome'] = 'Søker etter: ';
 $PALANG['pReturn_to'] = 'Returner til';
 $PALANG['pBroadcast_title'] = 'Send masseutsendelse';
-$PALANG['pBroadcast_from'] = 'Fra';
 $PALANG['pBroadcast_name'] = 'Ditt navn';
-$PALANG['pBroadcast_send'] = 'Send melding';
 $PALANG['pBroadcast_success'] = 'Masseutsendelsesmeldingen ble sendt.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Send masseutsendelse';
 $PALANG['pBroadcast_error_empty'] = 'Feltene Ditt navn, Emne og Melding kan ikke være tomme!';
--- a/languages/nl.lang
+++ b/languages/nl.lang
@ -59,15 +59,14 @@ $PALANG['pOverview_left_arrow'] = 'Vorige Pagina';
 $PALANG['pOverview_alias_domain_title'] = ':: Domein aliasen';
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Mailboxen';
-$PALANG['pOverview_button'] = 'Ga';
+$PALANG['go'] = 'Ga';
 $PALANG['pOverview_welcome'] = 'Overzicht voor ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias domeinen';
 $PALANG['pOverview_alias_address'] = 'Van';
-$PALANG['pOverview_alias_goto'] = 'Naar';
 $PALANG['active'] = 'Actief';
 $PALANG['and_x_more'] = '[en %s meer...]';
 $PALANG['pOverview_mailbox_username'] = 'e-mail';
-$PALANG['pOverview_mailbox_name'] = 'Naam';
+$PALANG['name'] = 'Naam';
 $PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'AUTOMATISCH BEANTWOORDEN IS ACTIEF';
 $PALANG['pOverview_vacation_option'] = 'Activeer automatisch beantwoorden';
@ -97,7 +96,6 @@ $PALANG['pCreate_alias_domain_success'] = 'De domein alias is toegevoegd aan de
 $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_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.';
@ -107,13 +105,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Om een catch-all te gebruiken, dient u
 $PALANG['pEdit_alias_welcome'] = 'Bewerk een alias voor uw domein.';
 $PALANG['pEdit_alias_help'] = 'Meerdere e-mailadressen toegestaan. Slechts één alias per regel.';
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Naar';
+$PALANG['to'] = 'Naar';
 $PALANG['pEdit_alias_goto_text_error1'] = 'U heeft geen Naar opgegeven.';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Het e-mail adres wat u opgaf is niet geldig: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Niet in staat de domein alias te bewerken!';
 $PALANG['pEdit_alias_forward_and_store'] = 'Lever af op de lokale mailbox.';
 $PALANG['pEdit_alias_forward_only'] = 'Alleen op opgegeven email adres afleveren.';
-$PALANG['pEdit_alias_button'] = 'Bewerk Alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Mislukt om de alias te bewerken!';

 $PALANG['pCreate_mailbox_welcome'] = 'Maak een nieuw lokale mailbox voor uw domein.';
@ -129,13 +126,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'De mailbox is aan de ma
 $PALANG['pEdit_mailbox_welcome'] = 'Bewerk een mailbox voor uw domein.';
 $PALANG['pEdit_mailbox_username'] = 'Gebruikersnaam';
 $PALANG['pEdit_mailbox_password_text_error'] = 'De wachtwoorden die u opgaf komen niet overeen.';
-$PALANG['pEdit_mailbox_name'] = 'Naam';
 $PALANG['pEdit_mailbox_quota'] = 'Quota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'De quota die opgaf is te hoog.';
 $PALANG['pEdit_mailbox_domain_error'] = 'Dit domein is niet van nu: ';
-$PALANG['pEdit_mailbox_button'] = 'Bewerk Mailbox'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Mislukt om het wachtwoord te wijzigen.';

 $PALANG['pPassword_welcome'] = 'Bewerk u login wachtwoord.';
@ -160,7 +155,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Tijd in seconds';

 $PALANG['pViewlog_welcome'] = 'Laat de laatste 10 actie\'s zien van ';
 $PALANG['pViewlog_timestamp'] = 'Tijd';
-$PALANG['pViewlog_username'] = 'Beheerder';
 $PALANG['pViewlog_action'] = 'Actie';
 $PALANG['pViewlog_data'] = 'Aanpassing';
 $PALANG['pViewlog_action_create_domain'] = 'domein toegevoegd';
@ -183,11 +177,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Ga';
 $PALANG['pViewlog_result_error'] = 'Mislukt om de logs te vinden!';

 $PALANG['pSendmail_welcome'] = 'Verstuur een e-mail.';
-$PALANG['pSendmail_admin'] = 'Van';
+$PALANG['from'] = 'Van';
 $PALANG['pSendmail_to'] = 'Naar';
 $PALANG['pSendmail_to_text_error'] = 'Naar is leeg of een ongeldig adres.';
 $PALANG['subject'] = 'Onderwerp';
@ -205,7 +198,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domein Beheerders';
 $PALANG['pAdminMenu_create_admin'] = 'Nieuwe beheerder';
 $PALANG['pAdminMenu_create_domain'] = 'Voeg Domein toe';

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

 $PALANG['description'] = 'Omschrijving';
@ -214,10 +206,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domein quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Back-up MX';
 $PALANG['last_modified'] = 'Laatst bewerkt';

-$PALANG['pAdminList_virtual_button'] = 'Ga';
-$PALANG['pAdminList_virtual_alias_address'] = 'Van';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Naar';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Naam';
 $PALANG['pAdminList_domain_userscontrol'] = 'Gebruikers<br />Beheer';

 $PALANG['pAdminCreate_domain_welcome'] = 'Voeg een nieuw domein toe';
@ -241,7 +229,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domein Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Mislukt het domein te bewerken.';
 $PALANG['pAdminEdit_domain_userscontrol'] = 'Sta contorle door gebruikers toe';

@ -254,11 +241,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Mislukt om beheerder toe te voegen
 $PALANG['pAdminCreate_admin_result_success'] = 'Beheerder is toegevoegd.';

 $PALANG['pAdminEdit_admin_welcome'] = 'Bewerk een domein beheerder';
-$PALANG['pAdminEdit_admin_username'] = 'Beheerder';
+$PALANG['admin'] = 'Beheerder';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Mislukt om beheerder te bewerken';
 $PALANG['pAdminEdit_admin_result_success'] = 'Beheerder is bewerkt!';

@ -292,9 +278,7 @@ $PALANG['pSearch'] = 'zoek';
 $PALANG['pSearch_welcome'] = 'zoeken naar: ';
 $PALANG['pReturn_to'] = 'Ga terug naar';
 $PALANG['pBroadcast_title'] = 'Verzend broadcast bericht';
-$PALANG['pBroadcast_from'] = 'Van';
 $PALANG['pBroadcast_name'] = 'Uw naam';
-$PALANG['pBroadcast_send'] = 'Verzend bericht';
 $PALANG['pBroadcast_success'] = 'Uw algemene bericht is verzonden.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Algemeen bericht';
 $PALANG['pBroadcast_error_empty'] = 'De velden Naam, Onderwerp en Bericht mogen niet leeg zijn !';
--- a/languages/nn.lang
+++ b/languages/nn.lang
@ -58,15 +58,14 @@ $PALANG['pOverview_left_arrow'] = 'Forrige side';
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Epostkontoer';
-$PALANG['pOverview_button'] = 'Vis';
+$PALANG['go'] = 'Vis';
 $PALANG['pOverview_welcome'] = 'Oversikt for ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Fra';
-$PALANG['pOverview_alias_goto'] = 'Mottaker';
 $PALANG['active'] = 'Aktiv'; # XXX check text - should be 'Active'
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-post';
-$PALANG['pOverview_mailbox_name'] = 'Nann';
+$PALANG['name'] = 'Nann'; # XXX check text - should be 'Name'
 $PALANG['pOverview_mailbox_quota'] = 'Kvote (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -96,7 +95,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -105,13 +103,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'For å opprette et alias som "mottar a
 $PALANG['pEdit_alias_welcome'] = 'Endre et alias.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'En mottaker per linje.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Mottaker';
+$PALANG['to'] = 'Mottaker'; # XXX check text - should be 'To'
 $PALANG['pEdit_alias_goto_text_error1'] = 'Du skrev ikke noe i mottakerfeltet';
 $PALANG['pEdit_alias_goto_text_error2'] = 'E-post adressen er ugyldig: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = 'Endre Alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Kan ikke endre Aliaset!';

 $PALANG['pCreate_mailbox_welcome'] = 'Opprett en ny epostkonto.';
@ -127,13 +124,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Endre en e-postkonto.';
 $PALANG['pEdit_mailbox_username'] = 'Brukernavn';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Passordene er ikke like!';
-$PALANG['pEdit_mailbox_name'] = 'Navn'; # XXX check / compare with pCreate_mailbox_name - should be ""
 $PALANG['pEdit_mailbox_quota'] = 'Kvote';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Kvoten er for høy!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Dette domenet er ikke ditt: ';
-$PALANG['pEdit_mailbox_button'] = 'Endre E-postkonto'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Klarte ikke å skifte passord';

 $PALANG['pPassword_welcome'] = 'Endre Passord.';
@ -157,7 +152,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Vis de 10 siste handlingene ';
 $PALANG['pViewlog_timestamp'] = 'Klokkeslett';
-$PALANG['pViewlog_username'] = 'Administrator';
 $PALANG['pViewlog_action'] = 'Handling';
 $PALANG['pViewlog_data'] = 'Data';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -180,11 +174,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Vis';
 $PALANG['pViewlog_result_error'] = 'Fant ikke loggen!';

 $PALANG['pSendmail_welcome'] = 'Send E-post.';
-$PALANG['pSendmail_admin'] = 'Fra';
+$PALANG['from'] = 'Fra';
 $PALANG['pSendmail_to'] = 'Mottaker';
 $PALANG['pSendmail_to_text_error'] = '"Mottaker"-feltet er tomt eller er ugyldig!';
 $PALANG['subject'] = 'Emne';
@ -202,7 +195,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domene-administratorer';
 $PALANG['pAdminMenu_create_admin'] = 'Ny Administrator';
 $PALANG['pAdminMenu_create_domain'] = 'Nytt Domene';

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

 $PALANG['description'] = 'Beskrivelse';
@ -211,10 +203,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Sist endret';

-$PALANG['pAdminList_virtual_button'] = 'Vis';
-$PALANG['pAdminList_virtual_alias_address'] = 'Fra';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Til';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';

 $PALANG['pAdminCreate_domain_welcome'] = 'Legg til et nytt domene';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domenet eksisterer!';
@ -238,7 +226,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Klarte ikke å oppdatere domenet!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Legg til ny domene-administrator';
@ -249,11 +236,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Klarte ikke å legge til administr
 $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Endre domene-administrator';
-$PALANG['pAdminEdit_admin_username'] = 'Administrator';
+$PALANG['admin'] = 'Administrator';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Klarte ikke å endre administratoren!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Administratoren er endret/oppdatert!';

@ -286,9 +272,7 @@ $PALANG['pSearch'] = 'søker';
 $PALANG['pSearch_welcome'] = 'Søker etter: ';
 $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
--- a/languages/pl.lang
+++ b/languages/pl.lang
@ -61,15 +61,14 @@ $PALANG['pOverview_left_arrow'] = 'Poprzednia strona';
 $PALANG['pOverview_alias_domain_title'] = ':: Aliasy domen';
 $PALANG['pOverview_alias_title'] = ':: Aliasy';
 $PALANG['pOverview_mailbox_title'] = ':: Konta pocztowe';
-$PALANG['pOverview_button'] = 'Idź';
+$PALANG['go'] = 'Idź';
 $PALANG['pOverview_welcome'] = 'Dane zbiorcze dla domeny ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Domeny aliasowe';
 $PALANG['pOverview_alias_address'] = 'Od';
-$PALANG['pOverview_alias_goto'] = 'Do';
 $PALANG['active'] = 'Aktywny';
 $PALANG['and_x_more'] = '[i %s wiecej...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
-$PALANG['pOverview_mailbox_name'] = 'Nazwa';
+$PALANG['name'] = 'Nazwa';
 $PALANG['pOverview_mailbox_quota'] = 'Udział (MB)';
 $PALANG['pOverview_vacation_edit'] = 'Auto odpowiedź';
 $PALANG['pOverview_vacation_option'] = 'Ustaw automatyczną odpowiedź';
@ -99,7 +98,6 @@ $PALANG['pCreate_alias_domain_success'] = 'Alias domeny został dodany do tabeli
 $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_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!';
@ -108,13 +106,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Aby utworzyć domyślne konto dla dome
 $PALANG['pEdit_alias_welcome'] = 'Edytuj alias dla Twojej domeny.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Jeden wpis na linię.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Do';
+$PALANG['to'] = 'Do';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Nie podałeś adresu odbiorcy (pole "To")';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Wpisany adres email jest niepoprawny: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Nie można zmodyfikować aliasu domeny!';
 $PALANG['pEdit_alias_forward_and_store'] = 'Dostarczaj do mojej skrzynki.';
 $PALANG['pEdit_alias_forward_only'] = 'Prześlij jedynie na podane adresy.';
-$PALANG['pEdit_alias_button'] = 'Edytuj alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Nie można zmodyfikować aliasu!';

 $PALANG['pCreate_mailbox_welcome'] = 'Utwórz lokalne konto pocztowe dla Twojej domeny.';
@ -130,13 +127,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Konto zostało dodane d
 $PALANG['pEdit_mailbox_welcome'] = 'Edytuj konto w Twojej domenie.';
 $PALANG['pEdit_mailbox_username'] = 'Nazwa użytkownika';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Wpisane hasło nie pasuje!';
-$PALANG['pEdit_mailbox_name'] = 'Nazwa';
 $PALANG['pEdit_mailbox_quota'] = 'Udział';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Podany udział jest za wysoki!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Ta domena nie należy do Ciebie: ';
-$PALANG['pEdit_mailbox_button'] = 'Edytuj konto'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Nie można zmienić parametrów!';

 $PALANG['pPassword_welcome'] = 'Zmień Swoje hasło.';
@ -161,7 +156,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Pokaż 10 ostatnich działań dla ';
 $PALANG['pViewlog_timestamp'] = 'Data';
-$PALANG['pViewlog_username'] = 'Administrator';
 $PALANG['pViewlog_action'] = 'Działanie';
 $PALANG['pViewlog_data'] = 'Dane';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -184,11 +178,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Idź';
 $PALANG['pViewlog_result_error'] = 'Nie można odszukać logów!';

 $PALANG['pSendmail_welcome'] = 'Wyślij wiadomość.';
-$PALANG['pSendmail_admin'] = 'Od';
+$PALANG['from'] = 'Od';
 $PALANG['pSendmail_to'] = 'Do';
 $PALANG['pSendmail_to_text_error'] = 'Podany adres jest niepoprawny, bądź pole "Do" jest puste!';
 $PALANG['subject'] = 'Temat';
@ -206,7 +199,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Administratorzy domeny';
 $PALANG['pAdminMenu_create_admin'] = 'Nowy administrator';
 $PALANG['pAdminMenu_create_domain'] = 'Nowa domena';

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

 $PALANG['description'] = 'Opis';
@ -215,10 +207,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $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_alias_address'] = 'Od';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Do';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Nazwa';

 $PALANG['pAdminCreate_domain_welcome'] = 'Dodaj nową domenę';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Podana domena już istnieje!';
@ -241,7 +229,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Nie można zmodyfikować domeny!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj konto administratora';
@ -253,11 +240,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Nie można dodać administratora!'
 $PALANG['pAdminCreate_admin_result_success'] = 'Administrator został dodany!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Edytuj administratora domeny';
-$PALANG['pAdminEdit_admin_username'] = 'Administrator';
+$PALANG['admin'] = 'Administrator'; # XXX check text - should be 'Admin'
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Nie można zmodyfikować administratora!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Administrator został zmodyfikowany!';

@ -294,9 +280,7 @@ $PALANG['pSearch'] = 'szukaj';
 $PALANG['pSearch_welcome'] = 'Wyszukuję: ';
 $PALANG['pReturn_to'] = 'Powrót do';
 $PALANG['pBroadcast_title'] = 'Wyślij wiadomość do wszystkich';
-$PALANG['pBroadcast_from'] = 'Od';
 $PALANG['pBroadcast_name'] = 'Nazwa';
-$PALANG['pBroadcast_send'] = 'Wyślij wiadomość';
 $PALANG['pBroadcast_success'] = 'Wiadomość do wszystkich została wysłana.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Wiadomość do wszystkich';
 $PALANG['pBroadcast_error_empty'] = 'Pola Nazwa, Temat i Wiadomość nie powinny być puste !';
--- a/languages/pt-br.lang
+++ b/languages/pt-br.lang
@ -60,15 +60,14 @@ $PALANG['pOverview_left_arrow'] = 'Página Anterior';
 $PALANG['pOverview_alias_domain_title'] = ':: Aliases de Domínio';
 $PALANG['pOverview_alias_title'] = ':: Aliases';
 $PALANG['pOverview_mailbox_title'] = ':: Contas de email';
-$PALANG['pOverview_button'] = 'Acessar';
+$PALANG['go'] = 'Acessar';
 $PALANG['pOverview_welcome'] = 'Visão geral de ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Aliases de Domínio';
 $PALANG['pOverview_alias_address'] = 'De';
-$PALANG['pOverview_alias_goto'] = 'Para';
 $PALANG['active'] = 'Habilitado';
 $PALANG['and_x_more'] = '[e %s mais...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
-$PALANG['pOverview_mailbox_name'] = 'Nome';
+$PALANG['name'] = 'Nome';
 $PALANG['pOverview_mailbox_quota'] = 'Cota de Espaço (MB)';
 $PALANG['pOverview_vacation_edit'] = 'EM MODO DE FÉRIAS';
 $PALANG['pOverview_vacation_option'] = 'Modo de férias';
@ -100,7 +99,6 @@ $PALANG['pCreate_alias_domain_success'] = 'Alias de domínio criado!';
 $PALANG['pCreate_alias_address_text_error1'] = 'Alias inválido!';
 $PALANG['email_address_already_exists'] = 'Endereço de email fornecido já existe. Por favor, escolha outro endereço!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Você alcançou seu limite de aliases!';
-$PALANG['pCreate_alias_goto'] = 'Para';
 $PALANG['pCreate_alias_goto_text'] = 'Para onde as mensagens serão enviadas.';
 $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!';
@ -110,13 +108,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Para criar um alias global, use "*" no
 $PALANG['pEdit_alias_welcome'] = 'Edição de alias do domínio.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Uma entrada por linha.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Para';
+$PALANG['to'] = 'Para';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Você não preencheu o campo Para';
 $PALANG['pEdit_alias_goto_text_error2'] = 'O endereço de email fornecido é inválido: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Não foi possível editar o alias de domínio!';
 $PALANG['pEdit_alias_forward_and_store'] = 'Entregar mensagens na caixa de email local além de redirecioná-las.';
 $PALANG['pEdit_alias_forward_only'] = 'Apenas redirecionar as mensagens para os endereços acima.';
-$PALANG['pEdit_alias_button'] = 'Editar Alias'; # XXX text no longer used
 $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.';
@ -132,13 +129,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Conta de email criada,
 $PALANG['pEdit_mailbox_welcome'] = 'Edição de conta de email do domínio.';
 $PALANG['pEdit_mailbox_username'] = 'Usuário';
 $PALANG['pEdit_mailbox_password_text_error'] = 'As senhas fornecidas são diferentes!';
-$PALANG['pEdit_mailbox_name'] = 'Nome';
 $PALANG['pEdit_mailbox_quota'] = 'Cota de espaço';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'A cota de espaço especificada é muito alta!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Domínio não lhe pertence: ';
-$PALANG['pEdit_mailbox_button'] = 'Editar Conta de Email'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Não foi possível editar a conta de email!';

 $PALANG['pPassword_welcome'] = 'Alteração de senha.';
@ -164,7 +159,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Últimas 10 ações para ';
 $PALANG['pViewlog_timestamp'] = 'Data/Hora';
-$PALANG['pViewlog_username'] = 'Administrador';
 $PALANG['pViewlog_action'] = 'Ação';
 $PALANG['pViewlog_data'] = 'Descrição';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -188,11 +182,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Acessar';
 $PALANG['pViewlog_result_error'] = 'Não foi possível encontrar o histórico!';

 $PALANG['pSendmail_welcome'] = 'Envio de mensagem.';
-$PALANG['pSendmail_admin'] = 'De';
+$PALANG['from'] = 'De';
 $PALANG['pSendmail_to'] = 'Para';
 $PALANG['pSendmail_to_text_error'] = 'Campo Para está vazio ou não é um endereço de email válido!';
 $PALANG['subject'] = 'Assunto';
@ -210,7 +203,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Administradores de Domínio';
 $PALANG['pAdminMenu_create_admin'] = 'Criar Administrador';
 $PALANG['pAdminMenu_create_domain'] = 'Criar Domínio';

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

 $PALANG['description'] = 'Descrição';
@ -219,10 +211,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'MX de Backup';
 $PALANG['last_modified'] = 'Última Modificação';

-$PALANG['pAdminList_virtual_button'] = 'Acessar';
-$PALANG['pAdminList_virtual_alias_address'] = 'De';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Para';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Nome';

 $PALANG['pAdminCreate_domain_welcome'] = 'Criação de um novo domínio.';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'O domínio já existe!';
@ -246,7 +234,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Não foi possível editar o domínio!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Criação de um novo administrador de domínio.';
@ -258,11 +245,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Não foi possível criar o adminis
 $PALANG['pAdminCreate_admin_result_success'] = 'Administrador criado!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Edição de administrador de domínio.';
-$PALANG['pAdminEdit_admin_username'] = 'Administrador';
+$PALANG['admin'] = 'Administrador';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Não foi possível editar o administrador!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Administrador editado!';

@ -298,9 +284,7 @@ $PALANG['pSearch_welcome'] = 'Pesquisando por: ';
 $PALANG['pReturn_to'] = 'Retornar para';

 $PALANG['pBroadcast_title'] = 'Envio de mensagem em massa.';
-$PALANG['pBroadcast_from'] = 'De';
 $PALANG['pBroadcast_name'] = 'Seu nome';
-$PALANG['pBroadcast_send'] = 'Enviar Mensagem';
 $PALANG['pBroadcast_success'] = 'Mensagem em massa enviada.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Mensagem em massa';
 $PALANG['pBroadcast_error_empty'] = 'Os campos Nome, Assunto e Mensagem devem ser preenchidos!';
--- a/languages/ru.lang
+++ b/languages/ru.lang
@ -61,15 +61,14 @@ $PALANG['pOverview_left_arrow'] = 'Предыдущая страница';
 $PALANG['pOverview_alias_domain_title'] = ':: Домены-алиасы';
 $PALANG['pOverview_alias_title'] = ':: Алиасы';
 $PALANG['pOverview_mailbox_title'] = ':: Ящики';
-$PALANG['pOverview_button'] = 'Выбрать';
+$PALANG['go'] = 'Выбрать';
 $PALANG['pOverview_welcome'] = 'Обзор для ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Домены-алиасы';
 $PALANG['pOverview_alias_address'] = 'От';
-$PALANG['pOverview_alias_goto'] = 'Кому';
 $PALANG['active'] = 'Активен';
 $PALANG['and_x_more'] = '[и еще %s...]';
 $PALANG['pOverview_mailbox_username'] = 'Ящик';
-$PALANG['pOverview_mailbox_name'] = 'Имя';
+$PALANG['name'] = 'Имя';
 $PALANG['pOverview_mailbox_quota'] = 'Квота (МБ)';
 $PALANG['pOverview_vacation_edit'] = 'ВКЛЮЧЕН АВТООТВЕТЧИК';
 $PALANG['pOverview_vacation_option'] = 'Установить автоответчик';
@ -100,7 +99,6 @@ $PALANG['pCreate_alias_domain_success'] = 'Домен-алиас добавле
 $PALANG['pCreate_alias_address_text_error1'] = 'Неверное имя алиаса!';
 $PALANG['email_address_already_exists'] = 'Этот почтовый адрес уже существует, пожалуйста, выберите другой.'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Вы достигли лимита по созданным алиасам!';
-$PALANG['pCreate_alias_goto'] = 'Кому';
 $PALANG['pCreate_alias_goto_text'] = 'Куда должна доставляться почта.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Неверное поле Кому!';
 $PALANG['pCreate_alias_result_error'] = 'Невозможно добавить алиас в список!';
@ -110,13 +108,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Для создания catch-all по
 $PALANG['pEdit_alias_welcome'] = 'Редактирование настроек пересылки';
 $PALANG['pEdit_alias_help'] = 'Можно указать несколько целей, одна запись на строку.';
 $PALANG['alias'] = 'Алиас';
-$PALANG['pEdit_alias_goto'] = 'Кому';
+$PALANG['to'] = 'Кому';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Вы ничего не ввели в поле Кому';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Вы ввели неверный адрес: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Невозможно изменить домен-алиас!';
 $PALANG['pEdit_alias_forward_and_store'] = 'Доставлять в локальный почтовый ящик.';
 $PALANG['pEdit_alias_forward_only'] = 'Только пересылать на указанные адреса.';
-$PALANG['pEdit_alias_button'] = 'Редактировать алиас'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Невозможно изменить алиас!';

 $PALANG['pCreate_mailbox_welcome'] = 'Создание нового почтового ящика для вашего домена.';
@ -132,13 +129,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Почтовый ящи
 $PALANG['pEdit_mailbox_welcome'] = 'Редактирование ящика для вашего домена.';
 $PALANG['pEdit_mailbox_username'] = 'Название';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Введенные вами пароли не совпадают!';
-$PALANG['pEdit_mailbox_name'] = 'Имя';
 $PALANG['pEdit_mailbox_quota'] = 'Квота';
 $PALANG['pEdit_mailbox_quota_text'] = 'МБ';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Квота, выставленная вами, слишком велика!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Этот домен не принадлежит вам: ';
-$PALANG['pEdit_mailbox_button'] = 'Редактировать ящик'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Невозможно изменить пароль!';

 $PALANG['pPassword_welcome'] = 'Изменение вашего пароля.';
@ -164,7 +159,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Просмотреть 10 последних действий для  ';
 $PALANG['pViewlog_timestamp'] = 'Время создания/модификации';
-$PALANG['pViewlog_username'] = 'Админ';
 $PALANG['pViewlog_action'] = 'Действие';
 $PALANG['pViewlog_data'] = 'Данные';

@ -188,11 +182,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Выбрать';
 $PALANG['pViewlog_result_error'] = 'Невозможно найти журнал!';

 $PALANG['pSendmail_welcome'] = 'Послать письмо.';
-$PALANG['pSendmail_admin'] = 'От';
+$PALANG['from'] = 'От';
 $PALANG['pSendmail_to'] = 'Кому';
 $PALANG['pSendmail_to_text_error'] = 'Поле Кому пустое либо содержит некорректный адрес!';
 $PALANG['subject'] = 'Тема';
@ -210,7 +203,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Админы доменов';
 $PALANG['pAdminMenu_create_admin'] = 'Новый админ';
 $PALANG['pAdminMenu_create_domain'] = 'Новый домен';

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

 $PALANG['description'] = 'Описание';
@ -219,10 +211,6 @@ $PALANG['pAdminList_domain_quota'] = 'Квота домена (МБ)';
 $PALANG['pAdminList_domain_backupmx'] = 'Резервный MX';
 $PALANG['last_modified'] = 'Последнее изменение';

-$PALANG['pAdminList_virtual_button'] = 'Выбрать';
-$PALANG['pAdminList_virtual_alias_address'] = 'От';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Кому';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Имя';

 $PALANG['pAdminCreate_domain_welcome'] = 'Добавление нового домена';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Домен уже существует!';
@ -246,7 +234,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Квота домена';
 $PALANG['transport'] = 'Транспорт';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Укажите транспорт';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Почтовый сервер является резервным MX';
-$PALANG['pAdminEdit_domain_button'] = 'Редактировать домен'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'Невозможно изменить домен!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Добавление нового администратора домена';
@ -258,11 +245,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Невозможно добави
 $PALANG['pAdminCreate_admin_result_success'] = 'Администратор был добавлен!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Редактирование администратора домена';
-$PALANG['pAdminEdit_admin_username'] = 'Администратор';
+$PALANG['admin'] = 'Администратор'; # XXX check text - should be 'Admin'
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Невозможно изменить администратора!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Администратор был изменен!';

@ -298,9 +284,7 @@ $PALANG['pSearch_welcome'] = 'Искать: ';
 $PALANG['pReturn_to'] = 'Вернуться к';

 $PALANG['pBroadcast_title'] = 'Отправка широковещательного сообщения';
-$PALANG['pBroadcast_from'] = 'От';
 $PALANG['pBroadcast_name'] = 'Ваше имя';
-$PALANG['pBroadcast_send'] = 'Отправить сообщение';
 $PALANG['pBroadcast_success'] = 'Ваше широковещательное сообщение было отправлено.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Широковещательное сообщение';
 $PALANG['pBroadcast_error_empty'] = 'Поля Имя, Тема и Сообщение не должны быть пустыми!';
--- a/languages/sk.lang
+++ b/languages/sk.lang
@ -59,15 +59,14 @@ $PALANG['pOverview_left_arrow'] = 'Predchádzajúca strana';
 $PALANG['pOverview_alias_domain_title'] = ':: Aliasy domén';
 $PALANG['pOverview_alias_title'] = ':: Aliasy';
 $PALANG['pOverview_mailbox_title'] = ':: Mailové schránky';
-$PALANG['pOverview_button'] = 'Prejsť';
+$PALANG['go'] = 'Prejsť';
 $PALANG['pOverview_welcome'] = 'Prehľad pre doménu ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Aliasy domén';
 $PALANG['pOverview_alias_address'] = 'Od';
-$PALANG['pOverview_alias_goto'] = 'Doručenie';
 $PALANG['active'] = 'Aktívny'; # XXX check text - should be 'Active'
 $PALANG['and_x_more'] = '[a %s ďalších...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
-$PALANG['pOverview_mailbox_name'] = 'Meno';
+$PALANG['name'] = 'Meno';
 $PALANG['pOverview_mailbox_quota'] = 'Kvóta (MB)';
 $PALANG['pOverview_vacation_edit'] = 'AUT. ODPOVEĎ';
 $PALANG['pOverview_vacation_option'] = 'aut. odpoveď';
@ -97,7 +96,6 @@ $PALANG['pCreate_alias_domain_success'] = 'Alias domény bol pridaný do tabuľk
 $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_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!';
@ -107,13 +105,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Pre vytvorenie doménového koša pou
 $PALANG['pEdit_alias_welcome'] = 'Upraviť aliasy'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Jeden záznam na riadku'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias'; # XXX
-$PALANG['pEdit_alias_goto'] = 'Cieľ';
+$PALANG['to'] = 'Cieľ'; # XXX check text - should be 'To'
 $PALANG['pEdit_alias_goto_text_error1'] = 'Nezadali ste cieľ';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Zadaná emailová adresa nie je platná: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Nepodarilo sa zmeniť alias domény!';
 $PALANG['pEdit_alias_forward_and_store'] = 'Doručiť aj do lokálnej schránky';
 $PALANG['pEdit_alias_forward_only'] = 'Len presmerovať na zadané emailové adresy';
-$PALANG['pEdit_alias_button'] = 'Upraviť'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Nepodarilo se upraviť alias!';

 $PALANG['pCreate_mailbox_welcome'] = 'Vytvoriť novú schránku v doméne';
@ -129,13 +126,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka bola pridaná
 $PALANG['pEdit_mailbox_welcome'] = 'Upraviť schránku v doméne';
 $PALANG['pEdit_mailbox_username'] = 'Užívateľské meno';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Zadaná heslá se nezhodujú!';
-$PALANG['pEdit_mailbox_name'] = 'Meno';
 $PALANG['pEdit_mailbox_quota'] = 'Kvóta';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Zadané miesto je príliš veľké!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Táto doména nie je vaša: ';
-$PALANG['pEdit_mailbox_button'] = 'Upraviť schránku'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Nepodarilo sa upraviť schránku!';

 $PALANG['pPassword_welcome'] = 'Zmeniť heslo';
@ -159,7 +154,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Prehľad 10 posledných akcií pre ';
 $PALANG['pViewlog_timestamp'] = 'Časová značka';
-$PALANG['pViewlog_username'] = 'Užívateľ';
 $PALANG['pViewlog_action'] = 'Akcia';
 $PALANG['pViewlog_data'] = 'Podrobnosti';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -182,11 +176,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Prejsť';
 $PALANG['pViewlog_result_error'] = 'Nepodarilo sa nájsť záznamy!';

 $PALANG['pSendmail_welcome'] = 'Poslať email';
-$PALANG['pSendmail_admin'] = 'Od';
+$PALANG['from'] = 'Od';
 $PALANG['pSendmail_to'] = 'Komu';
 $PALANG['pSendmail_to_text_error'] = 'Cieľ nie je platná emailová adresa!';
 $PALANG['subject'] = 'Predmet';
@ -204,7 +197,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Doménoví administrátori';
 $PALANG['pAdminMenu_create_admin'] = 'Nový admin';
 $PALANG['pAdminMenu_create_domain'] = 'Nová doména';

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

 $PALANG['description'] = 'Popis';
@ -213,10 +205,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Záložný MX';
 $PALANG['last_modified'] = 'Posledná zmena';

-$PALANG['pAdminList_virtual_button'] = 'Prejsť';
-$PALANG['pAdminList_virtual_alias_address'] = 'Od';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Cieľ';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Meno';

 $PALANG['pAdminCreate_domain_welcome'] = 'Pridať novú doménu';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Takáto doména už existuje!';
@ -239,7 +227,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Nepodarilo sa upraviť doménu!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Pridať nového administrátora';
@ -251,11 +238,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Nepodarilo sa pridať administrát
 $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['admin'] = 'Užívateľské meno'; # XXX check text - should be 'Admin'
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Nepodarilo sa upraviť administrátora!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Administrátor bol upravený!';

@ -289,9 +275,7 @@ $PALANG['pSearch'] = 'Hľadanie';
 $PALANG['pSearch_welcome'] = 'Hľadanie: ';
 $PALANG['pReturn_to'] = 'Návrat na';
 $PALANG['pBroadcast_title'] = 'Poslať hromadnú správu všetkým používateľom';
-$PALANG['pBroadcast_from'] = 'Od';
 $PALANG['pBroadcast_name'] = 'Vaše meno';
-$PALANG['pBroadcast_send'] = 'Poslať správu';
 $PALANG['pBroadcast_success'] = 'Hromadná správa bola odoslaná.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Hromadná správa';
 $PALANG['pBroadcast_error_empty'] = 'Polie Vaše meno, Predmet a Obsah nemôžu byť prázdne!';
--- a/languages/sl.lang
+++ b/languages/sl.lang
@ -58,15 +58,14 @@ $PALANG['pOverview_left_arrow'] = 'Prejsnja stran';
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Predali';
-$PALANG['pOverview_button'] = 'Pojdi';
+$PALANG['go'] = 'Pojdi';
 $PALANG['pOverview_welcome'] = 'Pregled za ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Od';
-$PALANG['pOverview_alias_goto'] = 'Za';
 $PALANG['active'] = 'Aktiven';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-pošta';
-$PALANG['pOverview_mailbox_name'] = 'Ime';
+$PALANG['name'] = 'Ime';
 $PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -96,7 +95,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -106,13 +104,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Če želite ustvariti "vseobsegajoči"
 $PALANG['pEdit_alias_welcome'] = 'Uredi alias za določeno domeno.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'V posamezni vrstici je lahko samo en naslov.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Za';
+$PALANG['to'] = 'Za';
 $PALANG['pEdit_alias_goto_text_error1'] = 'V polje "Za" niste vnesli ničesar!';
 $PALANG['pEdit_alias_goto_text_error2'] = 'E-poštni naslov, ki ste ga vnesli, ni pravilen: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = 'Uredi alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Aliasa ni bilo mogoče spremeniti!';

 $PALANG['pCreate_mailbox_welcome'] = 'Ustvari nov predal za izbrano domeno.';
@ -128,13 +125,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Uredi določen predal za izbrano domeno.';
 $PALANG['pEdit_mailbox_username'] = 'Uporabniško ime';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Vnešeni gesli se ne ujemata!';
-$PALANG['pEdit_mailbox_name'] = 'Ime';
 $PALANG['pEdit_mailbox_quota'] = 'Kvota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Vnešena kvota je prevelika!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Izbrana domena ni pod vašim nadzorom: ';
-$PALANG['pEdit_mailbox_button'] = 'Uredi predal'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Predala ni bilo mogoče spremeniti!';

 $PALANG['pPassword_welcome'] = 'Sprimenjanje gesla.';
@ -158,7 +153,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Seznam zadnjih 10 operacij za ';
 $PALANG['pViewlog_timestamp'] = 'Čas';
-$PALANG['pViewlog_username'] = 'Administrator';
 $PALANG['pViewlog_action'] = 'Operacija';
 $PALANG['pViewlog_data'] = 'Podatki';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -181,11 +175,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Pojdi';
 $PALANG['pViewlog_result_error'] = 'Dnevnikov ni bilo mogoče najti!';

 $PALANG['pSendmail_welcome'] = 'Pošlji e-pošto.';
-$PALANG['pSendmail_admin'] = 'Od';
+$PALANG['from'] = 'Od';
 $PALANG['pSendmail_to'] = 'Za';
 $PALANG['pSendmail_to_text_error'] = 'Polje "Za" ne vsebuje veljavnega e-poštnega naslova!';
 $PALANG['subject'] = 'Zadeva';
@ -203,7 +196,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domenski administratorji';
 $PALANG['pAdminMenu_create_admin'] = 'Nov administrator';
 $PALANG['pAdminMenu_create_domain'] = 'Nova domena';

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

 $PALANG['description'] = 'Opis';
@ -212,10 +204,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Zadnjič spremenjeno';

-$PALANG['pAdminList_virtual_button'] = 'Pojdi';
-$PALANG['pAdminList_virtual_alias_address'] = 'Od';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Za';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Ime';

 $PALANG['pAdminCreate_domain_welcome'] = 'Dodaj novo domeno';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Vnešena domena že obstaja!';
@ -238,7 +226,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Domene ni bilo mogoče spremeniti!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj domenskega administratorja';
@ -250,11 +237,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Administratorja ni bilo mogoče do
 $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je bil uspešno dodan';

 $PALANG['pAdminEdit_admin_welcome'] = 'Uredi domenskega administratorja';
-$PALANG['pAdminEdit_admin_username'] = 'Administrator';
+$PALANG['admin'] = 'Administrator';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Administratorja ni bilo mogoče spremeniti!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Admininstrator je bil uspešno spremenjen!';

@ -288,9 +274,7 @@ $PALANG['pSearch'] = 'search'; # XXX
 $PALANG['pSearch_welcome'] = 'Išči: ';
 $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
--- a/languages/sv.lang
+++ b/languages/sv.lang
@ -60,15 +60,14 @@ $PALANG['pOverview_left_arrow'] = 'Föregående sida';
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias';
 $PALANG['pOverview_mailbox_title'] = ':: Brevlådor';
-$PALANG['pOverview_button'] = 'Visa';
+$PALANG['go'] = 'Visa'; # XXX check text - should be 'Go'
 $PALANG['pOverview_welcome'] = 'Sammanfattning för ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Från';
-$PALANG['pOverview_alias_goto'] = 'Till';
 $PALANG['active'] = 'Aktiv';
 $PALANG['and_x_more'] = '[och %s mer...]';
 $PALANG['pOverview_mailbox_username'] = 'Epost';
-$PALANG['pOverview_mailbox_name'] = 'Namn';
+$PALANG['name'] = 'Namn';
 $PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'LEDIGHET ÄR AKTIVERAT';
 $PALANG['pOverview_vacation_option'] = 'Aktivera ledighet';
@ -98,7 +97,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -108,13 +106,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'För att skapa en catch-all ange ett "
 $PALANG['pEdit_alias_welcome'] = 'Ändra ett alias för din domän.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Ett alias per rad.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Till';
+$PALANG['to'] = 'Till';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Du angav inget i Till';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Epost adressen du angivit är felaktig: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Leverera till lokal brevlåda.';
 $PALANG['pEdit_alias_forward_only'] = 'Vidarebefodra till angiven epost endast.';
-$PALANG['pEdit_alias_button'] = 'Ändra alias'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Kan inte modifiera detta alias!';

 $PALANG['pCreate_mailbox_welcome'] = 'Skapa ett nytt lokalt brevlåda i din domän.';
@ -130,13 +127,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Brevlådan har lagts ti
 $PALANG['pEdit_mailbox_welcome'] = 'Ändra ett brevlåda i din domän.';
 $PALANG['pEdit_mailbox_username'] = 'Epostadress';
 $PALANG['pEdit_mailbox_password_text_error'] = 'Lösenorden du angav är olika!';
-$PALANG['pEdit_mailbox_name'] = 'Namn';
 $PALANG['pEdit_mailbox_quota'] = 'Quota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Quotagränsen du angett är för stor!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Detta är inte din domän: ';
-$PALANG['pEdit_mailbox_button'] = 'Ändra brevlåda'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Kan inte ändra lösenordet!';

 $PALANG['pPassword_welcome'] = 'Ändra ditt lösenord.';
@ -160,7 +155,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Visa dom senaste 10 åtgärderna för ';
 $PALANG['pViewlog_timestamp'] = 'Tidpunkt';
-$PALANG['pViewlog_username'] = 'Admin';
 $PALANG['pViewlog_action'] = 'Åtgärd';
 $PALANG['pViewlog_data'] = 'Data';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -183,11 +177,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Kör';
 $PALANG['pViewlog_result_error'] = 'Kan inte hitta loggarna!';

 $PALANG['pSendmail_welcome'] = 'Skicka ett mail.';
-$PALANG['pSendmail_admin'] = 'Från';
+$PALANG['from'] = 'Från';
 $PALANG['pSendmail_to'] = 'Till';
 $PALANG['pSendmail_to_text_error'] = 'Till är en ogiltig mailadress eller tomt.!';
 $PALANG['subject'] = 'Ämne'; # XXX check text - should be 'Subject'
@ -205,7 +198,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domän admins';
 $PALANG['pAdminMenu_create_admin'] = 'Ny admin';
 $PALANG['pAdminMenu_create_domain'] = 'Ny domän';

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

 $PALANG['description'] = 'Beskrivning';
@ -214,10 +206,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $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_alias_address'] = 'Från';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Till';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Namn';

 $PALANG['pAdminCreate_domain_welcome'] = 'Lägg till ny domän';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Den domänen finns redan!';
@ -240,7 +228,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # XXX
 $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
 $PALANG['pAdminEdit_domain_result_error'] = 'Kan inte modifiera domänen!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Lägg till ny domänadmin';
@ -252,11 +239,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Kan inte lägga till admin!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Admin har lagts till!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Ändra en domänadmin';
-$PALANG['pAdminEdit_admin_username'] = 'Admin';
+$PALANG['admin'] = 'Admin';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Kan inte ändra admin!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Admin har ändrats!';

@ -290,9 +276,7 @@ $PALANG['pSearch'] = 'sök';
 $PALANG['pSearch_welcome'] = 'Söker efter: ';
 $PALANG['pReturn_to'] = 'Återvänd till';
 $PALANG['pBroadcast_title'] = 'Grupputskick till alla';
-$PALANG['pBroadcast_from'] = 'Från';
 $PALANG['pBroadcast_name'] = 'Ditt namn';
-$PALANG['pBroadcast_send'] = 'Skicka';
 $PALANG['pBroadcast_success'] = 'Ditt grupputskick har sänts.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Grupputskick';
 $PALANG['pBroadcast_error_empty'] = 'Fälten namn, ämne och meddelande skall inte vara tomma!';
--- a/languages/tr.lang
+++ b/languages/tr.lang
@ -58,15 +58,14 @@ $PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
 $PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
-$PALANG['pOverview_button'] = 'Git';
+$PALANG['go'] = 'Git';
 $PALANG['pOverview_welcome'] = 'Genel Bilgiler: ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = 'Kimden';
-$PALANG['pOverview_alias_goto'] = 'Kime';
 $PALANG['active'] = 'Aktif';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'Eposta';
-$PALANG['pOverview_mailbox_name'] = 'Ýsim';
+$PALANG['name'] = 'Ýsim';
 $PALANG['pOverview_mailbox_quota'] = 'kota (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -96,7 +95,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $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_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!';
@ -106,13 +104,12 @@ $PALANG['pCreate_alias_catchall_text'] = 'Hepsini-yakala yaratmak için alias ol
 $PALANG['pEdit_alias_welcome'] = 'domaniniz için bir domain\'i düzenleyin. '; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Satýr baþýna bir giriþ.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';
-$PALANG['pEdit_alias_goto'] = 'Kime'; # XXX check / compare with pCreate_alias_goto - should be "To"
+$PALANG['to'] = 'Kime'; # XXX check text - should be 'To'
 $PALANG['pEdit_alias_goto_text_error1'] = 'Kime kýsmýna hiçbirþey girmediniz.';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Girdiðiniz e-posta uygun deðil: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = 'Alias Düzenle'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = 'Alias düzenlenemiyor!';

 $PALANG['pCreate_mailbox_welcome'] = 'Domaininiz için yeni bir lokal e-posta yaratýn.';
@ -128,13 +125,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = 'Domaninizdeki bir posta kutusunu düzenleyin.';
 $PALANG['pEdit_mailbox_username'] = 'kullanýcý adý'; # XXX check / compare with pCreate_mailbox_username - should be "Username"
 $PALANG['pEdit_mailbox_password_text_error'] = 'Verdiðiniz þifreler birbirini tutmuyor!';
-$PALANG['pEdit_mailbox_name'] = 'Ýsim';
 $PALANG['pEdit_mailbox_quota'] = 'kota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = 'Verdiðiniz kota çok yüksek!';
 $PALANG['pEdit_mailbox_domain_error'] = 'Bu domain dizin deðil: ';
-$PALANG['pEdit_mailbox_button'] = 'Posta kutusunu düzenle'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = 'Þifre deðiþtirilemedi!';

 $PALANG['pPassword_welcome'] = 'Giriþ þifrenizi deðiþtirin.';
@ -158,7 +153,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = 'Son 10 hareket:';
 $PALANG['pViewlog_timestamp'] = 'Timestamp';
-$PALANG['pViewlog_username'] = 'Yönetici';
 $PALANG['pViewlog_action'] = 'Aksiyon';
 $PALANG['pViewlog_data'] = 'Veri';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -181,11 +175,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = 'Git';
 $PALANG['pViewlog_result_error'] = 'Loglar bulunamýyor!';

 $PALANG['pSendmail_welcome'] = 'Eposta gönder.';
-$PALANG['pSendmail_admin'] = 'kimden';
+$PALANG['from'] = 'kimden';
 $PALANG['pSendmail_to'] = 'Kime';
 $PALANG['pSendmail_to_text_error'] = 'Kime doðru bir e-posta deðil!';
 $PALANG['subject'] = 'konu';
@ -203,7 +196,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = 'Domain Yöneticileri';
 $PALANG['pAdminMenu_create_admin'] = 'Yeni Yönetici';
 $PALANG['pAdminMenu_create_domain'] = 'Yeni Domain';

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

 $PALANG['description'] = 'Açýklama';
@ -212,10 +204,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Son Düzenleme';

-$PALANG['pAdminList_virtual_button'] = 'Git';
-$PALANG['pAdminList_virtual_alias_address'] = 'Kimden';
-$PALANG['pAdminList_virtual_alias_goto'] = 'Kime';
-$PALANG['pAdminList_virtual_mailbox_name'] = 'Ýsim';

 $PALANG['pAdminCreate_domain_welcome'] = 'Yeni domain ekle';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Bu Domain halen bulunmakta!';
@ -238,7 +226,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # 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
 $PALANG['pAdminEdit_domain_result_error'] = 'Domain düzenlenemedi!';

 $PALANG['pAdminCreate_admin_welcome'] = 'Yöneticiye yeni bir domain ekle';
@ -250,11 +237,10 @@ $PALANG['pAdminCreate_admin_result_error'] = 'Yönetici eklenemiyor!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Yönetici eklendi!';

 $PALANG['pAdminEdit_admin_welcome'] = 'Domain yöneticisi düzenle';
-$PALANG['pAdminEdit_admin_username'] = 'Yönetici';
+$PALANG['admin'] = 'Yönetici';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = 'Yönetici düzenlenemedi!';
 $PALANG['pAdminEdit_admin_result_success'] = 'Yönetici düzenlendi!';

@ -288,9 +274,7 @@ $PALANG['pSearch'] = 'search'; # XXX
 $PALANG['pSearch_welcome'] = 'Searching for: '; # XXX
 $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
--- a/languages/tw.lang
+++ b/languages/tw.lang
@ -58,15 +58,14 @@ $PALANG['pOverview_left_arrow'] = '上一頁';
 $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
 $PALANG['pOverview_alias_title'] = ':: 別名';
 $PALANG['pOverview_mailbox_title'] = ':: 郵箱';
-$PALANG['pOverview_button'] = '執行';
+$PALANG['go'] = '執行';
 $PALANG['pOverview_welcome'] = '瀏覽 ';
 $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
 $PALANG['pOverview_alias_address'] = '前往';
-$PALANG['pOverview_alias_goto'] = '轉到';
 $PALANG['active'] = '活動';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = '郵件地址';
-$PALANG['pOverview_mailbox_name'] = '姓名';
+$PALANG['name'] = '姓名';
 $PALANG['pOverview_mailbox_quota'] = '限制 (MB)';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
@ -96,7 +95,6 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to th
 $PALANG['pCreate_alias_address_text_error1'] = '該別名非法!';
 $PALANG['email_address_already_exists'] = '郵件地址已經存在, 請重新選擇!';
 $PALANG['pCreate_alias_address_text_error3'] = '你的別名已經達到上限!';
-$PALANG['pCreate_alias_goto'] = '轉到';
 $PALANG['pCreate_alias_goto_text'] = '郵件接收地址.';
 $PALANG['pCreate_alias_goto_text_error'] = '接收地址不正確!';
 $PALANG['pCreate_alias_result_error'] = '不能將別名添加到別名表中!';
@ -106,13 +104,12 @@ $PALANG['pCreate_alias_catchall_text'] = '要將所有的郵件全部轉發請
 $PALANG['pEdit_alias_welcome'] = '編輯你網域名中的別名.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = '每行一條記錄.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = '別名';
-$PALANG['pEdit_alias_goto'] = '轉到';
+$PALANG['to'] = '轉到';
 $PALANG['pEdit_alias_goto_text_error1'] = '你沒有填寫收信人';
 $PALANG['pEdit_alias_goto_text_error2'] = '郵件地址非法: ';
 $PALANG['pEdit_alias_domain_result_error'] = 'Unable to modify the alias domain!'; # XXX
 $PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
 $PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
-$PALANG['pEdit_alias_button'] = '編輯別名'; # XXX text no longer used
 $PALANG['pEdit_alias_result_error'] = '不能修改該別名!';

 $PALANG['pCreate_mailbox_welcome'] = '在你的網域中新建一個本地郵箱.';
@ -128,13 +125,11 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad
 $PALANG['pEdit_mailbox_welcome'] = '編輯你網域中的郵箱.';
 $PALANG['pEdit_mailbox_username'] = '用戶名';
 $PALANG['pEdit_mailbox_password_text_error'] = '你輸入的兩個新密碼不相同!';
-$PALANG['pEdit_mailbox_name'] = '姓名'; # XXX check / compare with pCreate_mailbox_name - should be ""
 $PALANG['pEdit_mailbox_quota'] = '限制';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
 $PALANG['mb_max'] = 'MB (max: %s)'; # XXX
 $PALANG['pEdit_mailbox_quota_text_error'] = '你輸入的容量限制超出範圍!';
 $PALANG['pEdit_mailbox_domain_error'] = '你沒有該網域的管理權限: ';
-$PALANG['pEdit_mailbox_button'] = '編輯郵箱'; # XXX text no longer used
 $PALANG['pEdit_mailbox_result_error'] = '不能編輯該郵箱!';

 $PALANG['pPassword_welcome'] = '更改你的登錄密碼.';
@ -158,7 +153,6 @@ $PALANG['pVacation_reply_delay_time_text'] = 'Time in seconds'; # XXX

 $PALANG['pViewlog_welcome'] = '查看最新的10項操作日誌 網域名: ';
 $PALANG['pViewlog_timestamp'] = '時間';
-$PALANG['pViewlog_username'] = '管理員';
 $PALANG['pViewlog_action'] = '操作';
 $PALANG['pViewlog_data'] = '內容';
 $PALANG['pViewlog_action_create_domain'] = 'create domain'; # XXX
@ -181,11 +175,10 @@ $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX
 $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX
 $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX

-$PALANG['pViewlog_button'] = '執行';
 $PALANG['pViewlog_result_error'] = '未找到相關的日誌!';

 $PALANG['pSendmail_welcome'] = '發送郵件.';
-$PALANG['pSendmail_admin'] = '發件人';
+$PALANG['from'] = '發件人';
 $PALANG['pSendmail_to'] = '收件人';
 $PALANG['pSendmail_to_text_error'] = '收件人為空或者收件人地址不正確!';
 $PALANG['subject'] = '主題';
@ -203,7 +196,6 @@ $PALANG['pAdminMenu_create_domain_admins'] = '網域管理員';
 $PALANG['pAdminMenu_create_admin'] = '新建管理員';
 $PALANG['pAdminMenu_create_domain'] = '新建網域';

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

 $PALANG['description'] = '描述';
@ -212,10 +204,6 @@ $PALANG['pAdminList_domain_quota'] = 'Domain quota (MB)'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = '最後修改日期';

-$PALANG['pAdminList_virtual_button'] = '執行';
-$PALANG['pAdminList_virtual_alias_address'] = '前往';
-$PALANG['pAdminList_virtual_alias_goto'] = '轉到';
-$PALANG['pAdminList_virtual_mailbox_name'] = '姓名';

 $PALANG['pAdminCreate_domain_welcome'] = '新建網域';
 $PALANG['pAdminCreate_domain_domain_text_error'] = '該網域已經存在!';
@ -238,7 +226,6 @@ $PALANG['pAdminEdit_domain_quota'] = 'Domain Quota'; # 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
 $PALANG['pAdminEdit_domain_result_error'] = '修改網域失敗!';

 $PALANG['pAdminCreate_admin_welcome'] = '新增網域管理員';
@ -250,11 +237,10 @@ $PALANG['pAdminCreate_admin_result_error'] = '新增管理員失敗!';
 $PALANG['pAdminCreate_admin_result_success'] = '新增管理員成功!';

 $PALANG['pAdminEdit_admin_welcome'] = '修改網域管理員';
-$PALANG['pAdminEdit_admin_username'] = '管理員';
+$PALANG['admin'] = '管理員';
 $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
 $PALANG['pAdminEdit_admin_result_error'] = '編輯網域管理員失敗!';
 $PALANG['pAdminEdit_admin_result_success'] = '編輯網域管理員成功!';

@ -288,9 +274,7 @@ $PALANG['pSearch'] = 'search'; # XXX
 $PALANG['pSearch_welcome'] = '搜索: ';
 $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
--- a/model/AdminHandler.php
+++ b/model/AdminHandler.php
@ -41,7 +41,7 @@ class AdminHandler extends PFAHandler {
        $this->struct=array(
            # field name                allow       display in...   type    $PALANG label                    $PALANG description                 default / options / ...
            #                           editing?    form    list
-            'username'        => pacol( $this->new, 1,      1,      'text', 'pAdminEdit_admin_username'    , 'pAdminCreate_admin_username_text' ),
+            'username'        => pacol( $this->new, 1,      1,      'text', 'admin'                        , 'pAdminCreate_admin_username_text' ),
            'password'        => pacol( 1,          1,      0,      'pass', 'password'                     , ''                                 ),
            'password2'       => pacol( 1,          1,      0,      'pass', 'password_again'               , ''                                 , '', '',
                /*not_in_db*/ 0,
--- a/model/AdminpasswordHandler.php
+++ b/model/AdminpasswordHandler.php
@ -24,7 +24,7 @@ class AdminpasswordHandler extends PFAHandler {
        $this->struct=array(
            # field name                allow       display in...   type    $PALANG label                    $PALANG description                 default / options / ...
            #                           editing?    form    list
-            'username'        => pacol( 0,          1,      1,      'text', 'pAdminEdit_admin_username'    , ''                                 ),
+            'username'        => pacol( 0,          1,      1,      'text', 'admin'                        , ''                                 ),
            'oldpass'         => pacol( 1,          1,      0,      'pass', 'pPassword_password_current'   , 'pPassword_password_current_text', '', '', 
                /*not_in_db*/ 1  ),
            'password'        => pacol( 1,          1,      0,      'pass', 'pPassword_password'           , ''                                 ),
--- a/model/AliasHandler.php
+++ b/model/AliasHandler.php
@ -32,7 +32,7 @@ class AliasHandler extends PFAHandler {
                /*not_in_db*/ 1                         ),
            'domain'        => pacol(   $this->new, 0,      0,      'enum', ''                              , ''                                , '', 
                /*options*/ $this->allowed_domains      ),
-            'goto'          => pacol(   1,          1,      1,      'txtl', 'pEdit_alias_goto'              , 'pEdit_alias_help'                ),
+            'goto'          => pacol(   1,          1,      1,      'txtl', 'to'                            , 'pEdit_alias_help'                ),
            'is_mailbox'    => pacol(   0,          0,      1,      'int', ''                             , ''                                , 0 ,
                # technically 'is_mailbox' is bool, but the automatic bool conversion breaks the query. Flagging it as int avoids this problem.
                # Maybe having a vbool type (without the automatic conversion) would be cleaner - we'll see if we need it.
--- a/model/MailboxHandler.php
+++ b/model/MailboxHandler.php
@ -29,7 +29,7 @@ class MailboxHandler extends PFAHandler {
                /*dont_write_to_db*/ 1,
                /*select*/ 'password as password2'
            ),
-            'name'          => pacol(   1,          1,      1,      'text', 'pEdit_mailbox_name'            , 'pCreate_mailbox_name_text'       , '' ),
+            'name'          => pacol(   1,          1,      1,      'text', 'name'                          , 'pCreate_mailbox_name_text'       , '' ),
            'quota'         => pacol(   1,          1,      1,      'int' , 'pEdit_mailbox_quota'           , 'pEdit_mailbox_quota_text'        , '' ), # in MB
            # read_from_db_postprocess() also sets 'quotabytes' for use in init()
            'active'        => pacol(   1,          1,      1,      'bool', 'active'                        , ''                                 , 1 ),
--- a/setup.php
+++ b/setup.php
@ -411,7 +411,7 @@ else
      <td><a href="setup.php?lostpw=1">Lost password?</a></td>
   </tr>
   <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_username'] . ":"; ?></td>
+      <td><?php print $PALANG['admin'] . ":"; ?></td>
      <td><input class="flat" type="text" name="username" value="<?php print $tUsername; ?>" /></td>
      <td><?php if (isset($errormsg['username'])) print $errormsg['username']; ?></td>
   </tr>
--- a/templates/adminlistadmin.tpl
+++ b/templates/adminlistadmin.tpl
@ -1,7 +1,7 @@
 {if $admin_properties}
 	<table id="admin_table">
 		{#tr_header#}
-			<td>{$PALANG.pAdminList_admin_username}</td>
+			<td>{$PALANG.admin}</td>
 			<td>{$PALANG.pAdminList_admin_count}</td>
 			<td>{$PALANG.last_modified}</td>
 			<td>{$PALANG.active}</td>
@ -20,7 +20,7 @@
 			<td>{$admin.modified}</td>
 			<td><a href="{#url_edit_admin#}&amp;edit={$admin.username|escape:"url"}&amp;active={if ($admin.active==0)}1{else}0{/if}">{$admin._active}</a></td>
 			<td><a href="{#url_edit_admin#}&edit={$admin.username|escape:"url"}">{$PALANG.edit}</a></td>
-			<td><a href="{#url_delete#}?table=admin&amp;delete={$admin.username|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pAdminList_admin_username}: {$admin.username}');">{$PALANG.del}</a></td>
+			<td><a href="{#url_delete#}?table=admin&amp;delete={$admin.username|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.admin}: {$admin.username}');">{$PALANG.del}</a></td>
 		</tr>
 {/foreach}
 	</table>
--- a/templates/adminlistdomain.tpl
+++ b/templates/adminlistdomain.tpl
@ -3,7 +3,7 @@
 	<select name="fUsername" onchange="this.form.submit();">
 	{$select_options}
 	</select>
-	<input class="button" type="submit" name="go" value="{$PALANG.pOverview_button}" />
+	<input class="button" type="submit" name="go" value="{$PALANG.go}" />
 </form>
 {#form_search#}
 </div>
--- a/templates/broadcast-message.tpl
+++ b/templates/broadcast-message.tpl
@ -5,7 +5,7 @@
 		<th colspan="2">{$PALANG.pBroadcast_title}</th>
 	</tr>
 	<tr>
-		<td class="label"><label>{$PALANG.pBroadcast_from}:</label></td>
+		<td class="label"><label>{$PALANG.from}:</label></td>
 		<td><em>{$smtp_from_email}</em></td>
 	</tr>
 	<tr>
@ -23,7 +23,7 @@
 	<tr>
 		<td>&nbsp;</td>
 		<td>
-		<input class="button" type="submit" name="submit" value="{$PALANG.pBroadcast_send}" />
+		<input class="button" type="submit" name="submit" value="{$PALANG.pSendmail_button}" />
 		</td>
 	</tr>
 </table>
--- a/templates/list-virtual.tpl
+++ b/templates/list-virtual.tpl
@ -5,7 +5,7 @@
 		{$select_options}
 	</select>
 	<input type="hidden" name="limit" value="0" />
-	<input class="button" type="submit" name="go" value="{$PALANG.pOverview_button}" />
+	<input class="button" type="submit" name="go" value="{$PALANG.go}" />
 </form>
 <h4>{$PALANG.pOverview_welcome}{$fDomain}</h4>
 <p>{$PALANG.aliases}: {$limit.alias_count} / {$limit.aliases}</p>
--- a/templates/list-virtual_alias.tpl
+++ b/templates/list-virtual_alias.tpl
@ -3,7 +3,7 @@
 			<td></td>
 		{/if}
 		<td>{$PALANG.pOverview_alias_address}</td>
-		<td>{$PALANG.pOverview_alias_goto}</td>
+		<td>{$PALANG.to}</td>
 		<td>{$PALANG.last_modified}</td>
 		<td>{$PALANG.active}</td>
 		<td colspan="2">&nbsp;</td>
--- a/templates/list-virtual_alias_domain.tpl
+++ b/templates/list-virtual_alias_domain.tpl
@ -7,7 +7,7 @@
 		{if $tAliasDomains|@count>0} {* -> HAT alias-domains *}
 			{#tr_header#}
 			<td>{$PALANG.pOverview_alias_address}</td>
-			<td>{$PALANG.pOverview_alias_goto}</td>
+			<td>{$PALANG.to}</td>
 			<td>{$PALANG.last_modified}</td>
 			<td>{$PALANG.active}</td>
 			<td>&nbsp;</td>
--- a/templates/list-virtual_mailbox.tpl
+++ b/templates/list-virtual_mailbox.tpl
@ -2,9 +2,9 @@
 		{if $CONF.show_status===YES}<td></td>{/if}
 		<td>{$PALANG.pOverview_mailbox_username}</td>
 		{if $display_mailbox_aliases==true}
-			<td>{$PALANG.pOverview_alias_goto}</td>
+			<td>{$PALANG.to}</td>
 		{/if}
-		<td>{$PALANG.pOverview_mailbox_name}</td>
+		<td>{$PALANG.name}</td>
 		{if $CONF.quota===YES}<td>{$PALANG.pOverview_mailbox_quota}</td>{/if}
 		<td>{$PALANG.last_modified}</td>
 		<td>{$PALANG.active}</td>
--- a/templates/overview-get.tpl
+++ b/templates/overview-get.tpl
@ -3,7 +3,7 @@
 	<select name="domain" onchange="this.form.submit();">
 	{$select_options}
 	</select>
-	<input class="button" type="submit" name="go" value="{$PALANG.pOverview_button}" />
+	<input class="button" type="submit" name="go" value="{$PALANG.go}" />
 </form>
 {#form_search#}
 </div>
--- a/templates/sendmail.tpl
+++ b/templates/sendmail.tpl
@ -5,7 +5,7 @@
 		<th colspan="3">{$PALANG.pSendmail_welcome}</th>
 	</tr>
 	<tr>
-		<td class="label"><label>{$PALANG.pSendmail_admin}:</label></td>
+		<td class="label"><label>{$PALANG.from}:</label></td>
 		<td><em>{$smtp_from_email}</em></td>
 		<td>&nbsp;</td>
 	</tr>
--- a/templates/users_edit-alias.tpl
+++ b/templates/users_edit-alias.tpl
@ -10,7 +10,7 @@
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td class="label"><label>{$PALANG.pEdit_alias_goto}:</label></td>
+		<td class="label"><label>{$PALANG.to}:</label></td>
 		<td><textarea class="flat" rows="4" cols="50" name="fGoto">
 {foreach from=$tGotoArray item=address}
 {$address}
--- a/templates/viewlog.tpl
+++ b/templates/viewlog.tpl
@ -1,7 +1,7 @@
 <div id="overview">
 <form name="frmOverview" method="post" action="">
 	<select name="fDomain" onchange="this.form.submit();">{$select_options}</select>
-	<input class="button" type="submit" name="go" value="{$PALANG.pViewlog_button}" />
+	<input class="button" type="submit" name="go" value="{$PALANG.go}" />
 </form>
 </div>
 {if $tLog}
@ -11,7 +11,7 @@
 	</tr>
 	{#tr_header#}
 		<td>{$PALANG.pViewlog_timestamp}</td>
-		<td>{$PALANG.pViewlog_username}</td>
+		<td>{$PALANG.admin}</td>
 		<td>{$PALANG.domain}</td>
 		<td>{$PALANG.pViewlog_action}</td>
 		<td>{$PALANG.pViewlog_data}</td>
--- a/users/edit-alias.php
+++ b/users/edit-alias.php
@ -59,8 +59,6 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
        exit(0);
    }

-    $pEdit_alias_goto = $PALANG['pEdit_alias_goto'];
-
    $fGoto = trim(safepost('fGoto'));
    $fForward_and_store = safepost('fForward_and_store');