SF.net SVN: postfixadmin:[1506] trunk
Brought to you by:
christian_boltz,
gingerdog
From: <chr...@us...> - 2013-07-28 20:15:00
|
Revision: 1506 http://sourceforge.net/p/postfixadmin/code/1506 Author: christian_boltz Date: 2013-07-28 20:14:57 +0000 (Sun, 28 Jul 2013) Log Message: ----------- *.lang: - rename $PALANG['pCreate_alias_address_text_error2'] to $PALANG['email-address-already-exists'] - delete $PALANG['pCreate_mailbox_username_text_error2'] model/*: - use new $PALANG names Modified Paths: -------------- trunk/languages/bg.lang trunk/languages/ca.lang trunk/languages/cn.lang trunk/languages/cs.lang trunk/languages/da.lang trunk/languages/de.lang trunk/languages/en.lang trunk/languages/es.lang trunk/languages/et.lang trunk/languages/eu.lang trunk/languages/fi.lang trunk/languages/fo.lang trunk/languages/fr.lang trunk/languages/hr.lang trunk/languages/hu.lang trunk/languages/is.lang trunk/languages/it.lang trunk/languages/ja.lang trunk/languages/lt.lang trunk/languages/mk.lang trunk/languages/nb.lang trunk/languages/nl.lang trunk/languages/nn.lang trunk/languages/pl.lang trunk/languages/pt-br.lang trunk/languages/ru.lang trunk/languages/sk.lang trunk/languages/sl.lang trunk/languages/sv.lang trunk/languages/tr.lang trunk/languages/tw.lang trunk/model/AliasHandler.php trunk/model/MailboxHandler.php Modified: trunk/languages/bg.lang =================================================================== --- trunk/languages/bg.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/bg.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -101,7 +101,7 @@ $PALANG['pCreate_alias_welcome'] = 'Създай нов alias за вашия домейн.'; $PALANG['pCreate_alias_address_text_error1'] = 'Този ALIAS не е валиден!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Този е-мейл адрес вече съществува, моля изберете различен!'; +$PALANG['email-address-already-exists'] = 'Този е-мейл адрес вече съществува, моля изберете различен!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Достигнали сте лимита си за създаване на alias-и!'; $PALANG['pCreate_alias_goto'] = 'Към'; $PALANG['pCreate_alias_button'] = 'Добави Alias'; @@ -125,7 +125,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Създаване на нова пощенска кутия за вашия домейн.'; $PALANG['pCreate_mailbox_username_text_error1'] = 'Е-мейл-а не е валиден!'; -$PALANG['pCreate_mailbox_username_text_error2'] = 'Този е-мейл адрес вече съществува, моля изберете друг!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Вие сте достигнали своя лимит за създаване на пощенски кутии!'; $PALANG['pCreate_mailbox_password2'] = 'Парола (отново)'; $PALANG['pCreate_mailbox_password_text'] = 'Парола за POP3/IMAP'; Modified: trunk/languages/ca.lang =================================================================== --- trunk/languages/ca.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/ca.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -99,7 +99,7 @@ $PALANG['pCreate_alias_welcome'] = 'Crear un nou àlies pel domini.'; $PALANG['pCreate_alias_address_text_error1'] = 'L\'àlies no és vàlid!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Aquesta adreça ja existeix, escull una altra de diferent, si us plau!'; +$PALANG['email-address-already-exists'] = 'Aquesta adreça ja existeix, escull una altra de diferent, si us plau!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Has arribat al límit de creació d\'àlies!'; $PALANG['pCreate_alias_goto'] = 'Destí'; $PALANG['pCreate_alias_button'] = 'Afegir àlies'; @@ -123,7 +123,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Crear una nova bústia pel seu domini.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Contrasenya (repetir)'; $PALANG['pCreate_mailbox_password_text'] = 'Contrasenya per a POP3/IMAP'; Modified: trunk/languages/cn.lang =================================================================== --- trunk/languages/cn.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/cn.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -100,7 +100,7 @@ $PALANG['pCreate_alias_welcome'] = '在你的域中新建一个别名.'; $PALANG['pCreate_alias_address_text_error1'] = '该别名非法!'; -$PALANG['pCreate_alias_address_text_error2'] = '邮件地址已经存在, 请重新选择!'; +$PALANG['email-address-already-exists'] = '邮件地址已经存在, 请重新选择!'; $PALANG['pCreate_alias_address_text_error3'] = '你的别名已经达到上限!'; $PALANG['pCreate_alias_goto'] = '转到'; $PALANG['pCreate_alias_button'] = '新建别名'; @@ -124,7 +124,6 @@ $PALANG['pCreate_mailbox_welcome'] = '在你的域中新建一个本地邮箱.'; $PALANG['pCreate_mailbox_username_text_error1'] = '邮件非法!'; -$PALANG['pCreate_mailbox_username_text_error2'] = '邮件地址已经存在,请重新选择!'; $PALANG['pCreate_mailbox_username_text_error3'] = '邮箱地址已经达到上限!'; $PALANG['pCreate_mailbox_password2'] = '密码 (再次输入)'; $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP 密码'; Modified: trunk/languages/cs.lang =================================================================== --- trunk/languages/cs.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/cs.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -105,7 +105,7 @@ $PALANG['pCreate_alias_welcome'] = 'Vytvořit nové přesměrování ve Vaší doméně.'; $PALANG['pCreate_alias_address_text_error1'] = 'Adresa neni platná!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Taková emailová adresa již existuje!'; +$PALANG['email-address-already-exists'] = 'Taková emailová adresa již existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Dosáhli jste limitu, nemůžete vytvářet další aliasy!'; $PALANG['pCreate_alias_goto'] = 'Cíl'; $PALANG['pCreate_alias_button'] = 'Přidat'; @@ -129,7 +129,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Vytvořit novou lokální schránku v doméně.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Heslo (znovu)'; $PALANG['pCreate_mailbox_password_text'] = 'Heslo pro POP3/IMAP/SMTP'; Modified: trunk/languages/da.lang =================================================================== --- trunk/languages/da.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/da.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -105,7 +105,7 @@ $PALANG['pCreate_alias_welcome'] = 'Tilføj et nyt alias til domænet.'; $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldigt.'; -$PALANG['pCreate_alias_address_text_error2'] = 'Emailadressen eksisterer allerede, vælg venligst en anden.'; +$PALANG['email-address-already-exists'] = 'Emailadressen eksisterer allerede, vælg venligst en anden.'; $PALANG['pCreate_alias_address_text_error3'] = 'Du har nået grænsen for antallet af aliases til domænet.'; $PALANG['pCreate_alias_goto'] = 'Modtager'; $PALANG['pCreate_alias_button'] = 'Tilføj alias'; @@ -129,7 +129,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Tilføj en ny lokal postboks til domænet.'; $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 domæne!'; $PALANG['pCreate_mailbox_password2'] = 'Adgangskode (igen)'; $PALANG['pCreate_mailbox_password_text'] = 'Adgangskode til POP3/IMAP'; Modified: trunk/languages/de.lang =================================================================== --- trunk/languages/de.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/de.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -102,7 +102,7 @@ $PALANG['pCreate_alias_welcome'] = 'Neuen Alias für Ihre Domain anlegen'; $PALANG['pCreate_alias_address_text_error1'] = 'Dieses ALIAS ist nicht erlaubt!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Diese eMail-Adresse existiert bereits. Bitte wählen Sie eine andere!'; +$PALANG['email-address-already-exists'] = 'Diese eMail-Adresse existiert bereits. Bitte wählen Sie eine andere!'; $PALANG['pCreate_alias_address_text_error3'] = 'Sie haben Ihr Limit für Aliase auf dieser Domain erreicht!'; $PALANG['pCreate_alias_goto'] = 'An'; $PALANG['pCreate_alias_button'] = 'Alias hinzufügen'; @@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Legen Sie eine neue Mailbox für Ihre Domain an.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Passwort (nochmal)'; $PALANG['pCreate_mailbox_password_text'] = 'Passwort für POP3/IMAP'; Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/en.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -103,7 +103,7 @@ $PALANG['pCreate_alias_welcome'] = 'Create a new alias for your domain.'; $PALANG['pCreate_alias_address_text_error1'] = 'The ALIAS is not valid!'; -$PALANG['pCreate_alias_address_text_error2'] = 'This email address already exists, please choose a different one!'; +$PALANG['email-address-already-exists'] = 'This email address already exists, please choose a different one!'; $PALANG['pCreate_alias_address_text_error3'] = 'You have reached your limit to create aliases!'; $PALANG['pCreate_alias_goto'] = 'To'; $PALANG['pCreate_alias_button'] = 'Add Alias'; @@ -127,7 +127,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Create a new mailbox for your domain.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Password (again)'; $PALANG['pCreate_mailbox_password_text'] = 'Password for POP3/IMAP'; Modified: trunk/languages/es.lang =================================================================== --- trunk/languages/es.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/es.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -100,7 +100,7 @@ $PALANG['pCreate_alias_welcome'] = 'Crear un nuevo alias para el dominio.'; $PALANG['pCreate_alias_address_text_error1'] = '¡El ALIAS no es válido!'; -$PALANG['pCreate_alias_address_text_error2'] = '¡Esta dirección ya existe, elija otra diferente por favor!'; +$PALANG['email-address-already-exists'] = '¡Esta dirección ya existe, elija otra diferente por favor!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = '¡Ha llegado a su límite de creación de alias!'; $PALANG['pCreate_alias_goto'] = 'Destino'; $PALANG['pCreate_alias_button'] = 'Añadir alias'; @@ -124,7 +124,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Crear un nuevo buzón para su dominio.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Contraseña (repetir)'; $PALANG['pCreate_mailbox_password_text'] = 'Contraseña para POP3/IMAP'; Modified: trunk/languages/et.lang =================================================================== --- trunk/languages/et.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/et.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -100,7 +100,7 @@ $PALANG['pCreate_alias_welcome'] = 'Loo uus alias domeenis.'; $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS pole kehtiv!'; -$PALANG['pCreate_alias_address_text_error2'] = 'See e-posti aadress eksisteerib juba, palun vali erinev!'; +$PALANG['email-address-already-exists'] = 'See e-posti aadress eksisteerib juba, palun vali erinev!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Oled kasutanud kogu aliaste arvu!'; $PALANG['pCreate_alias_goto'] = 'Kellele'; $PALANG['pCreate_alias_button'] = 'Lisa alias'; @@ -124,7 +124,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Loo uus postkast domeenis.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Parool (uuesti)'; $PALANG['pCreate_mailbox_password_text'] = 'Parool POP3/IMAP\'le'; Modified: trunk/languages/eu.lang =================================================================== --- trunk/languages/eu.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/eu.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -98,7 +98,7 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Domeinuarentzat alias berri bat sortu.'; $PALANG['pCreate_alias_address_text_error1'] = 'ALIASa okerra da!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Helbide hau existitzen da, ezberdin bat aukera ezazu mesedez!'; +$PALANG['email-address-already-exists'] = 'Helbide hau existitzen da, ezberdin bat aukera ezazu mesedez!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Alias sortze mugara heldu zara!'; $PALANG['pCreate_alias_goto'] = 'Norakoa'; $PALANG['pCreate_alias_button'] = 'Aliasa gehitu'; @@ -122,7 +122,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Postontzi berri bat sortu domeinuarentzat.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Pasahitza (errepikatu)'; $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP-entzat pasahitza'; Modified: trunk/languages/fi.lang =================================================================== --- trunk/languages/fi.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/fi.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -101,7 +101,7 @@ $PALANG['pCreate_alias_welcome'] = 'Luo uusi alias.'; $PALANG['pCreate_alias_address_text_error1'] = 'Alias ei ole oikean muotoinen!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Tämä sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!'; +$PALANG['email-address-already-exists'] = 'Tämä sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Aliasten maksimimäärä saavutettu. Et voi lisätä aliaksia enää!'; $PALANG['pCreate_alias_goto'] = 'Kenelle'; $PALANG['pCreate_alias_button'] = 'Lisää alias'; @@ -124,7 +124,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Luo uusi paikallinen postilaatikko.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Salasana (toistamiseen)'; $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP salasana'; Modified: trunk/languages/fo.lang =================================================================== --- trunk/languages/fo.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/fo.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -100,7 +100,7 @@ $PALANG['pCreate_alias_welcome'] = 'Stovna eitt nýtt dulnevni á tínum navnaøki.'; $PALANG['pCreate_alias_address_text_error1'] = 'DULNEVNI er ógyldugt!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Hendan e-post adressa finst longu, vinarliga vel eina aðra!'; +$PALANG['email-address-already-exists'] = 'Hendan e-post adressa finst longu, vinarliga vel eina aðra!'; $PALANG['pCreate_alias_address_text_error3'] = 'Tú hevur nátt tínum marki at stovna dulnevni!'; $PALANG['pCreate_alias_goto'] = 'Til'; $PALANG['pCreate_alias_button'] = 'Stovna Dulnevni'; @@ -124,7 +124,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Stovna ein nýggjan postkassa á tínum navnaøki.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Loyniorð (umaftur)'; $PALANG['pCreate_mailbox_password_text'] = 'Loyniorð til POP3/IMAP'; Modified: trunk/languages/fr.lang =================================================================== --- trunk/languages/fr.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/fr.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -101,7 +101,7 @@ $PALANG['pCreate_alias_domain_success'] = 'L\'alias de domaine est déj\xE0 pr\xE9sent dans la table de domaine!'; $PALANG['pCreate_alias_welcome'] = 'Créer un nouvel alias pour votre domaine.'; $PALANG['pCreate_alias_address_text_error1'] = 'Cet ALIAS n\'est pas valide!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Ce compte courriel existe déjà, choisissez un autre libellé !'; +$PALANG['email-address-already-exists'] = 'Ce compte courriel existe déjà, choisissez un autre libellé !'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Vous avez atteint votre limite d\'alias créés !'; $PALANG['pCreate_alias_goto'] = 'À'; $PALANG['pCreate_alias_button'] = 'Ajouter un alias'; @@ -125,7 +125,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Ajouter un nouveau compte courriel à votre domaine.'; $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 !'; $PALANG['pCreate_mailbox_password2'] = 'Mot de passe (confirmation)'; $PALANG['pCreate_mailbox_password_text'] = 'Mot de passe pour compte POP3/IMAP'; Modified: trunk/languages/hr.lang =================================================================== --- trunk/languages/hr.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/hr.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -99,7 +99,7 @@ $PALANG['pCreate_alias_welcome'] = 'Stvori novi alias za domenu.'; $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS nije valjan!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Ova adresa e-pote već postoji, molimo izaberite drugu!'; +$PALANG['email-address-already-exists'] = 'Ova adresa e-pote već postoji, molimo izaberite drugu!'; $PALANG['pCreate_alias_address_text_error3'] = 'Postigli ste maksimalan broj vaih aliasa!'; $PALANG['pCreate_alias_goto'] = 'Za'; $PALANG['pCreate_alias_button'] = 'Dodaj alias'; @@ -123,7 +123,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Stvori novi potanski ormarić za izbranu domenu.'; $PALANG['pCreate_mailbox_username_text_error1'] = 'Adresa e-pote nije pravilna!'; -$PALANG['pCreate_mailbox_username_text_error2'] = 'Ova adresa e-pote već postoji, molimo izaberite drugu!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Dostigli ste va limit potanskih ormarića!'; $PALANG['pCreate_mailbox_password2'] = 'Lozinka (ponovi)'; $PALANG['pCreate_mailbox_password_text'] = 'Lozinka za POP3/IMAP'; Modified: trunk/languages/hu.lang =================================================================== --- trunk/languages/hu.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/hu.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -102,7 +102,7 @@ $PALANG['pCreate_alias_welcome'] = 'Új alias készítése az adott domainhez'; $PALANG['pCreate_alias_address_text_error1'] = 'Az ALIAS érvénytelen!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Ez az email cím már létezik, kérlek válassz másikat!'; +$PALANG['email-address-already-exists'] = 'Ez az email cím már létezik, kérlek válassz másikat!'; $PALANG['pCreate_alias_address_text_error3'] = 'Elérted a maximális alias limitet!'; $PALANG['pCreate_alias_goto'] = 'Hova'; $PALANG['pCreate_alias_button'] = 'Alias felvétele'; @@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Új postafiók létrehozása az adott domainhez.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Jelszó (mégegyszer)'; $PALANG['pCreate_mailbox_password_text'] = 'Jelszó a POP3/IMAP -hoz'; Modified: trunk/languages/is.lang =================================================================== --- trunk/languages/is.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/is.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -99,7 +99,7 @@ $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Aliasinn er ekki í lagi!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Þetta pósthólf er nú þegar til, veldu annað!'; +$PALANG['email-address-already-exists'] = 'Þetta pósthólf er nú þegar til, veldu annað!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Þú hefur stofnað þann fjölda pósthólfa sem þú hefur heimild til!'; $PALANG['pCreate_alias_goto'] = 'Til'; $PALANG['pCreate_alias_button'] = 'Bæta við alias'; @@ -123,7 +123,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Create a new local mailbox for your domain.'; # XXX $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!'; $PALANG['pCreate_mailbox_password2'] = 'Lykilorð (aftur)'; $PALANG['pCreate_mailbox_password_text'] = 'Lykilorð til að opna POP3/IMAP'; Modified: trunk/languages/it.lang =================================================================== --- trunk/languages/it.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/it.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -101,7 +101,7 @@ $PALANG['pCreate_alias_welcome'] = 'Crea un nuovo alias per il tuo dominio.'; $PALANG['pCreate_alias_address_text_error1'] = 'L\' Alias non è valido!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Questo indirizzo di posta esiste già, per favore sceglierne uno diverso!'; +$PALANG['email-address-already-exists'] = 'Questo indirizzo di posta esiste già, per favore sceglierne uno diverso!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Hai raggiunto il tuo limite per creare alias!'; $PALANG['pCreate_alias_goto'] = 'A'; $PALANG['pCreate_alias_button'] = 'Aggiungi Alias'; @@ -125,7 +125,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Crea una nuova casella di posta locale per il tuo dominio.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Password (ripeti)'; $PALANG['pCreate_mailbox_password_text'] = 'Password per POP3/IMAP'; Modified: trunk/languages/ja.lang =================================================================== --- trunk/languages/ja.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/ja.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -102,7 +102,7 @@ $PALANG['pCreate_alias_welcome'] = '新しい転送先の作成'; $PALANG['pCreate_alias_address_text_error1'] = 'メールアドレスが無効です。'; -$PALANG['pCreate_alias_address_text_error2'] = 'このメールアドレスは既に存在するので、 別のアドレスを選択してください。'; # XXX check/beautify - was split in two lines before +$PALANG['email-address-already-exists'] = 'このメールアドレスは既に存在するので、 別のアドレスを選択してください。'; # XXX check/beautify - was split in two lines before $PALANG['pCreate_alias_address_text_error3'] = '転送アドレスの制限数に達しました。'; $PALANG['pCreate_alias_goto'] = '転送先アドレス'; $PALANG['pCreate_alias_button'] = '転送先追加'; @@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = '新しいメールアドレスの作成'; $PALANG['pCreate_mailbox_username_text_error1'] = 'メールアドレスが無効です。'; -$PALANG['pCreate_mailbox_username_text_error2'] = 'このメールアドレスは既に存在するので、別のアドレスを選択してください。'; $PALANG['pCreate_mailbox_username_text_error3'] = 'メールアドレスの制限数に達しました。'; $PALANG['pCreate_mailbox_password2'] = 'パスワード (確認)'; $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAPのパスワード'; Modified: trunk/languages/lt.lang =================================================================== --- trunk/languages/lt.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/lt.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -100,7 +100,7 @@ $PALANG['pCreate_alias_welcome'] = 'Naujas sinonimas.'; $PALANG['pCreate_alias_address_text_error1'] = 'Netinkamas sinonimas!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Šis el.pašto adresas jau yra, pasirinkite kitą pavadinimą!'; +$PALANG['email-address-already-exists'] = 'Šis el.pašto adresas jau yra, pasirinkite kitą pavadinimą!'; $PALANG['pCreate_alias_address_text_error3'] = 'Išnaudota visa pašto sinonimų kvota!'; $PALANG['pCreate_alias_goto'] = 'Kam'; $PALANG['pCreate_alias_button'] = 'Naujas sinonimas'; @@ -125,7 +125,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Nauja pašto dėžutė.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Slaptažodis (dar kartą)'; $PALANG['pCreate_mailbox_password_text'] = 'Slaptažodis jungtis prie POP3/IMAP'; Modified: trunk/languages/mk.lang =================================================================== --- trunk/languages/mk.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/mk.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -100,7 +100,7 @@ $PALANG['pCreate_alias_welcome'] = 'Креирање на нов алијас за вашиот домен.'; $PALANG['pCreate_alias_address_text_error1'] = 'Алијасот не е валиден!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Оваа адреса веќе постои. Ве молам одберете друга!'; +$PALANG['email-address-already-exists'] = 'Оваа адреса веќе постои. Ве молам одберете друга!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Го достигнавте вашиот лимит за креирање алијаси!'; $PALANG['pCreate_alias_goto'] = 'До'; $PALANG['pCreate_alias_button'] = 'Додавање алијас'; @@ -124,7 +124,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Креирање на ново поштенско сандаче.'; $PALANG['pCreate_mailbox_username_text_error1'] = 'EMAIL не е валиден!'; -$PALANG['pCreate_mailbox_username_text_error2'] = 'Оваа адреса веќе постои, одберете друга!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Достигнат е лимитот на поштенски сандачиња!'; $PALANG['pCreate_mailbox_password2'] = 'Лозинка (лозинка)'; $PALANG['pCreate_mailbox_password_text'] = 'Лозинка за POP3/IMAP'; Modified: trunk/languages/nb.lang =================================================================== --- trunk/languages/nb.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/nb.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -102,7 +102,7 @@ $PALANG['pCreate_alias_welcome'] = 'Opprett et nytt alias.'; $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldig!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Denne e-postadressen eksisterer allerede, vennligst velg en annen!'; +$PALANG['email-address-already-exists'] = 'Denne e-postadressen eksisterer allerede, vennligst velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Du har nådd grensen for antall aliaser under dette domenet!'; $PALANG['pCreate_alias_goto'] = 'Til'; $PALANG['pCreate_alias_button'] = 'Legg til alias'; @@ -125,7 +125,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Opprett en ny e-postkonto.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Passord (bekreft)'; $PALANG['pCreate_mailbox_password_text'] = 'Passord for POP3/IMAP'; Modified: trunk/languages/nl.lang =================================================================== --- trunk/languages/nl.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/nl.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -101,7 +101,7 @@ $PALANG['pCreate_alias_welcome'] = 'Maak een nieuw alias aan voor uw domein.'; $PALANG['pCreate_alias_address_text_error1'] = 'De Alias is niet geldig!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Dit e-mail aders bestaat al, kies aub een andere.'; +$PALANG['email-address-already-exists'] = 'Dit e-mail aders bestaat al, kies aub een andere.'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'U bezit het maximum aantal aliassen.'; $PALANG['pCreate_alias_goto'] = 'Naar'; $PALANG['pCreate_alias_button'] = 'Voeg alias toe'; @@ -125,7 +125,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Maak een nieuw lokale mailbox voor uw domein.'; $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.'; $PALANG['pCreate_mailbox_password2'] = 'Wachtwoord nogmaals'; $PALANG['pCreate_mailbox_password_text'] = 'Wachtwoord voor POP3/IMAP'; Modified: trunk/languages/nn.lang =================================================================== --- trunk/languages/nn.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/nn.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -100,7 +100,7 @@ $PALANG['pCreate_alias_welcome'] = 'Opprett et nytt alias.'; $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldig!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Denne epostadressen eksisterer allerede, velg en annen!'; +$PALANG['email-address-already-exists'] = 'Denne epostadressen eksisterer allerede, velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Du er over grensen for antall aliaser i ditt domene!'; $PALANG['pCreate_alias_goto'] = 'Mottaker'; $PALANG['pCreate_alias_button'] = 'Legg til Alias'; @@ -123,7 +123,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Opprett en ny epostkonto.'; $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_password2'] = 'Passord (igjen)'; $PALANG['pCreate_mailbox_password_text'] = 'Passord for POP3/IMAP'; Modified: trunk/languages/pl.lang =================================================================== --- trunk/languages/pl.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/pl.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -103,7 +103,7 @@ $PALANG['pCreate_alias_welcome'] = 'Utwórz nowy alias dla Twojej domeny.'; $PALANG['pCreate_alias_address_text_error1'] = 'Alias jest niepoprawny!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Taki adres email juz istnieje, proszę wybrać inny!'; +$PALANG['email-address-already-exists'] = 'Taki adres email juz istnieje, proszę wybrać inny!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Twój limit aliasów został osiągniety!'; $PALANG['pCreate_alias_goto'] = 'Do'; $PALANG['pCreate_alias_button'] = 'Dodaj alias'; @@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Utwórz lokalne konto pocztowe dla Twojej domeny.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Hasło (ponownie)'; $PALANG['pCreate_mailbox_password_text'] = 'Hasło do POP3/IMAP'; Modified: trunk/languages/pt-br.lang =================================================================== --- trunk/languages/pt-br.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/pt-br.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -104,7 +104,7 @@ $PALANG['pCreate_alias_welcome'] = 'Criação de um novo alias para o domínio.'; $PALANG['pCreate_alias_address_text_error1'] = 'Alias inválido!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Endereço de email fornecido já existe. Por favor, escolha outro endereço!'; +$PALANG['email-address-already-exists'] = 'Endereço de email fornecido já existe. Por favor, escolha outro endereço!'; $PALANG['pCreate_alias_address_text_error3'] = 'Você alcançou seu limite de aliases!'; $PALANG['pCreate_alias_goto'] = 'Para'; $PALANG['pCreate_alias_button'] = 'Criar Alias'; @@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Criação de uma nova conta de email para o domínio.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Senha (confirmação)'; $PALANG['pCreate_mailbox_password_text'] = 'Senha para POP3/IMAP'; Modified: trunk/languages/ru.lang =================================================================== --- trunk/languages/ru.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/ru.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -104,7 +104,7 @@ $PALANG['pCreate_alias_welcome'] = 'Создание нового алиаса в вашем домене.'; $PALANG['pCreate_alias_address_text_error1'] = 'Неверное имя алиаса!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Этот почтовый адрес уже существует, пожалуйста, выберите другой.'; +$PALANG['email-address-already-exists'] = 'Этот почтовый адрес уже существует, пожалуйста, выберите другой.'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Вы достигли лимита по созданным алиасам!'; $PALANG['pCreate_alias_goto'] = 'Кому'; $PALANG['pCreate_alias_button'] = 'Создать алиас'; @@ -128,7 +128,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Создание нового почтового ящика для вашего домена.'; $PALANG['pCreate_mailbox_username_text_error1'] = 'Неверное имя!'; -$PALANG['pCreate_mailbox_username_text_error2'] = 'Это имя уже существует, пожалуйста, выберите другое!'; $PALANG['pCreate_mailbox_username_text_error3'] = 'Вы достигли лимита по созданию почтовых ящиков!'; $PALANG['pCreate_mailbox_password2'] = 'Пароль (еще раз)'; $PALANG['pCreate_mailbox_password_text'] = 'Пароль для POP3/IMAP'; Modified: trunk/languages/sk.lang =================================================================== --- trunk/languages/sk.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/sk.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -101,7 +101,7 @@ $PALANG['pCreate_alias_welcome'] = 'Vytvoriť nový alias v doméne'; $PALANG['pCreate_alias_address_text_error1'] = 'Adresa nie je platná!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Takáto emailová adresa už existuje!'; +$PALANG['email-address-already-exists'] = 'Takáto emailová adresa už existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Dosiahli ste limit, nemôžete vytvárať ďalšie aliasy!'; $PALANG['pCreate_alias_goto'] = 'Cieľ'; $PALANG['pCreate_alias_button'] = 'Vytvoriť alias'; @@ -125,7 +125,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Vytvoriť novú schránku v doméne'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Heslo (znovu)'; $PALANG['pCreate_mailbox_password_text'] = 'Heslo pre POP3/IMAP/SMTP'; Modified: trunk/languages/sl.lang =================================================================== --- trunk/languages/sl.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/sl.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -100,7 +100,7 @@ $PALANG['pCreate_alias_welcome'] = 'Ustvari nov alias za določeno domeno.'; $PALANG['pCreate_alias_address_text_error1'] = 'Sintaksa aliasa je napačna!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Ta e-poštni naslov že obstaja, prosimo izberite drugega!'; +$PALANG['email-address-already-exists'] = 'Ta e-poštni naslov že obstaja, prosimo izberite drugega!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Maksimalno število aliasov je preseženo!'; $PALANG['pCreate_alias_goto'] = 'Za'; $PALANG['pCreate_alias_button'] = 'Dodaj alias'; @@ -124,7 +124,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Ustvari nov predal za izbrano domeno.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Geslo (ponovitev)'; $PALANG['pCreate_mailbox_password_text'] = 'Geslo za POP3/IMAP'; Modified: trunk/languages/sv.lang =================================================================== --- trunk/languages/sv.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/sv.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -102,7 +102,7 @@ $PALANG['pCreate_alias_welcome'] = 'Skapa nytt alias för din domän.'; $PALANG['pCreate_alias_address_text_error1'] = 'Detta ALIAS är inte giltigt!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Denna epostadress existerar redan, välj en annan epostadress!'; +$PALANG['email-address-already-exists'] = 'Denna epostadress existerar redan, välj en annan epostadress!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Du har redan högsta tillåtna antal alias definierade!'; $PALANG['pCreate_alias_goto'] = 'Till'; $PALANG['pCreate_alias_button'] = 'Lägg till alias'; @@ -126,7 +126,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Skapa ett nytt lokalt brevlåda i din domän.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'Lösenord (igen)'; $PALANG['pCreate_mailbox_password_text'] = 'Lösenord för POP3/IMAP'; Modified: trunk/languages/tr.lang =================================================================== --- trunk/languages/tr.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/tr.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -100,7 +100,7 @@ $PALANG['pCreate_alias_welcome'] = 'Domaininiz için yeni bir alias yaratýn.'; $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS uygun deðil!'; -$PALANG['pCreate_alias_address_text_error2'] = 'Bu e-posta zaten kullanýlýyor, lütfen baþka bir tane seçin!'; +$PALANG['email-address-already-exists'] = 'Bu e-posta zaten kullanýlýyor, lütfen baþka bir tane seçin!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Alias limitine ulaþtýnýz!'; $PALANG['pCreate_alias_goto'] = 'kime'; $PALANG['pCreate_alias_button'] = 'Alias Ekle'; @@ -124,7 +124,6 @@ $PALANG['pCreate_mailbox_welcome'] = 'Domaininiz için yeni bir lokal e-posta yaratýn.'; $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!'; $PALANG['pCreate_mailbox_password2'] = 'þifre (tekrar)'; $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP için þifre'; Modified: trunk/languages/tw.lang =================================================================== --- trunk/languages/tw.lang 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/languages/tw.lang 2013-07-28 20:14:57 UTC (rev 1506) @@ -100,7 +100,7 @@ $PALANG['pCreate_alias_welcome'] = '在你的網域中新建一個別名.'; $PALANG['pCreate_alias_address_text_error1'] = '該別名非法!'; -$PALANG['pCreate_alias_address_text_error2'] = '郵件地址已經存在, 請重新選擇!'; +$PALANG['email-address-already-exists'] = '郵件地址已經存在, 請重新選擇!'; $PALANG['pCreate_alias_address_text_error3'] = '你的別名已經達到上限!'; $PALANG['pCreate_alias_goto'] = '轉到'; $PALANG['pCreate_alias_button'] = '新建別名'; @@ -124,7 +124,6 @@ $PALANG['pCreate_mailbox_welcome'] = '在你的網域中新建一個本地郵箱.'; $PALANG['pCreate_mailbox_username_text_error1'] = '郵件非法!'; -$PALANG['pCreate_mailbox_username_text_error2'] = '郵件地址已經存在,請重新選擇!'; $PALANG['pCreate_mailbox_username_text_error3'] = '郵箱地址已經達到上限!'; $PALANG['pCreate_mailbox_password2'] = '密碼 (再次輸入)'; $PALANG['pCreate_mailbox_password_text'] = 'POP3/IMAP 密碼'; Modified: trunk/model/AliasHandler.php =================================================================== --- trunk/model/AliasHandler.php 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/model/AliasHandler.php 2013-07-28 20:14:57 UTC (rev 1506) @@ -66,7 +66,7 @@ } protected function initMsg() { - $this->msg['error_already_exists'] = 'pCreate_alias_address_text_error2'; + $this->msg['error_already_exists'] = 'email-address-already-exists'; $this->msg['error_does_not_exist'] = 'pCreate_alias_address_text_error1'; # TODO: better error message if ($this->new) { $this->msg['logname'] = 'create_alias'; Modified: trunk/model/MailboxHandler.php =================================================================== --- trunk/model/MailboxHandler.php 2013-07-28 20:03:13 UTC (rev 1505) +++ trunk/model/MailboxHandler.php 2013-07-28 20:14:57 UTC (rev 1506) @@ -83,7 +83,7 @@ } protected function initMsg() { - $this->msg['error_already_exists'] = 'pCreate_mailbox_username_text_error2'; + $this->msg['error_already_exists'] = 'email-address-already-exists'; $this->msg['error_does_not_exist'] = 'pCreate_mailbox_username_text_error1'; if ($this->new) { $this->msg['logname'] = 'create_mailbox'; @@ -140,7 +140,7 @@ # check if an alias with this name already exists - if yes, don't allow to create the mailbox $handler = new AliasHandler(1); if (!$handler->init($this->id)) { - $this->errormsg[] = Lang::read('pCreate_mailbox_username_text_error2'); + $this->errormsg[] = Lang::read('email-address-already-exists'); return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |