SF.net SVN: postfixadmin:[1503] trunk

[<chr...@us...>]

Revision: 1503
          http://sourceforge.net/p/postfixadmin/code/1503
Author:   christian_boltz
Date:     2013-07-28 19:24:00 +0000 (Sun, 28 Jul 2013)
Log Message:
-----------
*.lang:
- add $PALANG['active'] = 'Active' to replace various duplicates:
  -$PALANG['pOverview_alias_active']
  -$PALANG['pOverview_alias_domain_active']
  -$PALANG['pOverview_mailbox_active']
  -$PALANG['pCreate_alias_active']
  -$PALANG['pEdit_alias_active']
  -$PALANG['pCreate_mailbox_active']
  -$PALANG['pAdminList_admin_active']
  -$PALANG['pAdminList_domain_active']
  -$PALANG['pAdminList_virtual_mailbox_active']
  -$PALANG['pAdminEdit_domain_active']
  -$PALANG['pAdminEdit_admin_active']

model/*, templates/*:
- use $PALANG['active'] everywhere

Modified Paths:
--------------
    trunk/languages/bg.lang
    trunk/languages/ca.lang
    trunk/languages/cn.lang
    trunk/languages/cs.lang
    trunk/languages/da.lang
    trunk/languages/de.lang
    trunk/languages/en.lang
    trunk/languages/es.lang
    trunk/languages/et.lang
    trunk/languages/eu.lang
    trunk/languages/fi.lang
    trunk/languages/fo.lang
    trunk/languages/fr.lang
    trunk/languages/hr.lang
    trunk/languages/hu.lang
    trunk/languages/is.lang
    trunk/languages/it.lang
    trunk/languages/ja.lang
    trunk/languages/lt.lang
    trunk/languages/mk.lang
    trunk/languages/nb.lang
    trunk/languages/nl.lang
    trunk/languages/nn.lang
    trunk/languages/pl.lang
    trunk/languages/pt-br.lang
    trunk/languages/ru.lang
    trunk/languages/sk.lang
    trunk/languages/sl.lang
    trunk/languages/sv.lang
    trunk/languages/tr.lang
    trunk/languages/tw.lang
    trunk/model/AdminHandler.php
    trunk/model/AliasHandler.php
    trunk/model/AliasdomainHandler.php
    trunk/model/DomainHandler.php
    trunk/model/MailboxHandler.php
    trunk/templates/adminlistadmin.tpl
    trunk/templates/adminlistdomain.tpl
    trunk/templates/list-virtual_alias.tpl
    trunk/templates/list-virtual_alias_domain.tpl
    trunk/templates/list-virtual_mailbox.tpl

Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/bg.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -66,14 +66,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = 'Пощенски кутии';
 $PALANG['pOverview_alias_address'] = 'От';
 $PALANG['pOverview_alias_goto'] = 'До';
-$PALANG['pOverview_alias_active'] = 'Активен';
-$PALANG['pOverview_alias_domain_active'] = 'Активен'; 
+$PALANG['active'] = 'Активен';
 $PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'Е-мейл';
 $PALANG['pOverview_mailbox_name'] = 'Име';
 $PALANG['pOverview_mailbox_quota'] = 'Обем (MB)';
-$PALANG['pOverview_mailbox_active'] = 'Активен';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
 $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
@@ -106,7 +104,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = 'Този е-мейл адрес вече съществува, моля изберете различен!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Достигнали сте лимита си за създаване на alias-и!';
 $PALANG['pCreate_alias_goto'] = 'Към';
-$PALANG['pCreate_alias_active'] = 'Активен';
 $PALANG['pCreate_alias_button'] = 'Добави Alias';
 $PALANG['pCreate_alias_goto_text'] = 'Накъде трябва да се изпраща писмото.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Избраният адрес в полето Към не е валиден!';
@@ -118,7 +115,6 @@
 $PALANG['pEdit_alias_help'] = 'Един запис на ред.'; # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'Към';
-$PALANG['pEdit_alias_active'] = 'Active'; # XXX
 $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
@@ -137,7 +133,6 @@
 $PALANG['pCreate_mailbox_password_text_error'] = 'Паролите, които сте дали не съвпадат! Или са празни!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Пълно име';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Обема, който сте задали е твърде голям!';
-$PALANG['pCreate_mailbox_active'] = 'Активен';
 $PALANG['pCreate_mailbox_mail'] = 'Създай пощенска кутия'; # XXX Text change to 'Send Welcome mail'
 $PALANG['pCreate_mailbox_button'] = 'Добави пощенска кутия';
 $PALANG['pCreate_mailbox_result_error'] = 'Не мога да добавя пощенската кутия в таблицата!';
@@ -227,7 +222,6 @@
 
 $PALANG['pAdminList_admin_username'] = 'Админ';
 $PALANG['pAdminList_admin_count'] = 'Домейни';
-$PALANG['pAdminList_admin_active'] = 'Активен';
 
 $PALANG['pAdminList_domain_description'] = 'Описание';
 $PALANG['pAdminList_domain_aliases'] = 'Alias-и';
@@ -236,7 +230,6 @@
 $PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Последно модифициран'; # XXX check text - should be 'Last modified'
-$PALANG['pAdminList_domain_active'] = 'Активен';
 
 $PALANG['pAdminList_virtual_button'] = 'Напред';
 $PALANG['pAdminList_virtual_welcome'] = 'Преглед на ';
@@ -247,7 +240,6 @@
 $PALANG['pAdminList_virtual_mailbox_username'] = 'Е-мейл';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Име';
 $PALANG['pAdminList_virtual_mailbox_quota'] = 'Обем (MB)';
-$PALANG['pAdminList_virtual_mailbox_active'] = 'Активен';
 
 $PALANG['pAdminCreate_domain_welcome'] = 'Добавяне на нов домейн';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Този домейн вече съществува!';
@@ -274,7 +266,6 @@
 $PALANG['pAdminEdit_domain_transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Мейл сървъра е резервен MX';
-$PALANG['pAdminEdit_domain_active'] = 'Активен';
 $PALANG['pAdminEdit_domain_button'] = 'Редактирай домейн'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'Не мога да модифицирам домейна!';
 
@@ -292,7 +283,6 @@
 $PALANG['pAdminEdit_admin_password'] = 'Парола';
 $PALANG['pAdminEdit_admin_password2'] = 'Парола (отново)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Паролите, които сте въвели не съвпадат! Или са празни!'; # XXX check/beautify - was split in two lines before
-$PALANG['pAdminEdit_admin_active'] = 'Активен';
 $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

Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/ca.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -64,14 +64,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = 'Bústies';
 $PALANG['pOverview_alias_address'] = 'De';
 $PALANG['pOverview_alias_goto'] = 'Destí';
-$PALANG['pOverview_alias_active'] = 'Active'; # XXX
-$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
+$PALANG['active'] = 'Actiu';
 $PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-mail'; # XXX
 $PALANG['pOverview_mailbox_name'] = 'Nom';
 $PALANG['pOverview_mailbox_quota'] = 'Quota (MB)'; # XXX
-$PALANG['pOverview_mailbox_active'] = 'Actiu';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
 $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
@@ -104,7 +102,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = 'Aquesta adreça ja existeix, escull una altra de diferent, si us plau!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Has arribat al límit de creació d\'àlies!';
 $PALANG['pCreate_alias_goto'] = 'Destí';
-$PALANG['pCreate_alias_active'] = 'Active'; # XXX
 $PALANG['pCreate_alias_button'] = 'Afegir àlies';
 $PALANG['pCreate_alias_goto_text'] = 'A on ha de ser enviat l\'e-mail.';
 $PALANG['pCreate_alias_goto_text_error'] = 'El destí no és vàlid!';
@@ -116,7 +113,6 @@
 $PALANG['pEdit_alias_help'] = 'Una entrada per línia.'; # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Àlies';
 $PALANG['pEdit_alias_goto'] = 'Destí';
-$PALANG['pEdit_alias_active'] = 'Active'; # XXX
 $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
@@ -135,7 +131,6 @@
 $PALANG['pCreate_mailbox_password_text_error'] = 'Les contrasenyes introduides no coincideixen o estan en blanc!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Nom complet';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'La quota especificada és massa alta!';
-$PALANG['pCreate_mailbox_active'] = 'Actiu';
 $PALANG['pCreate_mailbox_mail'] = 'Crear bústia'; # XXX Text change to 'Send Welcome mail'
 $PALANG['pCreate_mailbox_button'] = 'Afegir bústia';
 $PALANG['pCreate_mailbox_result_error'] = 'Imposible afegir una bústia a la taula de bústies!';
@@ -225,7 +220,6 @@
 
 $PALANG['pAdminList_admin_username'] = 'Administrador';
 $PALANG['pAdminList_admin_count'] = 'Dominis';
-$PALANG['pAdminList_admin_active'] = 'Actiu';
 
 $PALANG['pAdminList_domain_description'] = 'Descripció';
 $PALANG['pAdminList_domain_aliases'] = 'Àlies';
@@ -234,7 +228,6 @@
 $PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Última Modificació';
-$PALANG['pAdminList_domain_active'] = 'Actiu';
 
 $PALANG['pAdminList_virtual_button'] = 'Ves';
 $PALANG['pAdminList_virtual_welcome'] = 'Resum de ';
@@ -245,7 +238,6 @@
 $PALANG['pAdminList_virtual_mailbox_username'] = 'E-mail';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nom';
 $PALANG['pAdminList_virtual_mailbox_quota'] = 'Quota (MB)';
-$PALANG['pAdminList_virtual_mailbox_active'] = 'Actiu';
 
 $PALANG['pAdminCreate_domain_welcome'] = 'Afegir nou domini';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'El domini ja existeix!';
@@ -272,7 +264,6 @@
 $PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX
-$PALANG['pAdminEdit_domain_active'] = 'Actiu';
 $PALANG['pAdminEdit_domain_button'] = 'Editar domini'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'Imposible modificar el domini!';
 
@@ -291,7 +282,6 @@
 $PALANG['pAdminEdit_admin_password'] = 'Contrasenya';
 $PALANG['pAdminEdit_admin_password2'] = 'Contrasenya (repetiu)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Les contrasenyes introduides no coincideixen o estan en blanc!'; # XXX check/beautify - was split in two lines before
-$PALANG['pAdminEdit_admin_active'] = 'Actiu';
 $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

Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/cn.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -65,14 +65,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = '邮箱';
 $PALANG['pOverview_alias_address'] = '前往';
 $PALANG['pOverview_alias_goto'] = '转到';
-$PALANG['pOverview_alias_active'] = 'Active'; # XXX
-$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
+$PALANG['active'] = '活动';
 $PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = '邮件地址';
 $PALANG['pOverview_mailbox_name'] = '姓名';
 $PALANG['pOverview_mailbox_quota'] = '限制 (MB)';
-$PALANG['pOverview_mailbox_active'] = '活动';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
 $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
@@ -105,7 +103,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = '邮件地址已经存在, 请重新选择!';
 $PALANG['pCreate_alias_address_text_error3'] = '你的别名已经达到上限!';
 $PALANG['pCreate_alias_goto'] = '转到';
-$PALANG['pCreate_alias_active'] = 'Active'; # XXX
 $PALANG['pCreate_alias_button'] = '新建别名';
 $PALANG['pCreate_alias_goto_text'] = '邮件接收地址.';
 $PALANG['pCreate_alias_goto_text_error'] = '接收地址不正确!';
@@ -117,7 +114,6 @@
 $PALANG['pEdit_alias_help'] = '每行一条记录.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = '别名';
 $PALANG['pEdit_alias_goto'] = '转到';
-$PALANG['pEdit_alias_active'] = 'Active'; # XXX
 $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
@@ -136,7 +132,6 @@
 $PALANG['pCreate_mailbox_password_text_error'] = '你输入的密码不相同! 或者为空!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = '全名';
 $PALANG['pCreate_mailbox_quota_text_error'] = '你输入的容量限制超出范围!';
-$PALANG['pCreate_mailbox_active'] = '活动';
 $PALANG['pCreate_mailbox_mail'] = '新建邮箱'; # XXX Text change to 'Send Welcome mail'
 $PALANG['pCreate_mailbox_button'] = '增加邮箱';
 $PALANG['pCreate_mailbox_result_error'] = '不能将邮箱增加到邮箱表中!';
@@ -226,7 +221,6 @@
 
 $PALANG['pAdminList_admin_username'] = '管理员';
 $PALANG['pAdminList_admin_count'] = '管理域数量';
-$PALANG['pAdminList_admin_active'] = '活动';
 
 $PALANG['pAdminList_domain_description'] = '描述';
 $PALANG['pAdminList_domain_aliases'] = '别名数';
@@ -235,7 +229,6 @@
 $PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = '最后修改日期';
-$PALANG['pAdminList_domain_active'] = '活动';
 
 $PALANG['pAdminList_virtual_button'] = '执行';
 $PALANG['pAdminList_virtual_welcome'] = '域概览 域名: ';
@@ -246,7 +239,6 @@
 $PALANG['pAdminList_virtual_mailbox_username'] = '邮箱';
 $PALANG['pAdminList_virtual_mailbox_name'] = '姓名';
 $PALANG['pAdminList_virtual_mailbox_quota'] = '限制 (MB)';
-$PALANG['pAdminList_virtual_mailbox_active'] = '活动';
 
 $PALANG['pAdminCreate_domain_welcome'] = '新建域';
 $PALANG['pAdminCreate_domain_domain_text_error'] = '该域已经存在!';
@@ -273,7 +265,6 @@
 $PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = '备份邮件服务器';
-$PALANG['pAdminEdit_domain_active'] = '活动';
 $PALANG['pAdminEdit_domain_button'] = '修改'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = '修改域失败!';
 
@@ -291,7 +282,6 @@
 $PALANG['pAdminEdit_admin_password'] = '密码';
 $PALANG['pAdminEdit_admin_password2'] = '密码 (验证)';
 $PALANG['pAdminEdit_admin_password_text_error'] = '你两次输入的新密码不相同! 或者为空!'; # XXX check/beautify - was split in two lines before
-$PALANG['pAdminEdit_admin_active'] = '活动';
 $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

Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/cs.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -70,14 +70,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = 'Schránek';
 $PALANG['pOverview_alias_address'] = 'Od';
 $PALANG['pOverview_alias_goto'] = 'Pro';
-$PALANG['pOverview_alias_active'] = 'Aktivní';
-$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
+$PALANG['active'] = 'Aktivní';
 $PALANG['pOverview_alias_edit'] = 'Přesměrování';
 $PALANG['and_x_more'] = '[a %s dalších...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
 $PALANG['pOverview_mailbox_name'] = 'Jméno';
 $PALANG['pOverview_mailbox_quota'] = 'Místo (MB)';
-$PALANG['pOverview_mailbox_active'] = 'Aktivní';
 $PALANG['pOverview_vacation_edit'] = 'ZAPNUTO';
 $PALANG['pOverview_vacation_option'] = 'vypnuto';
 $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
@@ -110,7 +108,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = 'Taková emailová adresa již existuje!';
 $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_active'] = 'Aktivní';
 $PALANG['pCreate_alias_button'] = 'Přidat';
 $PALANG['pCreate_alias_goto_text'] = 'Kam má pošta chodit.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Cíl není platný!';
@@ -122,7 +119,6 @@
 $PALANG['pEdit_alias_help'] = 'Jeden záznam na řádku.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Přesměrování';
 $PALANG['pEdit_alias_goto'] = 'Cíl';
-$PALANG['pEdit_alias_active'] = 'Aktivní';
 $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
@@ -141,7 +137,6 @@
 $PALANG['pCreate_mailbox_password_text_error'] = 'Zadaná hesla jsou rozdílná nebo prázdná!';
 $PALANG['pCreate_mailbox_name_text'] = 'Celé jméno';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Zadané místo je příliš velké!';
-$PALANG['pCreate_mailbox_active'] = 'Aktivní';
 $PALANG['pCreate_mailbox_mail'] = 'Vytvořit schránku na disku (odešle uvítací email)'; # XXX Text change to 'Send Welcome mail'
 $PALANG['pCreate_mailbox_button'] = 'Přidat schránku';
 $PALANG['pCreate_mailbox_result_error'] = 'Nepodařilo se přidat schránku do tabulky schránek!';
@@ -234,7 +229,6 @@
 
 $PALANG['pAdminList_admin_username'] = 'Administrátor';
 $PALANG['pAdminList_admin_count'] = 'Domény';
-$PALANG['pAdminList_admin_active'] = 'Aktivní';
 
 $PALANG['pAdminList_domain_description'] = 'Popis';
 $PALANG['pAdminList_domain_aliases'] = 'Přesměrování';
@@ -243,7 +237,6 @@
 $PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Záložní MX';
 $PALANG['last_modified'] = 'Naposledy Změněno';
-$PALANG['pAdminList_domain_active'] = 'Aktivní';
 
 $PALANG['pAdminList_virtual_button'] = 'Jít';
 $PALANG['pAdminList_virtual_welcome'] = 'Přehled pro ';
@@ -254,7 +247,6 @@
 $PALANG['pAdminList_virtual_mailbox_username'] = 'Název';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Celé Jméno';
 $PALANG['pAdminList_virtual_mailbox_quota'] = 'Místo (MB)';
-$PALANG['pAdminList_virtual_mailbox_active'] = 'Aktivní';
 
 $PALANG['pAdminCreate_domain_welcome'] = 'Přidat Novou Doménu';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Taková doména už existuje!';
@@ -282,7 +274,6 @@
 $PALANG['pAdminEdit_domain_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_active'] = 'Aktivní';
 $PALANG['pAdminEdit_domain_button'] = 'Upravit doménu'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'Nepodařilo se upravit doménu!';
 
@@ -300,7 +291,6 @@
 $PALANG['pAdminEdit_admin_password'] = 'Heslo';
 $PALANG['pAdminEdit_admin_password2'] = 'Heslo (znovu)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Zadaná hesla jsou rozdílná nebo prázdná!'; # XXX check/beautify - was split in two lines before
-$PALANG['pAdminEdit_admin_active'] = 'Administrátorský účet povolen';
 $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

Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/da.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -69,14 +69,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = 'Postbokse';
 $PALANG['pOverview_alias_address'] = 'Alias';
 $PALANG['pOverview_alias_goto'] = 'Modtager';
-$PALANG['pOverview_alias_active'] = 'Aktiveret';
-$PALANG['pOverview_alias_domain_active']   = 'Aktiveret';
+$PALANG['active'] = 'Aktiv';
 $PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[og %s til...]';
 $PALANG['pOverview_mailbox_username'] = 'Emailadresse';
 $PALANG['pOverview_mailbox_name'] = 'Navn';
 $PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
-$PALANG['pOverview_mailbox_active'] = 'Aktiv';
 $PALANG['pOverview_vacation_edit'] = 'Autosvar er aktiveret';
 $PALANG['pOverview_vacation_option'] = 'Angiv autosvar';
 $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
@@ -110,7 +108,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = '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_active'] = 'Aktiv';
 $PALANG['pCreate_alias_button'] = 'Tilføj alias';
 $PALANG['pCreate_alias_goto_text'] = 'Hvor emailen skal videresendes til.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Modtageradressen er ikke gyldig!';
@@ -122,7 +119,6 @@
 $PALANG['pEdit_alias_help'] = 'En modtager pr. linje.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'Modtager(e)'; # XXX check / compare with pCreate_alias_goto - should be "To"
-$PALANG['pEdit_alias_active'] = 'Aktiv';
 $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.';
@@ -141,7 +137,6 @@
 $PALANG['pCreate_mailbox_password_text_error'] = 'Adgangskoderne er ikke ens! Eller er tomme!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Fulde navn';
 $PALANG['pCreate_mailbox_quota_text_error']           = 'Den valgte kvota er for høj.';
-$PALANG['pCreate_mailbox_active'] = 'Aktiv';
 $PALANG['pCreate_mailbox_mail'] = 'Send velkomsthilsen'; # XXX Text change to 'Send Welcome mail'
 $PALANG['pCreate_mailbox_button'] = 'Tilføj postboks';
 $PALANG['pCreate_mailbox_result_error'] = 'Kan ikke tilføje postboksen til postboks-tabellen!';
@@ -234,7 +229,6 @@
 
 $PALANG['pAdminList_admin_username'] = 'Administrator';
 $PALANG['pAdminList_admin_count'] = 'Domæner';
-$PALANG['pAdminList_admin_active'] = 'Aktiv';
 
 $PALANG['pAdminList_domain_description'] = 'Beskrivelse';
 $PALANG['pAdminList_domain_aliases'] = 'Alias';
@@ -243,7 +237,6 @@
 $PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Senest ændret';
-$PALANG['pAdminList_domain_active'] = 'Aktiv';
 
 $PALANG['pAdminList_virtual_button'] = 'Vis';
 $PALANG['pAdminList_virtual_welcome'] = 'Oversigt for ';
@@ -254,7 +247,6 @@
 $PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';
 $PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvota (MB)';
-$PALANG['pAdminList_virtual_mailbox_active'] = 'Aktiv';
 
 $PALANG['pAdminCreate_domain_welcome'] = 'Tilføj et nyt domæne';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domænet eksisterer allerede!';
@@ -282,7 +274,6 @@
 $PALANG['pAdminEdit_domain_transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Præcisér transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mailserveren er backup MX';
-$PALANG['pAdminEdit_domain_active'] = 'Aktiv';
 $PALANG['pAdminEdit_domain_button'] = 'Rediger domæne'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'Kan ikke rette domænet!';
 
@@ -300,7 +291,6 @@
 $PALANG['pAdminEdit_admin_password'] = 'Adgangskode';
 $PALANG['pAdminEdit_admin_password2'] = 'Adgangskode (igen)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Adgangskoderne er ikke ens! Eller er tomme!'; # XXX check/beautify - was split in two lines before
-$PALANG['pAdminEdit_admin_active'] = 'Aktiv';
 $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

Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/de.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -67,14 +67,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = 'Mailboxen';
 $PALANG['pOverview_alias_address'] = 'Von';
 $PALANG['pOverview_alias_goto'] = 'An';
-$PALANG['pOverview_alias_active'] = 'Aktiv';
-$PALANG['pOverview_alias_domain_active'] = 'Aktiv';
+$PALANG['active'] = 'Aktiv';
 $PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[und %s weitere...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
 $PALANG['pOverview_mailbox_name'] = 'Name';
 $PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
-$PALANG['pOverview_mailbox_active'] = 'Aktiv';
 $PALANG['pOverview_vacation_edit'] = 'AUTOMATISCHE ANTWORT IST AKTIV';
 $PALANG['pOverview_vacation_option'] = 'Automatische Antwort einrichten';
 $PALANG['no_domains_for_this_admin'] = 'Sie haben für keine Domain eine Berechtigung';
@@ -107,7 +105,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = '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_active'] = 'Aktiv';
 $PALANG['pCreate_alias_button'] = 'Alias hinzufügen';
 $PALANG['pCreate_alias_goto_text'] = 'Wohin soll die eMail weitergeleitet werden?';
 $PALANG['pCreate_alias_goto_text_error'] = 'Das An-Feld ist falsch!';
@@ -119,7 +116,6 @@
 $PALANG['pEdit_alias_help'] = 'Angabe mehrerer Ziele möglich, ein Eintrag pro Zeile.';
 $PALANG['pEdit_alias_address'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'An';
-$PALANG['pEdit_alias_active'] = 'Aktiv';
 $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!';
@@ -138,7 +134,6 @@
 $PALANG['pCreate_mailbox_password_text_error'] = 'Die beiden Passwörter sind nicht identisch oder ganz leer!';
 $PALANG['pCreate_mailbox_name_text'] = 'Vollständiger Name';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Das angegebene Quota ist zu hoch!';
-$PALANG['pCreate_mailbox_active'] = 'Aktiv';
 $PALANG['pCreate_mailbox_mail'] = 'Begrüßungsmail senden';
 $PALANG['pCreate_mailbox_button'] = 'Mailbox hinzufügen';
 $PALANG['pCreate_mailbox_result_error'] = 'Unmöglich die Mailbox in die Mailbox-Tabelle einzutragen!';
@@ -231,7 +226,6 @@
 
 $PALANG['pAdminList_admin_username'] = 'Admin';
 $PALANG['pAdminList_admin_count'] = 'Domains';
-$PALANG['pAdminList_admin_active'] = 'Aktiv';
 
 $PALANG['pAdminList_domain_description'] = 'Beschreibung';
 $PALANG['pAdminList_domain_aliases'] = 'Aliase';
@@ -240,7 +234,6 @@
 $PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'zuletzt geändert';
-$PALANG['pAdminList_domain_active'] = 'Aktiv';
 
 $PALANG['pAdminList_virtual_button'] = 'Los';
 $PALANG['pAdminList_virtual_welcome'] = 'Überblick für ';
@@ -251,7 +244,6 @@
 $PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Name';
 $PALANG['pAdminList_virtual_mailbox_quota'] = 'Quota (MB)';
-$PALANG['pAdminList_virtual_mailbox_active'] = 'Aktiv';
 
 $PALANG['pAdminCreate_domain_welcome'] = 'Domain hinzufügen';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Diese Domain existiert bereits!';
@@ -279,7 +271,6 @@
 $PALANG['pAdminEdit_domain_transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX';
-$PALANG['pAdminEdit_domain_active'] = 'Aktiv';
 $PALANG['pAdminEdit_domain_button'] = 'Domain editieren'; # obsolete
 $PALANG['pAdminEdit_domain_result_error'] = 'Konnte Domain nicht editieren!';
 
@@ -297,7 +288,6 @@
 $PALANG['pAdminEdit_admin_password'] = 'Passwort';
 $PALANG['pAdminEdit_admin_password2'] = 'Passwort (nochmal)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Die beiden Passwörter sind nicht identisch oder leer!';
-$PALANG['pAdminEdit_admin_active'] = 'Aktiv';
 $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

Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/en.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -67,14 +67,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = 'Mailboxes';
 $PALANG['pOverview_alias_address'] = 'From';
 $PALANG['pOverview_alias_goto'] = 'To';
-$PALANG['pOverview_alias_active'] = 'Active';
-$PALANG['pOverview_alias_domain_active'] = 'Active';
+$PALANG['active'] = 'Active';
 $PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[and %s more...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
 $PALANG['pOverview_mailbox_name'] = 'Name';
 $PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
-$PALANG['pOverview_mailbox_active'] = 'Active';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON';
 $PALANG['pOverview_vacation_option'] = 'Set Vacation';
 $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.';
@@ -108,7 +106,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = '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_active'] = 'Active';
 $PALANG['pCreate_alias_button'] = 'Add Alias';
 $PALANG['pCreate_alias_goto_text'] = 'Where the mail needs to be sent to.';
 $PALANG['pCreate_alias_goto_text_error'] = 'The To: is not valid!';
@@ -120,7 +117,6 @@
 $PALANG['pEdit_alias_help'] = 'Accepts multiple targets, one entry per line.';
 $PALANG['pEdit_alias_address'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'To';
-$PALANG['pEdit_alias_active'] = 'Active';
 $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!';
@@ -139,7 +135,6 @@
 $PALANG['pCreate_mailbox_password_text_error'] = 'The passwords that you supplied don\'t match or are empty!';
 $PALANG['pCreate_mailbox_name_text'] = 'Full name';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'The quota that you specified is too high!';
-$PALANG['pCreate_mailbox_active'] = 'Active';
 $PALANG['pCreate_mailbox_mail'] = 'Send Welcome mail';
 $PALANG['pCreate_mailbox_button'] = 'Add Mailbox';
 $PALANG['pCreate_mailbox_result_error'] = 'Unable to add the mailbox to the mailbox table!';
@@ -232,7 +227,6 @@
 
 $PALANG['pAdminList_admin_username'] = 'Admin';
 $PALANG['pAdminList_admin_count'] = 'Domains';
-$PALANG['pAdminList_admin_active'] = 'Active';
 
 $PALANG['pAdminList_domain_description'] = 'Description';
 $PALANG['pAdminList_domain_aliases'] = 'Aliases';
@@ -242,7 +236,6 @@
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['pAdminList_domain_usercontrol'] = 'User Control';
 $PALANG['last_modified'] = 'Last modified';
-$PALANG['pAdminList_domain_active'] = 'Active';
 
 $PALANG['pAdminList_virtual_button'] = 'Go';
 $PALANG['pAdminList_virtual_welcome'] = 'Overview for ';
@@ -253,7 +246,6 @@
 $PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Name';
 $PALANG['pAdminList_virtual_mailbox_quota'] = 'Quota (MB)';
-$PALANG['pAdminList_virtual_mailbox_active'] = 'Active';
 
 $PALANG['pAdminCreate_domain_welcome'] = 'Add a new domain';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'The domain already exists!';
@@ -283,7 +275,6 @@
 $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_active'] = 'Active';
 $PALANG['pAdminEdit_domain_button'] = 'Edit Domain'; # text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'Unable to modify domain!';
 
@@ -301,7 +292,6 @@
 $PALANG['pAdminEdit_admin_password'] = 'Password';
 $PALANG['pAdminEdit_admin_password2'] = 'Password (again)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'The passwords that you supplied don\'t match or are empty!';
-$PALANG['pAdminEdit_admin_active'] = 'Active';
 $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

Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/es.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -65,14 +65,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = 'Buzones';
 $PALANG['pOverview_alias_address'] = 'De';
 $PALANG['pOverview_alias_goto'] = 'Destino';
-$PALANG['pOverview_alias_active'] = 'Activo'; 
-$PALANG['pOverview_alias_domain_active'] = 'Activo'; 
+$PALANG['active'] = 'Activo'; 
 $PALANG['pOverview_alias_edit'] = 'Alias'; 
 $PALANG['and_x_more'] = '[y %s más...]'; 
 $PALANG['pOverview_mailbox_username'] = 'E-mail';
 $PALANG['pOverview_mailbox_name'] = 'Nombre';
 $PALANG['pOverview_mailbox_quota'] = 'Cuota (MB)';
-$PALANG['pOverview_mailbox_active'] = 'Activo';
 $PALANG['pOverview_vacation_edit'] = 'VACATION ESTÁ ACTIVADO'; 
 $PALANG['pOverview_vacation_option'] = 'Establecer Vacation'; 
 $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
@@ -105,7 +103,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = '¡Esta dirección ya existe, elija otra diferente por favor!';
 $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_active'] = 'Activo'; 
 $PALANG['pCreate_alias_button'] = 'Añadir alias';
 $PALANG['pCreate_alias_goto_text'] = 'A donde debe de ser enviado el e-mail.';
 $PALANG['pCreate_alias_goto_text_error'] = '¡El PARA no es válido!';
@@ -117,7 +114,6 @@
 $PALANG['pEdit_alias_help'] = 'Una entrada por línea.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'Destino';
-$PALANG['pEdit_alias_active'] = 'Activo'; 
 $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!'; 
@@ -136,7 +132,6 @@
 $PALANG['pCreate_mailbox_password_text_error'] = '¡Las contraseñas introducidas no coinciden o están en blanco!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Nombre completo';
 $PALANG['pCreate_mailbox_quota_text_error'] = '¡La cuota especificada es demasiado alta!';
-$PALANG['pCreate_mailbox_active'] = 'Activo';
 $PALANG['pCreate_mailbox_mail'] = 'Enviar correo bienvenida';
 $PALANG['pCreate_mailbox_button'] = 'Añadir buzón';
 $PALANG['pCreate_mailbox_result_error'] = '¡Imposible añadir un buzón a la tabla de buzones!';
@@ -227,7 +222,6 @@
 
 $PALANG['pAdminList_admin_username'] = 'Administrador';
 $PALANG['pAdminList_admin_count'] = 'Dominios';
-$PALANG['pAdminList_admin_active'] = 'Activo';
 
 $PALANG['pAdminList_domain_description'] = 'Descripción';
 $PALANG['pAdminList_domain_aliases'] = 'Alias';
@@ -236,7 +230,6 @@
 $PALANG['pAdminList_domain_transport'] = 'Transporte'; 
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Última Modificación';
-$PALANG['pAdminList_domain_active'] = 'Activo';
 
 $PALANG['pAdminList_virtual_button'] = 'Ir';
 $PALANG['pAdminList_virtual_welcome'] = 'Resumen de ';
@@ -247,7 +240,6 @@
 $PALANG['pAdminList_virtual_mailbox_username'] = 'E-mail';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nombre';
 $PALANG['pAdminList_virtual_mailbox_quota'] = 'Cuota (MB)';
-$PALANG['pAdminList_virtual_mailbox_active'] = 'Activo';
 
 $PALANG['pAdminCreate_domain_welcome'] = 'Añadir nuevo dominio';
 $PALANG['pAdminCreate_domain_domain_text_error'] = '¡El dominio ya existe!';
@@ -274,7 +266,6 @@
 $PALANG['pAdminEdit_domain_transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Definir transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = 'El servidor de correo es backup MX'; # XXX
-$PALANG['pAdminEdit_domain_active'] = 'Activo';
 $PALANG['pAdminEdit_domain_button'] = 'Editar dominio'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = '¡Imposible modificar el dominio!';
 
@@ -293,7 +284,6 @@
 $PALANG['pAdminEdit_admin_password'] = 'Contraseña';
 $PALANG['pAdminEdit_admin_password2'] = 'Contraseña (repetir)';
 $PALANG['pAdminEdit_admin_password_text_error'] = '¡Las contraseñas introducidas no coinciden o están en blanco!'; # XXX check/beautify - was split in two lines before
-$PALANG['pAdminEdit_admin_active'] = 'Activo';
 $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

Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/et.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -65,14 +65,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = 'Postkaste';
 $PALANG['pOverview_alias_address'] = 'Kellelt';
 $PALANG['pOverview_alias_goto'] = 'Kellele';
-$PALANG['pOverview_alias_active'] = 'Active'; # XXX
-$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
+$PALANG['active'] = 'Aktiivne';
 $PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-posti aadress';
 $PALANG['pOverview_mailbox_name'] = 'Nimi';
 $PALANG['pOverview_mailbox_quota'] = 'Kettaruumi piirang (MB)';
-$PALANG['pOverview_mailbox_active'] = 'Aktiivne';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
 $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
@@ -105,7 +103,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = 'See e-posti aadress eksisteerib juba, palun vali erinev!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Oled kasutanud kogu aliaste arvu!';
 $PALANG['pCreate_alias_goto'] = 'Kellele';
-$PALANG['pCreate_alias_active'] = 'Active'; # XXX
 $PALANG['pCreate_alias_button'] = 'Lisa alias';
 $PALANG['pCreate_alias_goto_text'] = 'Kuhu peab kirja saatma.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Kellele pole kehtiv!';
@@ -117,7 +114,6 @@
 $PALANG['pEdit_alias_help'] = 'Üks kirje rea kohta.'; # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'Kellele';
-$PALANG['pEdit_alias_active'] = 'Active'; # XXX
 $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
@@ -136,7 +132,6 @@
 $PALANG['pCreate_mailbox_password_text_error'] = 'Sisestatud paroolid ei kattu! Või on tühjad!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Täielik nimi';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Sisestatud kettaruumi piirang on liiga kõrge!';
-$PALANG['pCreate_mailbox_active'] = 'Aktiivne';
 $PALANG['pCreate_mailbox_mail'] = 'Loo postkast'; # XXX Text change to 'Send Welcome mail'
 $PALANG['pCreate_mailbox_button'] = 'Lisa postkast';
 $PALANG['pCreate_mailbox_result_error'] = 'Postkasti lisamine tabelisse ebaõnnestus!';
@@ -226,7 +221,6 @@
 
 $PALANG['pAdminList_admin_username'] = 'Haldaja';
 $PALANG['pAdminList_admin_count'] = 'Domeene';
-$PALANG['pAdminList_admin_active'] = 'Aktiivne';
 
 $PALANG['pAdminList_domain_description'] = 'Kirjeldus';
 $PALANG['pAdminList_domain_aliases'] = 'Aliased';
@@ -235,7 +229,6 @@
 $PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Viimati muudetud'; # XXX check text - should be 'Last modified'
-$PALANG['pAdminList_domain_active'] = 'Aktiivne';
 
 $PALANG['pAdminList_virtual_button'] = 'Mine';
 $PALANG['pAdminList_virtual_welcome'] = 'Ülevaade domeenist: ';
@@ -246,7 +239,6 @@
 $PALANG['pAdminList_virtual_mailbox_username'] = 'E-posti aadress';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nimi';
 $PALANG['pAdminList_virtual_mailbox_quota'] = 'Kettaruumi piirang (MB)';
-$PALANG['pAdminList_virtual_mailbox_active'] = 'Aktiivne';
 
 $PALANG['pAdminCreate_domain_welcome'] = 'Lisa uus domeen';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Selline domeen on juba olemas!';
@@ -273,7 +265,6 @@
 $PALANG['pAdminEdit_domain_transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Kirjelda transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'E-posti server on varuserver (backup MX)';
-$PALANG['pAdminEdit_domain_active'] = 'Aktiivne';
 $PALANG['pAdminEdit_domain_button'] = 'Muuda domeen'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'Domeeni muutmine ebaõnnestus!';
 
@@ -291,7 +282,6 @@
 $PALANG['pAdminEdit_admin_password'] = 'Parool';
 $PALANG['pAdminEdit_admin_password2'] = 'Parool (uuesti)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Sisestatud paroolid ei kattu! Või on tühjad!'; # XXX check/beautify - was split in two lines before
-$PALANG['pAdminEdit_admin_active'] = 'Aktiivne';
 $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

Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/eu.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -64,14 +64,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = 'Postontziak';
 $PALANG['pOverview_alias_address'] = 'Igorlea';
 $PALANG['pOverview_alias_goto'] = 'Norakoa';
-$PALANG['pOverview_alias_active'] = 'Active'; # XXX
-$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
+$PALANG['active'] = 'Aktibatua';
 $PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-mail';
 $PALANG['pOverview_mailbox_name'] = 'Izena';
 $PALANG['pOverview_mailbox_quota'] = 'Kuota (MB)';
-$PALANG['pOverview_mailbox_active'] = 'Aktibatua';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
 $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
@@ -103,7 +101,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = 'Helbide hau existitzen da, ezberdin bat aukera ezazu mesedez!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Alias sortze mugara heldu zara!';
 $PALANG['pCreate_alias_goto'] = 'Norakoa';
-$PALANG['pCreate_alias_active'] = 'Active'; # XXX
 $PALANG['pCreate_alias_button'] = 'Aliasa gehitu';
 $PALANG['pCreate_alias_goto_text'] = 'Nora bidali behar den e-maila.';
 $PALANG['pCreate_alias_goto_text_error'] = 'NORAKO okerra!';
@@ -115,7 +112,6 @@
 $PALANG['pEdit_alias_help'] = 'Lerroko sarrera bat.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Aliasa';
 $PALANG['pEdit_alias_goto'] = 'Norakoa';
-$PALANG['pEdit_alias_active'] = 'Active'; # XXX
 $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
@@ -134,7 +130,6 @@
 $PALANG['pCreate_mailbox_password_text_error'] = 'Sartutako pasahitzak ez datoz bat edo zuriz daude!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Izen osoa';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Zehazturiko kuota altuegia da!';
-$PALANG['pCreate_mailbox_active'] = 'Aktibatua';
 $PALANG['pCreate_mailbox_mail'] = 'Postontzia sortu'; # XXX Text change to 'Send Welcome mail'
 $PALANG['pCreate_mailbox_button'] = 'Postontzia gehitu';
 $PALANG['pCreate_mailbox_result_error'] = 'Ezinezkoa postontzi taulara postontzia gehitzea!';
@@ -224,7 +219,6 @@
 
 $PALANG['pAdminList_admin_username'] = 'Kudeatzailea';
 $PALANG['pAdminList_admin_count'] = 'Domeinuak';
-$PALANG['pAdminList_admin_active'] = 'Aktibatua';
 
 $PALANG['pAdminList_domain_description'] = 'Deskripzioa';
 $PALANG['pAdminList_domain_aliases'] = 'Aliasa';
@@ -233,7 +227,6 @@
 $PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
 $PALANG['last_modified'] = 'Azken aldaketa';
-$PALANG['pAdminList_domain_active'] = 'Aktibatua';
 
 $PALANG['pAdminList_virtual_button'] = 'Joan';
 $PALANG['pAdminList_virtual_welcome'] = 'Laburpena ';
@@ -244,7 +237,6 @@
 $PALANG['pAdminList_virtual_mailbox_username'] = 'E-mail';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Izena';
 $PALANG['pAdminList_virtual_mailbox_quota'] = 'Kuota (MB)';
-$PALANG['pAdminList_virtual_mailbox_active'] = 'Aktibatua';
 
 $PALANG['pAdminCreate_domain_welcome'] = 'Domeinu berria gehitu';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domeinua existitzen da!';
@@ -271,7 +263,6 @@
 $PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX
-$PALANG['pAdminEdit_domain_active'] = 'Aktibatua';
 $PALANG['pAdminEdit_domain_button'] = 'Domeinua aldatu'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'Ezinezkoa domeinua aldatzea!';
 
@@ -290,7 +281,6 @@
 $PALANG['pAdminEdit_admin_password'] = 'Pasahitza';
 $PALANG['pAdminEdit_admin_password2'] = 'Pasahitza (errepikatu)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Sartutako pasahitzak ez datoz bat edo zuriz daude!'; # XXX check/beautify - was split in two lines before
-$PALANG['pAdminEdit_admin_active'] = 'Aktibatua';
 $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

Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/fi.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -66,14 +66,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = 'Postilaatikot';
 $PALANG['pOverview_alias_address'] = 'Keneltä';
 $PALANG['pOverview_alias_goto'] = 'Kenelle';
-$PALANG['pOverview_alias_active'] = 'Aktiivinen';
-$PALANG['pOverview_alias_domain_active'] = 'Aktiivinen';
+$PALANG['active'] = 'Aktiivinen';
 $PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[ja %s lisää...]';
 $PALANG['pOverview_mailbox_username'] = 'Sähköposti';
 $PALANG['pOverview_mailbox_name'] = 'Nimi';
 $PALANG['pOverview_mailbox_quota'] = 'Kiintiö (MB)';
-$PALANG['pOverview_mailbox_active'] = 'Aktiivinen';
 $PALANG['pOverview_vacation_edit'] = 'Lomavastaaja on päällä';
 $PALANG['pOverview_vacation_option'] = 'Aseta lomavastaaja';
 $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
@@ -106,7 +104,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = 'Tämä sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Aliasten maksimimäärä saavutettu. Et voi lisätä aliaksia enää!';
 $PALANG['pCreate_alias_goto'] = 'Kenelle';
-$PALANG['pCreate_alias_active'] = 'Aktiivinen';
 $PALANG['pCreate_alias_button'] = 'Lisää alias';
 $PALANG['pCreate_alias_goto_text'] = 'Minne posti lähetetään.';
 $PALANG['pCreate_alias_goto_text_error'] = '"Kenelle" osoite ei ole oikean muotoinen!';
@@ -117,7 +114,6 @@
 $PALANG['pEdit_alias_help'] = 'Yksi kohta per rivi.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'Kenelle';
-$PALANG['pEdit_alias_active'] = 'Aktiivinen';
 $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!';
@@ -136,7 +132,6 @@
 $PALANG['pCreate_mailbox_password_text_error'] = 'Antamasi salasanat eivät täsmää! tai ne ovat tyhjät!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Koko nimi';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Antamasi kiintiö on liian korkea!';
-$PALANG['pCreate_mailbox_active'] = 'Aktiivinen';
 $PALANG['pCreate_mailbox_mail'] = 'Luo postilaatikko'; # XXX Text change to 'Send Welcome mail'
 $PALANG['pCreate_mailbox_button'] = 'Lisää postilaatikko';
 $PALANG['pCreate_mailbox_result_error'] = 'Postilaatikon lisääminen ei onnistu!';
@@ -226,7 +221,6 @@
 
 $PALANG['pAdminList_admin_username'] = 'Ylläpitäjä';
 $PALANG['pAdminList_admin_count'] = 'Domainit';
-$PALANG['pAdminList_admin_active'] = 'Aktiivinen';
 
 $PALANG['pAdminList_domain_description'] = 'Kuvaus';
 $PALANG['pAdminList_domain_aliases'] = 'Aliakset';
@@ -235,7 +229,6 @@
 $PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Vara MX';
 $PALANG['last_modified'] = 'Viimeksi muokattu';
-$PALANG['pAdminList_domain_active'] = 'Atiivinen';
 
 $PALANG['pAdminList_virtual_button'] = 'Siirry';
 $PALANG['pAdminList_virtual_welcome'] = 'Yleisnäkymä ';
@@ -246,7 +239,6 @@
 $PALANG['pAdminList_virtual_mailbox_username'] = 'Sähköposti';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Nimi';
 $PALANG['pAdminList_virtual_mailbox_quota'] = 'Kiintiö (MB)';
-$PALANG['pAdminList_virtual_mailbox_active'] = 'Aktiivinen';
 
 $PALANG['pAdminCreate_domain_welcome'] = 'Lisää uusi domain';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Domain on jo järjestelmässä!';
@@ -273,7 +265,6 @@
 $PALANG['pAdminEdit_domain_transport'] = 'Transport';
 $PALANG['pAdminEdit_domain_transport_text'] = 'Määritä transport';
 $PALANG['pAdminEdit_domain_backupmx'] = 'Sähköpostipalvelin on vara MX';
-$PALANG['pAdminEdit_domain_active'] = 'Aktiivinen';
 $PALANG['pAdminEdit_domain_button'] = 'Muokkaa domainia'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'Domainin muokkaus ei onnistu!';
 
@@ -291,7 +282,6 @@
 $PALANG['pAdminEdit_admin_password'] = 'Salasana';
 $PALANG['pAdminEdit_admin_password2'] = 'Salasana (toistamiseen)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Antamasi salasanat eivät täsmää! Tai ne ovat tyhjiä!'; # XXX check/beautify - was split in two lines before
-$PALANG['pAdminEdit_admin_active'] = 'Aktiivinen';
 $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

Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/fo.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -65,14 +65,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = 'Postkassar';
 $PALANG['pOverview_alias_address'] = 'Frá';
 $PALANG['pOverview_alias_goto'] = 'Til';
-$PALANG['pOverview_alias_active'] = 'Active'; # XXX
-$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
+$PALANG['active'] = 'Virkin';
 $PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-post';
 $PALANG['pOverview_mailbox_name'] = 'Navn';
 $PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
-$PALANG['pOverview_mailbox_active'] = 'Virkin';
 $PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
 $PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
 $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
@@ -105,7 +103,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = '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_active'] = 'Active'; # XXX
 $PALANG['pCreate_alias_button'] = 'Stovna Dulnevni';
 $PALANG['pCreate_alias_goto_text'] = 'Har posturin skal sendast til.';
 $PALANG['pCreate_alias_goto_text_error'] = 'TIL er ógyldugt!';
@@ -117,7 +114,6 @@
 $PALANG['pEdit_alias_help'] = 'Eina adressu pr. linju.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Dulnevni';
 $PALANG['pEdit_alias_goto'] = 'Til';
-$PALANG['pEdit_alias_active'] = 'Active'; # XXX
 $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
@@ -136,7 +132,6 @@
 $PALANG['pCreate_mailbox_password_text_error'] = 'Loyniorðini tú skrivaði samsvara ikki! Ella eru tóm!'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_mailbox_name_text'] = 'Fult navn';
 $PALANG['pCreate_mailbox_quota_text_error'] = 'Kvotan tú skrivaði er ov høg!';
-$PALANG['pCreate_mailbox_active'] = 'Virkin';
 $PALANG['pCreate_mailbox_mail'] = 'Stovna postkassa'; # XXX Text change to 'Send Welcome mail'
 $PALANG['pCreate_mailbox_button'] = 'Stovna postkassa';
 $PALANG['pCreate_mailbox_result_error'] = 'Fái ikki stovnað postkassa!';
@@ -226,7 +221,6 @@
 
 $PALANG['pAdminList_admin_username'] = 'Umsitari';
 $PALANG['pAdminList_admin_count'] = 'Navnaøki';
-$PALANG['pAdminList_admin_active'] = 'Virkin';
 
 $PALANG['pAdminList_domain_description'] = 'Frágreiðing';
 $PALANG['pAdminList_domain_aliases'] = 'Dulnevni';
@@ -235,7 +229,6 @@
 $PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
 $PALANG['last_modified'] = 'Síðst broytt'; # XXX check text - should be 'Last modified'
-$PALANG['pAdminList_domain_active'] = 'Virki';
 
 $PALANG['pAdminList_virtual_button'] = 'Vel';
 $PALANG['pAdminList_virtual_welcome'] = 'Yvirlit yvir ';
@@ -246,7 +239,6 @@
 $PALANG['pAdminList_virtual_mailbox_username'] = 'E-post';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';
 $PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvota (MB)';
-$PALANG['pAdminList_virtual_mailbox_active'] = 'Virkin';
 
 $PALANG['pAdminCreate_domain_welcome'] = 'Stova nýtt navnaøki';
 $PALANG['pAdminCreate_domain_domain_text_error'] = 'Navnaøki finst longu!';
@@ -273,7 +265,6 @@
 $PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
 $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
 $PALANG['pAdminEdit_domain_backupmx'] = 'Post servari er "backup MX"';
-$PALANG['pAdminEdit_domain_active'] = 'Virki';
 $PALANG['pAdminEdit_domain_button'] = 'Broyt navnaøki'; # XXX text no longer used
 $PALANG['pAdminEdit_domain_result_error'] = 'Fái ikki broytt navnaøki!';
 
@@ -291,7 +282,6 @@
 $PALANG['pAdminEdit_admin_password'] = 'Loyniorð';
 $PALANG['pAdminEdit_admin_password2'] = 'Loyniorð (umaftur)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Loyniorðini tú skrivaði samsvara ikki! Ella eru tóm!'; # XXX check/beautify - was split in two lines before
-$PALANG['pAdminEdit_admin_active'] = 'Virkin';
 $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

Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang	2013-07-28 18:25:43 UTC (rev 1502)
+++ trunk/languages/fr.lang	2013-07-28 19:24:00 UTC (rev 1503)
@@ -67,14 +67,12 @@
 $PALANG['pOverview_alias_mailbox_count'] = 'Comptes courriels';
 $PALANG['pOverview_alias_address'] = 'De';
 $PALANG['pOverview_alias_goto'] = 'A';
-$PALANG['pOverview_alias_active'] = 'Activé';
-$PALANG['pOverview_alias_domain_active'] = 'Activé';
+$PALANG['active'] = 'Actif';
 $PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[et %s en plus...]';
 $PALANG['pOverview_mailbox_username'] = 'courriel';
 $PALANG['pOverview_mailbox_name'] = 'Nom';
 $PALANG['pOverview_mailbox_quota'] = 'Limite (MB)';
-$PALANG['pOverview_mailbox_active'] = 'Actif';
 $PALANG['pOverview_vacation_edit'] = 'REPONDEUR ACTIVE';
 $PALANG['pOverview_vacation_option'] = 'Configurer le répondeur';
 $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any domains.'; # XXX
@@ -106,7 +104,6 @@
 $PALANG['pCreate_alias_address_text_error2'] = 'Ce compte courriel existe déjà, choisissez un autre libellé !';
 $PALANG['pCreate_alias_address_text_error3'] = 'Vous avez atteint votre limite d\'alias créés !';
 $PALANG['pCreate_alias_goto'] = 'À';
-$PALANG['pCreate_alias_active'] = 'Activé';
 $PALANG['pCreate_alias_button'] = 'Ajouter un alias';
 $PALANG['pCreate_alias_goto_text'] = 'Destinataires des courriels.';
 $PALANG['pCreate_alias_goto_text_error'] = 'le champ À contient des erreurs!';
@@ -118,7 +115,6 @@
 $PALANG['pEdit_alias_help'] = 'Une entrée par ligne.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['pEdit_alias_address'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'À';
-$PALANG['pEdit_alias_active'] = 'Activé';
 $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: ';...
 
[truncated message content]