From 0fe45bca8ade4fe50e68a22fa801661694868e1c Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 31 Jul 2011 14:09:16 +0000 Subject: [PATCH] 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
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'] git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1151 a1433add-5e2c-0410-b055-b7f2511e0802 --- create-admin.php | 7 +++--- edit-admin.php | 3 ++- languages/bg.lang | 6 ++--- languages/ca.lang | 6 ++--- languages/cn.lang | 6 ++--- languages/cs.lang | 6 ++--- languages/da.lang | 6 ++--- languages/de.lang | 6 ++--- languages/en.lang | 6 ++--- languages/es.lang | 6 ++--- languages/et.lang | 6 ++--- languages/eu.lang | 6 ++--- languages/fi.lang | 6 ++--- languages/fo.lang | 6 ++--- languages/fr.lang | 8 +++---- languages/hr.lang | 6 ++--- languages/hu.lang | 6 ++--- languages/is.lang | 6 ++--- languages/it.lang | 6 ++--- languages/ja.lang | 8 +++---- languages/lt.lang | 6 ++--- languages/mk.lang | 6 ++--- languages/nb.lang | 6 ++--- languages/nl.lang | 6 ++--- languages/nn.lang | 6 ++--- languages/pl.lang | 6 ++--- languages/pt-br.lang | 6 ++--- languages/ru.lang | 6 ++--- languages/sk.lang | 6 ++--- languages/sl.lang | 6 ++--- languages/sv.lang | 6 ++--- languages/tr.lang | 8 +++---- languages/tw.lang | 6 ++--- templates/admin_create-admin.tpl | 38 -------------------------------- templates/admin_edit-admin.tpl | 30 +++++++++++++++++++------ 35 files changed, 125 insertions(+), 145 deletions(-) delete mode 100644 templates/admin_create-admin.tpl diff --git a/create-admin.php b/create-admin.php index 7343a6ea..418746a8 100644 --- a/create-admin.php +++ b/create-admin.php @@ -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 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } +$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: */ diff --git a/edit-admin.php b/edit-admin.php index a3d4bc88..3a988734 100644 --- a/edit-admin.php +++ b/edit-admin.php @@ -152,8 +152,9 @@ if ($result['rows'] >= 1) { } } +$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); diff --git a/languages/bg.lang b/languages/bg.lang index a247320a..080746e0 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -306,12 +306,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Редактирай домейн'; # XXX $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'] = 'Не мога да добавя админа!'; diff --git a/languages/ca.lang b/languages/ca.lang index dbe00e8f..5a56d864 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -304,13 +304,13 @@ $PALANG['pAdminEdit_domain_button'] = 'Editar domini'; # XXX text no longer used $PALANG['pAdminEdit_domain_result_error'] = 'Imposible modificar el domini!'; $PALANG['pAdminCreate_admin_welcome'] = 'Afegir un nou administrador de domini'; -$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!'; diff --git a/languages/cn.lang b/languages/cn.lang index f5e65dac..009f5cbc 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -305,12 +305,12 @@ $PALANG['pAdminEdit_domain_button'] = '修改'; # XXX text no longer used $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'] = '新增管理员失败!'; diff --git a/languages/cs.lang b/languages/cs.lang index 84caff3b..516381d9 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -314,12 +314,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Upravit doménu'; # XXX text no longer us $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!'; diff --git a/languages/da.lang b/languages/da.lang index 929662a8..30ebfc94 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -312,12 +312,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Rediger domæne'; # XXX text no longer us $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!'; diff --git a/languages/de.lang b/languages/de.lang index 85b7b272..651dc2fc 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -311,12 +311,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Domain editieren'; # obsolete $PALANG['pAdminEdit_domain_result_error'] = 'Konnte Domain nicht editieren!'; $PALANG['pAdminCreate_admin_welcome'] = 'Neuen Domain-Admin hinzufügen'; -$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örter sind nicht identisch oder leer!'; $PALANG['pAdminCreate_admin_button'] = 'Admin hinzufügen'; $PALANG['pAdminCreate_admin_result_error'] = 'Konnte den Admin nicht anlegen!'; diff --git a/languages/en.lang b/languages/en.lang index 6c14c7d5..50a6c8b2 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -313,12 +313,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Edit Domain'; # text no longer used $PALANG['pAdminEdit_domain_result_error'] = 'Unable to modify domain!'; $PALANG['pAdminCreate_admin_welcome'] = 'Add a new domain admin'; -$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!'; diff --git a/languages/es.lang b/languages/es.lang index 2fadaca1..9576454e 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -306,13 +306,13 @@ $PALANG['pAdminEdit_domain_button'] = 'Editar dominio'; # XXX text no longer use $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!'; diff --git a/languages/et.lang b/languages/et.lang index 0715ed35..dbf9d641 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -305,12 +305,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Muuda domeen'; # XXX text no longer used $PALANG['pAdminEdit_domain_result_error'] = 'Domeeni muutmine ebaõnnestus!'; $PALANG['pAdminCreate_admin_welcome'] = 'Lisa uus domeeni haldaja'; -$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!'; diff --git a/languages/eu.lang b/languages/eu.lang index 5a6212d2..f26bae71 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -303,13 +303,13 @@ $PALANG['pAdminEdit_domain_button'] = 'Domeinua aldatu'; # XXX text no longer us $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!'; diff --git a/languages/fi.lang b/languages/fi.lang index b3e5151d..8dc64a01 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -305,12 +305,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Muokkaa domainia'; # XXX text no longer u $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!'; diff --git a/languages/fo.lang b/languages/fo.lang index 2f1a4e4a..738acb85 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -305,12 +305,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Broyt navnaøki'; # XXX text no longer us $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!'; diff --git a/languages/fr.lang b/languages/fr.lang index 7c94daa0..60ea2828 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -307,12 +307,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Modifier un domaine'; # XXX text no longe $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['pAdminCreate_admin_address'] = 'Domaine'; $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'; diff --git a/languages/hr.lang b/languages/hr.lang index c9296202..67c64afd 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -304,12 +304,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Uredi domenu'; # XXX text no longer used $PALANG['pAdminEdit_domain_result_error'] = 'Domenu nije bilo moguće premeniti!'; $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj administratora domene'; -$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!'; diff --git a/languages/hu.lang b/languages/hu.lang index 465f051f..a0d824ae 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -311,12 +311,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Domain szerkesztése'; # XXX text no long $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!'; diff --git a/languages/is.lang b/languages/is.lang index 7caef36f..3925f57c 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -304,12 +304,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Breyta léni'; # XXX text no longer used $PALANG['pAdminEdit_domain_result_error'] = 'Get ekki breytt léni!'; $PALANG['pAdminCreate_admin_welcome'] = 'Bæta nýju léni við'; -$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!'; diff --git a/languages/it.lang b/languages/it.lang index e8a5829b..72d2f3e0 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -306,12 +306,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Modifica dominio'; # XXX text no longer u $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 è valido!'; $PALANG['pAdminCreate_admin_username_text_error2'] = 'L\'amministratore esiste di già, oppure non è 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!'; diff --git a/languages/ja.lang b/languages/ja.lang index 5f548f87..6d677976 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -311,12 +311,12 @@ $PALANG['pAdminEdit_domain_button'] = 'ドメイン修正'; # XXX text no longer $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_result_success'] = '管理者を追加しました $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 diff --git a/languages/lt.lang b/languages/lt.lang index 720c085f..add0b7b2 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -304,12 +304,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Keisti sritį'; # XXX text no longer used $PALANG['pAdminEdit_domain_result_error'] = 'Srities pakeisti nepavyko!'; $PALANG['pAdminCreate_admin_welcome'] = 'Registruoti naują srities administratorių'; -$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!'; diff --git a/languages/mk.lang b/languages/mk.lang index 3f63e9f8..8bc511e6 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -306,12 +306,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Едитирај домен'; # XXX text $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'] = 'Не можам да додадам администратор!'; diff --git a/languages/nb.lang b/languages/nb.lang index 369b2459..3218492e 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -306,12 +306,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Endre domene'; # XXX text no longer used $PALANG['pAdminEdit_domain_result_error'] = 'Kunne ikke endre domenet!'; $PALANG['pAdminCreate_admin_welcome'] = 'Legg til en ny domeneadministrator'; -$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!'; diff --git a/languages/nl.lang b/languages/nl.lang index 03d03325..12fb94fc 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -306,12 +306,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Bewerk domein'; # XXX text no longer used $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!'; diff --git a/languages/nn.lang b/languages/nn.lang index 8ed398b1..29506d86 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -304,11 +304,11 @@ $PALANG['pAdminEdit_domain_button'] = 'Endre'; # XXX text no longer used $PALANG['pAdminEdit_domain_result_error'] = 'Klarte ikke å oppdatere domenet!'; $PALANG['pAdminCreate_admin_welcome'] = 'Legg til ny domene-administrator'; -$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!'; diff --git a/languages/pl.lang b/languages/pl.lang index ae8e82bd..2b10231d 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -308,12 +308,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Edytuj domenę'; # XXX text no longer use $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!'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index b34dc662..239f6bf7 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -313,12 +313,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Editar Domínio'; # XXX text no longer us $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!'; diff --git a/languages/ru.lang b/languages/ru.lang index 3611e3cf..5474c2b4 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -313,12 +313,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Редактировать домен'; # $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'] = 'Невозможно добавить администратора!'; diff --git a/languages/sk.lang b/languages/sk.lang index eff761aa..5f4611c1 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -306,12 +306,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Upraviť doménu'; # XXX text no longer u $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!'; diff --git a/languages/sl.lang b/languages/sl.lang index 8c1be11b..dd0b4c0d 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -305,12 +305,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Shrani'; # XXX text no longer used $PALANG['pAdminEdit_domain_result_error'] = 'Domene ni bilo mogoče spremeniti!'; $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj domenskega administratorja'; -$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!'; diff --git a/languages/sv.lang b/languages/sv.lang index 212453b3..7594e5fe 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -307,12 +307,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Ändra domän'; # XXX text no longer used $PALANG['pAdminEdit_domain_result_error'] = 'Kan inte modifiera domänen!'; $PALANG['pAdminCreate_admin_welcome'] = 'Lägg till ny domänadmin'; -$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!'; diff --git a/languages/tr.lang b/languages/tr.lang index 66299a3f..412cc745 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -305,12 +305,12 @@ $PALANG['pAdminEdit_domain_button'] = 'Domain düzenle'; # XXX text no longer us $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['pAdminCreate_admin_address'] = 'Domain'; $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 diff --git a/languages/tw.lang b/languages/tw.lang index f659a7c1..046a4fca 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -305,12 +305,12 @@ $PALANG['pAdminEdit_domain_button'] = '修改'; # XXX text no longer used $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'] = '新增管理員失敗!'; diff --git a/templates/admin_create-admin.tpl b/templates/admin_create-admin.tpl deleted file mode 100644 index 5a2080c0..00000000 --- a/templates/admin_create-admin.tpl +++ /dev/null @@ -1,38 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$PALANG.pAdminCreate_admin_welcome}
{$pAdminCreate_admin_username_text}{$pAdminCreate_admin_username_text_error}
 {$pAdminCreate_admin_password_text_error}
 
- -  
  
- -
diff --git a/templates/admin_edit-admin.tpl b/templates/admin_edit-admin.tpl index dfd29a6a..cd597318 100644 --- a/templates/admin_edit-admin.tpl +++ b/templates/admin_edit-admin.tpl @@ -1,25 +1,39 @@
-
+ - + +{if $mode == 'edit'} +{else} + + + +{/if} - + - + - + +{if $mode == 'edit'} + @@ -30,14 +44,16 @@ +{/if} - + - +
{$PALANG.pAdminEdit_admin_welcome} + {if $mode == 'edit'} + {$PALANG.pAdminEdit_admin_welcome} + {else} + {$PALANG.pAdminCreate_admin_welcome} + {/if} +
{$username}  {$pAdminCreate_admin_username_text}{$pAdminCreate_admin_username_text_error}
 {$pAdminEdit_admin_password_text_error}{$admin_password_text_error}