SF.net SVN: postfixadmin:[1151] trunk

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

Revision: 1151
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1151&view=rev
Author:   christian_boltz
Date:     2011-07-31 14:09:16 +0000 (Sun, 31 Jul 2011)

Log Message:
-----------
Merge admin_edit-admin.tpl and admin_create-admin.tpl

create-admin.php
- switch to edit-admin template
- rename a smarty variable
- add smarty mode = create variable

edit-admin.php:
- rename a smarty variable
- add smarty mode = edit variable

admin_edit-admin.tpl:
- merge with admin_create-admin.tpl
- add some {if $mode == '...'} switches 
- change <form> name to "admin"
- rename a smarty variable

admin_create-admin.tpl:
- deleted

*.lang:
- mark some $PALANG texts as obsolete:
  - $PALANG['pAdminCreate_admin_username']
  - $PALANG['pAdminCreate_admin_password'
  - $PALANG['pAdminCreate_admin_password2']

Modified Paths:
--------------
    trunk/create-admin.php
    trunk/edit-admin.php
    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/templates/admin_edit-admin.tpl

Removed Paths:
-------------
    trunk/templates/admin_create-admin.tpl

Modified: trunk/create-admin.php
===================================================================
--- trunk/create-admin.php	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/create-admin.php	2011-07-31 14:09:16 UTC (rev 1151)
@@ -14,7 +14,7 @@
  * 
  * File: create-admin.php
  * Used to create new administrators.
- * Template File: admin_create-admin.tpl
+ * Template File: admin_edit-admin.tpl
  *
  *
  * Template Variables:
@@ -62,13 +62,14 @@
    
 }
 
+$smarty->assign ('mode', 'create');
 $smarty->assign ('tUsername', $tUsername);
 $smarty->assign ('pAdminCreate_admin_username_text', $PALANG['pAdminCreate_admin_username_text'], false);
 $smarty->assign ('pAdminCreate_admin_username_text_error', $pAdminCreate_admin_username_text_error, false);
-$smarty->assign ('pAdminCreate_admin_password_text_error', $pAdminCreate_admin_password_text_error, false);
+$smarty->assign ('admin_password_text_error', $pAdminCreate_admin_password_text_error, false);
 $smarty->assign ('select_options', select_options ($list_domains, $tDomains), false);
 
-$smarty->assign ('smarty_template', 'admin_create-admin');
+$smarty->assign ('smarty_template', 'admin_edit-admin');
 $smarty->display ('index.tpl');
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/edit-admin.php
===================================================================
--- trunk/edit-admin.php	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/edit-admin.php	2011-07-31 14:09:16 UTC (rev 1151)
@@ -152,8 +152,9 @@
     }
 }
 
+$smarty->assign ('mode', 'edit');
 $smarty->assign ('username', $username);
-$smarty->assign ('pAdminEdit_admin_password_text_error', $pAdminEdit_admin_password_text_error, false);
+$smarty->assign ('admin_password_text_error', $pAdminEdit_admin_password_text_error, false);
 $smarty->assign ('tActive_checked', $tActive_checked);
 $smarty->assign ('tSadmin_checked', $tSadmin_checked);
 $smarty->assign ('select_options', select_options ($tAllDomains, $tDomains), false);

Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/bg.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -306,12 +306,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Не мога да модифицирам домейна!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Добави нов админ на домейна';
-$PALANG['pAdminCreate_admin_username'] = 'Админ';
+$PALANG['pAdminCreate_admin_username'] = 'Админ'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Е-мейл адрес';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Админ не е валиден е-мейл адрес!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Админ-а вече съществува или не е валиден';
-$PALANG['pAdminCreate_admin_password'] = 'Парола';
-$PALANG['pAdminCreate_admin_password2'] = 'Парола (отново)';
+$PALANG['pAdminCreate_admin_password'] = 'Парола'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Парола (отново)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Паролите, които сте въвели не съвпадат! Или са празни!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Добави админ';
 $PALANG['pAdminCreate_admin_result_error'] = 'Не мога да добавя админа!';

Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/ca.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -304,13 +304,13 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Imposible modificar el domini!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Afegir un nou administrador de domini';
-$PALANG['pAdminCreate_admin_username'] = 'Administrador';
+$PALANG['pAdminCreate_admin_username'] = 'Administrador'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'E-mail';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrador no es un e-mail vàlid!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'L\'administrador ja existeix o no es vàlid!';
 
-$PALANG['pAdminCreate_admin_password'] = 'Contrasenya';
-$PALANG['pAdminCreate_admin_password2'] = 'Contrasenya (repetiu)';
+$PALANG['pAdminCreate_admin_password'] = 'Contrasenya'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Contrasenya (repetiu)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Les contrasenyes introduides no coincideixen o estan en blanc!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Afegir administrador';
 $PALANG['pAdminCreate_admin_result_error'] = 'Imposible afegir l\'administrador!';

Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/cn.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -305,12 +305,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = '修改域失败!';
 
 $PALANG['pAdminCreate_admin_welcome'] = '新增域管理员';
-$PALANG['pAdminCreate_admin_username'] = '管理员';
+$PALANG['pAdminCreate_admin_username'] = '管理员'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = '邮件地址';
 $PALANG['pAdminCreate_admin_username_text_error1'] = '管理员名不是一个合法的邮件地址!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = '管理员已经存在或者管理员名非法!';
-$PALANG['pAdminCreate_admin_password'] = '密码';
-$PALANG['pAdminCreate_admin_password2'] = '密码 (验证)';
+$PALANG['pAdminCreate_admin_password'] = '密码'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = '密码 (验证)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = '新所输入的两次新密码不相同! 或者为空!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = '新增';
 $PALANG['pAdminCreate_admin_result_error'] = '新增管理员失败!';

Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/cs.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -314,12 +314,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Nepodařilo se upravit doménu!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Přidat nového doménového administrátora';
-$PALANG['pAdminCreate_admin_username'] = 'Uživatelské jméno';
+$PALANG['pAdminCreate_admin_username'] = 'Uživatelské jméno'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Tato adresa není platná!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Taková adresa již existuje!';
-$PALANG['pAdminCreate_admin_password'] = 'Heslo';
-$PALANG['pAdminCreate_admin_password2'] = 'Heslo (znovu)';
+$PALANG['pAdminCreate_admin_password'] = 'Heslo'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Heslo (znovu)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Zadaná hesla jsou rozdílná nebo prázdná!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Přidat administrátora';
 $PALANG['pAdminCreate_admin_result_error'] = 'Nepodařilo se přidat administrátora!';

Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/da.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -312,12 +312,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Kan ikke rette domæne!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Tilføj ny domæneadministrator';
-$PALANG['pAdminCreate_admin_username'] = 'Administrator';
+$PALANG['pAdminCreate_admin_username'] = 'Administrator'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Emailadresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke en gyldig emailadresse!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Aministratoren findes allerede eller er ikke gyldig';
-$PALANG['pAdminCreate_admin_password'] = 'Adgangskode';
-$PALANG['pAdminCreate_admin_password2'] = 'Adgangskode (igen)';
+$PALANG['pAdminCreate_admin_password'] = 'Adgangskode'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Adgangskode (igen)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Adgangskoderne er ikke ens! Eller er tomme!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Tilføj administrator';
 $PALANG['pAdminCreate_admin_result_error'] = 'Kan ikke tilføje administrator!';

Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/de.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -311,12 +311,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Konnte Domain nicht editieren!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Neuen Domain-Admin hinzuf&uuml;gen';
-$PALANG['pAdminCreate_admin_username'] = 'Admin';
+$PALANG['pAdminCreate_admin_username'] = 'Admin'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Email Adresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin-Adresse ist keine echte Email-Adresse!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Der Admin existiert bereits bzw. ist nicht korrekt';
-$PALANG['pAdminCreate_admin_password'] = 'Passwort';
-$PALANG['pAdminCreate_admin_password2'] = 'Passwort (nochmal)';
+$PALANG['pAdminCreate_admin_password'] = 'Passwort'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Passwort (nochmal)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Die angegebenen Passw&ouml;rter sind nicht identisch oder leer!';
 $PALANG['pAdminCreate_admin_button'] = 'Admin hinzuf&uuml;gen';
 $PALANG['pAdminCreate_admin_result_error'] = 'Konnte den Admin nicht anlegen!';

Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/en.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -313,12 +313,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Unable to modify domain!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Add a new domain admin';
-$PALANG['pAdminCreate_admin_username'] = 'Admin';
+$PALANG['pAdminCreate_admin_username'] = 'Admin'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Email address';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin is not a valid email address!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'The admin already exists or is not valid';
-$PALANG['pAdminCreate_admin_password'] = 'Password';
-$PALANG['pAdminCreate_admin_password2'] = 'Password (again)';
+$PALANG['pAdminCreate_admin_password'] = 'Password'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Password (again)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'The passwords that you supplied don\'t match or are empty!';
 $PALANG['pAdminCreate_admin_button'] = 'Add Admin';
 $PALANG['pAdminCreate_admin_result_error'] = 'Unable to add admin!';

Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/es.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -306,13 +306,13 @@
 $PALANG['pAdminEdit_domain_result_error'] = '¡Imposible modificar el dominio!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Añadir un nuevo administrador de dominio';
