diff --git a/languages/bg.lang b/languages/bg.lang index 9a8e3a8d..3d9fdbf7 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -239,7 +239,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Мейл сървъра е резерв $PALANG['pAdminEdit_domain_result_error'] = 'Не мога да модифицирам домейна! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Добави нов админ на домейна'; -$PALANG['pAdminCreate_admin_username_text'] = 'Е-мейл адрес'; +$PALANG['email_address'] = 'Е-мейл адрес'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Админ не е валиден е-мейл адрес!'; $PALANG['admin_already_exists'] = 'Админ-а вече съществува или не е валиден'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -250,7 +250,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Админа беше добав $PALANG['pAdminEdit_admin_welcome'] = 'Редакция на админ на домейн'; $PALANG['admin'] = 'Админ'; $PALANG['password_again'] = 'Парола (отново)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Главен Администратор'; +$PALANG['super_admin'] = 'Главен Администратор'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Не мога да модифицирам админа! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Админ-а беше модифициран! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/ca.lang b/languages/ca.lang index 27b24f44..62b3804d 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -237,7 +237,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX $PALANG['pAdminEdit_domain_result_error'] = 'Imposible modificar el domini! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Afegir un nou administrador de domini'; -$PALANG['pAdminCreate_admin_username_text'] = 'E-mail'; +$PALANG['email_address'] = 'E-mail'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrador no es un e-mail vàlid!'; $PALANG['admin_already_exists'] = 'L\'administrador ja existeix o no es vàlid!'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -249,7 +249,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'L\'administrador ha estat afegit $PALANG['pAdminEdit_admin_welcome'] = 'Editar un administrador de domini'; $PALANG['admin'] = 'Administrador'; $PALANG['password_again'] = 'Contrasenya (repetiu)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Imposible modificar l\'administrador! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'L\'administrador ha estat modificat! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/cn.lang b/languages/cn.lang index b23278b5..0ef60ad5 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -238,7 +238,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = '备份邮件服务器'; $PALANG['pAdminEdit_domain_result_error'] = '修改域失败! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = '新增域管理员'; -$PALANG['pAdminCreate_admin_username_text'] = '邮件地址'; +$PALANG['email_address'] = '邮件地址'; $PALANG['pAdminCreate_admin_username_text_error1'] = '管理员名不是一个合法的邮件地址!'; $PALANG['admin_already_exists'] = '管理员已经存在或者管理员名非法!'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -249,7 +249,7 @@ $PALANG['pAdminCreate_admin_result_success'] = '新增管理员成功! (%s)'; # $PALANG['pAdminEdit_admin_welcome'] = '修改域管理员'; $PALANG['admin'] = '管理员'; $PALANG['password_again'] = '密码 (验证)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = '编辑域管理员失败! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = '编辑域管理员成功! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/cs.lang b/languages/cs.lang index 5634fe87..91a7d6ec 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -247,7 +247,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Tento server je záložní MX domény'; $PALANG['pAdminEdit_domain_result_error'] = 'Nepodařilo se upravit doménu! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Přidat nového doménového administrátora'; -$PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa'; +$PALANG['email_address'] = 'Emailová adresa'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Tato adresa není platná!'; $PALANG['admin_already_exists'] = 'Taková adresa již existuje!'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -258,7 +258,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administrátor byl přidán! (%s $PALANG['pAdminEdit_admin_welcome'] = 'Upravit doménového administrátora'; $PALANG['admin'] = 'Uživatelské jméno'; # XXX check text - should be 'Admin' $PALANG['password_again'] = 'Heslo (znovu)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Superuživatel'; +$PALANG['super_admin'] = 'Superuživatel'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Nepodařilo se upravit administrátora! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Administrátor byl upraven! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/da.lang b/languages/da.lang index be7226f5..8467d3fd 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -247,7 +247,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Mailserveren er backup MX'; $PALANG['pAdminEdit_domain_result_error'] = 'Kan ikke rette domænet! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Tilføj en ny domæneadministrator'; -$PALANG['pAdminCreate_admin_username_text'] = 'Emailadresse'; +$PALANG['email_address'] = 'Emailadresse'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke en gyldig emailadresse!'; $PALANG['admin_already_exists'] = 'Aministratoren findes allerede eller er ikke gyldig'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -258,7 +258,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er tilføj $PALANG['pAdminEdit_admin_welcome'] = 'Redigér en domæneadministrator'; $PALANG['admin'] = 'Administrator'; $PALANG['password_again'] = 'Adgangskode (igen)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Superadministrator'; +$PALANG['super_admin'] = 'Superadministrator'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Kunne ikke rette administrator! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Administrator er rettet! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/de.lang b/languages/de.lang index 89d47358..e01df994 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -244,7 +244,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; $PALANG['pAdminEdit_domain_result_error'] = 'Das Ändern der Domain %s ist fehlgeschlagen'; $PALANG['pAdminCreate_admin_welcome'] = 'Neuen Domain-Admin hinzufügen'; -$PALANG['pAdminCreate_admin_username_text'] = 'Email Adresse'; +$PALANG['email_address'] = 'Email Adresse'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin-Adresse ist keine echte Email-Adresse!'; $PALANG['admin_already_exists'] = 'Der Admin existiert bereits!'; $PALANG['admin_does_not_exist'] = 'Der Admin existiert nicht!'; @@ -255,7 +255,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Der Admin %s wurde angelegt.'; $PALANG['pAdminEdit_admin_welcome'] = 'Domain Admin editieren'; $PALANG['admin'] = 'Admin'; $PALANG['password_again'] = 'Passwort (nochmal)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super-Admin'; +$PALANG['super_admin'] = 'Super-Admin'; $PALANG['super_admin_desc'] = 'Super-Admins haben Zugriff auf alle Domains und können Domains und Admins verwalten.'; $PALANG['pAdminEdit_admin_result_error'] = 'Das Ändern des Admins %s ist fehlgeschlagen!'; $PALANG['pAdminEdit_admin_result_success'] = 'Der Admin %s wurde geändert.'; diff --git a/languages/en.lang b/languages/en.lang index 5b2badf4..48e3461c 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -245,7 +245,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; $PALANG['pAdminEdit_domain_result_error'] = 'Modifying the domain %s failed!'; $PALANG['pAdminCreate_admin_welcome'] = 'Add a new domain admin'; -$PALANG['pAdminCreate_admin_username_text'] = 'Email address'; +$PALANG['email_address'] = 'Email address'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin is not a valid email address!'; $PALANG['admin_already_exists'] = 'The admin already exists!'; $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; @@ -256,7 +256,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'The admin %s has been added!'; $PALANG['pAdminEdit_admin_welcome'] = 'Edit a domain admin'; $PALANG['admin'] = 'Admin'; $PALANG['password_again'] = 'Password (again)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; +$PALANG['super_admin'] = 'Super admin'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; $PALANG['pAdminEdit_admin_result_error'] = 'Modifying the admin %s failed!'; $PALANG['pAdminEdit_admin_result_success'] = 'The admin %s has been modified.'; diff --git a/languages/es.lang b/languages/es.lang index af8dc939..ef10a450 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -239,7 +239,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'El servidor de correo es backup MX'; # $PALANG['pAdminEdit_domain_result_error'] = '¡Imposible modificar el dominio! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Añadir un nuevo administrador de dominio'; -$PALANG['pAdminCreate_admin_username_text'] = 'E-mail'; +$PALANG['email_address'] = 'E-mail'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrador no es un e-mail válido!'; $PALANG['admin_already_exists'] = 'El administrador ya existe o no es válido!'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -251,7 +251,7 @@ $PALANG['pAdminCreate_admin_result_success'] = '¡El administrador ha sido añad $PALANG['pAdminEdit_admin_welcome'] = 'Editar un administrador de dominio'; $PALANG['admin'] = 'Administrador'; $PALANG['password_again'] = 'Contraseña (repetir)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = '¡Imposible modificar el administrador! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = '¡El administrador ha sido modificado! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/et.lang b/languages/et.lang index 4b7ed2c0..49654d0c 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -238,7 +238,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'E-posti server on varuserver (backup MX $PALANG['pAdminEdit_domain_result_error'] = 'Domeeni muutmine ebaõnnestus! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Lisa uus domeeni haldaja'; -$PALANG['pAdminCreate_admin_username_text'] = 'E-posti aadress'; +$PALANG['email_address'] = 'E-posti aadress'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Väljal haldaja pole kehtiv e-posti aadress!'; $PALANG['admin_already_exists'] = 'Selline haldaja on juba olemas'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -249,7 +249,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Haldaja on lisatud! (%s)'; # XXX $PALANG['pAdminEdit_admin_welcome'] = 'Muuda domeeni haldajat'; $PALANG['admin'] = 'Haldaja'; $PALANG['password_again'] = 'Parool (uuesti)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Haldaja muutmine ebaõnnestus! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Haldaja on muudetud! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/eu.lang b/languages/eu.lang index 3433cbf0..df7d2109 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -236,7 +236,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX $PALANG['pAdminEdit_domain_result_error'] = 'Ezinezkoa domeinua aldatzea! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Domeinu kudeatzaile berri bat gehitu'; -$PALANG['pAdminCreate_admin_username_text'] = 'E-mail helbidea'; +$PALANG['email_address'] = 'E-mail helbidea'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Kudeatzaile e-mailak ez du balio!'; $PALANG['admin_already_exists'] = 'Kudeatzailea existitzen da edo ez du balio!'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -248,7 +248,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Kudeatzailea gehituta1 (%s)'; # $PALANG['pAdminEdit_admin_welcome'] = 'Domeinu kudeatzaile bat aldatu'; $PALANG['admin'] = 'Kudeatzailea'; $PALANG['password_again'] = 'Pasahitza (errepikatu)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Ezinezkoa kudeatzailea aldatzea! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Kudeatzailea aldatu da! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/fi.lang b/languages/fi.lang index 18a66d03..fedfbf87 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -238,7 +238,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Sähköpostipalvelin on vara MX'; $PALANG['pAdminEdit_domain_result_error'] = 'Domainin muokkaus ei onnistu! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Lisää uusi domainin ylläpitäjä'; -$PALANG['pAdminCreate_admin_username_text'] = 'Sähköpostiosoite'; +$PALANG['email_address'] = 'Sähköpostiosoite'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Ylläpitäjän sähköpostiosoite ei ole oikeanmuotoinen!'; $PALANG['admin_already_exists'] = 'Ylläpitäjän sähköpostiosoite on jo olemassa tai se ei ole oikean muotoinen'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -249,7 +249,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Ylläpitäjä on lisätty! (%s)' $PALANG['pAdminEdit_admin_welcome'] = 'Muokkaa domainin ylläpitäjää'; $PALANG['admin'] = 'Ylläpitäjä'; # XXX check text - should be 'Admin' $PALANG['password_again'] = 'Salasana (toistamiseen)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Pääylläpitäjä'; +$PALANG['super_admin'] = 'Pääylläpitäjä'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Ylläpitäjän muokkaaminen ei onnistu! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Ylläpitäjän muokkaus onnistui! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/fo.lang b/languages/fo.lang index 3bb9e314..be98c9c9 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -238,7 +238,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Post servari er "backup MX"'; $PALANG['pAdminEdit_domain_result_error'] = 'Fái ikki broytt navnaøki! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Stovna navnaøki umsitara'; -$PALANG['pAdminCreate_admin_username_text'] = 'E-post adressa'; +$PALANG['email_address'] = 'E-post adressa'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Umsitari er ógyldug e-post adressa!'; $PALANG['admin_already_exists'] = 'Umsitari finst longu ella er ógyldugur'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -249,7 +249,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Umsitari er stovnaður! (%s)'; # $PALANG['pAdminEdit_admin_welcome'] = 'Broyt navnaøki umsitara'; $PALANG['admin'] = 'Umsitari'; $PALANG['password_again'] = 'Loyniorð (umaftur)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Fái ikki broytt umsitara! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Umsitari er broyttur! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/fr.lang b/languages/fr.lang index 3e299516..46953558 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -240,7 +240,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Le serveur est un "backup MX"'; $PALANG['pAdminEdit_domain_result_error'] = 'Impossible de modifier le domain! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Ajouter un nouvel administrateur de domaine'; -$PALANG['pAdminCreate_admin_username_text'] = 'adresse courriel'; +$PALANG['email_address'] = 'adresse courriel'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Ce n\'est pas une adresse courriel administrateur valide!'; $PALANG['admin_already_exists'] = 'Cet adresse courriel administrateur existe déjà ou n\'est pas valide'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -251,7 +251,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'L\'administrateur a été ajout $PALANG['pAdminEdit_admin_welcome'] = 'Modifier un domaine'; $PALANG['admin'] = 'Administrateur'; $PALANG['password_again'] = 'Mot de passe (confirmation)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super administrateur'; +$PALANG['super_admin'] = 'Super administrateur'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Impossible de modifier l\'administrateur ! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'L\'administrateur a été ajouté! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/hr.lang b/languages/hr.lang index 4bd4fdac..f00d4289 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -237,7 +237,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Poslužitelj e-pošte je sekundarni MX' $PALANG['pAdminEdit_domain_result_error'] = 'Domenu nije bilo moguće premeniti! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj administratora domene'; -$PALANG['pAdminCreate_admin_username_text'] = 'Adresa e-pošte'; +$PALANG['email_address'] = 'Adresa e-pošte'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator nije valjana adresa e-pošte!'; $PALANG['admin_already_exists'] = 'Adminstrator već postoji ili nije valjan'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -248,7 +248,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je uspješno doda $PALANG['pAdminEdit_admin_welcome'] = 'Uredi administratora domene'; $PALANG['admin'] = 'Administrator'; $PALANG['password_again'] = 'Lozinka (ponovi)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Administratora nije bilo moguće promjeniti! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Admininstrator je uspješno promjenjen! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/hu.lang b/languages/hu.lang index aab901d7..501fec7a 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -244,7 +244,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'A mail szerver egy backup MX'; $PALANG['pAdminEdit_domain_result_error'] = 'A domain módosítása sikertelen! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Új domain admin felvétele'; -$PALANG['pAdminCreate_admin_username_text'] = 'Email cím'; +$PALANG['email_address'] = 'Email cím'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Az Admin nem valós email cím!'; $PALANG['admin_already_exists'] = 'Az Admin már létezik, vagy nem valós a cím!'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -255,7 +255,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Az Admin sikeresen bekerült az $PALANG['pAdminEdit_admin_welcome'] = 'Domain admin szerkesztése'; $PALANG['admin'] = 'Admin'; $PALANG['password_again'] = 'Jelszó (mégegyszer)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Nemsikerült módosítani az admint! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Az Admin módosítása megtörtént! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/is.lang b/languages/is.lang index 7ea4f9be..507c4592 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -238,7 +238,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX $PALANG['pAdminEdit_domain_result_error'] = 'Get ekki breytt léni! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Bæta nýju léni við'; -$PALANG['pAdminCreate_admin_username_text'] = 'Póstfang'; +$PALANG['email_address'] = 'Póstfang'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Kerfisstjóri er ekki rétt póstfang!'; $PALANG['admin_already_exists'] = 'Kerfisstjóri er til nú þegar eða er ekki leyfilegt'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -249,7 +249,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Kerfisstjórinn hefur verið skr $PALANG['pAdminEdit_admin_welcome'] = 'Breyta kerfisstjóra léns'; $PALANG['admin'] = 'Kerfisstjóri'; # XXX check text - should be 'Admin' $PALANG['password_again'] = 'Lykilorð (aftur)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Get ekki breytt kerfisstjóra! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Kerfisstjórinn hefur verið breyttur! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/it.lang b/languages/it.lang index b0c0131d..28f8d63d 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -239,7 +239,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Questo server è un MX secondario'; $PALANG['pAdminEdit_domain_result_error'] = 'Impossibile modificare il dominio! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Aggiungi un nuovo amministratore per il dominio'; -$PALANG['pAdminCreate_admin_username_text'] = 'Indirizzo email'; +$PALANG['email_address'] = 'Indirizzo email'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'L\'indirizzo dell\'amministratore non è valido!'; $PALANG['admin_already_exists'] = 'L\'amministratore esiste di già, oppure non è valido'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -250,7 +250,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'L\'amministratore è stato aggiu $PALANG['pAdminEdit_admin_welcome'] = 'Modifica l\'amministratore del dominio'; $PALANG['admin'] = 'Amministratore'; # XXX check text - should be 'Admin' $PALANG['password_again'] = 'Password (ancora)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Superutente'; +$PALANG['super_admin'] = 'Superutente'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Impossibile modificare amministratore! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'L\'amministratore è stato modificato! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/ja.lang b/languages/ja.lang index 4ce8b364..bad5cc9a 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -244,7 +244,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'バックアップ MXサーバ'; $PALANG['pAdminEdit_domain_result_error'] = 'ドメインが修正できません！ (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = '新しいドメイン管理者の追加'; -$PALANG['pAdminCreate_admin_username_text'] = 'メールアドレス'; +$PALANG['email_address'] = 'メールアドレス'; $PALANG['pAdminCreate_admin_username_text_error1'] = '管理者は有効なメールアドレスではありません。'; $PALANG['admin_already_exists'] = '管理者は存在するか無効です。'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -255,7 +255,7 @@ $PALANG['pAdminCreate_admin_result_success'] = '管理者を追加しました $PALANG['pAdminEdit_admin_welcome'] = 'ドメイン管理者の編集'; $PALANG['admin'] = '管理者'; # XXX check / compare with pAdminCreate_admin_username - should be "admin" $PALANG['password_again'] = 'パスワード (確認)'; -$PALANG['pAdminEdit_admin_super_admin'] = '特権管理者'; +$PALANG['super_admin'] = '特権管理者'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = '管理者を修正できません！ (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = '管理者を修正しました。 (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/lt.lang b/languages/lt.lang index a0d9c257..a7bbeda7 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -239,7 +239,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Tai atsarginis pašto serveris (MX)'; $PALANG['pAdminEdit_domain_result_error'] = 'Srities pakeisti nepavyko! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Registruoti naują srities administratorių'; -$PALANG['pAdminCreate_admin_username_text'] = 'El.pašto adresas'; +$PALANG['email_address'] = 'El.pašto adresas'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administratorius turi būti el.pašto adresas!'; $PALANG['admin_already_exists'] = 'Administratorius šiai sričiai jau yra arba neteisingas'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -250,7 +250,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratorius užregistruotas $PALANG['pAdminEdit_admin_welcome'] = 'Registruoti srities administratorių'; $PALANG['admin'] = 'Administratorius'; # XXX check text - should be 'Admin' $PALANG['password_again'] = 'Slaptažodis (dar kartą)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super administratorius'; +$PALANG['super_admin'] = 'Super administratorius'; $PALANG['super_admin_desc'] = 'Super administratoriai turi priėjimą prie visų sričių, gali keisti sritis ir administratorius.'; $PALANG['pAdminEdit_admin_result_error'] = 'Administratoriaus pakeisti nepavyko! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Administratorius pakeistas! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/mk.lang b/languages/mk.lang index 7c401900..f2f07f66 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -239,7 +239,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Mail серверот е backup MX'; $PALANG['pAdminEdit_domain_result_error'] = 'Не можам да го модифицирам доменот! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Додади нов администратор на домен'; -$PALANG['pAdminCreate_admin_username_text'] = 'Email адреса'; +$PALANG['email_address'] = 'Email адреса'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Администратор не е валидна адреса!'; $PALANG['admin_already_exists'] = 'Администраторот веќе постои или не е валидна'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -250,7 +250,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Администраторот $PALANG['pAdminEdit_admin_welcome'] = 'Измена на администратор на домен'; $PALANG['admin'] = 'Администратор'; # XXX check text - should be 'Admin' $PALANG['password_again'] = 'Лозинка (повторно)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Не можам да го модифицирам администраторот! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Администраторот е модифициран! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/nb.lang b/languages/nb.lang index 5459adb4..5e2fbcd3 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -239,7 +239,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'E-postserveren er backup-MX'; $PALANG['pAdminEdit_domain_result_error'] = 'Kunne ikke endre domenet! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Legg til en ny domeneadministrator'; -$PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse'; +$PALANG['email_address'] = 'E-postadresse'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Du har ikke skrevet inn en gyldig e-postadresse!'; $PALANG['admin_already_exists'] = 'Administratoren er allerede definert, eller du har skrevet inn en ugyldig adresse'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -250,7 +250,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til! (%s $PALANG['pAdminEdit_admin_welcome'] = 'Endre domeneadministrator'; $PALANG['admin'] = 'Administrator'; $PALANG['password_again'] = 'Passord (bekreft)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super-administrator'; +$PALANG['super_admin'] = 'Super-administrator'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Klarte ikke å endre administratoren! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Administratoren er blitt endret! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/nl.lang b/languages/nl.lang index 2a5e5fd5..1cf7437d 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -239,7 +239,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is back-up MX'; $PALANG['pAdminEdit_domain_result_error'] = 'Mislukt het domein te bewerken. (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Voeg een nieuw domein beheerder toe'; -$PALANG['pAdminCreate_admin_username_text'] = 'E-mail adres'; +$PALANG['email_address'] = 'E-mail adres'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Beheerder is geen geldig e-mail adres!'; $PALANG['admin_already_exists'] = 'De beheerder bestaat al of is niet geldig'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -250,7 +250,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Beheerder is toegevoegd. (%s)'; $PALANG['pAdminEdit_admin_welcome'] = 'Bewerk een domein beheerder'; $PALANG['admin'] = 'Beheerder'; $PALANG['password_again'] = 'Wachtwoord (nogmaals)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super administrator'; +$PALANG['super_admin'] = 'Super administrator'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Mislukt om beheerder te bewerken (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Beheerder is bewerkt! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/nn.lang b/languages/nn.lang index 6f0d2610..56ee6ea0 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -238,7 +238,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'E-postservereb er backup-MX'; $PALANG['pAdminEdit_domain_result_error'] = 'Klarte ikke å oppdatere domenet! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Legg til ny domene-administrator'; -$PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse'; +$PALANG['email_address'] = 'E-postadresse'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke gyldig adresse!'; $PALANG['admin_already_exists'] = 'The admin already exists!'; # XXX $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -249,7 +249,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til! (%s $PALANG['pAdminEdit_admin_welcome'] = 'Endre domene-administrator'; $PALANG['admin'] = 'Administrator'; $PALANG['password_again'] = 'Passord (igjen)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Klarte ikke å endre administratoren! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Administratoren er endret/oppdatert! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/pl.lang b/languages/pl.lang index 6bfd1a00..0e2a5f95 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -241,7 +241,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Serwer pocztowy jest zapasowym MX'; $PALANG['pAdminEdit_domain_result_error'] = 'Nie można zmodyfikować domeny! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj konto administratora'; -$PALANG['pAdminCreate_admin_username_text'] = 'Adres email'; +$PALANG['email_address'] = 'Adres email'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administartor nie jest poprawnym adresem email!'; $PALANG['admin_already_exists'] = 'Administrator już istnieje lub jest niepoprawny'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -252,7 +252,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administrator został dodany! (% $PALANG['pAdminEdit_admin_welcome'] = 'Edytuj administratora domeny'; $PALANG['admin'] = 'Administrator'; # XXX check text - should be 'Admin' $PALANG['password_again'] = 'Hasło (ponownie)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Główny administrator'; +$PALANG['super_admin'] = 'Główny administrator'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Nie można zmodyfikować administratora! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Administrator został zmodyfikowany! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/pt-br.lang b/languages/pt-br.lang index 430c750e..374fb9e4 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -246,7 +246,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Servidor de email é um MX de backup'; $PALANG['pAdminEdit_domain_result_error'] = 'Não foi possível editar o domínio! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Criação de um novo administrador de domínio.'; -$PALANG['pAdminCreate_admin_username_text'] = 'Endereço de email'; +$PALANG['email_address'] = 'Endereço de email'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Endereço de email inválido!'; $PALANG['admin_already_exists'] = 'Administrador já existe ou é inválido'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -257,7 +257,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administrador criado! (%s)'; # X $PALANG['pAdminEdit_admin_welcome'] = 'Edição de administrador de domínio.'; $PALANG['admin'] = 'Administrador'; $PALANG['password_again'] = 'Senha (confirmação)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super administrador'; +$PALANG['super_admin'] = 'Super administrador'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Não foi possível editar o administrador! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Administrador editado! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/ru.lang b/languages/ru.lang index 93602488..0db69130 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -246,7 +246,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Почтовый сервер явля $PALANG['pAdminEdit_domain_result_error'] = 'Невозможно изменить домен! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Добавление нового администратора домена'; -$PALANG['pAdminCreate_admin_username_text'] = 'Почтовый адрес'; +$PALANG['email_address'] = 'Почтовый адрес'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Некорректный адрес администратора!'; $PALANG['admin_already_exists'] = 'Администратор уже существует либо некорректное имя'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -257,7 +257,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Администратор бы $PALANG['pAdminEdit_admin_welcome'] = 'Редактирование администратора домена'; $PALANG['admin'] = 'Администратор'; # XXX check text - should be 'Admin' $PALANG['password_again'] = 'Пароль (еще раз)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Супер админ'; +$PALANG['super_admin'] = 'Супер админ'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Невозможно изменить администратора! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Администратор был изменен! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/sk.lang b/languages/sk.lang index 2403a176..f9929f21 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -239,7 +239,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server je záložný MX'; $PALANG['pAdminEdit_domain_result_error'] = 'Nepodarilo sa upraviť doménu! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Pridať nového administrátora'; -$PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa'; +$PALANG['email_address'] = 'Emailová adresa'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Táto adresa nie je platná!'; $PALANG['admin_already_exists'] = 'Takáto adresa už existuje!'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -250,7 +250,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Administrátor bol pridaný! (%s $PALANG['pAdminEdit_admin_welcome'] = 'Upraviť doménového administrátora'; $PALANG['admin'] = 'Užívateľské meno'; # XXX check text - should be 'Admin' $PALANG['password_again'] = 'Heslo (znovu)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; +$PALANG['super_admin'] = 'Super admin'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Nepodarilo sa upraviť administrátora! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Administrátor bol upravený! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/sl.lang b/languages/sl.lang index 08b41ce9..0b1db915 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -238,7 +238,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Poštni strežnik je sekundarni MX'; $PALANG['pAdminEdit_domain_result_error'] = 'Domene ni bilo mogoče spremeniti! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj domenskega administratorja'; -$PALANG['pAdminCreate_admin_username_text'] = 'E-poštni naslov'; +$PALANG['email_address'] = 'E-poštni naslov'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator ni veljaven e-poštni naslov!'; $PALANG['admin_already_exists'] = 'Adminstrator že obstaja ali pa ni pravilen'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -249,7 +249,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je bil uspešno d $PALANG['pAdminEdit_admin_welcome'] = 'Uredi domenskega administratorja'; $PALANG['admin'] = 'Administrator'; $PALANG['password_again'] = 'Geslo (ponovitev)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Administratorja ni bilo mogoče spremeniti! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Admininstrator je bil uspešno spremenjen! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/sv.lang b/languages/sv.lang index 75f45d89..03db1f4e 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -240,7 +240,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX untran $PALANG['pAdminEdit_domain_result_error'] = 'Kan inte modifiera domänen! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Lägg till ny domänadmin'; -$PALANG['pAdminCreate_admin_username_text'] = 'Epostadress'; +$PALANG['email_address'] = 'Epostadress'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin är inte en giltig epostadress!'; $PALANG['admin_already_exists'] = 'Denna admin finns redan eller är inte giltig'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -251,7 +251,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Admin har lagts till! (%s)'; # X $PALANG['pAdminEdit_admin_welcome'] = 'Ändra en domänadmin'; $PALANG['admin'] = 'Admin'; $PALANG['password_again'] = 'Lösenord (igen)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super administratör'; +$PALANG['super_admin'] = 'Super administratör'; $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Kan inte ändra admin! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Admin har ändrats! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/tr.lang b/languages/tr.lang index d2e34231..460ee2f7 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -238,7 +238,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX $PALANG['pAdminEdit_domain_result_error'] = 'Domain düzenlenemedi! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = 'Yöneticiye yeni bir domain ekle'; -$PALANG['pAdminCreate_admin_username_text'] = 'Eposta adresi'; +$PALANG['email_address'] = 'Eposta adresi'; $PALANG['pAdminCreate_admin_username_text_error1'] = 'Yönetici uygun bir eposta adresi deðil!'; $PALANG['admin_already_exists'] = 'Yönetici halen bulunmakta ya da uygun deðil'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -249,7 +249,7 @@ $PALANG['pAdminCreate_admin_result_success'] = 'Yönetici eklendi! (%s)'; # XXX $PALANG['pAdminEdit_admin_welcome'] = 'Domain yöneticisi düzenle'; $PALANG['admin'] = 'Yönetici'; $PALANG['password_again'] = 'Þifre (tekrar)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = 'Yönetici düzenlenemedi! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = 'Yönetici düzenlendi! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/languages/tw.lang b/languages/tw.lang index 605f807c..4a96c8d1 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -238,7 +238,7 @@ $PALANG['pAdminEdit_domain_backupmx'] = '備份郵件服務器'; $PALANG['pAdminEdit_domain_result_error'] = '修改網域失敗! (%s)'; # XXX Text changed to: Modifying the domain %s failed! $PALANG['pAdminCreate_admin_welcome'] = '新增網域管理員'; -$PALANG['pAdminCreate_admin_username_text'] = '郵件地址'; +$PALANG['email_address'] = '郵件地址'; $PALANG['pAdminCreate_admin_username_text_error1'] = '管理員名不是一個合法的郵件地址!'; $PALANG['admin_already_exists'] = '管理員已經存在或者管理員名非法!'; # XXX Text changed to: The admin already exists! $PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX @@ -249,7 +249,7 @@ $PALANG['pAdminCreate_admin_result_success'] = '新增管理員成功! (%s)'; # $PALANG['pAdminEdit_admin_welcome'] = '修改網域管理員'; $PALANG['admin'] = '管理員'; $PALANG['password_again'] = '密碼 (驗證)'; -$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX +$PALANG['super_admin'] = 'Super admin'; # XXX $PALANG['super_admin_desc'] = 'Super admins have access to all domains, can manage domains and admin accounts.'; # XXX $PALANG['pAdminEdit_admin_result_error'] = '編輯網域管理員失敗! (%s)'; # XXX Text changed to: Modifying the admin %s failed! $PALANG['pAdminEdit_admin_result_success'] = '編輯網域管理員成功! (%s)'; # XXX Text changed to: The admin %s has been modified. diff --git a/model/AdminHandler.php b/model/AdminHandler.php index c9a21e1f..ac7b213d 100644 --- a/model/AdminHandler.php +++ b/model/AdminHandler.php @@ -24,9 +24,6 @@ class AdminHandler extends PFAHandler { # init $this->struct, $this->db_table and $this->id_field protected function initStruct() { - # TODO: shorter PALANG labels ;-) - # TODO: hardcode 'default' to Config::read in pacol()? - # NOTE: There are dependencies between domains and domain_count # NOTE: If you disable "display in list" for domain_count, the SQL query for domains might break. # NOTE: (Disabling both shouldn't be a problem.) @@ -39,17 +36,17 @@ class AdminHandler extends PFAHandler { } $this->struct=array( - # field name allow display in... type $PALANG label $PALANG description default / options / ... + # field name allow display in... type $PALANG label $PALANG description default / options / ... # editing? form list - 'username' => pacol( $this->new, 1, 1, 'text', 'admin' , 'pAdminCreate_admin_username_text' ), - 'password' => pacol( 1, 1, 0, 'pass', 'password' , '' ), - 'password2' => pacol( 1, 1, 0, 'pass', 'password_again' , '' , '', '', + 'username' => pacol( $this->new, 1, 1, 'text', 'admin' , 'email_address' ), + 'password' => pacol( 1, 1, 0, 'pass', 'password' , '' ), + 'password2' => pacol( 1, 1, 0, 'pass', 'password_again' , '' , '', '', /*not_in_db*/ 0, /*dont_write_to_db*/ 1, /*select*/ 'password as password2' ), - 'superadmin' => pacol( 1, 1, 1, 'bool', 'pAdminEdit_admin_super_admin' , 'super_admin_desc' , 0 + 'superadmin' => pacol( 1, 1, 1, 'bool', 'super_admin' , 'super_admin_desc' , 0 # TODO: (finally) replace the ALL domain with a column in the admin table # TODO: current status: 'superadmin' column exists and is written when storing an admin with AdminHandler, # TODO: but the superadmin status is still (additionally) stored in the domain_admins table ("ALL" dummy domain) @@ -58,14 +55,14 @@ class AdminHandler extends PFAHandler { # TODO: Create them with the trunk version to avoid this problem. ), - 'domains' => pacol( 1, 1, 1, 'list', 'domain' , '' , array(), list_domains(), + 'domains' => pacol( 1, 1, 1, 'list', 'domain' , '' , array(), list_domains(), /*not_in_db*/ 0, /*dont_write_to_db*/ 1, /*select*/ "coalesce(domains,'') as domains" /*extrafrom set in domain_count*/ ), - 'domain_count' => pacol( 0, 0, 1, 'vnum', '' , '' , '', '', + 'domain_count' => pacol( 0, 0, 1, 'vnum', '' , '' , '', '', /*not_in_db*/ 0, /*dont_write_to_db*/ 1, /*select*/ 'coalesce(__domain_count,0) as domain_count', @@ -75,9 +72,9 @@ class AdminHandler extends PFAHandler { " WHERE domain != 'ALL' GROUP BY username " . ' ) AS __domain on username = __domain_username'), - 'active' => pacol( 1, 1, 1, 'bool', 'active' , '' , 1 ), - 'created' => pacol( 0, 0, 1, 'ts', 'created' , '' ), - 'modified' => pacol( 0, 0, 1, 'ts', 'last_modified' , '' ), + 'active' => pacol( 1, 1, 1, 'bool', 'active' , '' , 1 ), + 'created' => pacol( 0, 0, 1, 'ts', 'created' , '' ), + 'modified' => pacol( 0, 0, 1, 'ts', 'last_modified' , '' ), ); } diff --git a/setup.php b/setup.php index ac0d7eea..1b728c12 100644 --- a/setup.php +++ b/setup.php @@ -312,8 +312,6 @@ else print "

Everything seems fine... attempting to create/update database structure

\n"; require_once($incpath.'/upgrade.php'); - $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text']; - $pAdminCreate_admin_password_text = ""; $tUsername = ''; $setupMessage = ''; $lostpw_error = 0; @@ -412,7 +410,7 @@ else - + diff --git a/templates/adminlistadmin.tpl b/templates/adminlistadmin.tpl index 382dbd40..a7f228a5 100644 --- a/templates/adminlistadmin.tpl +++ b/templates/adminlistadmin.tpl @@ -12,7 +12,7 @@ {$admin.username} {if $admin.superadmin == 1} - {$PALANG.pAdminEdit_admin_super_admin} + {$PALANG.super_admin} {else} {$admin.domain_count} {/if}