SF.net SVN: postfixadmin:[1191] trunk

[<chr...@us...>]

Revision: 1191
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1191&view=rev
Author:   christian_boltz
Date:     2011-09-25 16:52:25 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
users/password.php, edit-admin.php, edit-mailbox.php, *.lang:
- rename $PALANG['pPasswordTooShort'] to $PALANG['password_too_short']

*.lang:
- add $PALANG['password_no_characters'] and $PALANG['password_no_digits']
  (will be used by my next commit)

Modified Paths:
--------------
    trunk/edit-admin.php
    trunk/edit-mailbox.php
    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/users/password.php

Modified: trunk/edit-admin.php
===================================================================
--- trunk/edit-admin.php	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/edit-admin.php	2011-09-25 16:52:25 UTC (rev 1191)
@@ -83,7 +83,7 @@
                 }
                 else {
                     $error = 1;
-                    $pAdminEdit_admin_password_text_error = sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']);
+                    $pAdminEdit_admin_password_text_error = sprintf($PALANG['password_too_short'], $CONF['min_password_length']);
                 }
             }
             else {

Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/edit-mailbox.php	2011-09-25 16:52:25 UTC (rev 1191)
@@ -97,7 +97,7 @@
       if($fPassword == $fPassword2) {
          if ($fPassword != "") {
             if($min_length > 0 && strlen($fPassword) < $min_length) {
-               $mailbox_password_text_error = sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']);
+               $mailbox_password_text_error = sprintf($PALANG['password_too_short'], $CONF['min_password_length']);
                $error = 1;
             }
             $formvars['password'] = pacrypt($fPassword);

Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/bg.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -386,7 +386,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/ca.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -385,7 +385,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/cn.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -385,7 +385,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/cs.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -397,7 +397,9 @@
 $PALANG['pStatus_undeliverable'] = 'možná NEDORUČITELNÉ ';
 $PALANG['pStatus_custom'] = 'Doručeno do ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['pPasswordTooShort'] = "Heslo je příliš krátké - je vyžadováno minimálně %s znaků";
+$PALANG['password_too_short'] = "Heslo je příliš krátké - je vyžadováno minimálně %s znaků";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/da.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -396,7 +396,9 @@
 $PALANG['pStatus_custom'] = 'Leveres til ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
-$PALANG['pPasswordTooShort'] = "Adgangskoden er for kort - mindst %s tegn kræves";
+$PALANG['password_too_short'] = "Adgangskoden er for kort - mindst %s tegn kræves";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/de.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -396,7 +396,9 @@
 $PALANG['pStatus_custom'] = 'Zustellung an ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
-$PALANG['pPasswordTooShort'] = "Das Passwort ist zu kurz - mindestens %s Zeichen ben&ouml;tigt";
+$PALANG['password_too_short'] = "Das Passwort ist zu kurz - mindestens %s Zeichen ben&ouml;tigt";
+$PALANG['password_no_characters'] = "Ihr Passwort muss mindestens %s Buchstaben enthalten.";
+$PALANG['password_no_digits'] = "Ihr Passwort muss mindestens %s Ziffer(n) enthalten.";
 $PALANG['pInvalidDomainRegex'] = "Ung&uuml;ltiger Domainname %s - &Uuml;berpr&uuml;fung per RegEx fehlgeschlagen";
 $PALANG['pInvalidDomainDNS'] = "Ung&uuml;ltige Domain %s - nicht per DNS aufl&ouml;sbar";
 $PALANG['pInvalidMailRegex'] = "Ung&uuml;ltige Mailadresse - &Uuml;berpr&uuml;fung per RegEx fehlgeschlagen";

Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/en.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -397,7 +397,9 @@
 $PALANG['pStatus_custom'] = 'Delivers to ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # usage: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+$PALANG['password_too_short'] = "Password is too short - requires %s characters";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s).";
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s).";
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check";
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS";
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check";

Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/es.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -387,7 +387,9 @@
 $PALANG['pStatus_undeliverable'] = 'posiblemente NO SE ENTREGÓ'; 
 $PALANG['pStatus_custom'] = 'Enviado a '; 
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "La contraseña es demasiado corta - se necesitan %s caracteres"; 
+$PALANG['password_too_short'] = "La contraseña es demasiado corta - se necesitan %s caracteres"; 
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "El nombre de dominio %s es inválido, no se ajusta a la expresión regular"; 
 $PALANG['pInvalidDomainDNS'] = "El dominio %s no es válido, y/o no tiene resolución DNS"; 
 $PALANG['pInvalidMailRegex'] = "La dirección de email no es válidas, no se ajusta a la expresión regular"; 

Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/et.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -389,7 +389,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/eu.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -384,7 +384,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/fi.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -385,7 +385,9 @@
 $PALANG['pStatus_undeliverable'] = 'ehkä ei voida toimittaa ';
 $PALANG['pStatus_custom'] = 'Toimittaa osoiteeseen ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['pPasswordTooShort'] = "Salasana on liian lyhyt, vaaditaan %s merkkiä";
+$PALANG['password_too_short'] = "Salasana on liian lyhyt, vaaditaan %s merkkiä";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Virheellinen domain nimi %s, ei läpäise regexp testiä";
 $PALANG['pInvalidDomainDNS'] = "Virheellinen domain %s ja/tai ei löydy nimipalvelimista";
 $PALANG['pInvalidMailRegex'] = "Virheellinen sähköpostiosoite, ei läpäise regexp testiä";

Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/fo.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -390,7 +390,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/fr.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -387,7 +387,9 @@
 $PALANG['pStatus_undeliverable'] = 'Non délivrable ';
 $PALANG['pStatus_custom'] = 'Délivré à ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['pPasswordTooShort'] = "Mot de passe trop court. - %s caractères minimum";
+$PALANG['password_too_short'] = "Mot de passe trop court. - %s caractères minimum";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Nom de Domaine Invalide %s, vérification regexp impossible";
 $PALANG['pInvalidDomainDNS'] = "Domaine Invalide %s, et/ou non resolvable via les DNS";
 $PALANG['pInvalidMailRegex'] = "Adresse email invalide, vérification regexp impossible";

Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/hr.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -383,7 +383,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/hu.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -397,7 +397,9 @@
 $PALANG['pStatus_custom'] = 'Ide kézbesítődik ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
-$PALANG['pPasswordTooShort'] = "A Jelszó túl rövid - legalább %s karakter szükséges";
+$PALANG['password_too_short'] = "A Jelszó túl rövid - legalább %s karakter szükséges";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/is.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -384,7 +384,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/it.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -386,7 +386,9 @@
 $PALANG['pStatus_undeliverable'] = 'presumibilmente NON CONSEGNABILE ';
 $PALANG['pStatus_custom'] = 'In consegna a ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['pPasswordTooShort'] = "Password troppo breve - minimo %s caratteri";
+$PALANG['password_too_short'] = "Password troppo breve - minimo %s caratteri";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/ja.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -395,7 +395,9 @@
 $PALANG['pStatus_custom'] = '配送先 ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
-$PALANG['pPasswordTooShort'] = "パスワードが短すぎます。最低 %s 文字必要です。"; # usage: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+$PALANG['password_too_short'] = "パスワードが短すぎます。最低 %s 文字必要です。";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/lt.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -385,7 +385,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/mk.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -386,7 +386,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/nb.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -385,7 +385,9 @@
 $PALANG['pStatus_undeliverable'] = 'kan kanskje IKKE LEVERES ';
 $PALANG['pStatus_custom'] = 'Leverer til ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['pPasswordTooShort'] = "Passordet er for kort - det må inneholde minst %s tegn";
+$PALANG['password_too_short'] = "Passordet er for kort - det må inneholde minst %s tegn";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Ugyldig domenenavn %s, regexp-validering feilet";
 $PALANG['pInvalidDomainDNS'] = "Ugyldig domene %s, og/eller finnes ikke i DNS";
 $PALANG['pInvalidMailRegex'] = "Ugyldig e-postadresse, regexp-validering feilet";

Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/nl.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -387,7 +387,9 @@
 $PALANG['pStatus_undeliverable'] = 'Misschien niet af te leveren ';
 $PALANG['pStatus_custom'] = 'Bezorgen op ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['pPasswordTooShort'] = "Wachtwoord is te kort - moet minimaal %s karakters bevatten";
+$PALANG['password_too_short'] = "Wachtwoord is te kort - moet minimaal %s karakters bevatten";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Ongeldig domein naam %s";
 $PALANG['pInvalidDomainDNS'] = "Ongeldig domein %s";
 $PALANG['pInvalidMailRegex'] = "Ongeldig email adres";

Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/nn.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -382,7 +382,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/pl.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -391,7 +391,9 @@
 $PALANG['pStatus_undeliverable'] = 'może być NIEDOSTARCZALNA ';
 $PALANG['pStatus_custom'] = 'Dostarczyć do ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['pPasswordTooShort'] = 'Hasło jest za krótkie - musi mieć minimum %s znaków';
+$PALANG['password_too_short'] = 'Hasło jest za krótkie - musi mieć minimum %s znaków';
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = 'Nieprawidłowa nazwa domeny %s';
 $PALANG['pInvalidDomainDNS'] = 'Nieprawidłowa domena %s, nie wykrywana w DNS';
 $PALANG['pInvalidMailRegex'] = 'Nieprawidłowy adres email';

Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/pt-br.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -397,7 +397,9 @@
 $PALANG['pStatus_custom'] = 'Envia para ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
-$PALANG['pPasswordTooShort'] = "Senha muito curta - requer %s caracteres";  # uso: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+$PALANG['password_too_short'] = "Senha muito curta - requer %s caracteres";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Nome de domínio inválido %s, falhou checagem por expressão regular";
 $PALANG['pInvalidDomainDNS'] = "Domínio inválido %s, e/ou não pôde ser resolvido por DNS";
 $PALANG['pInvalidMailRegex'] = "Endereço de email inválido, falhou checagem por expressão regular";

Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/ru.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -397,7 +397,9 @@
 $PALANG['pStatus_custom'] = 'Доставляется для ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
-$PALANG['pPasswordTooShort'] = "Пароль слишком короткий - требуется %s символов";
+$PALANG['password_too_short'] = "Пароль слишком короткий - требуется %s символов";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Некорректное имя домена %s, не соответствует регулярному выражению";
 $PALANG['pInvalidDomainDNS'] = "Некорректный домен %s, и/или не обнаруживается в DNS";
 $PALANG['pInvalidMailRegex'] = "Некорректный адрес e-mail, не соответствует регулярному выражению";

Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/sk.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -386,7 +386,9 @@
 $PALANG['pStatus_undeliverable'] = 'možno NEDORUČITEĽNÉ ';
 $PALANG['pStatus_custom'] = 'Doručuje sa na ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['pPasswordTooShort'] = "Heslo je príliš krátke - musí mať aspoň %s znakov";
+$PALANG['password_too_short'] = "Heslo je príliš krátke - musí mať aspoň %s znakov";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Neplatný názov domény %s";
 $PALANG['pInvalidDomainDNS'] = "Neplatná doména %s alebo neexistuje jej DNS záznam";
 $PALANG['pInvalidMailRegex'] = "Neplatná emailová adresa";

Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/sl.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -385,7 +385,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/sv.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -387,7 +387,9 @@
 $PALANG['pStatus_undeliverable'] = 'kanske misslyckades leverera ';
 $PALANG['pStatus_custom'] = 'Levereras till ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
-$PALANG['pPasswordTooShort'] = "För kort lösenord - ett lösenord på %s tecken krävs";
+$PALANG['password_too_short'] = "För kort lösenord - ett lösenord på %s tecken krävs";
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/tr.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -385,7 +385,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/languages/tw.lang	2011-09-25 16:52:25 UTC (rev 1191)
@@ -385,7 +385,9 @@
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX
+$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
 $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX

Modified: trunk/users/password.php
===================================================================
--- trunk/users/password.php	2011-09-24 17:04:15 UTC (rev 1190)
+++ trunk/users/password.php	2011-09-25 16:52:25 UTC (rev 1191)
@@ -49,7 +49,7 @@
     $error = 0;
     if(strlen($fPassword) < $CONF['min_password_length']) {
         $error += 1;
-        flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+        flash_error(sprintf($PALANG['password_too_short'], $CONF['min_password_length']));
     }
     if(!MailboxHandler::login($username, $fPassword_current)) {
         $error += 1;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.