-$PALANG['pAdminCreate_admin_username'] = 'Administrador';
+$PALANG['pAdminCreate_admin_username'] = 'Administrador'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'E-mail';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrador no es un e-mail válido!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'El administrador ya existe o no es válido!';
 
-$PALANG['pAdminCreate_admin_password'] = 'Contraseña';
-$PALANG['pAdminCreate_admin_password2'] = 'Contraseña (repetir)';
+$PALANG['pAdminCreate_admin_password'] = 'Contraseña'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Contraseña (repetir)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = '¡Las contraseñas introducidas no coinciden o están en blanco!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Añadir administrador';
 $PALANG['pAdminCreate_admin_result_error'] = '¡Imposible añadir el administrador!';

Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/et.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -305,12 +305,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Domeeni muutmine ebaõnnestus!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Lisa uus domeeni haldaja';
-$PALANG['pAdminCreate_admin_username'] = 'Haldaja';
+$PALANG['pAdminCreate_admin_username'] = 'Haldaja'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'E-posti aadress';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Väljal haldaja pole kehtiv e-posti aadress!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Selline haldaja on juba olemas';
-$PALANG['pAdminCreate_admin_password'] = 'Parool';
-$PALANG['pAdminCreate_admin_password2'] = 'Parool (uuesti)';
+$PALANG['pAdminCreate_admin_password'] = 'Parool'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Parool (uuesti)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Sisestatud paroolid ei kattu! Või on tühjad!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Lisa haldaja';
 $PALANG['pAdminCreate_admin_result_error'] = 'Haldaja lisamine ebaõnnestus!';

Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/eu.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -303,13 +303,13 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Ezinezkoa domeinua aldatzea!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Domeinu kudeatzaile berri bat gehitu';
-$PALANG['pAdminCreate_admin_username'] = 'Kudeatzailea';
+$PALANG['pAdminCreate_admin_username'] = 'Kudeatzailea'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'E-mail helbidea';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Kudeatzaile e-mailak ez du balio!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Kudeatzailea existitzen da edo ez du balio!';
 
-$PALANG['pAdminCreate_admin_password'] = 'Pasahitza';
-$PALANG['pAdminCreate_admin_password2'] = 'Pasahitza (errepikatu)';
+$PALANG['pAdminCreate_admin_password'] = 'Pasahitza'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Pasahitza (errepikatu)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Sartutako pasahitzak ez datoz bat edo zuriz daude!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Kudeatzailea gehitu';
 $PALANG['pAdminCreate_admin_result_error'] = 'Ezinezkoa kudeatzailea gehitzea!';

Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/fi.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -305,12 +305,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Domainin muokkaus ei onnistu!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Lisää uusi domainin ylläpitäjä';
-$PALANG['pAdminCreate_admin_username'] = 'Ylläpitäjä';
+$PALANG['pAdminCreate_admin_username'] = 'Ylläpitäjä'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Sähköpostiosoite';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Ylläpitäjän sähköpostiosoite ei ole oikeanmuotoinen!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Ylläpitäjän sähköpostiosoite on jo olemassa tai se ei ole oikean muotoinen';
-$PALANG['pAdminCreate_admin_password'] = 'Salasana';
-$PALANG['pAdminCreate_admin_password2'] = 'Salasana (toistamiseen)';
+$PALANG['pAdminCreate_admin_password'] = 'Salasana'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Salasana (toistamiseen)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Antamasi salasanat eivät täsmää Tai ne ovat tyhjiä!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Lisää ylläpitäjä';
 $PALANG['pAdminCreate_admin_result_error'] = 'Ylläpitäjän lisäys ei onnistu!';

Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/fo.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -305,12 +305,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Fái ikki broytt navnaøki!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Stovna navnaøki umsitara';
-$PALANG['pAdminCreate_admin_username'] = 'Umsitari';
+$PALANG['pAdminCreate_admin_username'] = 'Umsitari'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'E-post adressa';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Umsitari er ógyldug e-post adressa!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Umsitari finst longu ella er ógyldugur';
-$PALANG['pAdminCreate_admin_password'] = 'Loyniorð';
-$PALANG['pAdminCreate_admin_password2'] = 'Loyniorð (umaftur)';
+$PALANG['pAdminCreate_admin_password'] = 'Loyniorð'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Loyniorð (umaftur)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Loyniorðini tú skrivaði samsvara ikki! Ella eru tóm!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Stovna umsitara';
 $PALANG['pAdminCreate_admin_result_error'] = 'Fái ikki stovnað umsitara!';

Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/fr.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -307,12 +307,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Impossible de modifier le domain!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Ajouter un nouvel administrateur de domaine';
-$PALANG['pAdminCreate_admin_username'] = 'Administrateur';
+$PALANG['pAdminCreate_admin_username'] = 'Administrateur'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'adresse courriel';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Ce n\'est pas une adresse courriel administrateur valide!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Cet adresse courriel administrateur existe déjà ou n\'est pas valide';
-$PALANG['pAdminCreate_admin_password'] = 'Mot de passe';
-$PALANG['pAdminCreate_admin_password2'] = 'Mot de passe (confirmation)';
+$PALANG['pAdminCreate_admin_password'] = 'Mot de passe'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Mot de passe (confirmation)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Le mot de passe fournit ne correspond pas ou est vide!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Ajouter un administrateur';
 $PALANG['pAdminCreate_admin_result_error'] = 'Impossible d\'ajouter un administrateur!';
