diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php index 2cf784eceb..771e391ce6 100644 --- a/packages/web/lib/fog/system.class.php +++ b/packages/web/lib/fog/system.class.php @@ -53,7 +53,7 @@ private static function _versionCompare() public function __construct() { self::_versionCompare(); - define('FOG_VERSION', '8'); + define('FOG_VERSION', '9'); define('FOG_SCHEMA', 245); define('FOG_BCACHE_VER', 111); define('FOG_SVN_REVISION', 6052); diff --git a/packages/web/lib/fog/user.class.php b/packages/web/lib/fog/user.class.php index 513a1340ed..101235f170 100644 --- a/packages/web/lib/fog/user.class.php +++ b/packages/web/lib/fog/user.class.php @@ -128,7 +128,7 @@ public function passwordValidate( * immediately if found. */ $test = preg_match( - '/(?=^.{3,40}$)^[\w][\w0-9]*[._@-]?[\w0-9]*[.]?[\w0-9]+$/i', + '/(?=^.{3,40}$)^[\w][\w0-9]*[._-]?[\w0-9]*[.]?[\w0-9]+$/i', $username ); if (!$test) { @@ -183,7 +183,7 @@ public function validatePw( * immediately if found. */ $test = preg_match( - '/(?=^.{3,40}$)^[\w][\w0-9]*[._@-]?[\w0-9]*[.]?[\w0-9]+$/i', + '/(?=^.{3,40}$)^[\w][\w0-9]*[._-]?[\w0-9]*[.]?[\w0-9]+$/i', $username ); if (!$test) { diff --git a/packages/web/lib/pages/usermanagementpage.class.php b/packages/web/lib/pages/usermanagementpage.class.php index 98bfaae066..f10fe2d52c 100644 --- a/packages/web/lib/pages/usermanagementpage.class.php +++ b/packages/web/lib/pages/usermanagementpage.class.php @@ -192,6 +192,22 @@ public function addPost() ->processEvent('USER_ADD_POST'); try { $name = strtolower(trim($_REQUEST['name'])); + $test = preg_match( + '/(?=^.{3,40}$)^[\w][\w0-9]*[._-]?[\w0-9]*[.]?[\w0-9]+$/i', + $name + ); + if (!$test) { + throw new Exception( + sprintf( + '%s.
%s.
%s.
%s.
%s.
', + _('Username does not meet rules'), + _('Must start with a word character'), + _('Must be at least 3 characters'), + _('Must be shorter than 41 characters'), + _('No contiguous special characters') + ) + ); + } if (self::getClass('UserManager')->exists($name)) { throw new Exception(_('Username already exists')); } @@ -309,6 +325,22 @@ public function editPost() ); try { $name = strtolower(trim($_REQUEST['name'])); + $test = preg_match( + '/(?=^.{3,40}$)^[\w][\w0-9]*[._-]?[\w0-9]*[.]?[\w0-9]+$/i', + $name + ); + if (!$test) { + throw new Exception( + sprintf( + '%s.
%s.
%s.
%s.
%s.
', + _('Username does not meet rules'), + _('Must start with a word character'), + _('Must be at least 3 characters'), + _('Must be shorter than 41 characters'), + _('No contiguous special characters') + ) + ); + } if ($name != trim($this->obj->get('name')) && $this->obj->getManager()->exists($name, $this->obj->get('id')) ) { diff --git a/packages/web/lib/plugins/ldap/class/ldap.class.php b/packages/web/lib/plugins/ldap/class/ldap.class.php index 3cc252661f..f0dd647c25 100644 --- a/packages/web/lib/plugins/ldap/class/ldap.class.php +++ b/packages/web/lib/plugins/ldap/class/ldap.class.php @@ -245,7 +245,7 @@ public function authLDAP($user, $pass) * immediately if found. */ $test = preg_match( - '/(?=^.{3,40}$)^[\w][\w0-9]*[._@-]?[\w0-9]*[.]?[\w0-9]+$/i', + '/(?=^.{3,40}$)^[\w][\w0-9]*[._-]?[\w0-9]*[.]?[\w0-9]+$/i', $user ); if (!$test) { diff --git a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po index 32cf4e693e..accb8a8adb 100644 --- a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fog-project-2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-09 14:44-0500\n" +"POT-Creation-Date: 2017-01-09 15:20-0500\n" "PO-Revision-Date: 2016-05-23 07:36-0400\n" "Last-Translator: vspushbullet \n" "Language-Team: German\n" @@ -1316,7 +1316,7 @@ msgstr "Bild bearbeiten" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:383 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:654 #: /var/www/fog/lib/pages/usermanagementpage.class.php:68 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:231 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:247 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:598 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1075 #: /var/www/fog/lib/pages/snapinmanagementpage.class.php:171 @@ -1544,7 +1544,7 @@ msgstr "Hinzufügen" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:853 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:268 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:284 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:183 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:793 @@ -4337,42 +4337,42 @@ msgid "New User" msgstr "Neuer Benutzer" #: /var/www/fog/lib/pages/usermanagementpage.class.php:138 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:236 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:252 msgid "User Name" msgstr "Benutzername" #: /var/www/fog/lib/pages/usermanagementpage.class.php:143 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:241 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:257 msgid "User Password" msgstr "Benutzer-Passwort" #: /var/www/fog/lib/pages/usermanagementpage.class.php:146 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:244 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:260 msgid "User Password (confirm)" msgstr "Benutzer-Passwort (bestätigen)" #: /var/www/fog/lib/pages/usermanagementpage.class.php:152 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:250 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:266 msgid "Mobile/Quick Image Access Only?" msgstr "Mobile/Quick Image Access nur?" #: /var/www/fog/lib/pages/usermanagementpage.class.php:155 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:253 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:269 msgid "Warning" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:156 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:254 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:270 msgid "if you tick this box" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:157 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:255 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:271 msgid "this user will not be able to log into" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:158 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:256 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:272 msgid "this FOG Management console in the future" msgstr "" @@ -4384,28 +4384,53 @@ msgstr "Benutzer erstellen" msgid "Add new user account" msgstr "Neuen Benutzer-Account hinzufügen" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:196 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:315 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:336 +msgid "Username does not meet rules" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:204 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:337 +msgid "Must start with a word character" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:205 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:338 +msgid "Must be at least 3 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:206 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:339 +msgid "Must be shorter than 41 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:207 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:340 +msgid "No contiguous special characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:212 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:347 msgid "Username already exists" msgstr "Benutzername ist bereits vorhanden." -#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:219 msgid "Failed to create user" msgstr "Fehler beim Benutzer erstellen" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:208 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:224 msgid "User created" msgstr "Benutzer erstellt" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:209 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:225 msgid "You may now create another" msgstr "Sie können jetzt eine andere erstellen" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:322 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:354 msgid "User update failed" msgstr "Benutzer-Update fehlgeschlagen" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:325 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:357 msgid "User updated" msgstr "Benutzer aktualisiert" diff --git a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po index a8ee5a8971..45fd324bcb 100644 --- a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-09 14:44-0500\n" +"POT-Creation-Date: 2017-01-09 15:20-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -1308,7 +1308,7 @@ msgstr "Edit Image" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:383 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:654 #: /var/www/fog/lib/pages/usermanagementpage.class.php:68 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:231 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:247 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:598 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1075 #: /var/www/fog/lib/pages/snapinmanagementpage.class.php:171 @@ -1536,7 +1536,7 @@ msgstr "Add" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:853 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:268 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:284 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:183 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:793 @@ -4324,42 +4324,42 @@ msgid "New User" msgstr "New User" #: /var/www/fog/lib/pages/usermanagementpage.class.php:138 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:236 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:252 msgid "User Name" msgstr "User Name" #: /var/www/fog/lib/pages/usermanagementpage.class.php:143 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:241 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:257 msgid "User Password" msgstr "User Password" #: /var/www/fog/lib/pages/usermanagementpage.class.php:146 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:244 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:260 msgid "User Password (confirm)" msgstr "User Password (confirm)" #: /var/www/fog/lib/pages/usermanagementpage.class.php:152 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:250 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:266 msgid "Mobile/Quick Image Access Only?" msgstr "Mobile/Quick Image Access Only?" #: /var/www/fog/lib/pages/usermanagementpage.class.php:155 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:253 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:269 msgid "Warning" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:156 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:254 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:270 msgid "if you tick this box" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:157 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:255 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:271 msgid "this user will not be able to log into" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:158 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:256 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:272 msgid "this FOG Management console in the future" msgstr "" @@ -4371,28 +4371,53 @@ msgstr "Create User" msgid "Add new user account" msgstr "Add new user account" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:196 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:315 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:336 +msgid "Username does not meet rules" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:204 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:337 +msgid "Must start with a word character" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:205 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:338 +msgid "Must be at least 3 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:206 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:339 +msgid "Must be shorter than 41 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:207 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:340 +msgid "No contiguous special characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:212 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:347 msgid "Username already exists" msgstr "Username already exists" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:219 msgid "Failed to create user" msgstr "Failed to create user" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:208 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:224 msgid "User created" msgstr "User created" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:209 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:225 msgid "You may now create another" msgstr "You may now create another" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:322 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:354 msgid "User update failed" msgstr "User update failed" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:325 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:357 msgid "User updated" msgstr "User updated" diff --git a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po index beebacd484..75ae008d7b 100755 --- a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-09 14:44-0500\n" +"POT-Creation-Date: 2017-01-09 15:20-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -1311,7 +1311,7 @@ msgstr "Editar imagen" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:383 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:654 #: /var/www/fog/lib/pages/usermanagementpage.class.php:68 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:231 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:247 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:598 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1075 #: /var/www/fog/lib/pages/snapinmanagementpage.class.php:171 @@ -1541,7 +1541,7 @@ msgstr "Añadir" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:853 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:268 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:284 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:183 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:793 @@ -4334,42 +4334,42 @@ msgid "New User" msgstr "Nuevo usuario" #: /var/www/fog/lib/pages/usermanagementpage.class.php:138 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:236 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:252 msgid "User Name" msgstr "Nombre de usuario" #: /var/www/fog/lib/pages/usermanagementpage.class.php:143 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:241 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:257 msgid "User Password" msgstr "Contraseña de usuario" #: /var/www/fog/lib/pages/usermanagementpage.class.php:146 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:244 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:260 msgid "User Password (confirm)" msgstr "Contraseña de usuario (confirmar)" #: /var/www/fog/lib/pages/usermanagementpage.class.php:152 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:250 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:266 msgid "Mobile/Quick Image Access Only?" msgstr "Móvil / acceso rápido sólo imagen?" #: /var/www/fog/lib/pages/usermanagementpage.class.php:155 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:253 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:269 msgid "Warning" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:156 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:254 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:270 msgid "if you tick this box" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:157 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:255 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:271 msgid "this user will not be able to log into" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:158 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:256 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:272 msgid "this FOG Management console in the future" msgstr "" @@ -4381,28 +4381,53 @@ msgstr "Crear usuario" msgid "Add new user account" msgstr "Añadir nueva cuenta de usuario" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:196 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:315 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:336 +msgid "Username does not meet rules" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:204 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:337 +msgid "Must start with a word character" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:205 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:338 +msgid "Must be at least 3 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:206 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:339 +msgid "Must be shorter than 41 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:207 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:340 +msgid "No contiguous special characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:212 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:347 msgid "Username already exists" msgstr "nombre de usuario ya existe" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:219 msgid "Failed to create user" msgstr "No se pudo crear el usuario" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:208 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:224 msgid "User created" msgstr "creado por el usuario" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:209 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:225 msgid "You may now create another" msgstr "Ahora puede crear otro" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:322 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:354 msgid "User update failed" msgstr "actualización Valoración falló" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:325 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:357 msgid "User updated" msgstr "el usuario actualiza" diff --git a/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po index 7f98d14490..5ff784fdec 100644 --- a/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-09 14:44-0500\n" +"POT-Creation-Date: 2017-01-09 15:20-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -1317,7 +1317,7 @@ msgstr "Modifier l'image" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:383 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:654 #: /var/www/fog/lib/pages/usermanagementpage.class.php:68 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:231 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:247 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:598 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1075 #: /var/www/fog/lib/pages/snapinmanagementpage.class.php:171 @@ -1547,7 +1547,7 @@ msgstr "Ajouter" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:853 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:268 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:284 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:183 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:793 @@ -4340,42 +4340,42 @@ msgid "New User" msgstr "Nouvel utilisateur" #: /var/www/fog/lib/pages/usermanagementpage.class.php:138 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:236 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:252 msgid "User Name" msgstr "Nom d'utilisateur" #: /var/www/fog/lib/pages/usermanagementpage.class.php:143 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:241 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:257 msgid "User Password" msgstr "Mot de passe de l'utilisateur" #: /var/www/fog/lib/pages/usermanagementpage.class.php:146 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:244 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:260 msgid "User Password (confirm)" msgstr "Mot de passe de l'utilisateur (confirmation)" #: /var/www/fog/lib/pages/usermanagementpage.class.php:152 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:250 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:266 msgid "Mobile/Quick Image Access Only?" msgstr "Mobile Accès rapide / Image Seulement?" #: /var/www/fog/lib/pages/usermanagementpage.class.php:155 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:253 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:269 msgid "Warning" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:156 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:254 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:270 msgid "if you tick this box" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:157 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:255 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:271 msgid "this user will not be able to log into" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:158 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:256 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:272 msgid "this FOG Management console in the future" msgstr "" @@ -4387,28 +4387,53 @@ msgstr "Créer un utilisateur" msgid "Add new user account" msgstr "Ajouter un compte d'utilisateur" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:196 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:315 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:336 +msgid "Username does not meet rules" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:204 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:337 +msgid "Must start with a word character" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:205 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:338 +msgid "Must be at least 3 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:206 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:339 +msgid "Must be shorter than 41 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:207 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:340 +msgid "No contiguous special characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:212 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:347 msgid "Username already exists" msgstr "Ce nom d'utilisateur existe déjà" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:219 msgid "Failed to create user" msgstr "Impossible de créer l'utilisateur" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:208 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:224 msgid "User created" msgstr "utilisateur créé" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:209 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:225 msgid "You may now create another" msgstr "Vous pouvez maintenant créer un autre" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:322 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:354 msgid "User update failed" msgstr "mise à jour de l'utilisateur a échoué" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:325 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:357 msgid "User updated" msgstr "mis à jour l'utilisateur" diff --git a/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po index 4a98e3164c..ec0ddad06d 100644 --- a/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-09 14:44-0500\n" +"POT-Creation-Date: 2017-01-09 15:20-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -1312,7 +1312,7 @@ msgstr "Modifica immagine" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:383 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:654 #: /var/www/fog/lib/pages/usermanagementpage.class.php:68 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:231 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:247 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:598 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1075 #: /var/www/fog/lib/pages/snapinmanagementpage.class.php:171 @@ -1541,7 +1541,7 @@ msgstr "Aggiungere" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:853 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:268 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:284 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:183 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:793 @@ -4331,42 +4331,42 @@ msgid "New User" msgstr "Nuovo utente" #: /var/www/fog/lib/pages/usermanagementpage.class.php:138 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:236 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:252 msgid "User Name" msgstr "Nome utente" #: /var/www/fog/lib/pages/usermanagementpage.class.php:143 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:241 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:257 msgid "User Password" msgstr "Password utente" #: /var/www/fog/lib/pages/usermanagementpage.class.php:146 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:244 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:260 msgid "User Password (confirm)" msgstr "User Password (conferma)" #: /var/www/fog/lib/pages/usermanagementpage.class.php:152 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:250 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:266 msgid "Mobile/Quick Image Access Only?" msgstr "Mobile / Quick Access solo immagine?" #: /var/www/fog/lib/pages/usermanagementpage.class.php:155 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:253 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:269 msgid "Warning" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:156 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:254 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:270 msgid "if you tick this box" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:157 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:255 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:271 msgid "this user will not be able to log into" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:158 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:256 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:272 msgid "this FOG Management console in the future" msgstr "" @@ -4378,28 +4378,53 @@ msgstr "Crea utente" msgid "Add new user account" msgstr "Aggiungere un nuovo account utente" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:196 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:315 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:336 +msgid "Username does not meet rules" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:204 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:337 +msgid "Must start with a word character" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:205 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:338 +msgid "Must be at least 3 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:206 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:339 +msgid "Must be shorter than 41 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:207 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:340 +msgid "No contiguous special characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:212 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:347 msgid "Username already exists" msgstr "Il nome utente esiste già" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:219 msgid "Failed to create user" msgstr "Impossibile creare utente" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:208 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:224 msgid "User created" msgstr "utente creato" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:209 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:225 msgid "You may now create another" msgstr "È ora possibile creare un altro" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:322 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:354 msgid "User update failed" msgstr "aggiornamento utente non riuscita" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:325 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:357 msgid "User updated" msgstr "utente aggiornato" diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot index 2c96c70521..7e8f329078 100644 --- a/packages/web/management/languages/messages.pot +++ b/packages/web/management/languages/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-09 15:10-0500\n" +"POT-Creation-Date: 2017-01-09 15:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1226,7 +1226,7 @@ msgstr "" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:383 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:654 #: /var/www/fog/lib/pages/usermanagementpage.class.php:68 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:231 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:247 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:598 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1075 #: /var/www/fog/lib/pages/snapinmanagementpage.class.php:171 @@ -1441,7 +1441,7 @@ msgstr "" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:853 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:268 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:284 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:183 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:793 @@ -4141,42 +4141,42 @@ msgid "New User" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:138 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:236 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:252 msgid "User Name" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:143 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:241 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:257 msgid "User Password" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:146 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:244 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:260 msgid "User Password (confirm)" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:152 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:250 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:266 msgid "Mobile/Quick Image Access Only?" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:155 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:253 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:269 msgid "Warning" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:156 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:254 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:270 msgid "if you tick this box" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:157 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:255 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:271 msgid "this user will not be able to log into" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:158 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:256 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:272 msgid "this FOG Management console in the future" msgstr "" @@ -4188,28 +4188,53 @@ msgstr "" msgid "Add new user account" msgstr "" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:196 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:315 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:336 +msgid "Username does not meet rules" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:204 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:337 +msgid "Must start with a word character" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:205 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:338 +msgid "Must be at least 3 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:206 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:339 +msgid "Must be shorter than 41 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:207 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:340 +msgid "No contiguous special characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:212 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:347 msgid "Username already exists" msgstr "" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:219 msgid "Failed to create user" msgstr "" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:208 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:224 msgid "User created" msgstr "" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:209 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:225 msgid "You may now create another" msgstr "" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:322 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:354 msgid "User update failed" msgstr "" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:325 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:357 msgid "User updated" msgstr "" diff --git a/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po index c10968a694..3e44be325d 100644 --- a/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-09 14:44-0500\n" +"POT-Creation-Date: 2017-01-09 15:20-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -1311,7 +1311,7 @@ msgstr "edição de imagem" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:383 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:654 #: /var/www/fog/lib/pages/usermanagementpage.class.php:68 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:231 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:247 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:598 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1075 #: /var/www/fog/lib/pages/snapinmanagementpage.class.php:171 @@ -1539,7 +1539,7 @@ msgstr "Adicionar" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:853 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:268 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:284 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:183 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:793 @@ -4329,42 +4329,42 @@ msgid "New User" msgstr "Novo usuário" #: /var/www/fog/lib/pages/usermanagementpage.class.php:138 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:236 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:252 msgid "User Name" msgstr "Nome de usuário" #: /var/www/fog/lib/pages/usermanagementpage.class.php:143 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:241 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:257 msgid "User Password" msgstr "Senha do usuário" #: /var/www/fog/lib/pages/usermanagementpage.class.php:146 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:244 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:260 msgid "User Password (confirm)" msgstr "User Password (confirmar)" #: /var/www/fog/lib/pages/usermanagementpage.class.php:152 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:250 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:266 msgid "Mobile/Quick Image Access Only?" msgstr "Mobile / Rápido Imagem Acesso Só?" #: /var/www/fog/lib/pages/usermanagementpage.class.php:155 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:253 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:269 msgid "Warning" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:156 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:254 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:270 msgid "if you tick this box" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:157 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:255 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:271 msgid "this user will not be able to log into" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:158 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:256 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:272 msgid "this FOG Management console in the future" msgstr "" @@ -4376,28 +4376,53 @@ msgstr "Criar usuário" msgid "Add new user account" msgstr "Adicionar nova conta de usuário" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:196 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:315 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:336 +msgid "Username does not meet rules" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:204 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:337 +msgid "Must start with a word character" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:205 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:338 +msgid "Must be at least 3 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:206 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:339 +msgid "Must be shorter than 41 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:207 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:340 +msgid "No contiguous special characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:212 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:347 msgid "Username already exists" msgstr "Nome de usuário já existe" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:219 msgid "Failed to create user" msgstr "Falha ao criar usuário" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:208 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:224 msgid "User created" msgstr "usuário criado" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:209 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:225 msgid "You may now create another" msgstr "Agora você pode criar outra" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:322 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:354 msgid "User update failed" msgstr "atualização do utilizador falhou" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:325 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:357 msgid "User updated" msgstr "usuário atualizada" diff --git a/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po index c90b182816..2d10e425a5 100644 --- a/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-09 14:44-0500\n" +"POT-Creation-Date: 2017-01-09 15:20-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -1304,7 +1304,7 @@ msgstr "编辑图像" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:383 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:654 #: /var/www/fog/lib/pages/usermanagementpage.class.php:68 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:231 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:247 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:598 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1075 #: /var/www/fog/lib/pages/snapinmanagementpage.class.php:171 @@ -1532,7 +1532,7 @@ msgstr "加" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:853 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:268 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:284 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 #: /var/www/fog/lib/pages/schemaupdaterpage.class.php:183 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:793 @@ -4312,42 +4312,42 @@ msgid "New User" msgstr "新用户" #: /var/www/fog/lib/pages/usermanagementpage.class.php:138 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:236 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:252 msgid "User Name" msgstr "用户名" #: /var/www/fog/lib/pages/usermanagementpage.class.php:143 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:241 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:257 msgid "User Password" msgstr "用户密码" #: /var/www/fog/lib/pages/usermanagementpage.class.php:146 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:244 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:260 msgid "User Password (confirm)" msgstr "用户密码(确认)" #: /var/www/fog/lib/pages/usermanagementpage.class.php:152 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:250 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:266 msgid "Mobile/Quick Image Access Only?" msgstr "移动/快速图像访问而已?" #: /var/www/fog/lib/pages/usermanagementpage.class.php:155 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:253 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:269 msgid "Warning" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:156 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:254 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:270 msgid "if you tick this box" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:157 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:255 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:271 msgid "this user will not be able to log into" msgstr "" #: /var/www/fog/lib/pages/usermanagementpage.class.php:158 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:256 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:272 msgid "this FOG Management console in the future" msgstr "" @@ -4359,28 +4359,53 @@ msgstr "创建用户" msgid "Add new user account" msgstr "添加新的用户帐户" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:196 -#: /var/www/fog/lib/pages/usermanagementpage.class.php:315 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:336 +msgid "Username does not meet rules" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:204 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:337 +msgid "Must start with a word character" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:205 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:338 +msgid "Must be at least 3 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:206 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:339 +msgid "Must be shorter than 41 characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:207 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:340 +msgid "No contiguous special characters" +msgstr "" + +#: /var/www/fog/lib/pages/usermanagementpage.class.php:212 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:347 msgid "Username already exists" msgstr "此用户名已存在" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:203 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:219 msgid "Failed to create user" msgstr "无法创建用户" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:208 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:224 msgid "User created" msgstr "用户创建" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:209 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:225 msgid "You may now create another" msgstr "现在,您可以创建另一个" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:322 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:354 msgid "User update failed" msgstr "用户更新失败" -#: /var/www/fog/lib/pages/usermanagementpage.class.php:325 +#: /var/www/fog/lib/pages/usermanagementpage.class.php:357 msgid "User updated" msgstr "用户更新"