From 57d25d3d41c6f0a7ecc49dea17f5d239e0add1bd Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 31 Jul 2011 15:22:17 +0000 Subject: [PATCH] Merge edit-mailbox.tpl and edit-mailbox.tpl: edit-mailbox.tpl: - merged with create-mailbox.tpl - added various {if $mode = ...} - use $PALANG.pCreate_mailbox_password (text: "Password") instead of $PALANG.pEdit_mailbox_password text (text: "New password") for edit mode create-mailbox.tpl: - deleted edit-mailbox.php: - add smarty mode = edit variable create-mailbox.php - add smarty mode = create variable *.lang: - marked pEdit_mailbox_password and pEdit_mailbox_password2 as obsolete git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1154 a1433add-5e2c-0410-b055-b7f2511e0802 --- create-mailbox.php | 1 + edit-mailbox.php | 1 + languages/bg.lang | 4 +-- languages/ca.lang | 4 +-- languages/cn.lang | 4 +-- languages/cs.lang | 4 +-- languages/da.lang | 4 +-- languages/de.lang | 4 +-- languages/en.lang | 4 +-- languages/es.lang | 4 +-- languages/et.lang | 4 +-- languages/eu.lang | 4 +-- languages/fi.lang | 4 +-- languages/fo.lang | 4 +-- languages/fr.lang | 4 +-- languages/hr.lang | 4 +-- languages/hu.lang | 4 +-- languages/is.lang | 4 +-- languages/it.lang | 4 +-- languages/ja.lang | 4 +-- languages/lt.lang | 4 +-- languages/mk.lang | 4 +-- languages/nb.lang | 4 +-- languages/nl.lang | 4 +-- languages/nn.lang | 4 +-- languages/pl.lang | 4 +-- languages/pt-br.lang | 4 +-- languages/ru.lang | 4 +-- languages/sk.lang | 4 +-- languages/sl.lang | 4 +-- languages/sv.lang | 4 +-- languages/tr.lang | 4 +-- languages/tw.lang | 4 +-- templates/create-mailbox.tpl | 57 ------------------------------------ templates/edit-mailbox.tpl | 35 ++++++++++++++++++---- 35 files changed, 94 insertions(+), 124 deletions(-) delete mode 100644 templates/create-mailbox.tpl diff --git a/create-mailbox.php b/create-mailbox.php index 57aec7af..c175524e 100644 --- a/create-mailbox.php +++ b/create-mailbox.php @@ -260,6 +260,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } } +$smarty->assign ('mode', 'create'); $smarty->assign ('tUsername', $tUsername); $smarty->assign ('tActive', ' checked="checked" '); # TODO: use form value if POST $smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)), false); diff --git a/edit-mailbox.php b/edit-mailbox.php index 274168e8..e3b586e0 100644 --- a/edit-mailbox.php +++ b/edit-mailbox.php @@ -173,6 +173,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } } +$smarty->assign ('mode', 'edit'); $smarty->assign ('fUsername', $fUsername); $smarty->assign ('tName', $tName, false); $smarty->assign ('tMaxquota', $tMaxquota); diff --git a/languages/bg.lang b/languages/bg.lang index 14bf3b38..675c66f6 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -159,8 +159,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Редакция на пощенска кутия за вашия домейн.'; $PALANG['pEdit_mailbox_username'] = 'Логин'; $PALANG['pEdit_mailbox_username_error'] = 'Не мога да открия пощенската кутия!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Нова парола'; -$PALANG['pEdit_mailbox_password2'] = 'Нова парола (отново)'; +$PALANG['pEdit_mailbox_password'] = 'Нова парола'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Нова парола (отново)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Паролите, които сте дали не съвпадат!'; $PALANG['pEdit_mailbox_name'] = 'Име'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/ca.lang b/languages/ca.lang index 0f6c0253..ae804c2f 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -157,8 +157,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Editar una bústia pel seu domini.'; $PALANG['pEdit_mailbox_username'] = 'Usuari'; $PALANG['pEdit_mailbox_username_error'] = 'Imposible localitzar la bústia!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nova contrasenya'; -$PALANG['pEdit_mailbox_password2'] = 'Nova contrasenya (repetiu)'; +$PALANG['pEdit_mailbox_password'] = 'Nova contrasenya'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nova contrasenya (repetiu)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Les contrasenyes introduides no coincideixen!'; $PALANG['pEdit_mailbox_name'] = 'Nom'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/cn.lang b/languages/cn.lang index 5f08e582..07ba4da4 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -158,8 +158,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = '编辑你域中的邮箱.'; $PALANG['pEdit_mailbox_username'] = '用户名'; $PALANG['pEdit_mailbox_username_error'] = '不能定们邮箱!'; # obsolete -$PALANG['pEdit_mailbox_password'] = '新密码'; -$PALANG['pEdit_mailbox_password2'] = '新密码 (验证)'; +$PALANG['pEdit_mailbox_password'] = '新密码'; # obsolete +$PALANG['pEdit_mailbox_password2'] = '新密码 (验证)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = '你输入的两个新密码不相同!'; $PALANG['pEdit_mailbox_name'] = '姓名'; # XXX check / compare with pCreate_mailbox_name - should be "" $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/cs.lang b/languages/cs.lang index f385abf0..5d49bfa9 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -163,8 +163,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka byla přidán $PALANG['pEdit_mailbox_welcome'] = 'Upravit lokální chránku v doméně.'; $PALANG['pEdit_mailbox_username'] = 'Uživatelské jméno'; $PALANG['pEdit_mailbox_username_error'] = 'Nepodařilo se nalézt schránku!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nové heslo'; -$PALANG['pEdit_mailbox_password2'] = 'Nové heslo (znovu)'; +$PALANG['pEdit_mailbox_password'] = 'Nové heslo'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nové heslo (znovu)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Zadaná hesla se neshodují!'; $PALANG['pEdit_mailbox_name'] = 'Jméno'; $PALANG['pEdit_mailbox_name_text'] = 'Celé Jméno'; # obsolete diff --git a/languages/da.lang b/languages/da.lang index 2447a9a2..993086ff 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -161,8 +161,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilføjet $PALANG['pEdit_mailbox_welcome'] = 'Rediger postboks.'; $PALANG['pEdit_mailbox_username'] = 'Brugernavn'; $PALANG['pEdit_mailbox_username_error'] = 'Kan ikke finde postboksen!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Ny adgangskode'; -$PALANG['pEdit_mailbox_password2'] = 'Ny adgangskode (igen)'; +$PALANG['pEdit_mailbox_password'] = 'Ny adgangskode'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Ny adgangskode (igen)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Adgangskoderne er ikke ens!'; $PALANG['pEdit_mailbox_name'] = 'Navn'; $PALANG['pEdit_mailbox_name_text'] = 'Fulde navn'; # obsolete diff --git a/languages/de.lang b/languages/de.lang index 45bc03d8..ec695b05 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -160,8 +160,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Die Mailbox wurde in de $PALANG['pEdit_mailbox_welcome'] = 'Ändern Sie ihre Mailbox hier.'; $PALANG['pEdit_mailbox_username'] = 'Benutzername'; $PALANG['pEdit_mailbox_username_error'] = 'Unmöglich die Mailbox aufzufinden!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Neues Passwort'; -$PALANG['pEdit_mailbox_password2'] = 'Neues Passwort (nochmal)'; +$PALANG['pEdit_mailbox_password'] = 'Neues Passwort'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Neues Passwort (nochmal)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Die beiden Passwörter sind nicht identisch!'; $PALANG['pEdit_mailbox_name'] = 'Name'; $PALANG['pEdit_mailbox_name_text'] = 'Vollständiger Name'; # obsolete diff --git a/languages/en.lang b/languages/en.lang index bf79e06a..da1103d9 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -162,8 +162,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Edit a mailbox for your domain.'; $PALANG['pEdit_mailbox_username'] = 'Username'; $PALANG['pEdit_mailbox_username_error'] = 'Unable to locate mailbox!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'New Password'; -$PALANG['pEdit_mailbox_password2'] = 'New Password (again)'; +$PALANG['pEdit_mailbox_password'] = 'New Password'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'New Password (again)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'The passwords that you supplied don\'t match!'; $PALANG['pEdit_mailbox_name'] = 'Name'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # obsolete diff --git a/languages/es.lang b/languages/es.lang index 85c6a288..ed871a85 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -158,8 +158,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Editar un buzón para su dominio.'; $PALANG['pEdit_mailbox_username'] = 'Usuario'; $PALANG['pEdit_mailbox_username_error'] = '¡Imposible localizar el buzón!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nueva contraseña'; -$PALANG['pEdit_mailbox_password2'] = 'Nueva contraseña (repetir)'; +$PALANG['pEdit_mailbox_password'] = 'Nueva contraseña'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nueva contraseña (repetir)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = '¡Las contraseñas introducidas no coinciden!'; $PALANG['pEdit_mailbox_name'] = 'Nombre'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/et.lang b/languages/et.lang index d290f2d7..471550b6 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -158,8 +158,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Muuda postkasti.'; $PALANG['pEdit_mailbox_username'] = 'Kasutajanimi'; $PALANG['pEdit_mailbox_username_error'] = 'Postkasti muutmine ebaõnnestus!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Uus parool'; -$PALANG['pEdit_mailbox_password2'] = 'Uus parool (uuesti)'; +$PALANG['pEdit_mailbox_password'] = 'Uus parool'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Uus parool (uuesti)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Sisestatud paroolid ei kattu!'; $PALANG['pEdit_mailbox_name'] = 'Nimi'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/eu.lang b/languages/eu.lang index 7433abf9..4f3554ba 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -156,8 +156,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Domeinuarentzat postontzi bat aldatu.'; $PALANG['pEdit_mailbox_username'] = 'Erabiltzailea'; $PALANG['pEdit_mailbox_username_error'] = 'Ezinezkoa postontzia aurkitzea!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Pasahitz berria'; -$PALANG['pEdit_mailbox_password2'] = 'Pasahitz berria (errepikatu)'; +$PALANG['pEdit_mailbox_password'] = 'Pasahitz berria'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Pasahitz berria (errepikatu)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Sartutako pasahitzak ez datoz bat!'; $PALANG['pEdit_mailbox_name'] = 'Izena'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/fi.lang b/languages/fi.lang index 4b544065..cd9df0d1 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -158,8 +158,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Sähköpostilaatikko on $PALANG['pEdit_mailbox_welcome'] = 'Muokkaa postilaatikkoa.'; $PALANG['pEdit_mailbox_username'] = 'Käyttäjätunnus'; $PALANG['pEdit_mailbox_username_error'] = 'Postilaatikkoa ei löydy!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Uusi salasana'; -$PALANG['pEdit_mailbox_password2'] = 'Uusi salasana (toistamiseen)'; +$PALANG['pEdit_mailbox_password'] = 'Uusi salasana'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Uusi salasana (toistamiseen)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Antamasi salasanat eivät täsmää!'; $PALANG['pEdit_mailbox_name'] = 'Nimi'; $PALANG['pEdit_mailbox_name_text'] = 'Koko nimi'; # obsolete diff --git a/languages/fo.lang b/languages/fo.lang index d0760538..b0e456c1 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -158,8 +158,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Broyt postkassa á tínum navnaøki.'; $PALANG['pEdit_mailbox_username'] = 'Brúkaranavn'; $PALANG['pEdit_mailbox_username_error'] = 'Finni ikki postkassa!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nýtt loyniorð'; -$PALANG['pEdit_mailbox_password2'] = 'Nýtt loyniorð (umaftur)'; +$PALANG['pEdit_mailbox_password'] = 'Nýtt loyniorð'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nýtt loyniorð (umaftur)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Loyniorðini tú skrivaði samsvara ikki!'; $PALANG['pEdit_mailbox_name'] = 'Navn'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/fr.lang b/languages/fr.lang index 08c969a9..f71640c0 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -159,8 +159,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Le compte courriel a é $PALANG['pEdit_mailbox_welcome'] = 'Modifier un compte courriel.'; $PALANG['pEdit_mailbox_username'] = 'Nom d\'utilisateur'; $PALANG['pEdit_mailbox_username_error'] = 'Impossible de localiser le compte courriel!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nouveau mot de passe'; -$PALANG['pEdit_mailbox_password2'] = 'Nouveau mot de passe (confirmation)'; +$PALANG['pEdit_mailbox_password'] = 'Nouveau mot de passe'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nouveau mot de passe (confirmation)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Le mot de passe entré ne correspond pas!'; $PALANG['pEdit_mailbox_name'] = 'Nom'; $PALANG['pEdit_mailbox_name_text'] = 'Nom complet'; # obsolete diff --git a/languages/hr.lang b/languages/hr.lang index 3d5613f6..1df109ed 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -157,8 +157,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Uredi poštanski ormarić za domenu.'; $PALANG['pEdit_mailbox_username'] = 'Korisničko ime'; $PALANG['pEdit_mailbox_username_error'] = 'Poštanski ormarić nije bilo moguče naći!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nova lozinka'; -$PALANG['pEdit_mailbox_password2'] = 'Nova lozinka (ponovi)'; +$PALANG['pEdit_mailbox_password'] = 'Nova lozinka'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nova lozinka (ponovi)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Unešene lozinke se ne podudaraju!'; $PALANG['pEdit_mailbox_name'] = 'Ime'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/hu.lang b/languages/hu.lang index 3a808070..a40b3ca3 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -160,8 +160,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'A postafiókot hozzáad $PALANG['pEdit_mailbox_welcome'] = 'Postafiók szerkesztése az adott domainhez.'; $PALANG['pEdit_mailbox_username'] = 'Felhasználónév'; $PALANG['pEdit_mailbox_username_error'] = 'Nem sikerült megtalálni a postafiókot!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Új jelszó'; -$PALANG['pEdit_mailbox_password2'] = 'Új jelszó (mégegyszer)'; +$PALANG['pEdit_mailbox_password'] = 'Új jelszó'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Új jelszó (mégegyszer)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'A beírt jelszavak nem egyeznek!'; $PALANG['pEdit_mailbox_name'] = 'Név'; $PALANG['pEdit_mailbox_name_text'] = 'Teljes név'; # obsolete diff --git a/languages/is.lang b/languages/is.lang index 7c3d67bf..8df63577 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -157,8 +157,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Breyta pósthólfi i léninu þínu.'; $PALANG['pEdit_mailbox_username'] = 'Auðkenni'; # XXX check / compare with pCreate_mailbox_username - should be "Username" $PALANG['pEdit_mailbox_username_error'] = 'Finn ekki pósthólfið!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nýtt lykilorð'; -$PALANG['pEdit_mailbox_password2'] = 'Nýja lykilorðið aftur'; +$PALANG['pEdit_mailbox_password'] = 'Nýtt lykilorð'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nýja lykilorðið aftur'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Lykilorðið sem þú skrifaðir inn passar ekki saman!'; $PALANG['pEdit_mailbox_name'] = 'Nafn'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/it.lang b/languages/it.lang index 5b287617..c11a1fee 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -159,8 +159,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'La casella è sta $PALANG['pEdit_mailbox_welcome'] = 'Modifica una casella di posta per il tuo dominio.'; $PALANG['pEdit_mailbox_username'] = 'Nome utente'; $PALANG['pEdit_mailbox_username_error'] = 'Impossibile trovare la casella di posta!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nuova Password'; -$PALANG['pEdit_mailbox_password2'] = 'Nuova Password (ripeti)'; +$PALANG['pEdit_mailbox_password'] = 'Nuova Password'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nuova Password (ripeti)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Le password che hai fornito non sono uguali!'; $PALANG['pEdit_mailbox_name'] = 'Nome'; $PALANG['pEdit_mailbox_name_text'] = 'Nome e cognome'; # obsolete diff --git a/languages/ja.lang b/languages/ja.lang index f3df52ac..a4cc7f0f 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -160,8 +160,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'メールアドレス $PALANG['pEdit_mailbox_welcome'] = 'メールアドレスの編集'; $PALANG['pEdit_mailbox_username'] = 'メールアドレス'; # XXX check / compare with pCreate_mailbox_username - should be "Username" $PALANG['pEdit_mailbox_username_error'] = 'Unable to locate mailbox!'; # obsolete -$PALANG['pEdit_mailbox_password'] = '新しいパスワード'; -$PALANG['pEdit_mailbox_password2'] = '新しいパスワード (確認)'; +$PALANG['pEdit_mailbox_password'] = '新しいパスワード'; # obsolete +$PALANG['pEdit_mailbox_password2'] = '新しいパスワード (確認)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'パスワードが一致しません。'; $PALANG['pEdit_mailbox_name'] = '名前'; $PALANG['pEdit_mailbox_name_text'] = 'フルネーム'; # obsolete diff --git a/languages/lt.lang b/languages/lt.lang index 88138e00..85cdf099 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -157,8 +157,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Keisti pašto dėžutę.'; $PALANG['pEdit_mailbox_username'] = 'Vartotojas'; $PALANG['pEdit_mailbox_username_error'] = 'Pašto dėžutė nerasta!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Naujas slaptažodis'; -$PALANG['pEdit_mailbox_password2'] = 'Naujas slaptažodis (dar kartą)'; +$PALANG['pEdit_mailbox_password'] = 'Naujas slaptažodis'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Naujas slaptažodis (dar kartą)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Įvesti slaptažodžiai nesutampa!'; $PALANG['pEdit_mailbox_name'] = 'Vardas'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/mk.lang b/languages/mk.lang index 33b027e0..595c248a 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -158,8 +158,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Измена на поштенско сандаче на доменот.'; $PALANG['pEdit_mailbox_username'] = 'Корисничко име'; $PALANG['pEdit_mailbox_username_error'] = 'Не можам да го најдам сандачето!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Нова лозинка'; -$PALANG['pEdit_mailbox_password2'] = 'Нова лозинка (повторно)'; +$PALANG['pEdit_mailbox_password'] = 'Нова лозинка'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Нова лозинка (повторно)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Внесените лозинки не одговараат!'; $PALANG['pEdit_mailbox_name'] = 'Име'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/nb.lang b/languages/nb.lang index c57b86a1..fb840b13 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -159,8 +159,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'E-postkontoen er blitt $PALANG['pEdit_mailbox_welcome'] = 'Endre en e-postkonto.'; $PALANG['pEdit_mailbox_username'] = 'Brukernavn'; $PALANG['pEdit_mailbox_username_error'] = 'Fant ikke e-postkontoen!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nytt passord'; -$PALANG['pEdit_mailbox_password2'] = 'Nytt passord (bekreft)'; +$PALANG['pEdit_mailbox_password'] = 'Nytt passord'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nytt passord (bekreft)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Passordene du oppga stemmer ikke overens!'; $PALANG['pEdit_mailbox_name'] = 'Navn'; $PALANG['pEdit_mailbox_name_text'] = 'Fullt navn'; # obsolete diff --git a/languages/nl.lang b/languages/nl.lang index ab0dd634..e05b52b0 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -159,8 +159,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'De mailbox is aan de ma $PALANG['pEdit_mailbox_welcome'] = 'Bewerk een mailbox voor uw domein.'; $PALANG['pEdit_mailbox_username'] = 'Gebruikersnaam'; $PALANG['pEdit_mailbox_username_error'] = 'Mislukt om mailbox te vinden!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nieuw wachtwoord'; -$PALANG['pEdit_mailbox_password2'] = 'Nieuw wachtwoord (nogmaals)'; +$PALANG['pEdit_mailbox_password'] = 'Nieuw wachtwoord'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nieuw wachtwoord (nogmaals)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'De wachtwoorden die u opgaf komen niet overeen.'; $PALANG['pEdit_mailbox_name'] = 'Naam'; $PALANG['pEdit_mailbox_name_text'] = 'Volledige naam'; # obsolete diff --git a/languages/nn.lang b/languages/nn.lang index b1e9793d..badcacee 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -156,8 +156,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Endre en e-postkonto.'; $PALANG['pEdit_mailbox_username'] = 'Brukernavn'; $PALANG['pEdit_mailbox_username_error'] = 'Fant ikke e-postkontoen!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nytt passord'; -$PALANG['pEdit_mailbox_password2'] = 'Nytt passord (igjen)'; +$PALANG['pEdit_mailbox_password'] = 'Nytt passord'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nytt passord (igjen)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Passordene er ikke like!'; $PALANG['pEdit_mailbox_name'] = 'Navn'; # XXX check / compare with pCreate_mailbox_name - should be "" $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/pl.lang b/languages/pl.lang index f6e482f2..f7b81e61 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -160,8 +160,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Konto zostało dodane d $PALANG['pEdit_mailbox_welcome'] = 'Edytuj konto w Twojej domenie.'; $PALANG['pEdit_mailbox_username'] = 'Nazwa użytkownika'; $PALANG['pEdit_mailbox_username_error'] = 'Nie można zlokalizować konta!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nowe hasło'; -$PALANG['pEdit_mailbox_password2'] = 'Nowe hasło (ponownie)'; +$PALANG['pEdit_mailbox_password'] = 'Nowe hasło'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nowe hasło (ponownie)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Wpisane hasło nie pasuje!'; $PALANG['pEdit_mailbox_name'] = 'Nazwa'; $PALANG['pEdit_mailbox_name_text'] = 'Pełna nazwa'; # obsolete diff --git a/languages/pt-br.lang b/languages/pt-br.lang index ca121ff6..009607ed 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -162,8 +162,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Conta de email criada, $PALANG['pEdit_mailbox_welcome'] = 'Edição de conta de email do domínio.'; $PALANG['pEdit_mailbox_username'] = 'Usuário'; $PALANG['pEdit_mailbox_username_error'] = 'Não foi possível encontrar a conta de email!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nova senha'; -$PALANG['pEdit_mailbox_password2'] = 'Nova senha (confirmação)'; +$PALANG['pEdit_mailbox_password'] = 'Nova senha'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nova senha (confirmação)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'As senhas fornecidas são diferentes!'; $PALANG['pEdit_mailbox_name'] = 'Nome'; $PALANG['pEdit_mailbox_name_text'] = 'Nome completo'; # obsolete diff --git a/languages/ru.lang b/languages/ru.lang index 0ec228aa..49f38a25 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -162,8 +162,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Почтовый ящи $PALANG['pEdit_mailbox_welcome'] = 'Редактирование ящика для вашего домена.'; $PALANG['pEdit_mailbox_username'] = 'Название'; $PALANG['pEdit_mailbox_username_error'] = 'Невозможно определить ящик!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Новый пароль'; -$PALANG['pEdit_mailbox_password2'] = 'Новый пароль (еще раз)'; +$PALANG['pEdit_mailbox_password'] = 'Новый пароль'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Новый пароль (еще раз)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Введенные вами пароли не совпадают!'; $PALANG['pEdit_mailbox_name'] = 'Имя'; $PALANG['pEdit_mailbox_name_text'] = 'Полное имя'; # obsolete diff --git a/languages/sk.lang b/languages/sk.lang index 0818efa2..19bae1bf 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -159,8 +159,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Schránka bola pridaná $PALANG['pEdit_mailbox_welcome'] = 'Upraviť schránku v doméne'; $PALANG['pEdit_mailbox_username'] = 'Užívateľské meno'; $PALANG['pEdit_mailbox_username_error'] = 'Nepodarilo sa nájsť schránku!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nové heslo'; -$PALANG['pEdit_mailbox_password2'] = 'Nové heslo (znovu)'; +$PALANG['pEdit_mailbox_password'] = 'Nové heslo'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nové heslo (znovu)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Zadaná heslá se nezhodujú!'; $PALANG['pEdit_mailbox_name'] = 'Meno'; $PALANG['pEdit_mailbox_name_text'] = 'Celé meno'; # obsolete diff --git a/languages/sl.lang b/languages/sl.lang index 1b3c323e..a91a2538 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -158,8 +158,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Uredi določen predal za izbrano domeno.'; $PALANG['pEdit_mailbox_username'] = 'Uporabniško ime'; $PALANG['pEdit_mailbox_username_error'] = 'Izbranega predala ni bilo mogoče najti!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Novo geslo'; -$PALANG['pEdit_mailbox_password2'] = 'Novo geslo (ponovitev)'; +$PALANG['pEdit_mailbox_password'] = 'Novo geslo'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Novo geslo (ponovitev)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Vnešeni gesli se ne ujemata!'; $PALANG['pEdit_mailbox_name'] = 'Ime'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/sv.lang b/languages/sv.lang index 8249b489..7ee18545 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -160,8 +160,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Brevlådan har lagts ti $PALANG['pEdit_mailbox_welcome'] = 'Ändra ett brevlåda i din domän.'; $PALANG['pEdit_mailbox_username'] = 'Epostadress'; $PALANG['pEdit_mailbox_username_error'] = 'Kan inte hitta den adressen!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Nytt Lösenord'; -$PALANG['pEdit_mailbox_password2'] = 'Nytt Lösenord (igen)'; +$PALANG['pEdit_mailbox_password'] = 'Nytt Lösenord'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Nytt Lösenord (igen)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Lösenorden du angav är olika!'; $PALANG['pEdit_mailbox_name'] = 'Namn'; $PALANG['pEdit_mailbox_name_text'] = 'Fullständigt namn'; # obsolete diff --git a/languages/tr.lang b/languages/tr.lang index b52fbb91..de80e163 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -158,8 +158,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = 'Domaninizdeki bir posta kutusunu düzenleyin.'; $PALANG['pEdit_mailbox_username'] = 'kullanýcý adý'; # XXX check / compare with pCreate_mailbox_username - should be "Username" $PALANG['pEdit_mailbox_username_error'] = 'Posta kutusu bulunamadý!'; # obsolete -$PALANG['pEdit_mailbox_password'] = 'Yeni þifre'; -$PALANG['pEdit_mailbox_password2'] = 'Yeni þifre (tekrar)'; +$PALANG['pEdit_mailbox_password'] = 'Yeni þifre'; # obsolete +$PALANG['pEdit_mailbox_password2'] = 'Yeni þifre (tekrar)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = 'Verdiðiniz þifreler birbirini tutmuyor!'; $PALANG['pEdit_mailbox_name'] = 'Ýsim'; $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/languages/tw.lang b/languages/tw.lang index 2e045f52..c2fc1dfb 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -158,8 +158,8 @@ $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been ad $PALANG['pEdit_mailbox_welcome'] = '編輯你網域中的郵箱.'; $PALANG['pEdit_mailbox_username'] = '用戶名'; $PALANG['pEdit_mailbox_username_error'] = '不能定們郵箱!'; # obsolete -$PALANG['pEdit_mailbox_password'] = '新密碼'; -$PALANG['pEdit_mailbox_password2'] = '新密碼 (驗證)'; +$PALANG['pEdit_mailbox_password'] = '新密碼'; # obsolete +$PALANG['pEdit_mailbox_password2'] = '新密碼 (驗證)'; # obsolete $PALANG['pEdit_mailbox_password_text_error'] = '你輸入的兩個新密碼不相同!'; $PALANG['pEdit_mailbox_name'] = '姓名'; # XXX check / compare with pCreate_mailbox_name - should be "" $PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete diff --git a/templates/create-mailbox.tpl b/templates/create-mailbox.tpl deleted file mode 100644 index 725019ee..00000000 --- a/templates/create-mailbox.tpl +++ /dev/null @@ -1,57 +0,0 @@ -{* checkboxes *} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -{if $CONF.quota===YES} - - - - - - -{/if} - - - - - - - - - - - - - - -
{$PALANG.pCreate_mailbox_welcome}
@ - - {$pCreate_mailbox_username_text_error}
{$PALANG.pCreate_mailbox_password_text}{$mailbox_password_text_error}
 
{$PALANG.pCreate_mailbox_name_text} 
{$PALANG.pEdit_mailbox_quota_text}{$mailbox_quota_text_error}
 
 
 
-
-
diff --git a/templates/edit-mailbox.tpl b/templates/edit-mailbox.tpl index 2f7b21b6..57fc9ea9 100644 --- a/templates/edit-mailbox.tpl +++ b/templates/edit-mailbox.tpl @@ -2,22 +2,35 @@
- + +{else} + {$PALANG.pCreate_mailbox_welcome} +{/if} +{if $mode == 'edit'} +{else} + + + +{/if} - + - + @@ -29,7 +42,9 @@ {if $CONF.quota===YES} - + + + @@ -40,11 +55,21 @@ +{if $mode == 'create'} + + + + + +{/if}
{$PALANG.pEdit_mailbox_welcome} +{if $mode == 'edit'} + {$PALANG.pEdit_mailbox_welcome}
{$fUsername}    @ + + {$pCreate_mailbox_username_text_error}
{$PALANG.pCreate_mailbox_password_text} {$mailbox_password_text_error}
 
{$PALANG.pEdit_mailbox_quota_text} {$mailbox_quota_text_error}  
 
  - + +{if $mode == 'edit'} +{/if}