@@ -322,7 +322,7 @@
 $PALANG['pAdminEdit_admin_welcome'] = 'Modifier un domaine';
 $PALANG['pAdminEdit_admin_username'] = 'Administrateur';
 $PALANG['pAdminEdit_admin_password'] = 'Mot de passe';
-$PALANG['pAdminEdit_admin_password2'] = 'Mot de passe(confirmation)';
+$PALANG['pAdminEdit_admin_password2'] = 'Mot de passe (confirmation)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Le mot de passe fournit ne correspond pas  ou est vide!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_active'] = 'Actif';
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super administrateur';

Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/hr.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -304,12 +304,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Domenu nije bilo moguće premeniti!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj administratora domene';
-$PALANG['pAdminCreate_admin_username'] = 'Administrator';
+$PALANG['pAdminCreate_admin_username'] = 'Administrator'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Adresa e-pošte';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator nije valjana adresa e-pošte!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Adminstrator već postoji ili nije valjan';
-$PALANG['pAdminCreate_admin_password'] = 'Lozinka';
-$PALANG['pAdminCreate_admin_password2'] = 'Lozinka (ponovi)';
+$PALANG['pAdminCreate_admin_password'] = 'Lozinka'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Lozinka (ponovi)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Unešene lozinke se ne podudaraju ili su prazne!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Dodaj administratora';
 $PALANG['pAdminCreate_admin_result_error'] = 'Administratora nije bilo moguće dodati!';

Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/hu.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -311,12 +311,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'A domain módosítása sikertelen!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Új domain admin felvétele';
-$PALANG['pAdminCreate_admin_username'] = 'Admin';
+$PALANG['pAdminCreate_admin_username'] = 'Admin'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Email cím';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Az Admin nem valós email cím!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Az Admin már létezik, vagy nem valós a cím!';
-$PALANG['pAdminCreate_admin_password'] = 'Jelszó';
-$PALANG['pAdminCreate_admin_password2'] = 'Jelszó (mégegyszer)';
+$PALANG['pAdminCreate_admin_password'] = 'Jelszó'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Jelszó (mégegyszer)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'A beírt jelszavak nem egyeznek! Vagy üresek!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Admin felvétele';
 $PALANG['pAdminCreate_admin_result_error'] = 'Nemsikerült az Admint felvenni!';

Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/is.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -304,12 +304,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Get ekki breytt léni!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Bæta nýju léni við';
-$PALANG['pAdminCreate_admin_username'] = 'Kerfisstjóri';
+$PALANG['pAdminCreate_admin_username'] = 'Kerfisstjóri'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Póstfang';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Kerfisstjóri er ekki rétt póstfang!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Kerfisstjóri er til nú þegar eða er ekki leyfilegt';
-$PALANG['pAdminCreate_admin_password'] = 'Lykilorð';
-$PALANG['pAdminCreate_admin_password2'] = 'Lykilorð (aftur)';
+$PALANG['pAdminCreate_admin_password'] = 'Lykilorð'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Lykilorð (aftur)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Lykilorðið sem þú gafst upp passar ekki! Eða var tómt!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Bæta við kerfisstjóra';
 $PALANG['pAdminCreate_admin_result_error'] = 'Get ekki bætt við kerfisstjóra!';

Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/it.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -306,12 +306,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Impossibile modificare il dominio!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Aggiungi un nuovo amministratore per il dominio';
-$PALANG['pAdminCreate_admin_username'] = 'Amministratore';
+$PALANG['pAdminCreate_admin_username'] = 'Amministratore'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Indirizzo email';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'L\'indirizzo dell\'amministratore non &egrave; valido!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'L\'amministratore esiste di gi&agrave;, oppure non &egrave; valido';
-$PALANG['pAdminCreate_admin_password'] = 'Password';
-$PALANG['pAdminCreate_admin_password2'] = 'Password (ancora)';
+$PALANG['pAdminCreate_admin_password'] = 'Password'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Password (ancora)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Le password che hai digitato non sono uguali! Oppure sono vuote!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Aggiungi amministratore';
 $PALANG['pAdminCreate_admin_result_error'] = 'Impossibile aggiungere amministratore!';

Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/ja.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -311,12 +311,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'ドメインが修正できません！';
 
 $PALANG['pAdminCreate_admin_welcome'] = '新しいドメイン管理者の追加';
