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)



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1191 a1433add-5e2c-0410-b055-b7f2511e0802

edit-admin.php

@@ -83,7 +83,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
                 }
                 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 {

edit-mailbox.php

@@ -97,7 +97,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
       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);

languages/bg.lang

@@ -386,7 +386,9 @@ $PALANG['pBroadcast_error_empty'] = 'Полетата Име, Заглавие
 $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

languages/ca.lang

@@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

languages/cn.lang

@@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

languages/cs.lang

@@ -397,7 +397,9 @@ $PALANG['pBroadcast_error_empty'] = 'Pole Od, Předmět a Zpráva by neměly bý
 $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

languages/da.lang

@@ -396,7 +396,9 @@ $PALANG['pStatus_undeliverable'] = 'kan måske ikke leveres ';
 $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

languages/de.lang

@@ -396,7 +396,9 @@ $PALANG['pStatus_undeliverable'] = 'möglicherweise UNZUSTELLBAR ';
 $PALANG['pStatus_custom'] = 'Zustellung an ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';
 
-$PALANG['pPasswordTooShort'] = "Das Passwort ist zu kurz - mindestens %s Zeichen benötigt";
+$PALANG['password_too_short'] = "Das Passwort ist zu kurz - mindestens %s Zeichen benö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ültiger Domainname %s - Überprüfung per RegEx fehlgeschlagen";
 $PALANG['pInvalidDomainDNS'] = "Ungültige Domain %s - nicht per DNS auflösbar";
 $PALANG['pInvalidMailRegex'] = "Ungültige Mailadresse - Überprüfung per RegEx fehlgeschlagen";

languages/en.lang

@@ -397,7 +397,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE ';
 $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";

languages/es.lang

@@ -387,7 +387,9 @@ $PALANG['pBroadcast_error_empty'] = '¡Los campos Nombre, Asunto y Mensaje no pu
 $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"; 

languages/et.lang

@@ -389,7 +389,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

languages/eu.lang

@@ -384,7 +384,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

languages/fi.lang

@@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'Nimi, Aihe tai Viesti kenttien ei pidä oll
 $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ä";

languages/fo.lang

@@ -390,7 +390,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

languages/fr.lang

@@ -387,7 +387,9 @@ $PALANG['pBroadcast_error_empty'] = 'Les champs Nom, Sujet et Message ne peuvent
 $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";

languages/hr.lang

@@ -383,7 +383,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

languages/hu.lang

@@ -397,7 +397,9 @@ $PALANG['pStatus_undeliverable'] = 'lehet hogy nem kézbesíthető ';
 $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

languages/is.lang

@@ -384,7 +384,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

languages/it.lang

@@ -386,7 +386,9 @@ $PALANG['pBroadcast_error_empty'] = 'Nome, oggetto e testo del messaggio non pos
 $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

languages/ja.lang

@@ -395,7 +395,9 @@ $PALANG['pStatus_undeliverable'] = 'おそらく配送不可能 ';
 $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

languages/lt.lang

@@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

languages/mk.lang

@@ -386,7 +386,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

languages/nb.lang

@@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'Feltene Ditt navn, Emne og Melding kan ikke
 $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";

languages/nl.lang

@@ -387,7 +387,9 @@ $PALANG['pBroadcast_error_empty'] = 'De velden Naam, Onderwerp en Bericht mogen
 $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";

languages/nn.lang

@@ -382,7 +382,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

languages/pl.lang

@@ -391,7 +391,9 @@ $PALANG['pBroadcast_error_empty'] = 'Pola Nazwa, Temat i Wiadomość nie powinny
 $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';

languages/pt-br.lang

@@ -397,7 +397,9 @@ $PALANG['pStatus_undeliverable'] = 'talvez NÃO-ENTREGÁVEL ';
 $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";

languages/ru.lang

@@ -397,7 +397,9 @@ $PALANG['pStatus_undeliverable'] = 'возможно НЕ ДОСТАВЛЕНО '
 $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, не соответствует регулярному выражению";

languages/sk.lang

@@ -386,7 +386,9 @@ $PALANG['pBroadcast_error_empty'] = 'Polie Vaše meno, Predmet a Obsah nemôžu
 $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";

languages/sl.lang

@@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

languages/sv.lang

@@ -387,7 +387,9 @@ $PALANG['pBroadcast_error_empty'] = 'Fälten namn, ämne och meddelande skall in
 $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

languages/tr.lang

@@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

languages/tw.lang

@@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should
 $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

users/password.php

@@ -49,7 +49,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
     $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;