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

@@ -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);

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);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

templates/create-mailbox.tpl

@@ -1,57 +0,0 @@
-{* checkboxes *}
-<div id="edit_form">
-<form name="mailbox" method="post" action="">
-<table>
-	<tr>
-		<th colspan="4">{$PALANG.pCreate_mailbox_welcome}</th>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pEdit_mailbox_username}:</label></td>
-		<td><input class="flat" type="text" name="fUsername" value="{$tUsername}"/></td>
-		<td>@
-		<select name="fDomain">{$select_options}</select>
-		</td>
-		<td class="error_msg">{$pCreate_mailbox_username_text_error}</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pCreate_mailbox_password}:</label></td>
-		<td><input class="flat" type="password" name="fPassword" /></td>
-		<td>{$PALANG.pCreate_mailbox_password_text}</td>
-		<td class="error_msg">{$mailbox_password_text_error}</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pCreate_mailbox_password2}:</label></td>
-		<td><input class="flat" type="password" name="fPassword2" /></td>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pEdit_mailbox_name}:</label></td>
-		<td><input class="flat" type="text" name="fName" value="{$tName}" /></td>
-		<td>{$PALANG.pCreate_mailbox_name_text}</td>
-		<td>&nbsp;</td>
-	</tr>
-{if $CONF.quota===YES}
-	<tr>
-		<td class="label"><label>{$PALANG.pEdit_mailbox_quota}:</label></td>
-		<td><input class="flat" type="text" name="fQuota" value="{$tQuota}" /></td>
-		<td>{$PALANG.pEdit_mailbox_quota_text}</td>
-		<td class="error_msg">{$mailbox_quota_text_error}</td>
-	</tr>
-{/if}
-	<tr>
-		<td class="label"><label>{$PALANG.pCreate_mailbox_active}:</label></td>
-		<td><input class="flat" type="checkbox" name="fActive"{$tActive}/></td>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-		<td class="label"><label>{$PALANG.pCreate_mailbox_mail}:</label></td>
-		<td><input class="flat" type="checkbox" name="fMail" checked="checked" /></td>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td colspan="3"><input class="button" type="submit" name="submit" value="{$PALANG.pCreate_mailbox_button}" /></td>
-	</tr>
-</table>
-</form>
-</div>

templates/edit-mailbox.tpl

@@ -2,22 +2,35 @@
 <form name="mailbox" method="post" action="">
 <table>
 	<tr>
-		<th colspan="4">{$PALANG.pEdit_mailbox_welcome}</th>
+		<th colspan="4">
+{if $mode == 'edit'}
+			{$PALANG.pEdit_mailbox_welcome}</th>
+{else}
+			{$PALANG.pCreate_mailbox_welcome}
+{/if}
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pEdit_mailbox_username}:</label></td>
+{if $mode == 'edit'}
 		<td><em>{$fUsername}</em></td>
 		<td>&nbsp;</td>
 		<td>&nbsp;</td>
+{else}
+		<td><input class="flat" type="text" name="fUsername" value="{$tUsername}"/></td>
+		<td>@
+		<select name="fDomain">{$select_options}</select>
+		</td>
+		<td class="error_msg">{$pCreate_mailbox_username_text_error}</td>
+{/if}
 	</tr>
 	<tr>
-		<td class="label"><label>{$PALANG.pEdit_mailbox_password}:</label></td>
+		<td class="label"><label>{$PALANG.pCreate_mailbox_password}:</label></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
 		<td>{$PALANG.pCreate_mailbox_password_text}</td>
 		<td class="error_msg">{$mailbox_password_text_error}</td>
 	</tr>
 	<tr>
-		<td class="label"><label>{$PALANG.pEdit_mailbox_password2}:</label></td>
+		<td class="label"><label>{$PALANG.pCreate_mailbox_password2}:</label></td>
 		<td><input class="flat" type="password" name="fPassword2" /></td>
 		<td colspan="2">&nbsp;</td>
 	</tr>
@@ -29,7 +42,9 @@
 	</tr>
 {if $CONF.quota===YES}
 	<tr>
-		<td class="label"><label>{$PALANG.pEdit_mailbox_quota} (max: {$tMaxquota}):</label></td>
+		<td class="label"><label>{$PALANG.pEdit_mailbox_quota}{if $mode == 'edit'} (max: {$tMaxquota}){/if}:</label></td>
+<!-- TODO: show available quota in create -->
+<!-- TODO: better place to show available quota? -->
 		<td><input class="flat" type="text" name="fQuota" value="{$tQuota}" /></td>
 		<td>{$PALANG.pEdit_mailbox_quota_text}</td>
 		<td class="error_msg">{$mailbox_quota_text_error}</td>
@@ -40,11 +55,21 @@
 		<td><input class="flat" type="checkbox" name="fActive"{$tActive}/></td>
 		<td colspan="2">&nbsp;</td>
 	</tr>
+{if $mode == 'create'}
+	<tr>
+		<td class="label"><label>{$PALANG.pCreate_mailbox_mail}:</label></td>
+		<td><input class="flat" type="checkbox" name="fMail" checked="checked" /></td>
+		<td colspan="2">&nbsp;</td>
+	</tr>
+{/if}
 	<tr>
    	<td>&nbsp;</td>
 		<td colspan="3">
-			<input class="button" type="submit" name="submit" value="{$PALANG.save}" />
+			<input class="button" type="submit" name="submit" 
+				value="{if $mode == 'edit'}{$PALANG.save}{else}{$PALANG.pCreate_mailbox_button}{/if}" />
+{if $mode == 'edit'}
 			<input class="button" type="submit" name="cancel" value="{$PALANG.exit}"/>
+{/if}
 		</td>
 	</tr>
 </table>