-$PALANG['pAdminCreate_admin_username'] = 'ドメイン管理者';
+$PALANG['pAdminCreate_admin_username'] = 'ドメイン管理者'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'メールアドレス';
 $PALANG['pAdminCreate_admin_username_text_error1'] = '管理者は有効なメールアドレスではありません。';
 $PALANG['pAdminCreate_admin_username_text_error2'] = '管理者は存在するか無効です。';
-$PALANG['pAdminCreate_admin_password'] = 'パスワード';
-$PALANG['pAdminCreate_admin_password2'] = 'パスワード (確認)';
+$PALANG['pAdminCreate_admin_password'] = 'パスワード'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'パスワード (確認)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'パスワードが一致しません。 または空です。'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = '管理者追加';
 $PALANG['pAdminCreate_admin_result_error'] = '管理者を追加できません！';
@@ -324,7 +324,7 @@
 $PALANG['pAdminCreate_admin_address'] = 'ドメイン';
 
 $PALANG['pAdminEdit_admin_welcome'] = 'ドメイン管理者の編集';
-$PALANG['pAdminEdit_admin_username'] = '管理者';
+$PALANG['pAdminEdit_admin_username'] = '管理者'; # XXX check / compare with pAdminCreate_admin_username - should be "admin"
 $PALANG['pAdminEdit_admin_password'] = 'パスワード';
 $PALANG['pAdminEdit_admin_password2'] = 'パスワード (確認)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'パスワードが一致しません。 または空です。'; # XXX check/beautify - was split in two lines before

Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/lt.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -304,12 +304,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Srities pakeisti nepavyko!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Registruoti naują srities administratorių';
-$PALANG['pAdminCreate_admin_username'] = 'Administratorius';
+$PALANG['pAdminCreate_admin_username'] = 'Administratorius'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'El.pašto adresas';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrotorius - tai ne el.pašto adresas!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Administratorius šiai sričiai jau yra';
-$PALANG['pAdminCreate_admin_password'] = 'Slaptažodis';
-$PALANG['pAdminCreate_admin_password2'] = 'Slaptažodis (dar kartą)';
+$PALANG['pAdminCreate_admin_password'] = 'Slaptažodis'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Slaptažodis (dar kartą)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Įvesti slaptažodžiai nesutampa! Arba neįvesti!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Registruoti administratorių';
 $PALANG['pAdminCreate_admin_result_error'] = 'Administratoriaus užregistruoti nepavyko!';

Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/mk.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -306,12 +306,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Не можам да го модифицирам доменот!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Додади нов администратор на домен';
-$PALANG['pAdminCreate_admin_username'] = 'Администратор';
+$PALANG['pAdminCreate_admin_username'] = 'Администратор'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Email адреса';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Администратор не е валидна адреса!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Администраторот веќе постои или не е валидна';
-$PALANG['pAdminCreate_admin_password'] = 'Лозинка';
-$PALANG['pAdminCreate_admin_password2'] = 'Лозинка (повторно)';
+$PALANG['pAdminCreate_admin_password'] = 'Лозинка'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Лозинка (повторно)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Внесените лозинки не одговараат! Или се празни!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Додади Администратор';
 $PALANG['pAdminCreate_admin_result_error'] = 'Не можам да додадам администратор!';

Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/nb.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -306,12 +306,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Kunne ikke endre domenet!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Legg til en ny domeneadministrator';
-$PALANG['pAdminCreate_admin_username'] = 'Administrator';
+$PALANG['pAdminCreate_admin_username'] = 'Administrator'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Du har ikke skrevet inn en gyldig e-postadresse!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Administratoren er allerede definert, eller du har skrevet inn en ugyldig adresse';
-$PALANG['pAdminCreate_admin_password'] = 'Passord';
-$PALANG['pAdminCreate_admin_password2'] = 'Passord (bekreft)';
+$PALANG['pAdminCreate_admin_password'] = 'Passord'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Passord (bekreft)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Passordene du oppga stemmer ikke overens! Eller du har ikke fylt ut feltene!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Legg til en administrator';
 $PALANG['pAdminCreate_admin_result_error'] = 'Kunne ikke legge til administratoren!';

Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/nl.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -306,12 +306,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Mislukt het domein te bewerken.';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Voeg een nieuw domein beheerder toe';
-$PALANG['pAdminCreate_admin_username'] = 'Beheerder';
+$PALANG['pAdminCreate_admin_username'] = 'Beheerder'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'E-mail adres';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Beheerder is geen geldig e-mail adres!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'De beheerder bestaat al of is niet geldig';
-$PALANG['pAdminCreate_admin_password'] = 'Wachtwoord';
-$PALANG['pAdminCreate_admin_password2'] = 'Wachtwoord (nogmaals)';
+$PALANG['pAdminCreate_admin_password'] = 'Wachtwoord'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Wachtwoord (nogmaals)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'De wachtwoorden die u opgaf komen niet overeen. Of zijn leeg.'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Voeg beheerder toe';
 $PALANG['pAdminCreate_admin_result_error'] = 'Mislukt om beheerder toe te voegen!';

Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/nn.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -304,11 +304,11 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Klarte ikke å oppdatere domenet!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Legg til ny domene-administrator';
-$PALANG['pAdminCreate_admin_username'] = 'Administrator';
+$PALANG['pAdminCreate_admin_username'] = 'Administrator'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke gyldig adresse!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Administratoren eksisterer eller er ikke gyldig'; $PALANG['pAdminCreate_admin_password'] = 'Passord';
-$PALANG['pAdminCreate_admin_password2'] = 'Passord (igjen)';
+$PALANG['pAdminCreate_admin_username_text_error2'] = 'Administratoren eksisterer eller er ikke gyldig'; $PALANG['pAdminCreate_admin_password'] = 'Passord'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Passord (igjen)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Passordene er ikke like! Eller feltene er tomme!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Legg til en administrator';
 $PALANG['pAdminCreate_admin_result_error'] = 'Klarte ikke å legge til administratoren!';

Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/pl.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -308,12 +308,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Nie można zmodyfikować domeny!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj konto administratora';
-$PALANG['pAdminCreate_admin_username'] = 'Administrator';
+$PALANG['pAdminCreate_admin_username'] = 'Administrator'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Adres email';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administartor nie jest poprawnym adresem email!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Administrator już istnieje lub jest niepoprawny';
-$PALANG['pAdminCreate_admin_password'] = 'Hasło';
-$PALANG['pAdminCreate_admin_password2'] = 'Hasło (ponownie)';
+$PALANG['pAdminCreate_admin_password'] = 'Hasło'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Hasło (ponownie)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Podane hasło nie pasuje! Lub jest puste!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Dodaj administratora';
 $PALANG['pAdminCreate_admin_result_error'] = 'Nie można dodać administratora!';

Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/pt-br.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -313,12 +313,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Não foi possível editar o domínio!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Criação de um novo administrador de domínio.';
-$PALANG['pAdminCreate_admin_username'] = 'Administrador';
+$PALANG['pAdminCreate_admin_username'] = 'Administrador'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Endereço de email';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Endereço de email inválido!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Administrador já existe ou é inválido';
-$PALANG['pAdminCreate_admin_password'] = 'Senha';
-$PALANG['pAdminCreate_admin_password2'] = 'Senha (confirmação)';
+$PALANG['pAdminCreate_admin_password'] = 'Senha'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Senha (confirmação)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'As senhas fornecidas são diferentes! Ou não foram digitadas!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Criar Administrador';
 $PALANG['pAdminCreate_admin_result_error'] = 'Não foi possível criar o administrador!';

Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/ru.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -313,12 +313,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Невозможно изменить домен!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Добавление нового администратора домена';
-$PALANG['pAdminCreate_admin_username'] = 'Администратор';
+$PALANG['pAdminCreate_admin_username'] = 'Администратор'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Почтовый адрес';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Некорректный адрес администратора!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Администратор уже существует либо некорректное имя';
-$PALANG['pAdminCreate_admin_password'] = 'Пароль';
-$PALANG['pAdminCreate_admin_password2'] = 'Пароль (еще раз)';
+$PALANG['pAdminCreate_admin_password'] = 'Пароль'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Пароль (еще раз)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Введенные вами пароли не совпадают! Либо пустые!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Добавить администратора';
 $PALANG['pAdminCreate_admin_result_error'] = 'Невозможно добавить администратора!';

Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/sk.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -306,12 +306,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Nepodarilo sa upraviť doménu!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Pridať nového administrátora';
-$PALANG['pAdminCreate_admin_username'] = 'Užívateľské meno';
+$PALANG['pAdminCreate_admin_username'] = 'Užívateľské meno'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Táto adresa nie je platná!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Takáto adresa už existuje!';
-$PALANG['pAdminCreate_admin_password'] = 'Heslo';
-$PALANG['pAdminCreate_admin_password2'] = 'Heslo (znovu)';
+$PALANG['pAdminCreate_admin_password'] = 'Heslo'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Heslo (znovu)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Zadané heslá sú rozdielne alebo prázdne!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Vytvoriť administrátora';
 $PALANG['pAdminCreate_admin_result_error'] = 'Nepodarilo sa pridať administrátora!';

Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/sl.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -305,12 +305,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Domene ni bilo mogoče spremeniti!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj domenskega administratorja';
-$PALANG['pAdminCreate_admin_username'] = 'Administrator';
+$PALANG['pAdminCreate_admin_username'] = 'Administrator'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'E-poštni naslov';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator ni veljaven e-poštni naslov!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Adminstrator že obstaja ali pa ni pravilen';
-$PALANG['pAdminCreate_admin_password'] = 'Geslo';
-$PALANG['pAdminCreate_admin_password2'] = 'Geslo (ponovitev)';
+$PALANG['pAdminCreate_admin_password'] = 'Geslo'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Geslo (ponovitev)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Vnešeni gesli se ne ujemata ali pa sta prazni!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Dodaj administratorja';
 $PALANG['pAdminCreate_admin_result_error'] = 'Administratorja ni bilo mogoče dodati!';

Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/sv.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -307,12 +307,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Kan inte modifiera domänen!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Lägg till ny domänadmin';
-$PALANG['pAdminCreate_admin_username'] = 'Admin';
+$PALANG['pAdminCreate_admin_username'] = 'Admin'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Epostadress';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin är inte en giltig epostadress!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Denna admin finns redan eller är inte giltig';
-$PALANG['pAdminCreate_admin_password'] = 'Lösenord';
-$PALANG['pAdminCreate_admin_password2'] = 'Lösenord (igen)';
+$PALANG['pAdminCreate_admin_password'] = 'Lösenord'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Lösenord (igen)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Lösenorden du angav är olika! Eller är tomma!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Lägg till admin';
 $PALANG['pAdminCreate_admin_result_error'] = 'Kan inte lägga till admin!';

Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/tr.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -305,12 +305,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = 'Domain düzenlenemedi!';
 
 $PALANG['pAdminCreate_admin_welcome'] = 'Yöneticiye yeni bir domain ekle';
