From 94dbfa2bb49ab832fba7130a8f486a99be039cf0 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Fri, 29 Jul 2011 23:30:54 +0000 Subject: [PATCH] Mostly merge edit-mailbox.tpl and create-mailbox.tpl edit-mailbox.php - report password errors next to the password field instead of flash_error() - small changes to smarty variables create-mailbox.php: - small changes to smarty variables edit-mailbox.tpl, create-mailbox.tpl: - merge as good as possible (everything that is still left will probably need an {if} - renamed some smarty variables - use colspan=3 for buttons *.lang: - mark pCreate_mailbox_username, pCreate_mailbox_name, pCreate_mailbox_quota, pCreate_mailbox_quota_text and pEdit_mailbox_name_text as obsolete - added some "please check" notes for translators git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1146 a1433add-5e2c-0410-b055-b7f2511e0802 --- create-mailbox.php | 5 +++-- edit-mailbox.php | 9 ++++----- languages/bg.lang | 10 +++++----- languages/ca.lang | 10 +++++----- languages/cn.lang | 12 ++++++------ languages/cs.lang | 10 +++++----- languages/da.lang | 10 +++++----- languages/de.lang | 12 ++++++------ languages/en.lang | 10 +++++----- languages/es.lang | 10 +++++----- languages/et.lang | 10 +++++----- languages/eu.lang | 10 +++++----- languages/fi.lang | 10 +++++----- languages/fo.lang | 10 +++++----- languages/fr.lang | 10 +++++----- languages/hr.lang | 10 +++++----- languages/hu.lang | 10 +++++----- languages/is.lang | 12 ++++++------ languages/it.lang | 10 +++++----- languages/ja.lang | 12 ++++++------ languages/lt.lang | 10 +++++----- languages/mk.lang | 12 ++++++------ languages/nb.lang | 10 +++++----- languages/nl.lang | 10 +++++----- languages/nn.lang | 12 ++++++------ languages/pl.lang | 10 +++++----- languages/pt-br.lang | 10 +++++----- languages/ru.lang | 10 +++++----- languages/sk.lang | 10 +++++----- languages/sl.lang | 10 +++++----- languages/sv.lang | 10 +++++----- languages/tr.lang | 12 ++++++------ languages/tw.lang | 12 ++++++------ templates/create-mailbox.tpl | 19 +++++++++---------- templates/edit-mailbox.tpl | 15 ++++++--------- 35 files changed, 185 insertions(+), 189 deletions(-) diff --git a/create-mailbox.php b/create-mailbox.php index 6a2c2030..57aec7af 100644 --- a/create-mailbox.php +++ b/create-mailbox.php @@ -261,12 +261,13 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } $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); $smarty->assign ('pCreate_mailbox_username_text_error', $pCreate_mailbox_username_text_error, false); -$smarty->assign ('pCreate_mailbox_password_text_error', $pCreate_mailbox_password_text_error, false); +$smarty->assign ('mailbox_password_text_error', $pCreate_mailbox_password_text_error, false); $smarty->assign ('tName', $tName, false); $smarty->assign ('tQuota', $tQuota); -$smarty->assign ('pCreate_mailbox_quota_text_error', $pCreate_mailbox_quota_text_error, false); +$smarty->assign ('mailbox_quota_text_error', $pCreate_mailbox_quota_text_error, false); $smarty->assign ('smarty_template', 'create-mailbox'); $smarty->display ('index.tpl'); diff --git a/edit-mailbox.php b/edit-mailbox.php index 44b0a338..647bdb7c 100644 --- a/edit-mailbox.php +++ b/edit-mailbox.php @@ -45,7 +45,6 @@ if (isset ($_GET['username'])) $fUsername = escape_string ($_GET['username']); $fUsername = strtolower ($fUsername); if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']); -$pEdit_mailbox_name_text = $PALANG['pEdit_mailbox_name_text']; $pEdit_mailbox_quota_text_error = ""; if (!(check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin')) ) @@ -102,14 +101,14 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") if($fPassword == $fPassword2) { if ($fPassword != "") { if($min_length > 0 && strlen($fPassword) < $min_length) { - flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length'])); + $mailbox_password_text_error = sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']); $error = 1; } $formvars['password'] = pacrypt($fPassword); } } else { - flash_error($PALANG['pEdit_mailbox_password_text_error']); + $mailbox_password_text_error = $PALANG['pEdit_mailbox_password_text_error']; $error = 1; } } @@ -175,10 +174,10 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") $smarty->assign ('fUsername', $fUsername); $smarty->assign ('tName', $tName, false); -$smarty->assign ('pEdit_mailbox_name_text', $pEdit_mailbox_name_text,false); $smarty->assign ('tMaxquota', $tMaxquota); $smarty->assign ('tQuota', $tQuota); -$smarty->assign ('pEdit_mailbox_quota_text_error', $pEdit_mailbox_quota_text_error); +$smarty->assign ('mailbox_quota_text_error', $pEdit_mailbox_quota_text_error); +$smarty->assign ('mailbox_password_text_error', $mailbox_password_text_error); if ($tActive) $smarty->assign ('tActive', ' checked="checked"'); $smarty->assign ('smarty_template', 'edit-mailbox'); $smarty->display ('index.tpl'); diff --git a/languages/bg.lang b/languages/bg.lang index c4bc814b..60a766ee 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -136,7 +136,7 @@ $PALANG['pEdit_alias_button'] = 'Редактирай Alias'; # XXX text no long $PALANG['pEdit_alias_result_error'] = 'Не мога да модифицирам този alias!'; $PALANG['pCreate_mailbox_welcome'] = 'Създаване на нова пощенска кутия за вашия домейн.'; -$PALANG['pCreate_mailbox_username'] = 'Логин'; +$PALANG['pCreate_mailbox_username'] = 'Логин'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Е-мейл-а не е валиден!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Този е-мейл адрес вече съществува, моля изберете друг!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Вие сте достигнали своя лимит за създаване на пощенски кутии!'; @@ -144,10 +144,10 @@ $PALANG['pCreate_mailbox_password'] = 'Парола'; $PALANG['pCreate_mailbox_password2'] = 'Парола (отново)'; $PALANG['pCreate_mailbox_password_text'] = 'Парола за POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Паролите, които сте дали не съвпадат! Или са празни!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Име'; +$PALANG['pCreate_mailbox_name'] = 'Име'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Пълно име'; -$PALANG['pCreate_mailbox_quota'] = 'Обем'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Обем'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Обема, който сте задали е твърде голям!'; $PALANG['pCreate_mailbox_active'] = 'Активен'; $PALANG['pCreate_mailbox_mail'] = 'Създай пощенска кутия'; @@ -163,7 +163,7 @@ $PALANG['pEdit_mailbox_password'] = 'Нова парола'; $PALANG['pEdit_mailbox_password2'] = 'Нова парола (отново)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Паролите, които сте дали не съвпадат!'; $PALANG['pEdit_mailbox_name'] = 'Име'; -$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = 'Обем'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Обема, който сте дали е твърде голям!'; diff --git a/languages/ca.lang b/languages/ca.lang index b2a8d013..32b9350f 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -134,7 +134,7 @@ $PALANG['pEdit_alias_button'] = 'Editar àlies'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Imposible modificar l\'àlies!'; $PALANG['pCreate_mailbox_welcome'] = 'Crear una nova bústia pel seu domini.'; -$PALANG['pCreate_mailbox_username'] = 'Usuari'; +$PALANG['pCreate_mailbox_username'] = 'Usuari'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'L\'e-mail no és vàlido!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Aquest e-mail ja existeix, escull un de diferente si us plau!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Has arribat al límit de creació de bústies!'; @@ -142,10 +142,10 @@ $PALANG['pCreate_mailbox_password'] = 'Contrasenya'; $PALANG['pCreate_mailbox_password2'] = 'Contrasenya (repetir)'; $PALANG['pCreate_mailbox_password_text'] = 'Contrasenya per a POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Les contrasenyes introduides no coincideixen o estan en blanc!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Nom'; +$PALANG['pCreate_mailbox_name'] = 'Nom'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Nom complet'; -$PALANG['pCreate_mailbox_quota'] = 'Quota'; # XXX -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Quota'; # XXX # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'La quota especificada és massa alta!'; $PALANG['pCreate_mailbox_active'] = 'Actiu'; $PALANG['pCreate_mailbox_mail'] = 'Crear bústia'; @@ -161,7 +161,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nova contrasenya'; $PALANG['pEdit_mailbox_password2'] = 'Nova contrasenya (repetiu)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Les contrasenyes introduides no coincideixen!'; $PALANG['pEdit_mailbox_name'] = 'Nom'; -$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = 'Quota'; # XXX $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'La quota especificada és massa alta!'; diff --git a/languages/cn.lang b/languages/cn.lang index b0b8003f..fe9f6ce0 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -135,7 +135,7 @@ $PALANG['pEdit_alias_button'] = '编辑别名'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = '不能修改该别名!'; $PALANG['pCreate_mailbox_welcome'] = '在你的域中新建一个本地邮箱.'; -$PALANG['pCreate_mailbox_username'] = '用户名'; +$PALANG['pCreate_mailbox_username'] = '用户名'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = '邮件非法!'; $PALANG['pCreate_mailbox_username_text_error2'] = '邮件地址已经存在,请重新选择!'; $PALANG['pCreate_mailbox_username_text_error3'] = '邮箱地址已经达到上限!'; @@ -143,10 +143,10 @@ $PALANG['pCreate_mailbox_password'] = '密码'; $PALANG['pCreate_mailbox_password2'] = '密码 (再次输入)'; $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP 密码'; $PALANG['pCreate_mailbox_password_text_error'] = '你输入的密码不相同! 或者为空!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = '名字'; +$PALANG['pCreate_mailbox_name'] = '名字'; # obsolete $PALANG['pCreate_mailbox_name_text'] = '全名'; -$PALANG['pCreate_mailbox_quota'] = '限制'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = '限制'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = '你输入的容量限制超出范围!'; $PALANG['pCreate_mailbox_active'] = '活动'; $PALANG['pCreate_mailbox_mail'] = '新建邮箱'; @@ -161,8 +161,8 @@ $PALANG['pEdit_mailbox_username_error'] = '不能定们邮箱!'; # obsolete $PALANG['pEdit_mailbox_password'] = '新密码'; $PALANG['pEdit_mailbox_password2'] = '新密码 (验证)'; $PALANG['pEdit_mailbox_password_text_error'] = '你输入的两个新密码不相同!'; -$PALANG['pEdit_mailbox_name'] = '姓名'; -$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX +$PALANG['pEdit_mailbox_name'] = '姓名'; # XXX check / compare with pCreate_mailbox_name - should be "" +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = '限制'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = '你输入的容量限制超出范围!'; diff --git a/languages/cs.lang b/languages/cs.lang index 8efa7f19..7a97e0c7 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -140,7 +140,7 @@ $PALANG['pEdit_alias_button'] = 'Upravit'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Nepodařilo se upravit přesměrování!'; $PALANG['pCreate_mailbox_welcome'] = 'Vytvořit novou lokální schránku v doméně.'; -$PALANG['pCreate_mailbox_username'] = 'Uživatelské jméno'; +$PALANG['pCreate_mailbox_username'] = 'Uživatelské jméno'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa neni platná!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Taková emailová adresa již¸ existuje!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Dosáhli jste limitu, nemů¸ete vytvářet další schránky!'; @@ -148,10 +148,10 @@ $PALANG['pCreate_mailbox_password'] = 'Heslo'; $PALANG['pCreate_mailbox_password2'] = 'Heslo (znovu)'; $PALANG['pCreate_mailbox_password_text'] = 'Heslo pro POP3/IMAP/SMTP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Zadaná hesla jsou rozdílná nebo prázdná!'; -$PALANG['pCreate_mailbox_name'] = 'Jméno'; +$PALANG['pCreate_mailbox_name'] = 'Jméno'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Celé jméno'; -$PALANG['pCreate_mailbox_quota'] = 'Místo'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Místo'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Zadané místo je příliš velké!'; $PALANG['pCreate_mailbox_active'] = 'Aktivní'; $PALANG['pCreate_mailbox_mail'] = 'Vytvořit schránku na disku (odešle uvítací email)'; @@ -167,7 +167,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nové heslo'; $PALANG['pEdit_mailbox_password2'] = 'Nové heslo (znovu)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Zadaná hesla se neshodují!'; $PALANG['pEdit_mailbox_name'] = 'Jméno'; -$PALANG['pEdit_mailbox_name_text'] = 'Celé Jméno'; +$PALANG['pEdit_mailbox_name_text'] = 'Celé Jméno'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Místo'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Zadané místo je příliš velké!'; diff --git a/languages/da.lang b/languages/da.lang index e823eba7..fb4f9524 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -138,7 +138,7 @@ $PALANG['pEdit_alias_button'] = 'Ret alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Kan ikke redigere aliaset!'; $PALANG['pCreate_mailbox_welcome'] = 'Tilføj en ny lokal postboks til dit domæne.'; -$PALANG['pCreate_mailbox_username'] = 'Brugernavn'; +$PALANG['pCreate_mailbox_username'] = 'Brugernavn'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Emailadressen er ikke gyldig!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Emailadressen eksisterer allerede. Vælg venligst en anden!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Du har nået grænsen for antallet af postbokse til dit domæne!'; @@ -146,10 +146,10 @@ $PALANG['pCreate_mailbox_password'] = 'Adgangskode'; $PALANG['pCreate_mailbox_password2'] = 'Adgangskode (igen)'; $PALANG['pCreate_mailbox_password_text'] = 'Adgangskode til POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Adgangskoderne er ikke ens! Eller er tomme!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Navn'; +$PALANG['pCreate_mailbox_name'] = 'Navn'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Fulde navn'; -$PALANG['pCreate_mailbox_quota'] = 'Kvota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Kvota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Den ønskede kvota er for høj!'; $PALANG['pCreate_mailbox_active'] = 'Aktiv'; $PALANG['pCreate_mailbox_mail'] = 'Send velkomsthilsen'; @@ -165,7 +165,7 @@ $PALANG['pEdit_mailbox_password'] = 'Ny adgangskode'; $PALANG['pEdit_mailbox_password2'] = 'Ny adgangskode (igen)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Adgangskoderne er ikke ens!'; $PALANG['pEdit_mailbox_name'] = 'Navn'; -$PALANG['pEdit_mailbox_name_text'] = 'Fulde navn'; +$PALANG['pEdit_mailbox_name_text'] = 'Fulde navn'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Kvota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Den ønskede kvota er for høj!'; diff --git a/languages/de.lang b/languages/de.lang index 264a148f..44cf38ff 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -137,7 +137,7 @@ $PALANG['pEdit_alias_button'] = 'Alias ändern'; # obsolete $PALANG['pEdit_alias_result_error'] = 'Ändern des Aliases nicht möglich!'; $PALANG['pCreate_mailbox_welcome'] = 'Legen Sie eine neue Mailbox für Ihre Domain an.'; -$PALANG['pCreate_mailbox_username'] = 'Benutzername'; +$PALANG['pCreate_mailbox_username'] = 'Benutzername'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Die EMAIL ist nicht korrekt!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Diese Email-Adresse existiert bereits. Bitte wählen Sie eine andere!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Sie dürfen leider nicht mehr Mailboxen für diese Domain anlegen!'; @@ -145,10 +145,10 @@ $PALANG['pCreate_mailbox_password'] = 'Passwort'; $PALANG['pCreate_mailbox_password2'] = 'Passwort (nochmal)'; $PALANG['pCreate_mailbox_password_text'] = 'Passwort für POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Die beiden Passwörter sind nicht identisch oder ganz leer!'; -$PALANG['pCreate_mailbox_name'] = 'Name'; -$PALANG['pCreate_mailbox_name_text'] = 'Voller Name'; -$PALANG['pCreate_mailbox_quota'] = 'Quota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_name'] = 'Name'; # obsolete +$PALANG['pCreate_mailbox_name_text'] = 'Vollständiger Name'; +$PALANG['pCreate_mailbox_quota'] = 'Quota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Das angegebene Quota ist zu hoch!'; $PALANG['pCreate_mailbox_active'] = 'Aktiv'; $PALANG['pCreate_mailbox_mail'] = 'Mailbox anlegen'; @@ -164,7 +164,7 @@ $PALANG['pEdit_mailbox_password'] = 'Neues Passwort'; $PALANG['pEdit_mailbox_password2'] = 'Neues Passwort (nochmal)'; $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'; +$PALANG['pEdit_mailbox_name_text'] = 'Vollständiger Name'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Quota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Das angegebene Quota ist zu hoch!'; diff --git a/languages/en.lang b/languages/en.lang index 712a6580..0439f07f 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -139,7 +139,7 @@ $PALANG['pEdit_alias_button'] = 'Edit Alias'; # text no longer used $PALANG['pEdit_alias_result_error'] = 'Unable to modify the alias!'; $PALANG['pCreate_mailbox_welcome'] = 'Create a new mailbox for your domain.'; -$PALANG['pCreate_mailbox_username'] = 'Username'; +$PALANG['pCreate_mailbox_username'] = 'Username'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'The EMAIL is not valid!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'This email address already exists, please choose a different one!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'You have reached your limit to create mailboxes!'; @@ -147,10 +147,10 @@ $PALANG['pCreate_mailbox_password'] = 'Password'; $PALANG['pCreate_mailbox_password2'] = 'Password (again)'; $PALANG['pCreate_mailbox_password_text'] = 'Password for POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'The passwords that you supplied don\'t match or are empty!'; -$PALANG['pCreate_mailbox_name'] = 'Name'; +$PALANG['pCreate_mailbox_name'] = 'Name'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Full name'; -$PALANG['pCreate_mailbox_quota'] = 'Quota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Quota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'The quota that you specified is too high!'; $PALANG['pCreate_mailbox_active'] = 'Active'; $PALANG['pCreate_mailbox_mail'] = 'Send Welcome mail'; @@ -166,7 +166,7 @@ $PALANG['pEdit_mailbox_password'] = 'New Password'; $PALANG['pEdit_mailbox_password2'] = 'New Password (again)'; $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'; +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Quota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'The quota that you specified is to high!'; diff --git a/languages/es.lang b/languages/es.lang index 4810b092..a6ac7f7b 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -135,7 +135,7 @@ $PALANG['pEdit_alias_button'] = 'Editar alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = '¡Imposible modificar el alias!'; $PALANG['pCreate_mailbox_welcome'] = 'Crear un nuevo buzón para su dominio.'; -$PALANG['pCreate_mailbox_username'] = 'Usuario'; +$PALANG['pCreate_mailbox_username'] = 'Usuario'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = '¡El e-mail no es válido!'; $PALANG['pCreate_mailbox_username_text_error2'] = '¡Este e-mail ya existe, escoja uno diferente por favor!'; $PALANG['pCreate_mailbox_username_text_error3'] = '¡Ha llegado al límite de creación de buzones!'; @@ -143,10 +143,10 @@ $PALANG['pCreate_mailbox_password'] = 'Contraseña'; $PALANG['pCreate_mailbox_password2'] = 'Contraseña (repetir)'; $PALANG['pCreate_mailbox_password_text'] = 'Contraseña para POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = '¡Las contraseñas introducidas no coinciden o están en blanco!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Nombre'; +$PALANG['pCreate_mailbox_name'] = 'Nombre'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Nombre completo'; -$PALANG['pCreate_mailbox_quota'] = 'Cuota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Cuota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = '¡La cuota especificada es demasiado alta!'; $PALANG['pCreate_mailbox_active'] = 'Activo'; $PALANG['pCreate_mailbox_mail'] = 'Crear buzón'; @@ -162,7 +162,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nueva contraseña'; $PALANG['pEdit_mailbox_password2'] = 'Nueva contraseña (repetir)'; $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 +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = 'Cuota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = '¡La cuota especificada es demasiado alta!'; diff --git a/languages/et.lang b/languages/et.lang index 2278b335..36131b0b 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -135,7 +135,7 @@ $PALANG['pEdit_alias_button'] = 'Muuda alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Aliase muutmine ebaõnnestus!'; $PALANG['pCreate_mailbox_welcome'] = 'Loo uus postkast domeenis.'; -$PALANG['pCreate_mailbox_username'] = 'Kasutajanimi'; +$PALANG['pCreate_mailbox_username'] = 'Kasutajanimi'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'E-posti aadress pole kehtiv!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Selline e-posti aadress on juba olemas, palun vali erinev!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Oled kasutanud kogu postkastide arvu!'; @@ -143,10 +143,10 @@ $PALANG['pCreate_mailbox_password'] = 'Parool'; $PALANG['pCreate_mailbox_password2'] = 'Parool (uuesti)'; $PALANG['pCreate_mailbox_password_text'] = 'Parool POP3/IMAP\'le'; $PALANG['pCreate_mailbox_password_text_error'] = 'Sisestatud paroolid ei kattu! Või on tühjad!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Nimi'; +$PALANG['pCreate_mailbox_name'] = 'Nimi'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Täielik nimi'; -$PALANG['pCreate_mailbox_quota'] = 'Kettaruumi piirang'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Kettaruumi piirang'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Sisestatud kettaruumi piirang on liiga kõrge!'; $PALANG['pCreate_mailbox_active'] = 'Aktiivne'; $PALANG['pCreate_mailbox_mail'] = 'Loo postkast'; @@ -162,7 +162,7 @@ $PALANG['pEdit_mailbox_password'] = 'Uus parool'; $PALANG['pEdit_mailbox_password2'] = 'Uus parool (uuesti)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Sisestatud paroolid ei kattu!'; $PALANG['pEdit_mailbox_name'] = 'Nimi'; -$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = 'Kettaruumi piirang'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Sisestatud kettaruumi piirang on liiga kõrge!'; diff --git a/languages/eu.lang b/languages/eu.lang index 3e43c881..0015737a 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -133,7 +133,7 @@ $PALANG['pEdit_alias_button'] = 'Aliasa aldatu'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Ezinezkoa aliasa aldatzea!'; $PALANG['pCreate_mailbox_welcome'] = 'Postontzi berri bat sortu domeinuarentzat.'; -$PALANG['pCreate_mailbox_username'] = 'Erabiltzailea'; +$PALANG['pCreate_mailbox_username'] = 'Erabiltzailea'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'E-maila baliogabekoa da!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'E-mail hau existitzen da. Ezberdin bat aukera ezazu, mesedez!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Postontzi sorkuntza mugara iritsi zara!'; @@ -141,10 +141,10 @@ $PALANG['pCreate_mailbox_password'] = 'Pasahitza'; $PALANG['pCreate_mailbox_password2'] = 'Pasahitza (errepikatu)'; $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP-entzat pasahitza'; $PALANG['pCreate_mailbox_password_text_error'] = 'Sartutako pasahitzak ez datoz bat edo zuriz daude!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Izena'; +$PALANG['pCreate_mailbox_name'] = 'Izena'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Izen osoa'; -$PALANG['pCreate_mailbox_quota'] = 'Kuota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Kuota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Zehazturiko kuota altuegia da!'; $PALANG['pCreate_mailbox_active'] = 'Aktibatua'; $PALANG['pCreate_mailbox_mail'] = 'Postontzia sortu'; @@ -160,7 +160,7 @@ $PALANG['pEdit_mailbox_password'] = 'Pasahitz berria'; $PALANG['pEdit_mailbox_password2'] = 'Pasahitz berria (errepikatu)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Sartutako pasahitzak ez datoz bat!'; $PALANG['pEdit_mailbox_name'] = 'Izena'; -$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = 'Kuota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Zehazturiko kuota altuegia da!'; diff --git a/languages/fi.lang b/languages/fi.lang index 9be38585..e29be95b 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -135,7 +135,7 @@ $PALANG['pEdit_alias_button'] = 'Muokkaa aliasta'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Aliasta ei voi muokata!'; $PALANG['pCreate_mailbox_welcome'] = 'Luo uusi paikallinen postilaatikko.'; -$PALANG['pCreate_mailbox_username'] = 'Käyttäjätunnus'; +$PALANG['pCreate_mailbox_username'] = 'Käyttäjätunnus'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Sähköpostiosoite ei ole oikean muotoinen!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Postilaatikoiden maksimimäärä saavutettu!'; @@ -143,10 +143,10 @@ $PALANG['pCreate_mailbox_password'] = 'Salasana'; $PALANG['pCreate_mailbox_password2'] = 'Salasana (toistamiseen)'; $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP salasana'; $PALANG['pCreate_mailbox_password_text_error'] = 'Antamasi salasanat eivät täsmää! tai ne ovat tyhjät!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Nimi'; +$PALANG['pCreate_mailbox_name'] = 'Nimi'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Koko nimi'; -$PALANG['pCreate_mailbox_quota'] = 'Kiintiö'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Kiintiö'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Antamasi kiintiö on liian korkea!'; $PALANG['pCreate_mailbox_active'] = 'Aktiivinen'; $PALANG['pCreate_mailbox_mail'] = 'Luo postilaatikko'; @@ -162,7 +162,7 @@ $PALANG['pEdit_mailbox_password'] = 'Uusi salasana'; $PALANG['pEdit_mailbox_password2'] = 'Uusi salasana (toistamiseen)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Antamasi salasanat eivät täsmää!'; $PALANG['pEdit_mailbox_name'] = 'Nimi'; -$PALANG['pEdit_mailbox_name_text'] = 'Koko nimi'; +$PALANG['pEdit_mailbox_name_text'] = 'Koko nimi'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Kiintiö'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Antamasi kiintiö on liian korkea!'; diff --git a/languages/fo.lang b/languages/fo.lang index ab239eb5..9955032c 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -135,7 +135,7 @@ $PALANG['pEdit_alias_button'] = 'Broyt Dulnevni'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Fái ikki broytt dulnevni!'; $PALANG['pCreate_mailbox_welcome'] = 'Stovna ein nýggjan postkassa á tínum navnaøki.'; -$PALANG['pCreate_mailbox_username'] = 'Brúkaranavn'; +$PALANG['pCreate_mailbox_username'] = 'Brúkaranavn'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'E-post adressan er ógyldug!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Hendan e-post adressan finst longu, vinarliga vel eina aðra!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Tú hevur nýtt tínum marki at stovna postkassar!'; @@ -143,10 +143,10 @@ $PALANG['pCreate_mailbox_password'] = 'Loyniorð'; $PALANG['pCreate_mailbox_password2'] = 'Loyniorð (umaftur)'; $PALANG['pCreate_mailbox_password_text'] = 'Loyniorð til POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Loyniorðini tú skrivaði samsvara ikki! Ella eru tóm!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Navn'; +$PALANG['pCreate_mailbox_name'] = 'Navn'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Fult navn'; -$PALANG['pCreate_mailbox_quota'] = 'Kvota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Kvota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Kvotan tú skrivaði er ov høg!'; $PALANG['pCreate_mailbox_active'] = 'Virkin'; $PALANG['pCreate_mailbox_mail'] = 'Stovna postkassa'; @@ -162,7 +162,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nýtt loyniorð'; $PALANG['pEdit_mailbox_password2'] = 'Nýtt loyniorð (umaftur)'; $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 +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = 'Kvota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Kvotan tú skrivaði er ov høg!'; diff --git a/languages/fr.lang b/languages/fr.lang index cd7551e0..1393b88a 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -136,7 +136,7 @@ $PALANG['pEdit_alias_button'] = 'Modifier cet alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Impossible de modifier cet alias!'; $PALANG['pCreate_mailbox_welcome'] = 'Ajouter un nouveau compte courriel à votre domaine.'; -$PALANG['pCreate_mailbox_username'] = 'Nom d\'utilisateur'; +$PALANG['pCreate_mailbox_username'] = 'Nom d\'utilisateur'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'L\'adresse courriel est invalide!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Ce compte courriel existe deja ! Entrez une autre adresse courriel !'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Vous avez atteint le nombre maximum de compte courriel !'; @@ -144,10 +144,10 @@ $PALANG['pCreate_mailbox_password'] = 'Mot de passe'; $PALANG['pCreate_mailbox_password2'] = 'Mot de passe (confirmation)'; $PALANG['pCreate_mailbox_password_text'] = 'Mot de passe pour compte POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Les mots de passe ne correspondent pas ! ou sont vide !'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Nom'; +$PALANG['pCreate_mailbox_name'] = 'Nom'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Nom complet'; -$PALANG['pCreate_mailbox_quota'] = 'Limite'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Limite'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'La limite que vous avez specifie est trop haute!'; $PALANG['pCreate_mailbox_active'] = 'Actif'; $PALANG['pCreate_mailbox_mail'] = 'Envoyer le message de bienvenue'; @@ -163,7 +163,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nouveau mot de passe'; $PALANG['pEdit_mailbox_password2'] = 'Nouveau mot de passe (confirmation)'; $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'; +$PALANG['pEdit_mailbox_name_text'] = 'Nom complet'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Limite'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'La limite fournit est trop haute!'; diff --git a/languages/hr.lang b/languages/hr.lang index 4b555382..a55261ff 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -134,7 +134,7 @@ $PALANG['pEdit_alias_button'] = 'Uredi alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Alias nije bilo moguče promjeniti!'; $PALANG['pCreate_mailbox_welcome'] = 'Stvori novi poštanski ormarić za izbranu domenu.'; -$PALANG['pCreate_mailbox_username'] = 'Korisničko ime'; +$PALANG['pCreate_mailbox_username'] = 'Korisničko ime'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa e-pošte nije pravilna!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Ova adresa e-pošte već postoji, molimo izaberite drugu!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Dostigli ste vaš limit poštanskih ormarića!'; @@ -142,10 +142,10 @@ $PALANG['pCreate_mailbox_password'] = 'Lozinka'; $PALANG['pCreate_mailbox_password2'] = 'Lozinka (ponovi)'; $PALANG['pCreate_mailbox_password_text'] = 'Lozinka za POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Unešene lozinke se ne podudaraju ili su prazne!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Ime'; +$PALANG['pCreate_mailbox_name'] = 'Ime'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Puno ime'; -$PALANG['pCreate_mailbox_quota'] = 'Kvota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Kvota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Unešena kvota je prevelika!'; $PALANG['pCreate_mailbox_active'] = 'Aktivan'; $PALANG['pCreate_mailbox_mail'] = 'Stvori poštanski ormarić'; @@ -161,7 +161,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nova lozinka'; $PALANG['pEdit_mailbox_password2'] = 'Nova lozinka (ponovi)'; $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 +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = 'Kvota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Unešena kvota je prevelika!'; diff --git a/languages/hu.lang b/languages/hu.lang index 21141316..ac9e1e7b 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -137,7 +137,7 @@ $PALANG['pEdit_alias_button'] = 'Alias szerkesztése'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Nemsikerült módosítani az Aliast!'; $PALANG['pCreate_mailbox_welcome'] = 'Új postafiók létrehozása az adott domainhez.'; -$PALANG['pCreate_mailbox_username'] = 'Felhasználónév'; +$PALANG['pCreate_mailbox_username'] = 'Felhasználónév'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Érvénytelen EMAIL !'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Ez az email cím már létezik, kérlek válassz másikat!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Elérted a maximális postafiók számot!'; @@ -145,10 +145,10 @@ $PALANG['pCreate_mailbox_password'] = 'Jelszó'; $PALANG['pCreate_mailbox_password2'] = 'Jelszó (mégegyszer)'; $PALANG['pCreate_mailbox_password_text'] = 'Jelszó a POP3/IMAP -hoz'; $PALANG['pCreate_mailbox_password_text_error'] = 'A jelszavak amiket megadtál nem egyeznek! Vagy üresek!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Név'; +$PALANG['pCreate_mailbox_name'] = 'Név'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Teljes név'; -$PALANG['pCreate_mailbox_quota'] = 'Quota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Quota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Túl magas quota értéket adtál meg!'; $PALANG['pCreate_mailbox_active'] = 'Aktív'; $PALANG['pCreate_mailbox_mail'] = 'Postafiók létrehozása'; @@ -164,7 +164,7 @@ $PALANG['pEdit_mailbox_password'] = 'Új jelszó'; $PALANG['pEdit_mailbox_password2'] = 'Új jelszó (mégegyszer)'; $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'; +$PALANG['pEdit_mailbox_name_text'] = 'Teljes név'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Quota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'A megadott quota érték túl magas!'; diff --git a/languages/is.lang b/languages/is.lang index ff59b507..746d9fc7 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -134,7 +134,7 @@ $PALANG['pEdit_alias_button'] = 'Breyta Alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Get ekki breytt alias!'; $PALANG['pCreate_mailbox_welcome'] = 'Create a new local mailbox for your domain.'; # XXX -$PALANG['pCreate_mailbox_username'] = 'notandanafn'; +$PALANG['pCreate_mailbox_username'] = 'notandanafn'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Netfangið er ekki til!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Þetta pósthólf er til núþegar, veldu þér annað!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Þú hefur stofnað þau póstholf sem þú hefur heimild til!'; @@ -142,10 +142,10 @@ $PALANG['pCreate_mailbox_password'] = 'Lykilorð'; $PALANG['pCreate_mailbox_password2'] = 'Lykilorð (aftur)'; $PALANG['pCreate_mailbox_password_text'] = 'Lykilorð til að opna POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Lykilorðin sem þú skrifaðir inn passa ekki saman! Eða þú gafst ekkert lykilorð upp!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Nafn'; +$PALANG['pCreate_mailbox_name'] = 'Nafn'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Fullt nafn'; -$PALANG['pCreate_mailbox_quota'] = 'kvóti'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'kvóti'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Kvótinn sem þú skilgreindir er meiri en heimild þín gefur!'; $PALANG['pCreate_mailbox_active'] = 'Virkur'; $PALANG['pCreate_mailbox_mail'] = 'Stofna pósthólf'; @@ -155,13 +155,13 @@ $PALANG['pCreate_mailbox_result_success'] = 'Pósthólfinu hefur verið bætt vi $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX $PALANG['pEdit_mailbox_welcome'] = 'Breyta pósthólfi i léninu þínu.'; -$PALANG['pEdit_mailbox_username'] = 'Auðkenni'; +$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_text_error'] = 'Lykilorðið sem þú skrifaðir inn passar ekki saman!'; $PALANG['pEdit_mailbox_name'] = 'Nafn'; -$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = 'kvóti'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Kvótinn sem þú skilgreindir er of hár fyrir heimildina þína!'; diff --git a/languages/it.lang b/languages/it.lang index 2823bcd7..4d109140 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -136,7 +136,7 @@ $PALANG['pEdit_alias_button'] = 'Modifica Alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Impossibile modificare alias!'; $PALANG['pCreate_mailbox_welcome'] = 'Crea una nuova casella di posta locale per il tuo dominio.'; -$PALANG['pCreate_mailbox_username'] = 'Nome utente'; +$PALANG['pCreate_mailbox_username'] = 'Nome utente'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'L\'indirizzo EMAIL non è valido!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Questo indirizzo email esiste già, per favore scegline uno diverso!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Hai raggiunto il limite per creare caselle di posta!'; @@ -144,10 +144,10 @@ $PALANG['pCreate_mailbox_password'] = 'Password'; $PALANG['pCreate_mailbox_password2'] = 'Password (ripeti)'; $PALANG['pCreate_mailbox_password_text'] = 'Password per POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Le password che hai fornito non sono uguali! O sono vuote!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Nome'; +$PALANG['pCreate_mailbox_name'] = 'Nome'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Nome completo'; -$PALANG['pCreate_mailbox_quota'] = 'Quota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Quota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'La quota che hai specificato è troppo alta!'; $PALANG['pCreate_mailbox_active'] = 'Attiva'; $PALANG['pCreate_mailbox_mail'] = 'Crea casella di posta'; @@ -163,7 +163,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nuova Password'; $PALANG['pEdit_mailbox_password2'] = 'Nuova Password (ripeti)'; $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'; +$PALANG['pEdit_mailbox_name_text'] = 'Nome e cognome'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Quota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'La quota che hai specificato è troppo alta!'; diff --git a/languages/ja.lang b/languages/ja.lang index 6c6af598..b106ec87 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -137,7 +137,7 @@ $PALANG['pEdit_alias_button'] = '転送先修正'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = '修正できません！'; $PALANG['pCreate_mailbox_welcome'] = '新しいメールアドレスの作成'; -$PALANG['pCreate_mailbox_username'] = 'ユーザ名'; +$PALANG['pCreate_mailbox_username'] = 'ユーザ名'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'メールアドレスが無効です。'; $PALANG['pCreate_mailbox_username_text_error2'] = 'このメールアドレスは既に存在するので、別のアドレスを選択してください。'; $PALANG['pCreate_mailbox_username_text_error3'] = 'メールアドレスの制限数に達しました。'; @@ -145,10 +145,10 @@ $PALANG['pCreate_mailbox_password'] = 'パスワード'; $PALANG['pCreate_mailbox_password2'] = 'パスワード (確認)'; $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAPのパスワード'; $PALANG['pCreate_mailbox_password_text_error'] = 'パスワードが一致しません。 または空です。'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = '名前'; +$PALANG['pCreate_mailbox_name'] = '名前'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'フルネーム'; -$PALANG['pCreate_mailbox_quota'] = '容量制限'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = '容量制限'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = '指定された容量制限が大きすぎます。'; $PALANG['pCreate_mailbox_active'] = 'アクティブ'; $PALANG['pCreate_mailbox_mail'] = 'ようこそメールの送信'; @@ -158,13 +158,13 @@ $PALANG['pCreate_mailbox_result_success'] = 'メールアドレスを追加し $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'メールアドレスを追加しました。しかし、いくつかのサブフォルダの作成に失敗しました。'; $PALANG['pEdit_mailbox_welcome'] = 'メールアドレスの編集'; -$PALANG['pEdit_mailbox_username'] = 'メールアドレス'; +$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_text_error'] = 'パスワードが一致しません。'; $PALANG['pEdit_mailbox_name'] = '名前'; -$PALANG['pEdit_mailbox_name_text'] = 'フルネーム'; +$PALANG['pEdit_mailbox_name_text'] = 'フルネーム'; # obsolete $PALANG['pEdit_mailbox_quota'] = '容量制限'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = '指定された容量制限が大きすぎます。'; diff --git a/languages/lt.lang b/languages/lt.lang index db1813eb..b68120ed 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -134,7 +134,7 @@ $PALANG['pEdit_alias_button'] = 'Keisti sinonimą'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Sinonimo pakeisti nepavyko!'; $PALANG['pCreate_mailbox_welcome'] = 'Nauja pašto dėžutė.'; -$PALANG['pCreate_mailbox_username'] = 'Vartotojas'; +$PALANG['pCreate_mailbox_username'] = 'Vartotojas'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Šis el.pašto adresas neteisingas!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Šis el.pašto adresas jau yra, pasirinkite kitą pavadinimą!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Išnaudota srities pašto dėžučių kvota!'; @@ -142,10 +142,10 @@ $PALANG['pCreate_mailbox_password'] = 'Slaptažodis'; $PALANG['pCreate_mailbox_password2'] = 'Slaptažodis (dar kartą)'; $PALANG['pCreate_mailbox_password_text'] = 'Slaptažodis jungtis POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Įvesti slaptažodžiai nesutampa Arba neįvesti!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Vardas'; +$PALANG['pCreate_mailbox_name'] = 'Vardas'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Vardas Pavardė'; -$PALANG['pCreate_mailbox_quota'] = 'Kvota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Kvota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Įvesta per didelė kvota!'; $PALANG['pCreate_mailbox_active'] = 'Įjungta(s)'; $PALANG['pCreate_mailbox_mail'] = 'Nauja pašto dėžutė'; @@ -161,7 +161,7 @@ $PALANG['pEdit_mailbox_password'] = 'Naujas slaptažodis'; $PALANG['pEdit_mailbox_password2'] = 'Naujas slaptažodis (dar kartą)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Įvesti slaptažodžiai nesutampa!'; $PALANG['pEdit_mailbox_name'] = 'Vardas'; -$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = 'Kvota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Įvesta per didelė kvota!'; diff --git a/languages/mk.lang b/languages/mk.lang index 53852446..639c3618 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -135,7 +135,7 @@ $PALANG['pEdit_alias_button'] = 'Едитирање на алијас'; # XXX te $PALANG['pEdit_alias_result_error'] = 'Не можам да го променам алијасот!'; $PALANG['pCreate_mailbox_welcome'] = 'Креирање на ново поштенско сандаче.'; -$PALANG['pCreate_mailbox_username'] = 'Корисничко име'; +$PALANG['pCreate_mailbox_username'] = 'Корисничко име'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'EMAIL не е валиден!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Оваа адреса веќе постои, одберете друга!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Достигнат е лимитот на поштенски сандачиња!'; @@ -143,10 +143,10 @@ $PALANG['pCreate_mailbox_password'] = 'Лозинка'; $PALANG['pCreate_mailbox_password2'] = 'Лозинка (лозинка)'; $PALANG['pCreate_mailbox_password_text'] = 'Лозинка за POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Внесените лозинки не се поклопуваат! Или се празни!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Име'; +$PALANG['pCreate_mailbox_name'] = 'Име'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Цело име'; -$PALANG['pCreate_mailbox_quota'] = 'квота'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'квота'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Внесената квота е превисока!'; $PALANG['pCreate_mailbox_active'] = 'Активен'; $PALANG['pCreate_mailbox_mail'] = 'Креирање на поштенско сандаче'; @@ -162,8 +162,8 @@ $PALANG['pEdit_mailbox_password'] = 'Нова лозинка'; $PALANG['pEdit_mailbox_password2'] = 'Нова лозинка (повторно)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Внесените лозинки не одговараат!'; $PALANG['pEdit_mailbox_name'] = 'Име'; -$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX -$PALANG['pEdit_mailbox_quota'] = 'Квота'; +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete +$PALANG['pEdit_mailbox_quota'] = 'Квота'; # XXX check / compare with pCreate_mailbox_quota - should be "Quota" $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Внесената квота е превисока!'; $PALANG['pEdit_mailbox_domain_error'] = 'Овој домен не е ваш: '; diff --git a/languages/nb.lang b/languages/nb.lang index 37dbd853..6de5a057 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -136,7 +136,7 @@ $PALANG['pEdit_alias_button'] = 'Endre alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Kan ikke endre aliaset!'; $PALANG['pCreate_mailbox_welcome'] = 'Opprett en ny e-postkonto.'; -$PALANG['pCreate_mailbox_username'] = 'Brukernavn'; +$PALANG['pCreate_mailbox_username'] = 'Brukernavn'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'E-postadressen er ikke gyldig!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'E-postadressen eksisterer allerede, vennligst velg en annen!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Du har nådd grensen for antall e-postkontoer under dette domenet!'; @@ -144,10 +144,10 @@ $PALANG['pCreate_mailbox_password'] = 'Passord'; $PALANG['pCreate_mailbox_password2'] = 'Passord (bekreft)'; $PALANG['pCreate_mailbox_password_text'] = 'Passord for POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Passordene du oppga stemmer ikke overens! Eller du har ikke fylt ut feltene!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Navn'; +$PALANG['pCreate_mailbox_name'] = 'Navn'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Fullt navn'; -$PALANG['pCreate_mailbox_quota'] = 'Kvote'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Kvote'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Kvoten du har angitt er for høy!'; $PALANG['pCreate_mailbox_active'] = 'Aktiv'; $PALANG['pCreate_mailbox_mail'] = 'Send velkomstmelding'; @@ -163,7 +163,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nytt passord'; $PALANG['pEdit_mailbox_password2'] = 'Nytt passord (bekreft)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Passordene du oppga stemmer ikke overens!'; $PALANG['pEdit_mailbox_name'] = 'Navn'; -$PALANG['pEdit_mailbox_name_text'] = 'Fullt navn'; +$PALANG['pEdit_mailbox_name_text'] = 'Fullt navn'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Kvote'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Kvoten du har angitt er for høy!'; diff --git a/languages/nl.lang b/languages/nl.lang index f271e84f..2acd85c3 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -136,7 +136,7 @@ $PALANG['pEdit_alias_button'] = 'Bewerk Alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Mislukt om de alias te bewerken!'; $PALANG['pCreate_mailbox_welcome'] = 'Maak een nieuw lokale mailbox voor uw domein.'; -$PALANG['pCreate_mailbox_username'] = 'Gebruikersnaam'; +$PALANG['pCreate_mailbox_username'] = 'Gebruikersnaam'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Het e-mail adres is niet geldig.'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Dit e-mail adres is al ingebruik. Kies aub een andere.'; $PALANG['pCreate_mailbox_username_text_error3'] = 'U bezit het maximum aantal mailboxen.'; @@ -144,10 +144,10 @@ $PALANG['pCreate_mailbox_password'] = 'Wachtwoord'; $PALANG['pCreate_mailbox_password2'] = 'Wachtwoord nogmaals'; $PALANG['pCreate_mailbox_password_text'] = 'Wachtwoord voor POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'De wachtwoorden die u opgaf komen niet overeen. Of zijn leeg.'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Naam'; +$PALANG['pCreate_mailbox_name'] = 'Naam'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Volledige naam'; -$PALANG['pCreate_mailbox_quota'] = 'Quota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Quota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'De quota die opgaf is te hoog.'; $PALANG['pCreate_mailbox_active'] = 'Actief'; $PALANG['pCreate_mailbox_mail'] = 'Mailbox toevoegen'; @@ -163,7 +163,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nieuw wachtwoord'; $PALANG['pEdit_mailbox_password2'] = 'Nieuw wachtwoord (nogmaals)'; $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'; +$PALANG['pEdit_mailbox_name_text'] = 'Volledige naam'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Quota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'De quota die opgaf is te hoog.'; diff --git a/languages/nn.lang b/languages/nn.lang index fe845539..613917e2 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -134,17 +134,17 @@ $PALANG['pEdit_alias_button'] = 'Endre Alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Kan ikke endre Aliaset!'; $PALANG['pCreate_mailbox_welcome'] = 'Opprett en ny epostkonto.'; -$PALANG['pCreate_mailbox_username'] = 'Brukernavn'; +$PALANG['pCreate_mailbox_username'] = 'Brukernavn'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'E-postadressen er ugyldig!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'E-postadressen eksisterer allerede, velg en annen!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Du er over grensen for antall e-postkontoer!'; $PALANG['pCreate_mailbox_password'] = 'Passord'; $PALANG['pCreate_mailbox_password2'] = 'Passord (igjen)'; $PALANG['pCreate_mailbox_password_text'] = 'Passord for POP3/IMAP'; -$PALANG['pCreate_mailbox_password_text_error'] = 'Passordene er ikke like! Eller feltet er tomt!'; $PALANG['pCreate_mailbox_name'] = 'Namn'; # XXX check/beautify - was split in two lines before +$PALANG['pCreate_mailbox_password_text_error'] = 'Passordene er ikke like! Eller feltet er tomt!'; $PALANG['pCreate_mailbox_name'] = 'Namn'; # XXX check/beautify - was split in two lines before # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Fornavn og etternavn'; -$PALANG['pCreate_mailbox_quota'] = 'Kvote'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Kvote'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Den ønskede kvoten er for høy!'; $PALANG['pCreate_mailbox_active'] = 'Aktiv'; $PALANG['pCreate_mailbox_mail'] = 'Opprett epostkonto'; @@ -159,8 +159,8 @@ $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_text_error'] = 'Passordene er ikke like!'; -$PALANG['pEdit_mailbox_name'] = 'Navn'; -$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX +$PALANG['pEdit_mailbox_name'] = 'Navn'; # XXX check / compare with pCreate_mailbox_name - should be "" +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = 'Kvote'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Kvoten er for høy!'; diff --git a/languages/pl.lang b/languages/pl.lang index d88f587c..40ee94b4 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -137,7 +137,7 @@ $PALANG['pEdit_alias_button'] = 'Edytuj alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Nie można zmodyfikować aliasu!'; $PALANG['pCreate_mailbox_welcome'] = 'Utwórz lokalne konto pocztowe dla Twojej domeny.'; -$PALANG['pCreate_mailbox_username'] = 'Nazwa użytkownika'; +$PALANG['pCreate_mailbox_username'] = 'Nazwa użytkownika'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Adres EMAIL jest niepoprawny!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Taki adres email już istnieje, proszę wybrać inny!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Twój limit kont pocztowych został osiągniety!'; @@ -145,10 +145,10 @@ $PALANG['pCreate_mailbox_password'] = 'Hasło'; $PALANG['pCreate_mailbox_password2'] = 'Hasło (ponownie)'; $PALANG['pCreate_mailbox_password_text'] = 'Hasło do POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Wpisane hasło nie pasuje! Lub jest puste!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Nazwa'; +$PALANG['pCreate_mailbox_name'] = 'Nazwa'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Pełna nazwa'; -$PALANG['pCreate_mailbox_quota'] = 'Udział'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Udział'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Podany udział jest za wysoki!'; $PALANG['pCreate_mailbox_active'] = 'Aktywny'; $PALANG['pCreate_mailbox_mail'] = 'Utwórz konto'; @@ -164,7 +164,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nowe hasło'; $PALANG['pEdit_mailbox_password2'] = 'Nowe hasło (ponownie)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Wpisane hasło nie pasuje!'; $PALANG['pEdit_mailbox_name'] = 'Nazwa'; -$PALANG['pEdit_mailbox_name_text'] = 'Pełna nazwa'; +$PALANG['pEdit_mailbox_name_text'] = 'Pełna nazwa'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Udział'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Podany udział jest za wysoki!'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index f0f42523..dc4e26b7 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -139,7 +139,7 @@ $PALANG['pEdit_alias_button'] = 'Editar Alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Não foi possível editar o alias!'; $PALANG['pCreate_mailbox_welcome'] = 'Criação de uma nova conta de email para o domínio.'; -$PALANG['pCreate_mailbox_username'] = 'Usuário'; +$PALANG['pCreate_mailbox_username'] = 'Usuário'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Email inválido!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Endereço de email fornecido já existe. Por favor, escolha outro endereço!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Você alcançou o limite de contas de email!'; @@ -147,10 +147,10 @@ $PALANG['pCreate_mailbox_password'] = 'Senha'; $PALANG['pCreate_mailbox_password2'] = 'Senha (confirmação)'; $PALANG['pCreate_mailbox_password_text'] = 'Senha para POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'As senhas fornecidas são diferentes! Ou não foram digitadas!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Nome'; +$PALANG['pCreate_mailbox_name'] = 'Nome'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Nome completo'; -$PALANG['pCreate_mailbox_quota'] = 'Cota de espaço'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Cota de espaço'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'A cota de espaço especificada é muito alta!'; $PALANG['pCreate_mailbox_active'] = 'Habilitada'; $PALANG['pCreate_mailbox_mail'] = 'Enviar mensagem de boas-vindas'; @@ -166,7 +166,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nova senha'; $PALANG['pEdit_mailbox_password2'] = 'Nova senha (confirmação)'; $PALANG['pEdit_mailbox_password_text_error'] = 'As senhas fornecidas são diferentes!'; $PALANG['pEdit_mailbox_name'] = 'Nome'; -$PALANG['pEdit_mailbox_name_text'] = 'Nome completo'; +$PALANG['pEdit_mailbox_name_text'] = 'Nome completo'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Cota de espaço'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'A cota de espaço especificada é muito alta!'; diff --git a/languages/ru.lang b/languages/ru.lang index f27018f2..cf1e4cdd 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -139,7 +139,7 @@ $PALANG['pEdit_alias_button'] = 'Редактировать алиас'; # XXX t $PALANG['pEdit_alias_result_error'] = 'Невозможно изменить алиас!'; $PALANG['pCreate_mailbox_welcome'] = 'Создание нового почтового ящика для вашего домена.'; -$PALANG['pCreate_mailbox_username'] = 'Название'; +$PALANG['pCreate_mailbox_username'] = 'Название'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Неверное имя!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Это имя уже существует, пожалуйста, выберите другое!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Вы достигли лимита по созданию почтовых ящиков!'; @@ -147,10 +147,10 @@ $PALANG['pCreate_mailbox_password'] = 'Пароль'; $PALANG['pCreate_mailbox_password2'] = 'Пароль (еще раз)'; $PALANG['pCreate_mailbox_password_text'] = 'Пароль для POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Введенные вами пароли не совпадают! Либо пусты!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Имя'; +$PALANG['pCreate_mailbox_name'] = 'Имя'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Полное имя'; -$PALANG['pCreate_mailbox_quota'] = 'Квота'; -$PALANG['pCreate_mailbox_quota_text'] = 'МБ'; +$PALANG['pCreate_mailbox_quota'] = 'Квота'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'МБ'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Квота, выставленная вами, слишком велика!'; # XXX check text - should be The quota that you specified is to high! $PALANG['pCreate_mailbox_active'] = 'Активен'; $PALANG['pCreate_mailbox_mail'] = 'Отправить приветственное письмо'; @@ -166,7 +166,7 @@ $PALANG['pEdit_mailbox_password'] = 'Новый пароль'; $PALANG['pEdit_mailbox_password2'] = 'Новый пароль (еще раз)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Введенные вами пароли не совпадают!'; $PALANG['pEdit_mailbox_name'] = 'Имя'; -$PALANG['pEdit_mailbox_name_text'] = 'Полное имя'; +$PALANG['pEdit_mailbox_name_text'] = 'Полное имя'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Квота'; $PALANG['pEdit_mailbox_quota_text'] = 'МБ'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Квота, выставленная вами, слишком велика!'; diff --git a/languages/sk.lang b/languages/sk.lang index a1891c54..fb84389c 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -136,7 +136,7 @@ $PALANG['pEdit_alias_button'] = 'Upraviť'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Nepodarilo se upraviť alias!'; $PALANG['pCreate_mailbox_welcome'] = 'Vytvoriť novú schránku v doméne'; -$PALANG['pCreate_mailbox_username'] = 'Užívateľské meno'; +$PALANG['pCreate_mailbox_username'] = 'Užívateľské meno'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa nie je platná!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Takáto emailová adresa už¸ existuje!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Dosiahli ste limit, nemôžete vytvárať ďalšie schránky!'; @@ -144,10 +144,10 @@ $PALANG['pCreate_mailbox_password'] = 'Heslo'; $PALANG['pCreate_mailbox_password2'] = 'Heslo (znovu)'; $PALANG['pCreate_mailbox_password_text'] = 'Heslo pre POP3/IMAP/SMTP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Zadaná heslá sú rozdielne alebo prázdne!'; -$PALANG['pCreate_mailbox_name'] = 'Meno'; +$PALANG['pCreate_mailbox_name'] = 'Meno'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Celé meno'; -$PALANG['pCreate_mailbox_quota'] = 'Kvóta'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Kvóta'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Zadané miesto je príliš velké!'; $PALANG['pCreate_mailbox_active'] = 'Aktívna'; $PALANG['pCreate_mailbox_mail'] = 'Poslať uvítací email'; @@ -163,7 +163,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nové heslo'; $PALANG['pEdit_mailbox_password2'] = 'Nové heslo (znovu)'; $PALANG['pEdit_mailbox_password_text_error'] = 'Zadaná heslá se nezhodujú!'; $PALANG['pEdit_mailbox_name'] = 'Meno'; -$PALANG['pEdit_mailbox_name_text'] = 'Celé meno'; +$PALANG['pEdit_mailbox_name_text'] = 'Celé meno'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Kvóta'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Zadané miesto je príliš veľké!'; diff --git a/languages/sl.lang b/languages/sl.lang index 2fef91db..a53b2678 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -135,7 +135,7 @@ $PALANG['pEdit_alias_button'] = 'Uredi alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Aliasa ni bilo mogoče spremeniti!'; $PALANG['pCreate_mailbox_welcome'] = 'Ustvari nov predal za izbrano domeno.'; -$PALANG['pCreate_mailbox_username'] = 'Uporabniško ime'; +$PALANG['pCreate_mailbox_username'] = 'Uporabniško ime'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'E-poštni naslov ni pravilen!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Izbrani e-poštni naslov že obstaja, prosimo izberite drugega!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Maksimalno število predalov je preseženo!'; @@ -143,10 +143,10 @@ $PALANG['pCreate_mailbox_password'] = 'Geslo'; $PALANG['pCreate_mailbox_password2'] = 'Geslo (ponovitev)'; $PALANG['pCreate_mailbox_password_text'] = 'Geslo za POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Vnešeni gesli se razlikujeta ali pa sta prazni!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Ime'; +$PALANG['pCreate_mailbox_name'] = 'Ime'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Polno ime'; -$PALANG['pCreate_mailbox_quota'] = 'Kvota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Kvota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Vnešena kvota je prevelika!'; $PALANG['pCreate_mailbox_active'] = 'Aktiven'; $PALANG['pCreate_mailbox_mail'] = 'Ustvari predal'; @@ -162,7 +162,7 @@ $PALANG['pEdit_mailbox_password'] = 'Novo geslo'; $PALANG['pEdit_mailbox_password2'] = 'Novo geslo (ponovitev)'; $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 +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = 'Kvota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Vnešena kvota je prevelika!'; diff --git a/languages/sv.lang b/languages/sv.lang index c18b1957..18a828b5 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -137,7 +137,7 @@ $PALANG['pEdit_alias_button'] = 'Ändra alias'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Kan inte modifiera detta alias!'; $PALANG['pCreate_mailbox_welcome'] = 'Skapa ett nytt lokalt brevlåda i din domän.'; -$PALANG['pCreate_mailbox_username'] = 'Epostadress'; +$PALANG['pCreate_mailbox_username'] = 'Epostadress'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'EPOSTADRESSEN är inte korrekt!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Denna epostadress finns redan, ange en annan adress!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Du har redan skapat max tillåtet antal brevlådan!'; @@ -145,10 +145,10 @@ $PALANG['pCreate_mailbox_password'] = 'Lösenord'; $PALANG['pCreate_mailbox_password2'] = 'Lösenord (igen)'; $PALANG['pCreate_mailbox_password_text'] = 'Lösenord för POP3/IMAP'; $PALANG['pCreate_mailbox_password_text_error'] = 'Lösenorden du angivit är olika! Eller tomma!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Namn'; +$PALANG['pCreate_mailbox_name'] = 'Namn'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Fullständigt namn'; -$PALANG['pCreate_mailbox_quota'] = 'Quota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'Quota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Quotan du angivit är för stor!'; $PALANG['pCreate_mailbox_active'] = 'Aktiv'; $PALANG['pCreate_mailbox_mail'] = 'Skicka välkomstbrev'; @@ -164,7 +164,7 @@ $PALANG['pEdit_mailbox_password'] = 'Nytt Lösenord'; $PALANG['pEdit_mailbox_password2'] = 'Nytt Lösenord (igen)'; $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'; +$PALANG['pEdit_mailbox_name_text'] = 'Fullständigt namn'; # obsolete $PALANG['pEdit_mailbox_quota'] = 'Quota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Quotagränsen du angett är för stor!'; diff --git a/languages/tr.lang b/languages/tr.lang index 4d182274..77f739e5 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -135,7 +135,7 @@ $PALANG['pEdit_alias_button'] = 'Alias Düzenle'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = 'Alias düzenlenemiyor!'; $PALANG['pCreate_mailbox_welcome'] = 'Domaininiz için yeni bir lokal e-posta yaratýn.'; -$PALANG['pCreate_mailbox_username'] = 'Kullanýcý adý'; +$PALANG['pCreate_mailbox_username'] = 'Kullanýcý adý'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = 'E-POSTA uygun deðil!'; $PALANG['pCreate_mailbox_username_text_error2'] = 'Bu elektronik posta kullanýlmakta, lütfen farklý bir tane seçin!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Posta kutusu yaratma limitinize eriþtiniz!'; @@ -143,10 +143,10 @@ $PALANG['pCreate_mailbox_password'] = 'þifre'; $PALANG['pCreate_mailbox_password2'] = 'þifre (tekrar)'; $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP için þifre'; $PALANG['pCreate_mailbox_password_text_error'] = 'Verdiðiniz þifreler birbirini tutmuyor! Ya da boþ!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = 'Ýsim'; +$PALANG['pCreate_mailbox_name'] = 'Ýsim'; # obsolete $PALANG['pCreate_mailbox_name_text'] = 'Tam isim'; -$PALANG['pCreate_mailbox_quota'] = 'kota'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = 'kota'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = 'Veridðiniz kota çok yüksek!'; $PALANG['pCreate_mailbox_active'] = 'Aktif'; $PALANG['pCreate_mailbox_mail'] = 'Posta kutusu yarat'; @@ -156,13 +156,13 @@ $PALANG['pCreate_mailbox_result_success'] = 'Posta kutusu tabloya eklendi!'; $PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX $PALANG['pEdit_mailbox_welcome'] = 'Domaninizdeki bir posta kutusunu düzenleyin.'; -$PALANG['pEdit_mailbox_username'] = 'kullanýcý adý'; +$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_text_error'] = 'Verdiðiniz þifreler birbirini tutmuyor!'; $PALANG['pEdit_mailbox_name'] = 'Ýsim'; -$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = 'kota'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = 'Verdiðiniz kota çok yüksek!'; diff --git a/languages/tw.lang b/languages/tw.lang index f69e5948..9583276a 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -135,7 +135,7 @@ $PALANG['pEdit_alias_button'] = '編輯別名'; # XXX text no longer used $PALANG['pEdit_alias_result_error'] = '不能修改該別名!'; $PALANG['pCreate_mailbox_welcome'] = '在你的網域中新建一個本地郵箱.'; -$PALANG['pCreate_mailbox_username'] = '用戶名'; +$PALANG['pCreate_mailbox_username'] = '用戶名'; # obsolete $PALANG['pCreate_mailbox_username_text_error1'] = '郵件非法!'; $PALANG['pCreate_mailbox_username_text_error2'] = '郵件地址已經存在,請重新選擇!'; $PALANG['pCreate_mailbox_username_text_error3'] = '郵箱地址已經達到上限!'; @@ -143,10 +143,10 @@ $PALANG['pCreate_mailbox_password'] = '密碼'; $PALANG['pCreate_mailbox_password2'] = '密碼 (再次輸入)'; $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP 密碼'; $PALANG['pCreate_mailbox_password_text_error'] = '你輸入的密碼不相同! 或者為空!'; # XXX check/beautify - was split in two lines before -$PALANG['pCreate_mailbox_name'] = '名字'; +$PALANG['pCreate_mailbox_name'] = '名字'; # obsolete $PALANG['pCreate_mailbox_name_text'] = '全名'; -$PALANG['pCreate_mailbox_quota'] = '限制'; -$PALANG['pCreate_mailbox_quota_text'] = 'MB'; +$PALANG['pCreate_mailbox_quota'] = '限制'; # obsolete +$PALANG['pCreate_mailbox_quota_text'] = 'MB'; # obsolete $PALANG['pCreate_mailbox_quota_text_error'] = '你輸入的容量限制超出範圍!'; $PALANG['pCreate_mailbox_active'] = '活動'; $PALANG['pCreate_mailbox_mail'] = '新建郵箱'; @@ -161,8 +161,8 @@ $PALANG['pEdit_mailbox_username_error'] = '不能定們郵箱!'; # obsolete $PALANG['pEdit_mailbox_password'] = '新密碼'; $PALANG['pEdit_mailbox_password2'] = '新密碼 (驗證)'; $PALANG['pEdit_mailbox_password_text_error'] = '你輸入的兩個新密碼不相同!'; -$PALANG['pEdit_mailbox_name'] = '姓名'; -$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX +$PALANG['pEdit_mailbox_name'] = '姓名'; # XXX check / compare with pCreate_mailbox_name - should be "" +$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX # obsolete $PALANG['pEdit_mailbox_quota'] = '限制'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; $PALANG['pEdit_mailbox_quota_text_error'] = '你輸入的容量限制超出範圍!'; diff --git a/templates/create-mailbox.tpl b/templates/create-mailbox.tpl index 88e6cb88..725019ee 100644 --- a/templates/create-mailbox.tpl +++ b/templates/create-mailbox.tpl @@ -6,18 +6,18 @@ {$PALANG.pCreate_mailbox_welcome} - + @ - {$pCreate_mailbox_username_text_error} + {$pCreate_mailbox_username_text_error} {$PALANG.pCreate_mailbox_password_text} - {$pCreate_mailbox_password_text_error} + {$mailbox_password_text_error} @@ -25,22 +25,22 @@   - + {$PALANG.pCreate_mailbox_name_text}   {if $CONF.quota===YES} - + - {$PALANG.pCreate_mailbox_quota_text} - {$pCreate_mailbox_quota_text_error} + {$PALANG.pEdit_mailbox_quota_text} + {$mailbox_quota_text_error} {/if} - +   @@ -50,8 +50,7 @@   - -   + diff --git a/templates/edit-mailbox.tpl b/templates/edit-mailbox.tpl index 64fd4be0..15e8b519 100644 --- a/templates/edit-mailbox.tpl +++ b/templates/edit-mailbox.tpl @@ -1,4 +1,3 @@ -{* {$pEdit_mailbox_username_text} nicht gesetzt *}
@@ -14,19 +13,18 @@ - - + + - - + - + {if $CONF.quota===YES} @@ -34,7 +32,7 @@ - + {/if} @@ -44,11 +42,10 @@ - -
  {$PALANG.pCreate_mailbox_password_text}{$mailbox_password_text_error}
   
{$pEdit_mailbox_name_text}{$PALANG.pCreate_mailbox_name_text}  
{$PALANG.pEdit_mailbox_quota_text}{$pEdit_mailbox_quota_text_error}{$mailbox_quota_text_error}
  +