SF.net SVN: postfixadmin:[1507] trunk

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

Revision: 1507
          http://sourceforge.net/p/postfixadmin/code/1507
Author:   christian_boltz
Date:     2013-07-28 20:22:05 +0000 (Sun, 28 Jul 2013)
Log Message:
-----------
*.lang:
  - rename $PALANG['pEdit_alias_address'] to $PALANG['alias']
  - remove duplicate $PALANG['pOverview_alias_edit']

model/*, templates/*:
- use $PALANG['alias'] 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/AliasHandler.php
    trunk/templates/list-virtual_mailbox.tpl
    trunk/templates/users_edit-alias.tpl

Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/bg.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -67,7 +67,6 @@
 $PALANG['pOverview_alias_address'] = 'От';
 $PALANG['pOverview_alias_goto'] = 'До';
 $PALANG['active'] = 'Активен';
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'Е-мейл';
 $PALANG['pOverview_mailbox_name'] = 'Име';
@@ -113,7 +112,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'Към';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Не сте въвели нищо в полето Към';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Е-мейл адреса, който сте въвели не е валиден: ';

Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/ca.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -65,7 +65,6 @@
 $PALANG['pOverview_alias_address'] = 'De';
 $PALANG['pOverview_alias_goto'] = 'Destí';
 $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';
@@ -111,7 +110,7 @@
 
 $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['pEdit_alias_address'] = 'Àlies';
+$PALANG['alias'] = 'Àlies';
 $PALANG['pEdit_alias_goto'] = '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: ';

Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/cn.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -66,7 +66,6 @@
 $PALANG['pOverview_alias_address'] = '前往';
 $PALANG['pOverview_alias_goto'] = '转到';
 $PALANG['active'] = '活动';
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = '邮件地址';
 $PALANG['pOverview_mailbox_name'] = '姓名';
@@ -112,7 +111,7 @@
 
 $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['pEdit_alias_address'] = '别名';
+$PALANG['alias'] = '别名';
 $PALANG['pEdit_alias_goto'] = '转到';
 $PALANG['pEdit_alias_goto_text_error1'] = '你没有填写收信人';
 $PALANG['pEdit_alias_goto_text_error2'] = '邮件地址非法: ';

Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/cs.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -71,7 +71,6 @@
 $PALANG['pOverview_alias_address'] = 'Od';
 $PALANG['pOverview_alias_goto'] = 'Pro';
 $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';
@@ -117,7 +116,7 @@
 
 $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['pEdit_alias_address'] = 'Přesměrování';
+$PALANG['alias'] = 'Přesměrování';
 $PALANG['pEdit_alias_goto'] = 'Cíl';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Nezadali jste cíl';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Emailová adresa kterou jste zadali není platná: ';

Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/da.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -70,7 +70,6 @@
 $PALANG['pOverview_alias_address'] = 'Alias';
 $PALANG['pOverview_alias_goto'] = 'Modtager';
 $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';
@@ -117,7 +116,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'Modtager(e)'; # XXX check / compare with pCreate_alias_goto - 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: ';

Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/de.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -68,7 +68,6 @@
 $PALANG['pOverview_alias_address'] = 'Von';
 $PALANG['pOverview_alias_goto'] = 'An';
 $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';
@@ -114,7 +113,7 @@
 
 $PALANG['pEdit_alias_welcome'] = 'Weiterleitungs-Einstellungen ändern';
 $PALANG['pEdit_alias_help'] = 'Angabe mehrerer Ziele möglich, ein Eintrag pro Zeile.';
-$PALANG['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = '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: ';

Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/en.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -68,7 +68,6 @@
 $PALANG['pOverview_alias_address'] = 'From';
 $PALANG['pOverview_alias_goto'] = 'To';
 $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';
@@ -115,7 +114,7 @@
 
 $PALANG['pEdit_alias_welcome'] = 'Edit forwarding settings';
 $PALANG['pEdit_alias_help'] = 'Accepts multiple targets, one entry per line.';
-$PALANG['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = '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: ';

Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/es.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -66,7 +66,6 @@
 $PALANG['pOverview_alias_address'] = 'De';
 $PALANG['pOverview_alias_goto'] = 'Destino';
 $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';
@@ -112,7 +111,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = '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: ';

Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/et.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -66,7 +66,6 @@
 $PALANG['pOverview_alias_address'] = 'Kellelt';
 $PALANG['pOverview_alias_goto'] = 'Kellele';
 $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';
@@ -112,7 +111,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = '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: ';

Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/eu.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -65,7 +65,6 @@
 $PALANG['pOverview_alias_address'] = 'Igorlea';
 $PALANG['pOverview_alias_goto'] = 'Norakoa';
 $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';
@@ -110,7 +109,7 @@
 
 $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['pEdit_alias_address'] = 'Aliasa';
+$PALANG['alias'] = 'Aliasa';
 $PALANG['pEdit_alias_goto'] = 'Norakoa';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Norakoan ez duzu ezer jarri';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Sartutako e-mail helbidea baliiogabekoa da: ';

Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/fi.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -67,7 +67,6 @@
 $PALANG['pOverview_alias_address'] = 'Keneltä';
 $PALANG['pOverview_alias_goto'] = 'Kenelle';
 $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';
@@ -112,7 +111,7 @@
 $PALANG['pCreate_alias_catchall_text'] = 'Jos haluat luoda catch-all osoitteen käytä "*" merkkiä aliaksena. Ohjaus domainista domainiin tapahtuu käyttämällä "*@domain.tld" Kenelle: -osoitteena.'; # XXX check/beautify - was split in two lines before
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = '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: ';

Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/fo.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -66,7 +66,6 @@
 $PALANG['pOverview_alias_address'] = 'Frá';
 $PALANG['pOverview_alias_goto'] = 'Til';
 $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';
@@ -112,7 +111,7 @@
 
 $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['pEdit_alias_address'] = 'Dulnevni';
+$PALANG['alias'] = 'Dulnevni';
 $PALANG['pEdit_alias_goto'] = '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: ';

Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/fr.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -68,7 +68,6 @@
 $PALANG['pOverview_alias_address'] = 'De';
 $PALANG['pOverview_alias_goto'] = 'A';
 $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';
@@ -113,7 +112,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'À';
 $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: ';

Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/hr.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -65,7 +65,6 @@
 $PALANG['pOverview_alias_address'] = 'Od';
 $PALANG['pOverview_alias_goto'] = 'Za';
 $PALANG['active'] = 'Aktivan';
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-pošta';
 $PALANG['pOverview_mailbox_name'] = 'Ime';
@@ -111,7 +110,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'Za';
 $PALANG['pEdit_alias_goto_text_error1'] = 'U polje "Za" niste unijeli ništa!';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Adresa e-pošte, koju ste unijeli nije pravilna: ';

Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/hu.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -67,7 +67,6 @@
 $PALANG['pOverview_alias_address'] = 'Honnan';
 $PALANG['pOverview_alias_goto'] = 'Hova';
 $PALANG['active'] = 'Aktív';
-$PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'Email';
 $PALANG['pOverview_mailbox_name'] = 'Név';
@@ -114,7 +113,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = '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: ';

Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/is.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -66,7 +66,6 @@
 $PALANG['pOverview_alias_address'] = 'Póstur fyrir';
 $PALANG['pOverview_alias_goto'] = 'Áframsendist til';
 $PALANG['active'] = 'Virkt';
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'Póstfang';
 $PALANG['pOverview_mailbox_name'] = 'Nafn notanda';
@@ -111,7 +110,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'To'; # XXX check / compare with pCreate_alias_goto - 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: ';

Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/it.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -67,7 +67,6 @@
 $PALANG['pOverview_alias_address'] = 'Da';
 $PALANG['pOverview_alias_goto'] = 'a';
 $PALANG['active'] = 'Attivo';
-$PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[più %s altri...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
 $PALANG['pOverview_mailbox_name'] = 'Nome';
@@ -113,7 +112,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'A';
 $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 : ';

Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/ja.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -68,7 +68,6 @@
 $PALANG['pOverview_alias_address'] = '転送元';
 $PALANG['pOverview_alias_goto'] = '転送先';
 $PALANG['active'] = 'アクティブ';
-$PALANG['pOverview_alias_edit'] = '転送';
 $PALANG['and_x_more'] = '[その他 %s 個]';
 $PALANG['pOverview_mailbox_username'] = 'メールアドレス';
 $PALANG['pOverview_mailbox_name'] = '名前';
@@ -114,7 +113,7 @@
 
 $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['pEdit_alias_address'] = '転送元'; # XXX check / compare with pCreate_alias_address - should be 'Alias'
+$PALANG['alias'] = '転送元'; # XXX check text - should be 'Alias'
 $PALANG['pEdit_alias_goto'] = '転送先'; # XXX check / compare with pCreate_alias_goto - should be "To"
 $PALANG['pEdit_alias_goto_text_error1'] = '転送先が入力されていません。';
 $PALANG['pEdit_alias_goto_text_error2'] = 'このメールアドレスは無効です: ';

Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/lt.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -66,7 +66,6 @@
 $PALANG['pOverview_alias_address'] = 'Iš';
 $PALANG['pOverview_alias_goto'] = 'Į';
 $PALANG['active'] = 'Įjungtas'; # XXX check text - should be 'Active'
-$PALANG['pOverview_alias_edit'] = 'Sinonimas';
 $PALANG['and_x_more'] = '[ir %s daugiau...]';
 $PALANG['pOverview_mailbox_username'] = 'El.paštas';
 $PALANG['pOverview_mailbox_name'] = 'Vardas';
@@ -113,7 +112,7 @@
 
 $PALANG['pEdit_alias_welcome'] = 'Keisti persiuntimo nustatymus';
 $PALANG['pEdit_alias_help'] = 'Gali būti keli įrašai, vienas įrašas eilutėje.';
-$PALANG['pEdit_alias_address'] = 'Sinonimas';
+$PALANG['alias'] = 'Sinonimas';
 $PALANG['pEdit_alias_goto'] = 'Kam';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Neužpildėte lauko "Kam"';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Įvestas neteisingas pašto adresas: ';

Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/mk.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -66,7 +66,6 @@
 $PALANG['pOverview_alias_address'] = 'Од';
 $PALANG['pOverview_alias_goto'] = 'До';
 $PALANG['active'] = 'Активен';
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'Адреса';
 $PALANG['pOverview_mailbox_name'] = 'Име';
@@ -112,7 +111,7 @@
 
 $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['pEdit_alias_address'] = 'Алијас';
+$PALANG['alias'] = 'Алијас';
 $PALANG['pEdit_alias_goto'] = 'До';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Немате ништо внесено во полето ДО';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Адресата која ја имате внесено не е валидна: ';

Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/nb.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -68,7 +68,6 @@
 $PALANG['pOverview_alias_address'] = 'Fra';
 $PALANG['pOverview_alias_goto'] = 'Til';
 $PALANG['active'] = 'Aktiv';
-$PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[og %s flere...]';
 $PALANG['pOverview_mailbox_username'] = 'E-post';
 $PALANG['pOverview_mailbox_name'] = 'Navn';
@@ -113,7 +112,7 @@
 $PALANG['pCreate_alias_catchall_text'] = 'For å opprette et "catch-all"-alias, bruk "*" som alias. For domene-til-domene-videresending, bruk "*@domene.tld" i Til-feltet.'; # XXX check/beautify - was split in two lines before
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'Til';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Du skrev ingenting i Til-feltet';
 $PALANG['pEdit_alias_goto_text_error2'] = 'E-postadressen er ikke gyldig: ';

Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/nl.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -67,7 +67,6 @@
 $PALANG['pOverview_alias_address'] = 'Van';
 $PALANG['pOverview_alias_goto'] = 'Naar';
 $PALANG['active'] = 'Actief';
-$PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[en %s meer...]';
 $PALANG['pOverview_mailbox_username'] = 'e-mail';
 $PALANG['pOverview_mailbox_name'] = 'Naam';
@@ -113,7 +112,7 @@
 
 $PALANG['pEdit_alias_welcome'] = 'Bewerk een alias voor uw domein.';
 $PALANG['pEdit_alias_help'] = 'Meerdere e-mailadressen toegestaan. Slechts één alias per regel.';
-$PALANG['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = '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: ';

Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/nn.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -66,7 +66,6 @@
 $PALANG['pOverview_alias_address'] = 'Fra';
 $PALANG['pOverview_alias_goto'] = 'Mottaker';
 $PALANG['active'] = 'Aktiv'; # XXX check text - should be 'Active'
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-post';
 $PALANG['pOverview_mailbox_name'] = 'Nann';
@@ -111,7 +110,7 @@
 $PALANG['pCreate_alias_catchall_text'] = 'For å opprette et alias som "mottar alt" bruk "*" som alias. For domene-til-domene videresending bruk "*@domene.tld" som mottaker.';  # XXX check/beautify - was split in two lines before
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'Mottaker';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Du skrev ikke noe i mottakerfeltet';
 $PALANG['pEdit_alias_goto_text_error2'] = 'E-post adressen er ugyldig: ';

Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/pl.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -69,7 +69,6 @@
 $PALANG['pOverview_alias_address'] = 'Od';
 $PALANG['pOverview_alias_goto'] = 'Do';
 $PALANG['active'] = 'Aktywny';
-$PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[i %s wiecej...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
 $PALANG['pOverview_mailbox_name'] = 'Nazwa';
@@ -114,7 +113,7 @@
 $PALANG['pCreate_alias_catchall_text'] = 'Aby utworzyć domyślne konto dla domeny (catch-all) podaj "*" (gwiazdkę) jako alias. Jeśli chcesz przekazywać całość poczty do innej domeny, wpisz jako alias "*@domena.tld".'; # XXX check/beautify - was split in two lines before
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = '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: ';

Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/pt-br.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -68,7 +68,6 @@
 $PALANG['pOverview_alias_address'] = 'De';
 $PALANG['pOverview_alias_goto'] = 'Para';
 $PALANG['active'] = 'Habilitado';
-$PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[e %s mais...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
 $PALANG['pOverview_mailbox_name'] = 'Nome';
@@ -116,7 +115,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = '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: ';

Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/ru.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -69,7 +69,6 @@
 $PALANG['pOverview_alias_address'] = 'От';
 $PALANG['pOverview_alias_goto'] = 'Кому';
 $PALANG['active'] = 'Активен';
-$PALANG['pOverview_alias_edit'] = 'Алиас';
 $PALANG['and_x_more'] = '[и еще %s...]';
 $PALANG['pOverview_mailbox_username'] = 'Ящик';
 $PALANG['pOverview_mailbox_name'] = 'Имя';
@@ -116,7 +115,7 @@
 
 $PALANG['pEdit_alias_welcome'] = 'Редактирование настроек пересылки';
 $PALANG['pEdit_alias_help'] = 'Можно указать несколько целей, одна запись на строку.';
-$PALANG['pEdit_alias_address'] = 'Алиас';
+$PALANG['alias'] = 'Алиас';
 $PALANG['pEdit_alias_goto'] = 'Кому';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Вы ничего не ввели в поле Кому';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Вы ввели неверный адрес: ';

Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/sk.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -67,7 +67,6 @@
 $PALANG['pOverview_alias_address'] = 'Od';
 $PALANG['pOverview_alias_goto'] = 'Doručenie';
 $PALANG['active'] = 'Aktívny'; # XXX check text - should be 'Active'
-$PALANG['pOverview_alias_edit'] = 'aliasy';
 $PALANG['and_x_more'] = '[a %s ďalších...]';
 $PALANG['pOverview_mailbox_username'] = 'Email';
 $PALANG['pOverview_mailbox_name'] = 'Meno';
@@ -113,7 +112,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias'; # XXX
 $PALANG['pEdit_alias_goto'] = 'Cieľ';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Nezadali ste cieľ';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Zadaná emailová adresa nie je platná: ';

Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/sl.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -66,7 +66,6 @@
 $PALANG['pOverview_alias_address'] = 'Od';
 $PALANG['pOverview_alias_goto'] = 'Za';
 $PALANG['active'] = 'Aktiven';
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'E-pošta';
 $PALANG['pOverview_mailbox_name'] = 'Ime';
@@ -112,7 +111,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = '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: ';

Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/sv.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -68,7 +68,6 @@
 $PALANG['pOverview_alias_address'] = 'Från';
 $PALANG['pOverview_alias_goto'] = 'Till';
 $PALANG['active'] = 'Aktiv';
-$PALANG['pOverview_alias_edit'] = 'Alias';
 $PALANG['and_x_more'] = '[och %s mer...]';
 $PALANG['pOverview_mailbox_username'] = 'Epost';
 $PALANG['pOverview_mailbox_name'] = 'Namn';
@@ -114,7 +113,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'Till';
 $PALANG['pEdit_alias_goto_text_error1'] = 'Du angav inget i Till';
 $PALANG['pEdit_alias_goto_text_error2'] = 'Epost adressen du angivit är felaktig: ';

Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/tr.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -66,7 +66,6 @@
 $PALANG['pOverview_alias_address'] = 'Kimden';
 $PALANG['pOverview_alias_goto'] = 'Kime';
 $PALANG['active'] = 'Aktif';
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = 'Eposta';
 $PALANG['pOverview_mailbox_name'] = 'Ýsim';
@@ -112,7 +111,7 @@
 
 $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['pEdit_alias_address'] = 'Alias';
+$PALANG['alias'] = 'Alias';
 $PALANG['pEdit_alias_goto'] = 'Kime'; # XXX check / compare with pCreate_alias_goto - 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: ';

Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/languages/tw.lang	2013-07-28 20:22:05 UTC (rev 1507)
@@ -66,7 +66,6 @@
 $PALANG['pOverview_alias_address'] = '前往';
 $PALANG['pOverview_alias_goto'] = '轉到';
 $PALANG['active'] = '活動';
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
 $PALANG['and_x_more'] = '[and %s more...]'; # XXX
 $PALANG['pOverview_mailbox_username'] = '郵件地址';
 $PALANG['pOverview_mailbox_name'] = '姓名';
@@ -112,7 +111,7 @@
 
 $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['pEdit_alias_address'] = '別名';
+$PALANG['alias'] = '別名';
 $PALANG['pEdit_alias_goto'] = '轉到';
 $PALANG['pEdit_alias_goto_text_error1'] = '你沒有填寫收信人';
 $PALANG['pEdit_alias_goto_text_error2'] = '郵件地址非法: ';

Modified: trunk/model/AliasHandler.php
===================================================================
--- trunk/model/AliasHandler.php	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/model/AliasHandler.php	2013-07-28 20:22:05 UTC (rev 1507)
@@ -26,8 +26,8 @@
         $this->struct=array(
             # field name                allow       display in...   type    $PALANG label                     $PALANG description                 default / ...
             #                           editing?    form    list
-            'address'       => pacol(   $this->new, 1,      1,      'mail', 'pEdit_alias_address'           , 'pCreate_alias_catchall_text'     ),
-            'localpart'     => pacol(   $this->new, 0,      0,      'text', 'pEdit_alias_address'           , 'pCreate_alias_catchall_text'     , '', 
+            'address'       => pacol(   $this->new, 1,      1,      'mail', 'alias'                         , 'pCreate_alias_catchall_text'     ),
+            'localpart'     => pacol(   $this->new, 0,      0,      'text', 'alias'                         , 'pCreate_alias_catchall_text'     , '', 
                 /*options*/ '', 
                 /*not_in_db*/ 1                         ),
             'domain'        => pacol(   $this->new, 0,      0,      'enum', ''                              , ''                                , '', 

Modified: trunk/templates/list-virtual_mailbox.tpl
===================================================================
--- trunk/templates/list-virtual_mailbox.tpl	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/templates/list-virtual_mailbox.tpl	2013-07-28 20:22:05 UTC (rev 1507)
@@ -84,7 +84,7 @@
 			{if $authentication_has_role.global_admin!==true && $CONF.alias_control_admin===YES}{assign var="edit_aliases" value=1}{/if}
 			{if $authentication_has_role.global_admin==true && $CONF.alias_control===YES}{assign var="edit_aliases" value=1}{/if}
 			{if $edit_aliases==1}
-				<td><a href="edit.php?table=alias&amp;edit={$item.username|escape:"url"}">{$PALANG.pOverview_alias_edit}</a></td>
+				<td><a href="edit.php?table=alias&amp;edit={$item.username|escape:"url"}">{$PALANG.alias}</a></td>
 			{/if}
 			<td><a href="edit.php?table=mailbox&amp;edit={$item.username|escape:"url"}">{$PALANG.edit}</a></td>
 			<td><a href="delete.php?table=mailbox&amp;delete={$item.username|escape:"url"}&amp;domain={$fDomain|escape:"url"}" onclick="return confirm ('{$PALANG.confirm}{$PALANG.pOverview_get_mailboxes}: {$item.username}');">{$PALANG.del}</a></td>

Modified: trunk/templates/users_edit-alias.tpl
===================================================================
--- trunk/templates/users_edit-alias.tpl	2013-07-28 20:14:57 UTC (rev 1506)
+++ trunk/templates/users_edit-alias.tpl	2013-07-28 20:22:05 UTC (rev 1507)
@@ -5,7 +5,7 @@
 		<th colspan="3">{$PALANG.pEdit_alias_welcome}<br /><em>{$PALANG.pEdit_alias_help}</em></th>
 	</tr>
 	<tr>
-		<td class="label"><label>{$PALANG.pEdit_alias_address}:</label></td>
+		<td class="label"><label>{$PALANG.alias}:</label></td>
 		<td><em>{$USERID_USERNAME}</em></td>
 		<td>&nbsp;</td>
 	</tr>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.