-$PALANG['pAdminCreate_admin_username'] = 'Yönetici';
+$PALANG['pAdminCreate_admin_username'] = 'Yönetici'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = 'Eposta adresi';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Yönetici uygun bir eposta adresi deðil!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = 'Yönetici halen bulunmakta ya da uygun deðil';
-$PALANG['pAdminCreate_admin_password'] = 'Þifre';
-$PALANG['pAdminCreate_admin_password2'] = 'Þifre (tekrar)';
+$PALANG['pAdminCreate_admin_password'] = 'Þifre'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = 'Þifre (tekrar)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = 'Girdiðiniz þifreler uymuyor! Ya da boþ!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = 'Yönetici ekle';
 $PALANG['pAdminCreate_admin_result_error'] = 'Yönetici eklenemiyor!';
@@ -320,7 +320,7 @@
 $PALANG['pAdminEdit_admin_welcome'] = 'Domain yöneticisi düzenle';
 $PALANG['pAdminEdit_admin_username'] = 'Yönetici';
 $PALANG['pAdminEdit_admin_password'] = 'Þifre';
-$PALANG['pAdminEdit_admin_password2'] = 'þifre (tekrar)';
+$PALANG['pAdminEdit_admin_password2'] = 'Þifre (tekrar)';
 $PALANG['pAdminEdit_admin_password_text_error'] = 'Verdiðiniz þifreler birbirini tutmuyor! Ya da boþ!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminEdit_admin_active'] = 'Aktif';
 $PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX

Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/languages/tw.lang	2011-07-31 14:09:16 UTC (rev 1151)
@@ -305,12 +305,12 @@
 $PALANG['pAdminEdit_domain_result_error'] = '修改網域失敗!';
 
 $PALANG['pAdminCreate_admin_welcome'] = '新增網域管理員';
