SF.net SVN: postfixadmin:[1587] trunk

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

Revision: 1587
          http://sourceforge.net/p/postfixadmin/code/1587
Author:   christian_boltz
Date:     2013-11-16 20:20:50 +0000 (Sat, 16 Nov 2013)
Log Message:
-----------
AliasHandler:
- only allow @domain as target if $this->id is a catchall
- delete commented out version of delete()
- better error messages

languages/*.lang
- add new texts needed for AliasHandler

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

Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/bg.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -105,13 +105,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Този ALIAS не е валиден!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Този е-мейл адрес вече съществува, моля изберете различен!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Достигнали сте лимита си за създаване на alias-и!';
 $PALANG['pCreate_alias_goto_text'] = 'Накъде трябва да се изпраща писмото.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Избраният адрес в полето Към не е валиден!';
 $PALANG['pCreate_alias_result_error'] = 'Не мога да добавя alias-а към таблицата! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Alias-а беше добавен успешно в таблицата!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'За да създадете catch-all използвайте "*" за alias. За пренасочване на домейн към домейн използвайте "*@domain.tld" в полето Към.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/ca.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -103,13 +103,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'L\'àlies no és vàlid!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Aquesta adreça ja existeix, escull una altra de diferent, si us plau!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Has arribat al límit de creació d\'àlies!';
 $PALANG['pCreate_alias_goto_text'] = 'A on ha de ser enviat l\'e-mail.';
 $PALANG['pCreate_alias_goto_text_error'] = 'El destí no és vàlid!';
 $PALANG['pCreate_alias_result_error'] = '¡No és posible afegir l\'àlies a la taula d\'àlies! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'L\'àlies ha estat creat correctament!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Per crear un àlies general usi "*" com a àlies. Per una redirecció de domini a domini, usi "*@domain.tld" com a Destí.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/cn.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -104,13 +104,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = '该别名非法!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = '邮件地址已经存在, 请重新选择!';
 $PALANG['pCreate_alias_address_text_error3'] = '你的别名已经达到上限!';
 $PALANG['pCreate_alias_goto_text'] = '邮件接收地址.';
 $PALANG['pCreate_alias_goto_text_error'] = '接收地址不正确!';
 $PALANG['pCreate_alias_result_error'] = '不能将别名添加到别名表中! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = '添加别名成功!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = '要将所有的邮件全部转发请使用"*"作为别名. 域到域的转发请使用"*@domain.tld".'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/cs.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -109,13 +109,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Adresa neni platná!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Taková emailová adresa již existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Dosáhli jste limitu, nemůžete vytvářet další aliasy!';
 $PALANG['pCreate_alias_goto_text'] = 'Kam má pošta chodit.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Cíl není platný!';
 $PALANG['pCreate_alias_result_error'] = 'Nepodařilo se přidat přesměrování do tabulky aliasů! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Přesměrování bylo uspěšně přidáno do tabulky aliasů!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Pro vytvoření doménového koše použijte * jako alias. Pro alias doména -> doména použijte *@domain.tld jako cíl.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/da.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -109,13 +109,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldigt.';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Emailadressen eksisterer allerede, vælg venligst en anden.';
 $PALANG['pCreate_alias_address_text_error3'] = 'Du har nået grænsen for antallet af aliases til domænet.';
 $PALANG['pCreate_alias_goto_text'] = 'Hvor emailen skal videresendes til.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Modtageradressen er ikke gyldig!';
 $PALANG['pCreate_alias_result_error'] = 'Kan ikke tilføje aliaset til alias-tabellen! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Aliaset er blevet tilføjet alias-tabellen!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'For at tilføje et stjerne-alias, brug en "*" som alias. For domæne til domæne-videresending brug "*@domæne.tld" som modtager.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/de.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -106,13 +106,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'Die Domain %s ist das Ziel einer oder mehrerer Alias-Domains und kann nicht gelöscht werden! (Löschen Sie zuerst die Alias-Domains.)';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Dieses ALIAS ist nicht erlaubt!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Diese eMail-Adresse existiert bereits. Bitte wählen Sie eine andere!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Sie haben Ihr Limit für Aliase auf dieser Domain erreicht!';
 $PALANG['pCreate_alias_goto_text'] = 'Wohin soll die eMail weitergeleitet werden?';
 $PALANG['pCreate_alias_goto_text_error'] = 'Das An-Feld ist falsch!';
 $PALANG['pCreate_alias_result_error'] = 'Das Erstellen des Aliases %s ist fehlgeschlagen!';
 $PALANG['pCreate_alias_result_success'] = 'Der Alias %s wurde erstellt!';
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Um alle Adressen abzudecken benutzen Sie einen "*" als Alias. Um ganze Domains an andere Domains weiterzuleiten benutzen Sie "*@domain.tld" im "An"-Feld.';
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $PALANG['pEdit_alias_welcome'] = 'Weiterleitungs-Einstellungen ändern';
 $PALANG['pEdit_alias_help'] = 'Angabe mehrerer Ziele möglich, ein Eintrag pro Zeile.';

Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/en.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -107,13 +107,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)';
 
 $PALANG['pCreate_alias_address_text_error1'] = 'The ALIAS is not valid!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!';
 $PALANG['email_address_already_exists'] = 'This email address already exists, please choose a different one!';
 $PALANG['pCreate_alias_address_text_error3'] = 'You have reached your limit to create aliases!';
 $PALANG['pCreate_alias_goto_text'] = 'Where the mail needs to be sent to.';
 $PALANG['pCreate_alias_goto_text_error'] = 'The To: is not valid!';
 $PALANG['pCreate_alias_result_error'] = 'Creating the alias %s failed!';
 $PALANG['pCreate_alias_result_success'] = 'The alias %s has been created!';
+$PALANG['alias_updated'] = 'The alias %s has been updated!';
 $PALANG['pCreate_alias_catchall_text'] = 'To create a catch-all use an "*" as alias.'; # XXX don't propagate usage of *@target-domain.com for domain-aliasing any longer
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!';
 
 $PALANG['pEdit_alias_welcome'] = 'Edit forwarding settings';
 $PALANG['pEdit_alias_help'] = 'Accepts multiple targets, one entry per line.';

Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/es.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -104,13 +104,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = '¡El ALIAS no es válido!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = '¡Esta dirección ya existe, elija otra diferente por favor!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = '¡Ha llegado a su límite de creación de alias!';
 $PALANG['pCreate_alias_goto_text'] = 'A donde debe de ser enviado el e-mail.';
 $PALANG['pCreate_alias_goto_text_error'] = '¡El PARA no es válido!';
 $PALANG['pCreate_alias_result_error'] = '¡No es posible añadir el alias a la tabla de alias! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = '¡El alias ha sido añadido a la tabla de alias!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Para crear un alias general use "*" como alias. Para una redirección de dominio a dominio, use "*@domain.tld" como Destino.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/et.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -104,13 +104,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS pole kehtiv!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'See e-posti aadress eksisteerib juba, palun vali erinev!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Oled kasutanud kogu aliaste arvu!';
 $PALANG['pCreate_alias_goto_text'] = 'Kuhu peab kirja saatma.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Kellele pole kehtiv!';
 $PALANG['pCreate_alias_result_error'] = 'Aliase lisamine tabelisse ebaõnnestus! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Alias lisati aliaste tabelisse!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Loomaks püüa-kõik aadressi kasuta aliasena "*". Domeenilt domeenile edasisaatmiseks kasuta kellele väljal "*@domeen.xx".'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/eu.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -102,13 +102,16 @@
 $PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIASa okerra da!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Helbide hau existitzen da, ezberdin bat aukera ezazu mesedez!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Alias sortze mugara heldu zara!';
 $PALANG['pCreate_alias_goto_text'] = 'Nora bidali behar den e-maila.';
 $PALANG['pCreate_alias_goto_text_error'] = 'NORAKO okerra!';
 $PALANG['pCreate_alias_result_error'] = 'Ezinezkoa aliasa alias taulan sartzea! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Aliasa alias taulan gehituta!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Alias orokor bat sortzeko "*" erabil ezazu alias gisa. Domeinuz domeinurako birbideraketa baterako Norako gisa "*@domain.tld" erabil ezazu.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/fi.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -105,13 +105,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Alias ei ole oikean muotoinen!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Tämä sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Aliasten maksimimäärä saavutettu. Et voi lisätä aliaksia enää!';
 $PALANG['pCreate_alias_goto_text'] = 'Minne posti lähetetään.';
 $PALANG['pCreate_alias_goto_text_error'] = '"Kenelle" osoite ei ole oikean muotoinen!';
 $PALANG['pCreate_alias_result_error'] = 'Aliaksen lisäys alias tauluun epäonnistui! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Alias on lisätty!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $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['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 $PALANG['pEdit_alias_welcome'] = 'Muokkaa aliasta.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Yksi kohta per rivi.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';

Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/fo.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -104,13 +104,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'DULNEVNI er ógyldugt!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Hendan e-post adressa finst longu, vinarliga vel eina aðra!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Tú hevur nátt tínum marki at stovna dulnevni!';
 $PALANG['pCreate_alias_goto_text'] = 'Har posturin skal sendast til.';
 $PALANG['pCreate_alias_goto_text_error'] = 'TIL er ógyldugt!';
 $PALANG['pCreate_alias_result_error'] = 'Fái ikki stovnað dulnevni! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Dulnevni er stovnað!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Fyri at stovna eitt ið fangar alt, brúka eina "*" sum dulnevni. Fyri navnaøki til navnaøki víðarisending brúka "*@navnaøki.fo" til hetta.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/fr.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -105,13 +105,16 @@
 $PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 $PALANG['pCreate_alias_address_text_error1'] = 'Cet ALIAS n\'est pas valide!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Ce compte courriel existe déjà, choisissez un autre libellé !'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Vous avez atteint votre limite d\'alias créés !';
 $PALANG['pCreate_alias_goto_text'] = 'Destinataires des courriels.';
 $PALANG['pCreate_alias_goto_text_error'] = 'le champ À contient des erreurs!';
 $PALANG['pCreate_alias_result_error'] = 'Impossible d\'ajouter cet alias dans la table ! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'L\'alias a été ajouté !'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Pour ajouter un alias global, utilisez "*". Pour un transfert de domaine à domaine, utilisez "*@domain.tld" dans le champs A.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/hr.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -103,13 +103,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS nije valjan!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Ova adresa e-pošte već postoji, molimo izaberite drugu!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Postigli ste maksimalan broj vaših aliasa!';
 $PALANG['pCreate_alias_goto_text'] = 'Kuda poslati e-poštu.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Unos "Za" je nepravilan!'; # XXX check - should be   The To: is not valid!
 $PALANG['pCreate_alias_result_error'] = 'Nije bilo moguće dodati alias u tablicu aliasa! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Alias je dodan u tablicu aliasa!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Ukoliko želite stvoriti "sveprimajući" alias, upotrijebite "*" umjesto aliasa. Za preusmjeravanje iz domene na domenu, upotrijebite "*@domena.tld" u "Za" polju.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/hu.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -106,13 +106,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Az ALIAS érvénytelen!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Ez az email cím már létezik, kérlek válassz másikat!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Elérted a maximális alias limitet!';
 $PALANG['pCreate_alias_goto_text'] = 'Ahova a levélnek mennie kell.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Érvénytelen a HOVA mezõ!';
 $PALANG['pCreate_alias_result_error'] = 'Nemsikerült hozzáadni az aliast az alias táblához! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Az aliast felvettük az alias táblába!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'A catch-all (*@valami.hu) beállításához használj "*" -ot az alias mezõnél. A domain-domain közötti átirányításhoz használd a "*@akarmi.hu" címet.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/is.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -104,13 +104,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliasinn er ekki í lagi!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Þetta pósthólf er nú þegar til, veldu annað!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Þú hefur stofnað þann fjölda pósthólfa sem þú hefur heimild til!';
 $PALANG['pCreate_alias_goto_text'] = 'Þangað sem pósturinn á að sendast.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Til línan er ekki gild!';
 $PALANG['pCreate_alias_result_error'] = 'Get ekki bætt við alias í alias töflu! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Nýr alias hefur verið bætt við alias töfluna!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Til að útbúa alias fyrir öll netföng í léninu, þá geturðu útbúið "*" alias. Til að áframsenda með alias á annað lén eða pósthólf, notaðu "*@domain.tld í til.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/it.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -105,13 +105,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'L\' Alias non è valido!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Questo indirizzo di posta esiste già, per favore sceglierne uno diverso!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Hai raggiunto il tuo limite per creare alias!';
 $PALANG['pCreate_alias_goto_text'] = 'Dove la mail deve essere spedita.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Il campo A non è valido!';
 $PALANG['pCreate_alias_result_error'] = 'Non sono riuscito ad aggiungere l\'alias alla tabella degli alias! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'L\'alias è stato aggiunto alla tabella degli alias!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Per creare un account universale, usare "*" come alias. Per inoltri da dominio a dominio, usare "*@domain.tld" come campo "a".'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/ja.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -106,13 +106,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'メールアドレスが無効です。';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'このメールアドレスは既に存在するので、 別のアドレスを選択してください。'; # XXX check/beautify - was split in two lines before
 $PALANG['pCreate_alias_address_text_error3'] = '転送アドレスの制限数に達しました。';
 $PALANG['pCreate_alias_goto_text'] = 'メールを転送するアドレス';
 $PALANG['pCreate_alias_goto_text_error'] = '転送先が無効です。';
 $PALANG['pCreate_alias_result_error'] = '転送先を追加できません！ (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = '転送先を追加しました。'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'すべてのメールを受け取るには、転送元に "*" を使います。 別のドメインにすべて転送するには、転送先に "*.domain.tld" を使います。'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/lt.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -104,13 +104,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Netinkamas sinonimas!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Šis el.pašto adresas jau yra, pasirinkite kitą pavadinimą!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Išnaudota visa pašto sinonimų kvota!';
 $PALANG['pCreate_alias_goto_text'] = 'Adresas, kuriuo persiųsti paštą.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Kam: įvestas neteisingai!';
 $PALANG['pCreate_alias_result_error'] = 'Sinonimo registruoti nepavyko! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Sinonimas užregistruotas!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Jei norite sukurti sinonimą, kuris gautų visas žinutes neegzistuojantiems adresatams, naudokite "*".';
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 
 $PALANG['pEdit_alias_welcome'] = 'Keisti persiuntimo nustatymus';

Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/mk.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -104,13 +104,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Алијасот не е валиден!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Оваа адреса веќе постои. Ве молам одберете друга!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Го достигнавте вашиот лимит за креирање алијаси!';
 $PALANG['pCreate_alias_goto_text'] = 'Каде треба да се испрати поштата.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Полето ДО не е валидно!';
 $PALANG['pCreate_alias_result_error'] = 'Не можам да го додадам алијасот на табелата со алијаси! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Алијасот е додаден на табелата со алијаси!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'За да креираш catch-all користи "*" како алијас.  За препраќање од домен на домен користи "*@domain.tld" како ДО.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/nb.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -106,13 +106,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldig!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Denne e-postadressen eksisterer allerede, vennligst velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Du har nådd grensen for antall aliaser under dette domenet!';
 $PALANG['pCreate_alias_goto_text'] = 'Hvor e-postmeldingen skal videresendes til.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Til-adressen er ikke gyldig!';
 $PALANG['pCreate_alias_result_error'] = 'Kunne ikke legge til aliaset i alias-tabellen! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Aliaset er blitt lagt til i alias-tabellen!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $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['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 $PALANG['pEdit_alias_welcome'] = 'Endre et alias.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Én e-postadresse per linje.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';

Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/nl.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -105,13 +105,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'De Alias is niet geldig!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Dit e-mail aders bestaat al, kies aub een andere.'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'U bezit het maximum aantal aliassen.';
 $PALANG['pCreate_alias_goto_text'] = 'Waar de e-mails heen gestuurd worden.';
 $PALANG['pCreate_alias_goto_text_error'] = 'De NAAR is niet geldig.';
 $PALANG['pCreate_alias_result_error'] = 'Mislukt om de alias toe te voegen. (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'De alias is toegevoegd.'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Om een catch-all te gebruiken, dient u een "*" (asteric) in te vullen als alias. Voor domein naar domein forwarding gebruik "*@domein.tld" als naar.';
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $PALANG['pEdit_alias_welcome'] = 'Bewerk een alias voor uw domein.';
 $PALANG['pEdit_alias_help'] = 'Meerdere e-mailadressen toegestaan. Slechts één alias per regel.';

Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/nn.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -104,13 +104,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldig!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Denne epostadressen eksisterer allerede, velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Du er over grensen for antall aliaser i ditt domene!';
 $PALANG['pCreate_alias_goto_text'] = 'Hvor skal e-posten videresendes?';
 $PALANG['pCreate_alias_goto_text_error'] = 'Mottakerfeltet er ikke gyldig!';
 $PALANG['pCreate_alias_result_error'] = 'Klarte ikke legge til aliaset! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Aliaset er lagt til i alias-tabellen!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $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['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 $PALANG['pEdit_alias_welcome'] = 'Endre et alias.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'En mottaker per linje.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';

Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/pl.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -107,13 +107,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Alias jest niepoprawny!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Taki adres email juz istnieje, proszę wybrać inny!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Twój limit aliasów został osiągniety!';
 $PALANG['pCreate_alias_goto_text'] = 'Gdzie ten mail powinien być wysłany.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Pole TO jest niepoprawne!';
 $PALANG['pCreate_alias_result_error'] = 'Nie można dodać aliasu do tabeli aliasów! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Alias został dodany do tabeli aliasów!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $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['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 $PALANG['pEdit_alias_welcome'] = 'Edytuj alias dla Twojej domeny.'; # XXX Text change to: 'Edit forwarding settings'
 $PALANG['pEdit_alias_help'] = 'Jeden wpis na linię.'; # XXX # XXX Text change to: 'Accepts multiple targets, one entry per line.'
 $PALANG['alias'] = 'Alias';

Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/pt-br.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -108,13 +108,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Alias inválido!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Endereço de email fornecido já existe. Por favor, escolha outro endereço!';
 $PALANG['pCreate_alias_address_text_error3'] = 'Você alcançou seu limite de aliases!';
 $PALANG['pCreate_alias_goto_text'] = 'Para onde as mensagens serão enviadas.';
 $PALANG['pCreate_alias_goto_text_error'] = 'O endereço no campo Para é inválido!';
 $PALANG['pCreate_alias_result_error'] = 'Não foi possível criar o alias! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Alias criado!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Para criar um alias global, use "*" no campo Alias. Para encaminhar de um domínio para outro, use "*@dominio.tld" no campo Para.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/ru.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -108,13 +108,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Неверное имя алиаса!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Этот почтовый адрес уже существует, пожалуйста, выберите другой.'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Вы достигли лимита по созданным алиасам!';
 $PALANG['pCreate_alias_goto_text'] = 'Куда должна доставляться почта.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Неверное поле Кому!';
 $PALANG['pCreate_alias_result_error'] = 'Невозможно добавить алиас в список! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Алиас был успешно создан!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Для создания catch-all почтового ящика используйте "*" в качестве имени алиаса.'; # XXX don't propagate usage of *@target-domain.com for domain-aliasing any longer
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $PALANG['pEdit_alias_welcome'] = 'Редактирование настроек пересылки';
 $PALANG['pEdit_alias_help'] = 'Можно указать несколько целей, одна запись на строку.';

Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/sk.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -105,13 +105,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Adresa nie je platná!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Takáto emailová adresa už existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Dosiahli ste limit, nemôžete vytvárať ďalšie aliasy!';
 $PALANG['pCreate_alias_goto_text'] = 'Kam má pošta chodiť';
 $PALANG['pCreate_alias_goto_text_error'] = 'Cieľ nie je platný!';
 $PALANG['pCreate_alias_result_error'] = 'Nepodarilo sa pridať alias do tabuľky! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Alias bol pridaný do tabuľky!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Pre vytvorenie doménového koša použite * ako alias. Pre alias doména-doména použite *@domain.tld ako cieľ.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/sl.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -104,13 +104,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Sintaksa aliasa je napačna!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Ta e-poštni naslov že obstaja, prosimo izberite drugega!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Maksimalno število aliasov je preseženo!';
 $PALANG['pCreate_alias_goto_text'] = 'Kamor želite nasloviti pošto.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Vnos "Za" je napačen!'; # XXX check - should be   The To: is not valid!
 $PALANG['pCreate_alias_result_error'] = 'Aliasa ni bilo mogoče dodati! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Alias je bil uspešno dodan!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Če želite ustvariti "vseobsegajoči" alias, uporabite "*" namesto aliasa. Za posredovanje iz domene na domeno, uporabite "*@domena.si" v "Za" polju.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/sv.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -106,13 +106,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'Detta ALIAS är inte giltigt!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Denna epostadress existerar redan, välj en annan epostadress!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Du har redan högsta tillåtna antal alias definierade!';
 $PALANG['pCreate_alias_goto_text'] = 'Vart skall mailen skickas.';
 $PALANG['pCreate_alias_goto_text_error'] = 'TILL data är felaktigt!';
 $PALANG['pCreate_alias_result_error'] = 'Kan inte lägga till detta alias i aliastabellen! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Aliaset har lagts till i aliastabellen!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'För att skapa en catch-all ange ett "*" som alias. För domän till domän forwarding använd "*@domän.tld" som till.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/tr.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -104,13 +104,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS uygun deðil!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = 'Bu e-posta zaten kullanýlýyor, lütfen baþka bir tane seçin!'; # XXX check text - should be 'This email address already exists, please choose a different one\!'
 $PALANG['pCreate_alias_address_text_error3'] = 'Alias limitine ulaþtýnýz!';
 $PALANG['pCreate_alias_goto_text'] = 'E-postanýn gitmesi gereken yer.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Kime alaný uygun deðil!';
 $PALANG['pCreate_alias_result_error'] = 'Alias\'ý alias tabþlosuna eklenemedi! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = 'Alias tabloya eklendi!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = 'Hepsini-yakala yaratmak için alias olarak "*" kullanýn. Domain yönlendirme domaini için kime kýsmýnda "*@domain.tld" kullanýn.'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/languages/tw.lang	2013-11-16 20:20:50 UTC (rev 1587)
@@ -104,13 +104,16 @@
 $PALANG['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
 
 $PALANG['pCreate_alias_address_text_error1'] = '該別名非法!';
+$PALANG['alias_does_not_exist'] = 'This alias does not exist!'; # XXX
 $PALANG['email_address_already_exists'] = '郵件地址已經存在, 請重新選擇!';
 $PALANG['pCreate_alias_address_text_error3'] = '你的別名已經達到上限!';
 $PALANG['pCreate_alias_goto_text'] = '郵件接收地址.';
 $PALANG['pCreate_alias_goto_text_error'] = '接收地址不正確!';
 $PALANG['pCreate_alias_result_error'] = '不能將別名添加到別名表中! (%s)'; # XXX Text changed to: Creating the alias %s failed!
 $PALANG['pCreate_alias_result_success'] = '添加別名成功!'; # XXX text change: 'The alias %s has been created!'
+$PALANG['alias_updated'] = 'The alias %s has been updated!'; # XXX
 $PALANG['pCreate_alias_catchall_text'] = '要將所有的郵件全部轉發請使用"*"作為別名. 網域到網域的轉發請使用"*@domain.tld".'; # XXX check/beautify - was split in two lines before
+$PALANG['mailbox_alias_cant_be_deleted'] = 'This alias belongs to a mailbox and can\'t be deleted!'; # XXX
 
 $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.'

Modified: trunk/model/AliasHandler.php
===================================================================
--- trunk/model/AliasHandler.php	2013-11-16 20:02:14 UTC (rev 1586)
+++ trunk/model/AliasHandler.php	2013-11-16 20:20:50 UTC (rev 1587)
@@ -67,7 +67,7 @@
 
     protected function initMsg() {
         $this->msg['error_already_exists'] = 'email_address_already_exists';
-        $this->msg['error_does_not_exist'] = 'pCreate_alias_address_text_error1'; # TODO: better error message
+        $this->msg['error_does_not_exist'] = 'alias_does_not_exist';
         if ($this->new) {
             $this->msg['logname'] = 'create_alias';
             $this->msg['store_error'] = 'pCreate_alias_result_error';
@@ -75,7 +75,7 @@
         } else {
             $this->msg['logname'] = 'edit_alias';
             $this->msg['store_error'] = 'pEdit_alias_result_error';
-            $this->msg['successmessage'] = 'pCreate_alias_result_success'; # TODO: better message for edit
+            $this->msg['successmessage'] = 'alias_updated';
         }
     }
 
@@ -282,14 +282,6 @@
         return parent::getList( "__is_mailbox IS NULL AND ( $condition )", $limit, $offset);
     }
 
-/* delete is already implemented in the "old functions" section
-    public function delete() {
-        $this->errormsg[] = '*** Alias domain deletion not implemented yet ***';
-        return false; # XXX function aborts here until TODO below is implemented! XXX
-        # TODO: move the needed code from delete.php here
-    }
-*/
-
     pro...
 
[truncated message content]