-$PALANG['pAdminCreate_admin_username'] = '管理員';
+$PALANG['pAdminCreate_admin_username'] = '管理員'; # obsolete
 $PALANG['pAdminCreate_admin_username_text'] = '郵件地址';
 $PALANG['pAdminCreate_admin_username_text_error1'] = '管理員名不是一個合法的郵件地址!';
 $PALANG['pAdminCreate_admin_username_text_error2'] = '管理員已經存在或者管理員名非法!';
-$PALANG['pAdminCreate_admin_password'] = '密碼';
-$PALANG['pAdminCreate_admin_password2'] = '密碼 (驗證)';
+$PALANG['pAdminCreate_admin_password'] = '密碼'; # obsolete
+$PALANG['pAdminCreate_admin_password2'] = '密碼 (驗證)'; # obsolete
 $PALANG['pAdminCreate_admin_password_text_error'] = '新所輸入的兩次新密碼不相同! 或者為空!'; # XXX check/beautify - was split in two lines before
 $PALANG['pAdminCreate_admin_button'] = '新增';
 $PALANG['pAdminCreate_admin_result_error'] = '新增管理員失敗!';

Deleted: trunk/templates/admin_create-admin.tpl
===================================================================
--- trunk/templates/admin_create-admin.tpl	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/templates/admin_create-admin.tpl	2011-07-31 14:09:16 UTC (rev 1151)
@@ -1,38 +0,0 @@
-<div id="edit_form">
-<form name="create_admin" method="post" action="">
-<table>
-	<tr>
-		<th colspan="4">{$PALANG.pAdminCreate_admin_welcome}</th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pAdminCreate_admin_username}:</label></td>
-		<td><input class="flat" type="text" name="fUsername" value="{$tUsername}" /></td>
-		<td>{$pAdminCreate_admin_username_text}</td>
-		<td><span class="error_msg">{$pAdminCreate_admin_username_text_error}</span></td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pAdminCreate_admin_password}:</label></td>
-		<td><input class="flat" type="password" name="fPassword" /></td>
-		<td>&nbsp;</td>
-		<td><span class="error_msg">{$pAdminCreate_admin_password_text_error}</span></td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pAdminCreate_admin_password2}:</label></td>
-		<td><input class="flat" type="password" name="fPassword2" /></td>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pAdminCreate_admin_address}:</label></td>
-		<td>
-			<select name="fDomains[]" size="10" multiple="multiple">{$select_options}</select>
-		</td>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td><input class="button" type="submit" name="submit" value="{$PALANG.pAdminCreate_admin_button}" /></td>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-</table>
-</form>
-</div>

Modified: trunk/templates/admin_edit-admin.tpl
===================================================================
--- trunk/templates/admin_edit-admin.tpl	2011-07-30 21:24:24 UTC (rev 1150)
+++ trunk/templates/admin_edit-admin.tpl	2011-07-31 14:09:16 UTC (rev 1151)
@@ -1,25 +1,39 @@
 <div id="edit_form">
-<form name="alias" method="post" action="">
+<form name="admin" method="post" action="">
 <table>
 	<tr>
-		<th colspan="4">{$PALANG.pAdminEdit_admin_welcome}</th>
+		<th colspan="4">
+			{if $mode == 'edit'}
+				{$PALANG.pAdminEdit_admin_welcome}
+			{else}
+				{$PALANG.pAdminCreate_admin_welcome}
+			{/if}
+		</th>
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pAdminEdit_admin_username}:</label></td>
+{if $mode == 'edit'}
 		<td>{$username}</td>
 		<td colspan="2">&nbsp;</td>
+{else}
+		<td><input class="flat" type="text" name="fUsername" value="{$tUsername}" /></td>
+		<td>{$pAdminCreate_admin_username_text}</td>
+		<td><span class="error_msg">{$pAdminCreate_admin_username_text_error}</span></td>
+{/if}
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pAdminEdit_admin_password}:</label></td>
-		<td><input class="flat" type="password" name="fPassword" value=""/></td>
+		<td><input class="flat" type="password" name="fPassword" /></td>
 		<td>&nbsp;</td>
-		<td><span class="error_msg">{$pAdminEdit_admin_password_text_error}</span></td>
+		<td><span class="error_msg">{$admin_password_text_error}</span></td>
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pAdminEdit_admin_password2}:</label></td>
-		<td><input class="flat" type="password" name="fPassword2" value="" /></td>
+		<td><input class="flat" type="password" name="fPassword2" /></td>
 		<td colspan="2">&nbsp;</td>
 	</tr>
+{if $mode == 'edit'}
+<!-- TODO: these options should also be available in create-admin -->
 	<tr>
 		<td class="label"><label>{$PALANG.pAdminEdit_admin_active}:</label></td>
 		<td><input class="flat" type="checkbox" name="fActive"{$tActive_checked}/></td>
@@ -30,14 +44,16 @@
 		<td><input class="flat" type="checkbox" name="fSadmin"{$tSadmin_checked}/></td>
 		<td colspan="2">&nbsp;</td>
 	</tr>
+{/if}
 	<tr>
 	    <td class="label"><label>{$PALANG.pAdminCreate_admin_address}:</label></td>
 		<td><select name="fDomains[]" size="10" multiple="multiple">{$select_options}</select></td>
-		<td>&nbsp;</td>
+		<td colspan="2">&nbsp;</td>
 	</tr>
 	<tr>
 		<td>&nbsp;</td>
-		<td><input class="button" type="submit" name="submit" value="{$PALANG.save}" /></td>
+		<td><input class="button" type="submit" name="submit" 
+			value="{if $mode == 'edit'}{$PALANG.save}{else}{$PALANG.pAdminCreate_admin_button}{/if}" /></td>
 		<td colspan="2">&nbsp;</td>
 	</tr>
 </table>


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