diff --git a/CHANGELOG b/CHANGELOG index 0678394d..54552236 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +=== ** v1.2.0.0-rc2 === + +* [ADD] Switched to BCRYPT for hashing passwords and key derivation. WARNING: Master password should be reentered by users (you can use a temporary password) +* [MOD] Some tweaks on forms passwords decryption +* [FIX] Fixed issue when blank custom fields are retrieved for an item. + === ** v1.2.0.0-rc1 === * [ADD] Security improvements preventing common threats (SQL Injection, XSS, CSRF) diff --git a/CHANGELOG-ES b/CHANGELOG-ES index 799a8a35..986abc2b 100644 --- a/CHANGELOG-ES +++ b/CHANGELOG-ES @@ -1,3 +1,9 @@ +=== ** v1.2.0.0-rc2 === + +* [ADD] Cambiado a BCRYPT para generar el hash de las claves y derivaciones. AVISO: La clave maestra debe de ser introducida por los usuarios (es posible usar una clave temporal) +* [MOD] Algunos ajustes en la desencriptación de claves de los formularios +* [FIX] Corregido error cuando los campos personalizados en blanco son obtenidos para un elemento. + === ** v1.2.0.0-rc1 === * [ADD] Mejoras de seguridad para prevenir ataques comunes (SQL Injection, XSS, CSRF) diff --git a/ajax/ajax_accountSave.php b/ajax/ajax_accountSave.php index da3232ec..5139a459 100644 --- a/ajax/ajax_accountSave.php +++ b/ajax/ajax_accountSave.php @@ -49,8 +49,8 @@ $customerId = SP\Request::analyze('customerId', 0); $newCustomer = SP\Request::analyze('customer_new'); $accountName = SP\Request::analyze('name'); $accountLogin = SP\Request::analyze('login'); -$accountPassword = SP\Request::analyze('pass', '', false, false, false); -$accountPasswordR = SP\Request::analyze('passR', '', false, false, false); +$accountPassword = SP\Request::analyzeEncrypted('pass'); +$accountPasswordR = SP\Request::analyzeEncrypted('passR'); $categoryId = SP\Request::analyze('categoryId', 0); $accountOtherGroups = SP\Request::analyze('othergroups'); $accountOtherUsers = SP\Request::analyze('otherusers'); @@ -113,18 +113,13 @@ if ($actionId === \SP\Controller\ActionsInterface::ACTION_ACC_NEW) { if ($actionId == \SP\Controller\ActionsInterface::ACTION_ACC_NEW || $actionId === \SP\Controller\ActionsInterface::ACTION_ACC_EDIT_PASS ) { - // Desencriptar con la clave RSA - $CryptPKI = new \SP\CryptPKI(); - $clearAccountPass = $CryptPKI->decryptRSA(base64_decode($accountPassword)); - $clearAccountPassR = $CryptPKI->decryptRSA(base64_decode($accountPasswordR)); - - if ($clearAccountPass != $clearAccountPassR) { + if ($accountPassword != $accountPasswordR) { SP\Common::printJSON(_('Las claves no coinciden')); } // Encriptar clave de cuenta try { - $accountEncPass = SP\Crypt::encryptData($clearAccountPass); + $accountEncPass = SP\Crypt::encryptData($accountPassword); } catch (\SP\SPException $e) { SP\Common::printJSON($e->getMessage()); } diff --git a/ajax/ajax_appMgmtSave.php b/ajax/ajax_appMgmtSave.php index 3a72dd3f..46f27228 100644 --- a/ajax/ajax_appMgmtSave.php +++ b/ajax/ajax_appMgmtSave.php @@ -61,7 +61,7 @@ if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW || $actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_DELETE ) { $isLdap = SP\Request::analyze('isLdap', 0); - $userPassR = SP\Request::analyze('passR', '', false, false, false); + $userPassR = SP\Request::analyzeEncrypted('passR'); $User = new SP\User(); $User->setUserId($itemId); @@ -75,7 +75,7 @@ if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW $User->setUserIsAdminAcc(SP\Request::analyze('adminacc', 0, false, 1)); $User->setUserIsDisabled(SP\Request::analyze('disabled', 0, false, 1)); $User->setUserChangePass(SP\Request::analyze('changepass', 0, false, 1)); - $User->setUserPass(SP\Request::analyze('pass', '', false, false, false)); + $User->setUserPass(SP\Request::analyzeEncrypted('pass')); // Nuevo usuario o editar if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW @@ -105,7 +105,7 @@ if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW } if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW) { - if (!$User->getUserPass() && !$userPassR) { + if (!$User->getUserPass() || !$userPassR) { SP\Common::printJSON(_('La clave no puede estar en blanco'), 2); } elseif ($User->getUserPass() != $userPassR) { SP\Common::printJSON(_('Las claves no coinciden'), 2); @@ -144,19 +144,10 @@ if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW SP\Common::printJSON(_('Ey, esto es una DEMO!!')); } elseif (!$User->getUserPass() || !$userPassR) { SP\Common::printJSON(_('La clave no puede estar en blanco'), 2); - } - - // Desencriptar con la clave RSA - $CryptPKI = new \SP\CryptPKI(); - $clearUserPass = $CryptPKI->decryptRSA(base64_decode($User->getUserPass())); - $clearUserPassR = $CryptPKI->decryptRSA(base64_decode($userPassR)); - - if ($clearUserPass != $clearUserPassR) { + } elseif ($User->getUserPass() != $userPassR) { SP\Common::printJSON(_('Las claves no coinciden'), 2); } - $User->setUserPass($clearUserPass); - if ($User->updateUserPass()) { SP\Common::printJSON(_('Clave actualizada'), 0); } @@ -452,13 +443,13 @@ if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW $ApiTokens->setRefreshToken(SP\Request::analyze('refreshtoken', false, false, true)); if ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_APITOKENS_NEW - || $actionId === \SP\Controller\ActionsInterface::ACTION_MGM_APITOKENS_EDIT) - { + || $actionId === \SP\Controller\ActionsInterface::ACTION_MGM_APITOKENS_EDIT + ) { if ($ApiTokens->getUserId() === 0 || $ApiTokens->getActionId() === 0) { SP\Common::printJSON(_('Usuario o acción no indicado'), 2); } - if ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_APITOKENS_NEW){ + if ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_APITOKENS_NEW) { try { $ApiTokens->addToken(); } catch (\SP\SPException $e) { @@ -466,7 +457,7 @@ if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW } SP\Common::printJSON(_('Autorización creada'), 0, $doActionOnClose); - } elseif ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_APITOKENS_EDIT){ + } elseif ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_APITOKENS_EDIT) { try { $ApiTokens->updateToken(); } catch (\SP\SPException $e) { @@ -476,7 +467,7 @@ if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW SP\Common::printJSON(_('Autorización actualizada'), 0, $doActionOnClose); } - } elseif ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_APITOKENS_DELETE){ + } elseif ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_APITOKENS_DELETE) { try { $ApiTokens->deleteToken(); } catch (\SP\SPException $e) { @@ -497,8 +488,8 @@ if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW $frmFieldRequired = SP\Request::analyze('required', false, false, true); if ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_CUSTOMFIELDS_NEW - || $actionId === \SP\Controller\ActionsInterface::ACTION_MGM_CUSTOMFIELDS_EDIT) - { + || $actionId === \SP\Controller\ActionsInterface::ACTION_MGM_CUSTOMFIELDS_EDIT + ) { if (!$frmFieldName) { SP\Common::printJSON(_('Nombre del campo no indicado'), 2); } elseif ($frmFieldType === 0) { @@ -511,7 +502,7 @@ if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW $CustomFieldDef->setHelp($frmFieldHelp); $CustomFieldDef->setRequired($frmFieldRequired); - if ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_CUSTOMFIELDS_NEW){ + if ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_CUSTOMFIELDS_NEW) { try { $CustomFieldDef->addCustomField(); } catch (\SP\SPException $e) { @@ -519,7 +510,7 @@ if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW } SP\Common::printJSON(_('Campo creado'), 0, $doActionOnClose); - } elseif ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_CUSTOMFIELDS_EDIT){ + } elseif ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_CUSTOMFIELDS_EDIT) { try { $CustomFieldDef->setId($itemId); $CustomFieldDef->updateCustomField(); @@ -530,7 +521,7 @@ if ($actionId === \SP\Controller\ActionsInterface::ACTION_USR_USERS_NEW SP\Common::printJSON(_('Campo actualizado'), 0, $doActionOnClose); } - } elseif ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_CUSTOMFIELDS_DELETE){ + } elseif ($actionId === \SP\Controller\ActionsInterface::ACTION_MGM_CUSTOMFIELDS_DELETE) { try { \SP\CustomFieldDef::deleteCustomField($itemId); } catch (\SP\SPException $e) { diff --git a/ajax/ajax_backup.php b/ajax/ajax_backup.php index 3f37794d..5d4cd853 100644 --- a/ajax/ajax_backup.php +++ b/ajax/ajax_backup.php @@ -42,8 +42,8 @@ if (!$sk || !SP\Common::checkSessionKey($sk)) { $actionId = SP\Request::analyze('actionId', 0); $onCloseAction = SP\Request::analyze('onCloseAction'); $activeTab = SP\Request::analyze('activeTab', 0); -$exportPassword = SP\Request::analyze('exportPwd', '', false, false, false); -$exportPasswordR = SP\Request::analyze('exportPwdR', '', false, false, false); +$exportPassword = SP\Request::analyzeEncrypted('exportPwd'); +$exportPasswordR = SP\Request::analyzeEncrypted('exportPwdR'); $doActionOnClose = "sysPassUtil.Common.doAction($actionId,'',$activeTab);"; @@ -58,19 +58,11 @@ if ($actionId === SP\Controller\ActionsInterface::ACTION_CFG_BACKUP) { SP\Common::printJSON(_('Proceso de backup finalizado'), 0, $doActionOnClose); } elseif ($actionId === SP\Controller\ActionsInterface::ACTION_CFG_EXPORT) { - try { - $CryptPKI = new \SP\CryptPKI(); - $clearExportPwd = $CryptPKI->decryptRSA(base64_decode($exportPassword)); - $clearExportPwdR = $CryptPKI->decryptRSA(base64_decode($exportPasswordR)); - } catch (Exception $e) { - SP\Common::printJSON(_('Error en clave RSA')); - } - - if (!empty($clearExportPwd) && $clearExportPwd !== $clearExportPwdR){ + if (!empty($exportPassword) && $exportPassword !== $exportPasswordR){ SP\Common::printJSON(_('Las claves no coinciden')); } - if(!\SP\XmlExport::doExport($clearExportPwd)){ + if(!\SP\XmlExport::doExport($exportPassword)){ SP\Log::writeNewLogAndEmail(_('Realizar Exportación'), _('Error al realizar la exportación de cuentas')); SP\Common::printJSON(_('Error al realizar la exportación') . ';;' . _('Revise el registro de eventos para más detalles')); diff --git a/ajax/ajax_checkLdap.php b/ajax/ajax_checkLdap.php index c492e8f4..b5d39010 100644 --- a/ajax/ajax_checkLdap.php +++ b/ajax/ajax_checkLdap.php @@ -45,7 +45,7 @@ $frmLdapServer = SP\Request::analyze('ldap_server'); $frmLdapBase = SP\Request::analyze('ldap_base'); $frmLdapGroup = SP\Request::analyze('ldap_group'); $frmLdapBindUser = SP\Request::analyze('ldap_binduser'); -$frmLdapBindPass = SP\Request::analyze('ldap_bindpass'); +$frmLdapBindPass = SP\Request::analyzeEncrypted('ldap_bindpass'); if (!$frmLdapServer || !$frmLdapBase || !$frmLdapBindUser || !$frmLdapBindPass) { SP\Common::printJSON(_('Los parámetros de LDAP no están configurados')); diff --git a/ajax/ajax_configSave.php b/ajax/ajax_configSave.php index 100aa1d6..c29f464d 100644 --- a/ajax/ajax_configSave.php +++ b/ajax/ajax_configSave.php @@ -57,7 +57,7 @@ if ($actionId === SP\Controller\ActionsInterface::ACTION_CFG_GENERAL if ($actionId === SP\Controller\ActionsInterface::ACTION_CFG_GENERAL) { // General $siteLang = SP\Request::analyze('sitelang'); - $siteTheme = SP\Request::analyze('sitetheme'); + $siteTheme = SP\Request::analyze('sitetheme', 'material-blue'); $sessionTimeout = SP\Request::analyze('session_timeout', 300); $logEnabled = SP\Request::analyze('log_enabled', false, false, true); $debugEnabled = SP\Request::analyze('debug', false, false, true); @@ -105,7 +105,7 @@ if ($actionId === SP\Controller\ActionsInterface::ACTION_CFG_GENERAL $proxyServer = SP\Request::analyze('proxy_server'); $proxyPort = SP\Request::analyze('proxy_port', 0); $proxyUser = SP\Request::analyze('proxy_user'); - $proxyPass = SP\Request::analyze('proxy_pass'); + $proxyPass = SP\Request::analyzeEncrypted('proxy_pass'); // Valores para Proxy @@ -152,7 +152,7 @@ if ($actionId === SP\Controller\ActionsInterface::ACTION_CFG_GENERAL $ldapDefaultGroup = SP\Request::analyze('ldap_defaultgroup', 0); $ldapDefaultProfile = SP\Request::analyze('ldap_defaultprofile', 0); $ldapBindUser = SP\Request::analyze('ldap_binduser'); - $ldapBindPass = SP\Request::analyze('ldap_bindpass', '', false, false, false); + $ldapBindPass = SP\Request::analyzeEncrypted('ldap_bindpass'); // Valores para la configuración de LDAP if ($ldapEnabled && (!$ldapServer || !$ldapBase || !$ldapBindUser)) { @@ -178,7 +178,7 @@ if ($actionId === SP\Controller\ActionsInterface::ACTION_CFG_GENERAL $mailServer = SP\Request::analyze('mail_server'); $mailPort = SP\Request::analyze('mail_port', 25); $mailUser = SP\Request::analyze('mail_user'); - $mailPass = SP\Request::analyze('mail_pass', '', false, false, false); + $mailPass = SP\Request::analyzeEncrypted('mail_pass'); $mailSecurity = SP\Request::analyze('mail_security'); $mailFrom = SP\Request::analyze('mail_from'); $mailRequests = SP\Request::analyze('mail_requestsenabled', false, false, true); @@ -220,9 +220,9 @@ if ($actionId === SP\Controller\ActionsInterface::ACTION_CFG_GENERAL SP\Common::printJSON(_('Configuración actualizada'), 0, $doActionOnClose); } elseif ($actionId === SP\Controller\ActionsInterface::ACTION_CFG_ENCRYPTION) { - $currentMasterPass = SP\Request::analyze('curMasterPwd', '', false, false, false); - $newMasterPass = SP\Request::analyze('newMasterPwd', '', false, false, false); - $newMasterPassR = SP\Request::analyze('newMasterPwdR', '', false, false, false); + $currentMasterPass = SP\Request::analyzeEncrypted('curMasterPwd'); + $newMasterPass = SP\Request::analyzeEncrypted('newMasterPwd'); + $newMasterPassR = SP\Request::analyzeEncrypted('newMasterPwdR'); $confirmPassChange = SP\Request::analyze('confirmPassChange', 0, false, 1); $noAccountPassChange = SP\Request::analyze('chkNoAccountChange', 0, false, 1); @@ -234,36 +234,26 @@ if ($actionId === SP\Controller\ActionsInterface::ACTION_CFG_GENERAL SP\Common::printJSON(_('Se ha de confirmar el cambio de clave')); } - try { - // Desencriptar con la clave RSA - $CryptPKI = new \SP\CryptPKI(); - $clearCurMasterPass = $CryptPKI->decryptRSA(base64_decode($currentMasterPass)); - $clearNewMasterPass = $CryptPKI->decryptRSA(base64_decode($newMasterPass)); - $clearNewMasterPassR = $CryptPKI->decryptRSA(base64_decode($newMasterPassR)); - } catch (Exception $e) { - SP\Common::printJSON(_('Error en clave RSA')); - } - - if ($clearNewMasterPass == $clearCurMasterPass) { + if ($newMasterPass == $currentMasterPass) { SP\Common::printJSON(_('Las claves son idénticas')); - } elseif ($clearNewMasterPass != $clearNewMasterPassR) { + } elseif ($newMasterPass != $newMasterPassR) { SP\Common::printJSON(_('Las claves maestras no coinciden')); - } elseif (!SP\Crypt::checkHashPass($clearCurMasterPass, SP\Config::getConfigDbValue('masterPwd'))) { + } elseif (!SP\Crypt::checkHashPass($currentMasterPass, SP\Config::getConfigDbValue('masterPwd'), true)) { SP\Common::printJSON(_('La clave maestra actual no coincide')); } - $hashMPass = SP\Crypt::mkHashPassword($clearNewMasterPass); + $hashMPass = SP\Crypt::mkHashPassword($newMasterPass); if (!$noAccountPassChange) { $Account = new SP\Account(); - if (!$Account->updateAccountsMasterPass($clearCurMasterPass, $clearNewMasterPass)) { + if (!$Account->updateAccountsMasterPass($currentMasterPass, $newMasterPass)) { SP\Common::printJSON(_('Errores al actualizar las claves de las cuentas')); } $AccountHistory = new SP\AccountHistory(); - if (!$AccountHistory->updateAccountsMasterPass($clearCurMasterPass, $clearNewMasterPass, $hashMPass)) { + if (!$AccountHistory->updateAccountsMasterPass($currentMasterPass, $newMasterPass, $hashMPass)) { SP\Common::printJSON(_('Errores al actualizar las claves de las cuentas del histórico')); } } diff --git a/ajax/ajax_doLogin.php b/ajax/ajax_doLogin.php index 808053e4..37419670 100644 --- a/ajax/ajax_doLogin.php +++ b/ajax/ajax_doLogin.php @@ -39,25 +39,18 @@ if (!SP\Request::analyze('login', false)) { } $userLogin = SP\Request::analyze('user'); -$userPass = SP\Request::analyze('pass', '', false, false, false); -$masterPass = SP\Request::analyze('mpass'); +$userPass = SP\Request::analyzeEncrypted('pass'); +$masterPass = SP\Request::analyzeEncrypted('mpass'); if (!$userLogin || !$userPass) { SP\Common::printJSON(_('Usuario/Clave no introducidos')); } -try { - $CryptPKI = new \SP\CryptPKI(); - $clearUserPass = $CryptPKI->decryptRSA(base64_decode($userPass)); -} catch (Exception $e) { - SP\Common::printJSON(_('Error en clave RSA')); -} - $User = new SP\User(); $User->setUserLogin($userLogin); -$User->setUserPass($clearUserPass); +$User->setUserPass($userPass); -if ($resLdap = SP\Auth::authUserLDAP($userLogin, $clearUserPass)) { +if ($resLdap = SP\Auth::authUserLDAP($userLogin, $userPass)) { $User->setUserName(SP\Auth::$userName); $User->setUserEmail(SP\Auth::$userEmail); } @@ -113,7 +106,7 @@ if ($resLdap === true) { $Log->addDescription('(MySQL)'); // Autentificamos con la BBDD - if (!SP\Auth::authUserMySQL($userLogin, $clearUserPass)) { + if (!SP\Auth::authUserMySQL($userLogin, $userPass)) { $Log->addDescription(_('Login incorrecto')); $Log->addDescription(_('Usuario') . ": " . $userLogin); $Log->writeLog(); @@ -145,13 +138,11 @@ if (!$masterPass ) { SP\Common::printJSON(_('La clave maestra no ha sido guardada o es incorrecta'), 3); } elseif ($masterPass) { - $clearMasterPass = $CryptPKI->decryptRSA(base64_decode($masterPass)); - - if (SP\Config::checkTempMasterPass($clearMasterPass)) { - $clearMasterPass = SP\Config::getTempMasterPass($clearMasterPass); + if (SP\Config::checkTempMasterPass($masterPass)) { + $masterPass = SP\Config::getTempMasterPass($masterPass); } - if (!$User->updateUserMPass($clearMasterPass)) { + if (!$User->updateUserMPass($masterPass)) { $Log->addDescription(_('Clave maestra incorrecta')); $Log->writeLog(); diff --git a/ajax/ajax_import.php b/ajax/ajax_import.php index 942573b8..bfdff9f7 100644 --- a/ajax/ajax_import.php +++ b/ajax/ajax_import.php @@ -42,23 +42,16 @@ if (SP\Util::demoIsEnabled()) { $sk = SP\Request::analyze('sk', false); $defaultUser= SP\Request::analyze('defUser', 0); $defaultGroup = SP\Request::analyze('defGroup', 0); -$importPwd = SP\Request::analyze('importPwd', '', false, false, false); +$importPwd = SP\Request::analyzeEncrypted('importPwd'); $csvDelimiter = SP\Request::analyze('csvDelimiter'); if (!$sk || !SP\Common::checkSessionKey($sk)) { SP\Common::printJSON(_('CONSULTA INVÁLIDA')); } -try { - $CryptPKI = new \SP\CryptPKI(); - $clearImportPwd = $CryptPKI->decryptRSA(base64_decode($importPwd)); -} catch (Exception $e) { - SP\Common::printJSON(_('Error en clave RSA')); -} - SP\Import::setDefUser($defaultUser); SP\Import::setDefGroup($defaultGroup); -SP\Import::setImportPwd($clearImportPwd); +SP\Import::setImportPwd($importPwd); SP\Import::setCsvDelimiter($csvDelimiter); $res = SP\Import::doImport($_FILES["inFile"]); diff --git a/ajax/ajax_migrate.php b/ajax/ajax_migrate.php index 76c1c2e3..d3bfe1b8 100644 --- a/ajax/ajax_migrate.php +++ b/ajax/ajax_migrate.php @@ -46,7 +46,7 @@ if (!$sk || !SP\Common::checkSessionKey($sk)) { } $frmDBUser = SP\Request::analyze('dbuser'); -$frmDBPass = SP\Request::analyze('dbpass'); +$frmDBPass = SP\Request::analyzeEncrypted('dbpass'); $frmDBName = SP\Request::analyze('dbname'); $frmDBHost = SP\Request::analyze('dbhost'); $frmMigrateEnabled = SP\Request::analyze('chkmigrate', 0, false, 1); diff --git a/ajax/ajax_passReset.php b/ajax/ajax_passReset.php index 29b32bd0..9280df6c 100644 --- a/ajax/ajax_passReset.php +++ b/ajax/ajax_passReset.php @@ -39,8 +39,8 @@ if (!$sk || !SP\Common::checkSessionKey($sk)) { $userLogin = SP\Request::analyze('login'); $userEmail = SP\Request::analyze('email'); -$userPass = SP\Request::analyze('pass'); -$userPassV = SP\Request::analyze('passv'); +$userPass = SP\Request::analyzeEncrypted('pass'); +$userPassR = SP\Request::analyzeEncrypted('passR'); $hash = SP\Request::analyze('hash'); $time = SP\Request::analyze('time'); @@ -64,7 +64,7 @@ if ($userLogin && $userEmail) { SP\Email::sendEmail($log); } -if ($userPass && $userPassV && $userPass === $userPassV) { +if ($userPass && $userPassR && $userPass === $userPassR) { $userId = UserUtil::checkHashPassRecover($hash); if ($userId) { diff --git a/inc/Auth.class.php b/inc/Auth.class.php index fa32e5bd..68245390 100644 --- a/inc/Auth.class.php +++ b/inc/Auth.class.php @@ -155,17 +155,16 @@ class Auth } } - $query = 'SELECT user_login, user_pass ' + $query = 'SELECT user_login, user_pass, user_hashSalt ' . 'FROM usrData ' - . 'WHERE user_login = :login AND user_isMigrate = 0 ' - . 'AND user_pass = SHA1(CONCAT(user_hashSalt, :pass)) LIMIT 1'; + . 'WHERE user_login = :login AND user_isMigrate = 0 LIMIT 1'; $data['login'] = $userLogin; - $data['pass'] = $userPass; - $ret = (DB::getQuery($query, __FUNCTION__, $data) === true && DB::$lastNumRows === 1); + $queryRes = DB::getResults($query, __FUNCTION__, $data); - return $ret; + return ($queryRes !== false + && $queryRes->user_pass == crypt($userPass, $queryRes->user_hashSalt)); } /** @@ -203,7 +202,6 @@ class Auth /** * Comprobar el token de seguridad * - * @param $userId int El id del usuario * @param $actionId int El id de la accion * @param $token string El token de seguridad * @return bool diff --git a/inc/Config.class.php b/inc/Config.class.php index 000843c3..15364928 100644 --- a/inc/Config.class.php +++ b/inc/Config.class.php @@ -357,8 +357,8 @@ class Config public static function setTempMasterPass($maxTime = 14400) { // Encriptar la clave maestra con hash aleatorio generado - $randomHash = Util::generate_random_bytes(32); - $pass = Crypt::mkCustomMPassEncrypt($randomHash, Crypt::getSessionMasterPass()); + $randomKey = Crypt::generateAesKey(Util::generate_random_bytes()); + $pass = Crypt::mkCustomMPassEncrypt($randomKey, Crypt::getSessionMasterPass()); if (!is_array($pass)) { return false; @@ -366,19 +366,19 @@ class Config self::setConfigDbValue('tempmaster_pass', bin2hex($pass[0]), false); self::setConfigDbValue('tempmaster_passiv', bin2hex($pass[1]), false); - self::setConfigDbValue('tempmaster_passhash', sha1($randomHash), false); + self::setConfigDbValue('tempmaster_passhash', Crypt::mkHashPassword($randomKey), false); self::setConfigDbValue('tempmaster_passtime', time(), false); self::setConfigDbValue('tempmaster_maxtime', time() + $maxTime, false); self::setConfigDbValue('tempmaster_attempts', 0, false); - return $randomHash; + return $randomKey; } /** * Guardar un parámetro de configuración en la BBDD. * * @param string $param con el parámetro a guardar - * @param string $value con el calor a guardar + * @param string $value con el valor a guardar * @param bool $email enviar email? * @return bool */ @@ -431,7 +431,10 @@ class Config return false; } - $isValid = (self::getConfigDbValue('tempmaster_passhash') == sha1($pass)); + Crypt::checkHashPass($pass, self::getConfigDbValue('tempmaster_passhash')); + +// $isValid = (self::getConfigDbValue('tempmaster_passhash') == sha1($pass)); + $isValid = Crypt::checkHashPass($pass, self::getConfigDbValue('tempmaster_passhash')); if (!$isValid) { self::setConfigDbValue('tempmaster_attempts', $attempts + 1, false); diff --git a/inc/Crypt.class.php b/inc/Crypt.class.php index 2bd553d5..f722c63f 100644 --- a/inc/Crypt.class.php +++ b/inc/Crypt.class.php @@ -28,59 +28,25 @@ namespace SP; defined('APP_ROOT') || die(_('No es posible acceder directamente a este archivo')); /** - * Esta clase es la encargada de realizar el encriptad/desencriptado de claves + * Esta clase es la encargada de realizar el encriptado/desencriptado de claves */ class Crypt { public static $strInitialVector; - /** - * Comprobar si el módulo de encriptación está disponible. - * - * @return bool - */ - public static function checkCryptModule() - { - return mcrypt_module_self_test(MCRYPT_RIJNDAEL_256); - } - /** * Generar un hash de una clave utilizando un salt. * * @param string $pwd con la clave a 'hashear' + * @param bool $appendSalt Añidor el salt al hash * @return string con el hash de la clave */ - public static function mkHashPassword($pwd) + public static function mkHashPassword($pwd, $appendSalt = true) { - $salt = bin2hex(self::getIV()); // Obtenemos 256 bits aleatorios en hexadecimal - $hash = hash("sha256", $salt . $pwd); // Añadimos el salt a la clave y rehacemos el hash - $hashPwd = $salt . $hash; - return $hashPwd; - } + $salt = self::makeHashSalt(); + $hash = crypt($pwd, $salt); - /** - * Comprobar el hash de una clave. - * - * @param string $pwd con la clave a comprobar - * @param string $correctHash con el hash a comprobar - * @return bool - */ - public static function checkHashPass($pwd, $correctHash) - { - // Obtenemos el salt de la clave - $salt = substr($correctHash, 0, 64); - // Obtenemos el hash SHA256 - $validHash = substr($correctHash, 64, 64); - - // Re-hash de la clave a comprobar - $testHash = hash("sha256", $salt . $pwd); - - // Si los hashes son idénticos, la clave es válida - if ($testHash === $validHash) { - return true; - } - - return false; + return ($appendSalt === true) ? $salt . $hash : $hash; } /** @@ -90,59 +56,9 @@ class Crypt */ public static function makeHashSalt() { - return self::getIV(); - } + $salt = '$2y$07$' . bin2hex(self::getIV()) . '$'; - /** - * Generar datos encriptados. - * Esta función llama a los métodos privados para encriptar datos. - * - * @param string $data con los datos a encriptar - * @param string $masterPwd con la clave maestra - * @return bool - */ - public static function mkEncrypt($data, $masterPwd = "") - { - $masterPwd = (!$masterPwd) ? self::getSessionMasterPass() : $masterPwd; - - self::$strInitialVector = self::getIV(); - $cryptValue = self::encrypt($data, $masterPwd, self::$strInitialVector); - - return $cryptValue; - } - - /** - * Desencriptar la clave maestra de la sesión. - * - * @return string con la clave maestra - */ - public static function getSessionMasterPass() - { - return self::getDecrypt(Session::getMPass(), Session::getMPassIV(), Session::getMPassPwd()); - } - - /** - * Desencriptar datos con la clave maestra. - * - * @param string $strEncrypted Los datos a desencriptar - * @param string $cryptIV con el IV - * @param string $strPassword La clave maestra - * @return string con los datos desencriptados - */ - public static function getDecrypt($strEncrypted, $cryptIV, $strPassword = null) - { - if (is_null($strPassword)){ - $strPassword = self::getSessionMasterPass(); - } - - $mcryptRes = self::getMcryptResource(); - mcrypt_generic_init($mcryptRes, $strPassword, $cryptIV); - $strDecrypted = trim(mdecrypt_generic($mcryptRes, $strEncrypted)); - - mcrypt_generic_deinit($mcryptRes); - mcrypt_module_close($mcryptRes); - - return $strDecrypted; + return $salt; } /** @@ -170,22 +86,43 @@ class Crypt } /** - * Encriptar datos con la clave maestra. + * Método para obtener un recurso del módulo mcrypt. + * Se utiliza el algoritmo RIJNDAEL_256 en modo CBC * - * @param string $strValue con los datos a encriptar - * @param string $strPassword con la clave maestra - * @param string $cryptIV con el IV - * @return string con los datos encriptados + * @return resource */ - private static function encrypt($strValue, $strPassword, $cryptIV) + private static function getMcryptResource() { - $mcryptRes = self::getMcryptResource(); + return mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, ''); + } - mcrypt_generic_init($mcryptRes, $strPassword, $cryptIV); - $strEncrypted = mcrypt_generic($mcryptRes, $strValue); - mcrypt_generic_deinit($mcryptRes); + /** + * Comprobar el hash de una clave. + * + * @param string $pwd con la clave a comprobar + * @param string $originalHash con el hash a comprobar + * @param bool $isMPass si es la clave maestra + * @return bool + */ + public static function checkHashPass($pwd, $originalHash, $isMPass = false) + { + // Obtenemos el salt de la clave + $salt = substr($originalHash, 0, 72); + // Obtenemos el hash SHA256 + $validHash = substr($originalHash, 72); + // Re-hash de la clave a comprobar + $testHash = crypt($pwd, $salt); - return $strEncrypted; + // Comprobar si el hash está en formato anterior a 12002 + if ($isMPass && strlen($originalHash) === 128) { + Config::setConfigDbValue('masterPwd', self::mkHashPassword($pwd)); + Log::writeNewLog(_('Aviso'), _('Se ha regenerado el HASH de clave maestra. No es necesaria ninguna acción.')); + + return (hash("sha256", substr($originalHash, 0, 64) . $pwd) == substr($originalHash, 64, 64)); + } + + // Si los hashes son idénticos, la clave es válida + return $testHash == $validHash; } /** @@ -205,14 +142,22 @@ class Crypt } /** - * Método para obtener un recurso del módulo mcrypt. - * Se utiliza el algoritmo RIJNDAEL_256 en modo CBC + * Encriptar datos con la clave maestra. * - * @return resource + * @param string $strValue con los datos a encriptar + * @param string $strPassword con la clave maestra + * @param string $cryptIV con el IV + * @return string con los datos encriptados */ - private static function getMcryptResource() + private static function encrypt($strValue, $strPassword, $cryptIV) { - return mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, ''); + $mcryptRes = self::getMcryptResource(); + + mcrypt_generic_init($mcryptRes, $strPassword, $cryptIV); + $strEncrypted = mcrypt_generic($mcryptRes, $strValue); + mcrypt_generic_deinit($mcryptRes); + + return $strEncrypted; } /** @@ -252,4 +197,90 @@ class Crypt return $encData; } + + /** + * Comprobar si el módulo de encriptación está disponible. + * + * @return bool + */ + public static function checkCryptModule() + { + return mcrypt_module_self_test(MCRYPT_RIJNDAEL_256); + } + + /** + * Generar datos encriptados. + * Esta función llama a los métodos privados para encriptar datos. + * + * @param string $data con los datos a encriptar + * @param string $masterPwd con la clave maestra + * @return bool + */ + public static function mkEncrypt($data, $masterPwd = "") + { + $masterPwd = (!$masterPwd) ? self::getSessionMasterPass() : $masterPwd; + + self::$strInitialVector = self::getIV(); + $cryptValue = self::encrypt($data, $masterPwd, self::$strInitialVector); + + return $cryptValue; + } + + /** + * Desencriptar la clave maestra de la sesión. + * + * @return string con la clave maestra + */ + public static function getSessionMasterPass() + { + return self::getDecrypt(Session::getMPass(), Session::getMPassIV(), Session::getMPassPwd()); + } + + /** + * Desencriptar datos con la clave maestra. + * + * @param string $strEncrypted Los datos a desencriptar + * @param string $cryptIV con el IV + * @param string $strPassword La clave maestra + * @return string con los datos desencriptados + */ + public static function getDecrypt($strEncrypted, $cryptIV, $strPassword = null) + { + if (is_null($strPassword)) { + $strPassword = self::getSessionMasterPass(); + } + + $mcryptRes = self::getMcryptResource(); + mcrypt_generic_init($mcryptRes, $strPassword, $cryptIV); + $strDecrypted = trim(mdecrypt_generic($mcryptRes, $strEncrypted)); + + mcrypt_generic_deinit($mcryptRes); + mcrypt_module_close($mcryptRes); + + return $strDecrypted; + } + + /** + * Generar una key para su uso con el algoritmo AES + * + * @param string $string La cadena de la que deriva la key + * @param null $salt El salt utilizado + * @return string + */ + public static function generateAesKey($string, $salt = null) + { + if (is_null($salt)) { + $salt = Config::getValue('passwordsalt'); + } + + $salt = '$2y$07$' . $salt . '$'; + $key = substr(crypt($string, $salt), 7, 32); + + return $key; + } + + public static function checkPassword($pwd, $salt) + { + $testHash = crypt($pwd, $salt); + } } \ No newline at end of file diff --git a/inc/CustomFields.class.php b/inc/CustomFields.class.php index 3d783db3..11913209 100644 --- a/inc/CustomFields.class.php +++ b/inc/CustomFields.class.php @@ -121,26 +121,73 @@ class CustomFields extends CustomFieldsBase public static function getCustomFieldsData($moduleId, $itemId) { $query = 'SELECT customfielddata_id, ' . - 'customfielddata_defId, ' . 'customfielddef_id, ' . 'customfielddata_data, ' . 'customfielddata_iv, ' . 'customfielddef_field ' . 'FROM customFieldsData ' . - 'RIGHT JOIN customFieldsDef ON customfielddata_defId = customfielddef_id ' . - 'WHERE customfielddef_module = :moduleidA ' . + 'JOIN customFieldsDef ON customfielddata_defId = customfielddef_id ' . + 'WHERE customfielddef_module = :moduleid ' . 'AND customfielddata_itemId = :itemid ' . - 'UNION ' . - 'SELECT customfielddata_id, ' . - 'customfielddata_defId, ' . - 'customfielddef_id, ' . - 'customfielddata_data, ' . - 'customfielddata_iv, ' . - 'customfielddef_field ' . + 'ORDER BY customfielddef_id'; + + $data['moduleid'] = $moduleId; + $data['itemid'] = $itemId; + + DB::setReturnArray(); + + $queryRes = DB::getResults($query, __FUNCTION__, $data); + + if ($queryRes === false) { + return array(); + } + + $queryMerge = array_merge($queryRes, self::getCustomFieldsNoData($moduleId, $itemId)); + + $customFields = array(); + + foreach ($queryMerge as $customField) { + /** + * @var CustomFieldDef + */ + $field = unserialize($customField->customfielddef_field); + + $attribs = new \stdClass(); + $attribs->id = $customField->customfielddef_id; + $attribs->name = 'cf_' . strtolower(self::cleanFieldName($field->getName())); + $attribs->text = $field->getName(); + $attribs->type = $field->getType(); + $attribs->typeName = self::getFieldsTypes($field->getType()); + $attribs->value = (isset($customField->customfielddata_data)) ? self::formatValue(Crypt::getDecrypt($customField->customfielddata_data, $customField->customfielddata_iv)) : ''; + $attribs->help = $field->getHelp(); + $attribs->required = $field->isRequired(); + + $customFields[] = $attribs; + } + + return $customFields; + } + + /** + * Devuelve los campos personalizados sin datos de un elemento + * + * @param $moduleId int El id del módulo + * @param $itemId int EL id del elemento + * @return array + */ + private static function getCustomFieldsNoData($moduleId, $itemId) + { + $query = 'SELECT customfielddef_field,' . + 'customfielddef_id ' . + 'FROM customFieldsDef ' . + 'WHERE customfielddef_module = :moduleidA ' . + 'AND customfielddef_id NOT IN ' . + '(SELECT customfielddef_id ' . 'FROM customFieldsData ' . - 'RIGHT JOIN customFieldsDef ON customfielddata_defId = customfielddef_id ' . + 'JOIN customFieldsDef ON customfielddata_defId = customfielddef_id ' . 'WHERE customfielddef_module = :moduleidB ' . - 'AND ISNULL(customfielddata_itemId)'; + 'AND customfielddata_itemId = :itemid) ' . + 'ORDER BY customfielddef_id'; $data['moduleidA'] = $moduleId; $data['moduleidB'] = $moduleId; @@ -154,28 +201,7 @@ class CustomFields extends CustomFieldsBase return array(); } - $customFields = array(); - - foreach ($queryRes as $customField) { - /** - * @var CustomFieldDef - */ - $field = unserialize($customField->customfielddef_field); - - $attribs = new \stdClass(); - $attribs->id = $customField->customfielddef_id; - $attribs->name = 'cf_' . strtolower(self::cleanFieldName($field->getName())); - $attribs->text = $field->getName(); - $attribs->type = $field->getType(); - $attribs->typeName = self::getFieldsTypes($field->getType()); - $attribs->value = (!is_null($customField->customfielddata_data)) ? self::formatValue(Crypt::getDecrypt($customField->customfielddata_data, $customField->customfielddata_iv)) : ''; - $attribs->help = $field->getHelp(); - $attribs->required = $field->isRequired(); - - $customFields[] = $attribs; - } - - return $customFields; + return $queryRes; } /** @@ -214,25 +240,6 @@ class CustomFields extends CustomFieldsBase return $queryRes; } - /** - * Eliminar los datos de un campo personalizado o los de una definición de campos - * - * @param int $itemId El Id del elemento asociado al campo - * @return bool - */ - public static function deleteCustomFieldForItem($itemId, $moduleId) - { - $query = 'DELETE FROM customFieldsData ' . - 'WHERE customfielddata_itemId = :itemid ' . - 'AND customfielddata_moduleId = :moduleid LIMIT 1'; - $data['itemid'] = $itemId; - $data['moduleid'] = $moduleId; - - $queryRes = DB::getQuery($query, __FUNCTION__, $data); - - return $queryRes; - } - /** * Eliminar los datos de un campo personalizado o los de una definición de campos * @@ -277,7 +284,7 @@ class CustomFields extends CustomFieldsBase return $this->addCustomField(); } - if (empty($this->_value)){ + if (empty($this->_value)) { return self::deleteCustomFieldForItem($this->_itemId, $this->_module); } @@ -337,7 +344,7 @@ class CustomFields extends CustomFieldsBase */ public function addCustomField() { - if (empty($this->_value)){ + if (empty($this->_value)) { return true; } @@ -361,6 +368,25 @@ class CustomFields extends CustomFieldsBase return $queryRes; } + /** + * Eliminar los datos de un campo personalizado o los de una definición de campos + * + * @param int $itemId El Id del elemento asociado al campo + * @return bool + */ + public static function deleteCustomFieldForItem($itemId, $moduleId) + { + $query = 'DELETE FROM customFieldsData ' . + 'WHERE customfielddata_itemId = :itemid ' . + 'AND customfielddata_moduleId = :moduleid LIMIT 1'; + $data['itemid'] = $itemId; + $data['moduleid'] = $moduleId; + + $queryRes = DB::getQuery($query, __FUNCTION__, $data); + + return $queryRes; + } + /** * @return string */ diff --git a/inc/Request.class.php b/inc/Request.class.php index 5195c22a..3ce2c1fc 100644 --- a/inc/Request.class.php +++ b/inc/Request.class.php @@ -25,7 +25,6 @@ namespace SP; - /** * Clase Request para la gestión de peticiones HTTP * @@ -112,4 +111,25 @@ class Request exit(); } } + + /** + * Analizar un valor encriptado y devolverlo desencriptado + * + * @param $param + * @return string + */ + public static function analyzeEncrypted($param) + { + $encryptedData = self::analyze($param, '', false, false, false); + + if ($encryptedData === ''){ + return ''; + } + + // Desencriptar con la clave RSA + $CryptPKI = new CryptPKI(); + $clearData = $CryptPKI->decryptRSA(base64_decode($encryptedData)); + + return $clearData; + } } \ No newline at end of file diff --git a/inc/Template.class.php b/inc/Template.class.php index 7e62e62b..d8adb4f6 100644 --- a/inc/Template.class.php +++ b/inc/Template.class.php @@ -86,7 +86,7 @@ class Template $template = VIEW_PATH . DIRECTORY_SEPARATOR . Init::$THEME . DIRECTORY_SEPARATOR . $file . '.inc'; if (!is_readable($template)) { - throw new InvalidArgumentException('No es posible obtener la plantilla "' . $file . '"'); + throw new InvalidArgumentException(sprintf(_('No es posible obtener la plantilla "%s" : %s'), $file, $template)); } $this->setTemplate($template); @@ -125,7 +125,7 @@ class Template public function __get($name) { if (!array_key_exists($name, $this->_vars)) { - throw new InvalidArgumentException('No es posible obtener la variable "' . $name . '"'); + throw new InvalidArgumentException(sprintf(_('No es posible obtener la variable "%s"'), $name)); } return $this->_vars[$name]; @@ -168,7 +168,7 @@ class Template public function __unset($name) { if (!isset($this->_vars[$name])) { - throw new InvalidArgumentException('No es posible destruir la variable "' . $name . '"'); + throw new InvalidArgumentException(sprintf(_('No es posible destruir la variable "%s"'), $name)); } unset($this->_vars[$name]); @@ -208,8 +208,6 @@ class Template $name = $scope . '_' . $name; } -// error_log('SET: ' . $name . ' -> ' . $value); - $this->_vars[$name] = $value; } diff --git a/inc/Upgrade.class.php b/inc/Upgrade.class.php index b8fe2903..2c0f589a 100644 --- a/inc/Upgrade.class.php +++ b/inc/Upgrade.class.php @@ -33,7 +33,7 @@ defined('APP_ROOT') || die(_('No es posible acceder directamente a este archivo' */ class Upgrade { - private static $_dbUpgrade = array(110, 1121, 1122, 1123, 11213, 11219, 11220, 12001); + private static $_dbUpgrade = array(110, 1121, 1122, 1123, 11213, 11219, 11220, 12001, 12002); private static $_cfgUpgrade = array(1124); /** @@ -117,6 +117,12 @@ class Upgrade $queries[] = 'CREATE TABLE `customFieldsDef` (`customfielddef_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `customfielddef_module` smallint(5) unsigned NOT NULL, `customfielddef_field` blob NOT NULL, PRIMARY KEY (`customfielddef_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8;'; $queries[] = 'CREATE TABLE `customFieldsData` (`customfielddata_id` int(10) unsigned NOT NULL AUTO_INCREMENT,`customfielddata_moduleId` smallint(5) unsigned NOT NULL,`customfielddata_itemId` int(10) unsigned NOT NULL,`customfielddata_defId` int(10) unsigned NOT NULL,`customfielddata_data` longblob,`customfielddata_iv` varbinary(128) DEFAULT NULL, PRIMARY KEY (`customfielddata_id`), KEY `IDX_DEFID` (`customfielddata_defId`), KEY `IDX_DELETE` (`customfielddata_itemId`,`customfielddata_moduleId`), KEY `IDX_UPDATE` (`customfielddata_moduleId`,`customfielddata_itemId`,`customfielddata_defId`), KEY `IDX_ITEM` (`customfielddata_itemId`), KEY `IDX_MODULE` (`customfielddata_moduleId`)) ENGINE=InnoDB DEFAULT CHARSET=utf8;'; break; + case 12002: + $queries[] = 'ALTER TABLE config CHANGE config_value config_value VARCHAR(255);'; + $queries[] = 'ALTER TABLE usrData CHANGE user_pass user_pass VARBINARY(128);'; + $queries[] = 'ALTER TABLE usrData CHANGE user_hashSalt user_hashSalt VARBINARY(128);'; + $queries[] = 'ALTER TABLE accHistory CHANGE acchistory_mPassHash acchistory_mPassHash VARBINARY(255);'; + break; default : $log->addDescription(_('No es necesario actualizar la Base de Datos.')); return true; @@ -228,6 +234,9 @@ class Upgrade case 12001: return (Profile::migrateProfiles() && UserUtil::migrateUsersGroup()); break; + case 12002: + return (UserUtil::setMigrateUsers()); + break; default: break; } diff --git a/inc/User.class.php b/inc/User.class.php index 9696a613..83822695 100644 --- a/inc/User.class.php +++ b/inc/User.class.php @@ -48,7 +48,7 @@ class User extends UserBase return false; } - if (Crypt::checkHashPass($masterPwd, $configMPass)) { + if (Crypt::checkHashPass($masterPwd, $configMPass, true)) { $strUserMPwd = Crypt::mkCustomMPassEncrypt(self::getCypherPass($this->_userPass), $masterPwd); if (!$strUserMPwd) { @@ -78,10 +78,7 @@ class User extends UserBase */ private function getCypherPass() { - $configSalt = Config::getConfigDbValue('passwordsalt'); - $cypherPass = substr(sha1($configSalt . $this->_userPass), 0, 32); - - return $cypherPass; + return Crypt::generateAesKey($this->_userPass . $this->_userLogin); } /** diff --git a/inc/UserBase.class.php b/inc/UserBase.class.php index f00d34f7..0d399b7a 100644 --- a/inc/UserBase.class.php +++ b/inc/UserBase.class.php @@ -340,7 +340,7 @@ abstract class UserBase */ public function addUser() { - $passdata = UserUtil::makeUserPass($this->_userPass); + $passdata = UserUtil::makeUserPassHash($this->_userPass); $query = 'INSERT INTO usrData SET ' . 'user_name = :name,' @@ -545,7 +545,7 @@ abstract class UserBase */ public function updateUserPass() { - $passdata = UserUtil::makeUserPass($this->_userPass); + $passdata = UserUtil::makeUserPassHash($this->_userPass); $userLogin = UserUtil::getUserLoginById($this->_userId); $query = 'UPDATE usrData SET ' diff --git a/inc/UserLdap.class.php b/inc/UserLdap.class.php index 2ba56288..4654c55c 100644 --- a/inc/UserLdap.class.php +++ b/inc/UserLdap.class.php @@ -44,7 +44,7 @@ class UserLdap */ public static function newUserLDAP(User $User) { - $passdata = UserUtil::makeUserPass($User->getUserPass()); + $passdata = UserUtil::makeUserPassHash($User->getUserPass()); $groupId = Config::getValue('ldap_defaultgroup', 0); $profileId = Config::getValue('ldap_defaultprofile', 0); @@ -95,7 +95,7 @@ class UserLdap */ public static function updateLDAPUserInDB(User $User) { - $passdata = UserUtil::makeUserPass($User->getUserPass()); + $passdata = UserUtil::makeUserPassHash($User->getUserPass()); $query = 'UPDATE usrData SET ' . 'user_pass = :pass,' diff --git a/inc/UserUtil.class.php b/inc/UserUtil.class.php index aa3b6bdd..83551872 100644 --- a/inc/UserUtil.class.php +++ b/inc/UserUtil.class.php @@ -77,7 +77,7 @@ class UserUtil */ public static function migrateUser($userLogin, $userPass) { - $passdata = UserUtil::makeUserPass($userPass); + $passdata = UserUtil::makeUserPassHash($userPass); $query = 'UPDATE usrData SET ' . 'user_pass = :pass,' @@ -115,10 +115,10 @@ class UserUtil * @param string $userPass con la clave del usuario * @return array con la clave y salt del usuario */ - public static function makeUserPass($userPass) + public static function makeUserPassHash($userPass) { $salt = Crypt::makeHashSalt(); - $userPass = sha1($salt . $userPass); + $userPass = crypt($userPass, $salt); return array('salt' => $salt, 'pass' => $userPass); } @@ -505,16 +505,14 @@ class UserUtil return false; } - $configMPass = Config::getConfigDbValue('masterPwd'); + $configHashMPass = Config::getConfigDbValue('masterPwd'); - if ($configMPass === false) { + if ($configHashMPass === false) { return false; } // Comprobamos el hash de la clave del usuario con la guardada - $ret = Crypt::checkHashPass($userMPass, $configMPass); - - return $ret; + return Crypt::checkHashPass($userMPass, $configHashMPass, true); } /** @@ -641,7 +639,7 @@ class UserUtil */ public static function updateUserPass($userId, $userPass) { - $passdata = UserUtil::makeUserPass($userPass); + $passdata = UserUtil::makeUserPassHash($userPass); $userLogin = UserUtil::getUserLoginById($userId); $query = 'UPDATE usrData SET ' @@ -708,4 +706,14 @@ class UserUtil return true; } + + /** + * Establecer el campo isMigrate de cada usuario + */ + public static function setMigrateUsers() + { + $query = 'UPDATE usrData SET user_isMigrate = 1'; + + return DB::getQuery($query, __FUNCTION__); + } } \ No newline at end of file diff --git a/inc/Util.class.php b/inc/Util.class.php index 2647738d..e8df02f2 100644 --- a/inc/Util.class.php +++ b/inc/Util.class.php @@ -77,7 +77,6 @@ class Util */ public static function generate_random_bytes($length = 30) { - // Try to use openssl_random_pseudo_bytes if (function_exists('openssl_random_pseudo_bytes')) { $pseudo_byte = bin2hex(openssl_random_pseudo_bytes($length, $strong)); @@ -200,7 +199,7 @@ class Util */ public static function getVersionString() { - return '1.2-rc1'; + return '1.2-rc2'; } /** @@ -317,7 +316,7 @@ class Util */ public static function getVersion($retBuild = false) { - $build = '01'; + $build = '02'; $version = array(1, 2, 0); if ($retBuild) { diff --git a/inc/locales/de_DE/LC_MESSAGES/messages.mo b/inc/locales/de_DE/LC_MESSAGES/messages.mo index 144d5a7f..9a0893a7 100644 Binary files a/inc/locales/de_DE/LC_MESSAGES/messages.mo and b/inc/locales/de_DE/LC_MESSAGES/messages.mo differ diff --git a/inc/locales/de_DE/LC_MESSAGES/messages.po b/inc/locales/de_DE/LC_MESSAGES/messages.po index 64926d6d..f926c2d2 100644 --- a/inc/locales/de_DE/LC_MESSAGES/messages.po +++ b/inc/locales/de_DE/LC_MESSAGES/messages.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: sysPass\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-23 12:59+0100\n" -"PO-Revision-Date: 2015-09-23 12:59+0100\n" +"POT-Creation-Date: 2015-09-30 03:00+0100\n" +"PO-Revision-Date: 2015-09-30 03:01+0100\n" "Last-Translator: nuxsmin \n" "Language-Team: \n" "Language: de_DE\n" @@ -54,7 +54,7 @@ msgstr "Kontoname ist notwendig" #: ../../../../ajax/ajax_accountSave.php:77 #: ../../../../ajax/ajax_accountSave.php:88 -#: ../../../../ajax/ajax_appMgmtSave.php:337 +#: ../../../../ajax/ajax_appMgmtSave.php:328 msgid "Es necesario un nombre de cliente" msgstr "Kunde ist notwendig" @@ -80,63 +80,63 @@ msgid "Id inválido" msgstr "Ungültige ID" #: ../../../../ajax/ajax_accountSave.php:110 -#: ../../../../ajax/ajax_accountSave.php:263 -#: ../../../../ajax/ajax_appMgmtSave.php:543 -#: ../../../../ajax/ajax_configSave.php:297 +#: ../../../../ajax/ajax_accountSave.php:258 +#: ../../../../ajax/ajax_appMgmtSave.php:534 +#: ../../../../ajax/ajax_configSave.php:287 #: ../../../../ajax/ajax_userPrefsSave.php:79 ../../../../api.php:53 msgid "Acción Inválida" msgstr "Ungültige Aktion" -#: ../../../../ajax/ajax_accountSave.php:122 +#: ../../../../ajax/ajax_accountSave.php:117 #: ../../../../ajax/ajax_appMgmtSave.php:111 -#: ../../../../ajax/ajax_appMgmtSave.php:155 -#: ../../../../ajax/ajax_backup.php:70 +#: ../../../../ajax/ajax_appMgmtSave.php:148 +#: ../../../../ajax/ajax_backup.php:62 msgid "Las claves no coinciden" msgstr "Passwörter stimmen nicht" -#: ../../../../ajax/ajax_accountSave.php:173 +#: ../../../../ajax/ajax_accountSave.php:168 msgid "Cuenta creada" msgstr "Konto hinzugefügt" -#: ../../../../ajax/ajax_accountSave.php:176 +#: ../../../../ajax/ajax_accountSave.php:171 msgid "Error al crear la cuenta" msgstr "Fehler beim Anlegen des Kontos" -#: ../../../../ajax/ajax_accountSave.php:211 +#: ../../../../ajax/ajax_accountSave.php:206 msgid "Sin cambios" msgstr "Keine Änderungen" -#: ../../../../ajax/ajax_accountSave.php:223 +#: ../../../../ajax/ajax_accountSave.php:218 msgid "Cuenta actualizada" msgstr "Konto aktualisiert" -#: ../../../../ajax/ajax_accountSave.php:226 +#: ../../../../ajax/ajax_accountSave.php:221 msgid "Error al modificar la cuenta" msgstr "Fehler beim Änderns des Kontos" -#: ../../../../ajax/ajax_accountSave.php:233 +#: ../../../../ajax/ajax_accountSave.php:228 msgid "Cuenta eliminada" msgstr "Konto gelöscht" -#: ../../../../ajax/ajax_accountSave.php:236 +#: ../../../../ajax/ajax_accountSave.php:231 msgid "Error al eliminar la cuenta" msgstr "Fehler beim Löschen eines Kontos" -#: ../../../../ajax/ajax_accountSave.php:246 -#: ../../../../ajax/ajax_appMgmtSave.php:161 +#: ../../../../ajax/ajax_accountSave.php:241 +#: ../../../../ajax/ajax_appMgmtSave.php:152 #: ../../../../ajax/ajax_passReset.php:74 msgid "Clave actualizada" msgstr "Passwort aktualisiert" -#: ../../../../ajax/ajax_accountSave.php:249 +#: ../../../../ajax/ajax_accountSave.php:244 msgid "Error al actualizar la clave" msgstr "Fehler beim Ändern des Passworts" -#: ../../../../ajax/ajax_accountSave.php:256 +#: ../../../../ajax/ajax_accountSave.php:251 msgid "Cuenta restaurada" msgstr "Konto wiederhergestellt" -#: ../../../../ajax/ajax_accountSave.php:259 +#: ../../../../ajax/ajax_accountSave.php:254 msgid "Error al restaurar cuenta" msgstr "Fehler bei der Wiederherstellung der Rechnung" @@ -262,8 +262,8 @@ msgstr "E-Mail ist notwendig" #: ../../../../ajax/ajax_appMgmtSave.php:95 #: ../../../../ajax/ajax_appMgmtSave.php:144 -#: ../../../../ajax/ajax_appMgmtSave.php:168 -#: ../../../../ajax/ajax_configSave.php:272 +#: ../../../../ajax/ajax_appMgmtSave.php:159 +#: ../../../../ajax/ajax_configSave.php:262 #: ../../../../ajax/ajax_import.php:39 ../../../../ajax/ajax_migrate.php:39 #: ../../../../ajax/ajax_userPrefsSave.php:55 msgid "Ey, esto es una DEMO!!" @@ -299,49 +299,49 @@ msgstr "Benutzer aktualisiert" msgid "Error al actualizar el usuario" msgstr "Fehler beim Ändern des Benutzers" -#: ../../../../ajax/ajax_appMgmtSave.php:164 +#: ../../../../ajax/ajax_appMgmtSave.php:155 #: ../../../../ajax/ajax_passReset.php:78 msgid "Error al modificar la clave" msgstr "Fehler beim Ändern des Passworts" -#: ../../../../ajax/ajax_appMgmtSave.php:170 +#: ../../../../ajax/ajax_appMgmtSave.php:161 msgid "No es posible eliminar, usuario en uso" msgstr "Benutzer kann nicht gelöscht werden, wird noch benutzt" -#: ../../../../ajax/ajax_appMgmtSave.php:174 +#: ../../../../ajax/ajax_appMgmtSave.php:165 msgid "Usuario eliminado" msgstr "Benutzer gelöscht" -#: ../../../../ajax/ajax_appMgmtSave.php:177 +#: ../../../../ajax/ajax_appMgmtSave.php:168 msgid "Error al eliminar el usuario" msgstr "Fehler beim Löschen eines Benutzers" -#: ../../../../ajax/ajax_appMgmtSave.php:192 +#: ../../../../ajax/ajax_appMgmtSave.php:183 msgid "Es necesario un nombre de grupo" msgstr "Gruppename ist notwendig" -#: ../../../../ajax/ajax_appMgmtSave.php:200 +#: ../../../../ajax/ajax_appMgmtSave.php:191 msgid "Nombre de grupo duplicado" msgstr "Duplizierter Gruppenname" -#: ../../../../ajax/ajax_appMgmtSave.php:212 +#: ../../../../ajax/ajax_appMgmtSave.php:203 msgid "Grupo creado" msgstr "Gruppe hinzugefügt" -#: ../../../../ajax/ajax_appMgmtSave.php:214 +#: ../../../../ajax/ajax_appMgmtSave.php:205 msgid "Error al crear el grupo" msgstr "Fehler beim Anlegen des Kunden" -#: ../../../../ajax/ajax_appMgmtSave.php:225 +#: ../../../../ajax/ajax_appMgmtSave.php:216 msgid "Grupo actualizado" msgstr "Gruppe aktualisiert" -#: ../../../../ajax/ajax_appMgmtSave.php:228 +#: ../../../../ajax/ajax_appMgmtSave.php:219 msgid "Error al actualizar el grupo" msgstr "Fehler beim Ändern der Gruppe" -#: ../../../../ajax/ajax_appMgmtSave.php:237 -#: ../../../../ajax/ajax_appMgmtSave.php:314 +#: ../../../../ajax/ajax_appMgmtSave.php:228 +#: ../../../../ajax/ajax_appMgmtSave.php:305 #: ../../../../inc/CustomFieldsBase.class.php:83 #: ../../../../inc/themes/classic/account.inc:109 #: ../../../../inc/themes/classic/groups.inc:24 @@ -352,7 +352,7 @@ msgstr "Fehler beim Ändern der Gruppe" msgid "Usuarios" msgstr "Benutzer" -#: ../../../../ajax/ajax_appMgmtSave.php:241 +#: ../../../../ajax/ajax_appMgmtSave.php:232 #: ../../../../inc/Category.class.php:266 #: ../../../../inc/CustomFieldsBase.class.php:80 #: ../../../../inc/Customer.class.php:150 @@ -362,126 +362,126 @@ msgstr "Benutzer" msgid "Cuentas" msgstr "Konten" -#: ../../../../ajax/ajax_appMgmtSave.php:244 -#: ../../../../ajax/ajax_appMgmtSave.php:316 +#: ../../../../ajax/ajax_appMgmtSave.php:235 +#: ../../../../ajax/ajax_appMgmtSave.php:307 #: ../../../../inc/Category.class.php:119 #: ../../../../inc/Customer.class.php:150 msgid "No es posible eliminar" msgstr "Kann nicht gelöscht werden" -#: ../../../../ajax/ajax_appMgmtSave.php:244 +#: ../../../../ajax/ajax_appMgmtSave.php:235 msgid "Grupo en uso por:" msgstr "Gruppe in Benutzung durch:" -#: ../../../../ajax/ajax_appMgmtSave.php:249 +#: ../../../../ajax/ajax_appMgmtSave.php:240 msgid "Grupo eliminado" msgstr "Gruppe gelöscht" -#: ../../../../ajax/ajax_appMgmtSave.php:252 +#: ../../../../ajax/ajax_appMgmtSave.php:243 msgid "Error al eliminar el grupo" msgstr "Fehler beim Löschen einer Gruppe" -#: ../../../../ajax/ajax_appMgmtSave.php:291 +#: ../../../../ajax/ajax_appMgmtSave.php:282 msgid "Es necesario un nombre de perfil" msgstr "Profil ist notwendig" -#: ../../../../ajax/ajax_appMgmtSave.php:293 +#: ../../../../ajax/ajax_appMgmtSave.php:284 msgid "Nombre de perfil duplicado" msgstr "Duplizierter Profilname" -#: ../../../../ajax/ajax_appMgmtSave.php:298 +#: ../../../../ajax/ajax_appMgmtSave.php:289 msgid "Perfil creado" msgstr "Profil hinzugefügt" -#: ../../../../ajax/ajax_appMgmtSave.php:301 +#: ../../../../ajax/ajax_appMgmtSave.php:292 msgid "Error al crear el perfil" msgstr "Fehler beim Anlegen des Profils" -#: ../../../../ajax/ajax_appMgmtSave.php:304 +#: ../../../../ajax/ajax_appMgmtSave.php:295 msgid "Perfil actualizado" msgstr "Profil aktualisiert" -#: ../../../../ajax/ajax_appMgmtSave.php:307 +#: ../../../../ajax/ajax_appMgmtSave.php:298 msgid "Error al actualizar el perfil" msgstr "Fehler beim Ändern des Profils" -#: ../../../../ajax/ajax_appMgmtSave.php:316 +#: ../../../../ajax/ajax_appMgmtSave.php:307 msgid "Perfil en uso por:" msgstr "Profil wird benutzt durch: " -#: ../../../../ajax/ajax_appMgmtSave.php:319 +#: ../../../../ajax/ajax_appMgmtSave.php:310 msgid "Perfil eliminado" msgstr "Profil gelöscht" -#: ../../../../ajax/ajax_appMgmtSave.php:322 +#: ../../../../ajax/ajax_appMgmtSave.php:313 msgid "Error al eliminar el perfil" msgstr "Fehler beim Löschen eines Profils" -#: ../../../../ajax/ajax_appMgmtSave.php:357 +#: ../../../../ajax/ajax_appMgmtSave.php:348 msgid "Cliente creado" msgstr "Kunde hinzugefügt" -#: ../../../../ajax/ajax_appMgmtSave.php:372 +#: ../../../../ajax/ajax_appMgmtSave.php:363 msgid "Cliente actualizado" msgstr "Kunde aktualisiert" -#: ../../../../ajax/ajax_appMgmtSave.php:382 +#: ../../../../ajax/ajax_appMgmtSave.php:373 msgid "Cliente eliminado" msgstr "Kunde gelöscht" -#: ../../../../ajax/ajax_appMgmtSave.php:396 +#: ../../../../ajax/ajax_appMgmtSave.php:387 msgid "Es necesario un nombre de categoría" msgstr "Kategoriename ist notwendig" -#: ../../../../ajax/ajax_appMgmtSave.php:416 +#: ../../../../ajax/ajax_appMgmtSave.php:407 msgid "Categoría creada" msgstr "Kategorie hinzugefügt" -#: ../../../../ajax/ajax_appMgmtSave.php:431 +#: ../../../../ajax/ajax_appMgmtSave.php:422 msgid "Categoría actualizada" msgstr "Kategorie aktualisiert" -#: ../../../../ajax/ajax_appMgmtSave.php:442 +#: ../../../../ajax/ajax_appMgmtSave.php:433 msgid "Categoría eliminada" msgstr "Kategorie gelöscht" -#: ../../../../ajax/ajax_appMgmtSave.php:458 +#: ../../../../ajax/ajax_appMgmtSave.php:449 msgid "Usuario o acción no indicado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:468 +#: ../../../../ajax/ajax_appMgmtSave.php:459 msgid "Autorización creada" msgstr "Authentifizierung hinzugefügt" -#: ../../../../ajax/ajax_appMgmtSave.php:476 +#: ../../../../ajax/ajax_appMgmtSave.php:467 msgid "Autorización actualizada" msgstr "Authentifizierung aktualisiert" -#: ../../../../ajax/ajax_appMgmtSave.php:486 +#: ../../../../ajax/ajax_appMgmtSave.php:477 msgid "Autorización eliminada" msgstr "Authentifizierung gelöscht" -#: ../../../../ajax/ajax_appMgmtSave.php:503 +#: ../../../../ajax/ajax_appMgmtSave.php:494 msgid "Nombre del campo no indicado" msgstr "Feldname nicht gesetzt" -#: ../../../../ajax/ajax_appMgmtSave.php:505 +#: ../../../../ajax/ajax_appMgmtSave.php:496 msgid "Tipo del campo no indicado" msgstr "Feldtyp nicht gesetzt" -#: ../../../../ajax/ajax_appMgmtSave.php:507 +#: ../../../../ajax/ajax_appMgmtSave.php:498 msgid "Módulo del campo no indicado" msgstr "Feldmodul nicht gesetzt" -#: ../../../../ajax/ajax_appMgmtSave.php:521 +#: ../../../../ajax/ajax_appMgmtSave.php:512 msgid "Campo creado" msgstr "Feld hinzugefügt" -#: ../../../../ajax/ajax_appMgmtSave.php:530 +#: ../../../../ajax/ajax_appMgmtSave.php:521 msgid "Campo actualizado" msgstr "Feld aktualisiert" -#: ../../../../ajax/ajax_appMgmtSave.php:540 +#: ../../../../ajax/ajax_appMgmtSave.php:531 msgid "Campo eliminado" msgstr "Feld gelöscht" @@ -494,7 +494,7 @@ msgstr "Backup erstellen" msgid "Error al realizar el backup" msgstr "Fehler beim Ausführen des Backups" -#: ../../../../ajax/ajax_backup.php:54 ../../../../ajax/ajax_backup.php:76 +#: ../../../../ajax/ajax_backup.php:54 ../../../../ajax/ajax_backup.php:68 #: ../../../../ajax/ajax_checkLdap.php:57 ../../../../inc/Import.class.php:128 #: ../../../../inc/Migrate.class.php:93 msgid "Revise el registro de eventos para más detalles" @@ -508,30 +508,23 @@ msgstr "Sicherung der Applikation und der Datenbank erfolgreich durchgeführt" msgid "Proceso de backup finalizado" msgstr "Backup beendet" -#: ../../../../ajax/ajax_backup.php:66 -#: ../../../../ajax/ajax_configSave.php:244 -#: ../../../../ajax/ajax_doLogin.php:53 ../../../../ajax/ajax_import.php:56 -#, fuzzy -msgid "Error en clave RSA" -msgstr "Abfrage-Fehler" - -#: ../../../../ajax/ajax_backup.php:74 ../../../../ajax/ajax_backup.php:79 +#: ../../../../ajax/ajax_backup.php:66 ../../../../ajax/ajax_backup.php:71 msgid "Realizar Exportación" msgstr "Export ausführen" -#: ../../../../ajax/ajax_backup.php:74 +#: ../../../../ajax/ajax_backup.php:66 msgid "Error al realizar la exportación de cuentas" msgstr "Fehler beim exportieren der Accounts" -#: ../../../../ajax/ajax_backup.php:76 +#: ../../../../ajax/ajax_backup.php:68 msgid "Error al realizar la exportación" msgstr "Fehler beim exportieren" -#: ../../../../ajax/ajax_backup.php:79 +#: ../../../../ajax/ajax_backup.php:71 msgid "Exportación de cuentas realizada correctamente" msgstr "Export erfolgreich abgeschlossen" -#: ../../../../ajax/ajax_backup.php:81 +#: ../../../../ajax/ajax_backup.php:73 msgid "Proceso de exportación finalizado" msgstr "Export fertig" @@ -608,7 +601,7 @@ msgid "Configuración actualizada" msgstr "Konfiguration aktualisiert" #: ../../../../ajax/ajax_configSave.php:230 -#: ../../../../ajax/ajax_configSave.php:282 +#: ../../../../ajax/ajax_configSave.php:272 #: ../../../../ajax/ajax_viewpass.php:60 #: ../../../../inc/Controller.class.php:169 msgid "Clave maestra actualizada" @@ -628,40 +621,40 @@ msgstr "Master-Passwort notwendig" msgid "Se ha de confirmar el cambio de clave" msgstr "Passwort muss bestätigt werden" -#: ../../../../ajax/ajax_configSave.php:248 +#: ../../../../ajax/ajax_configSave.php:238 msgid "Las claves son idénticas" msgstr "Passwörter sind identisch" -#: ../../../../ajax/ajax_configSave.php:250 +#: ../../../../ajax/ajax_configSave.php:240 msgid "Las claves maestras no coinciden" msgstr "Master-Passwort stimmt nicht" -#: ../../../../ajax/ajax_configSave.php:252 +#: ../../../../ajax/ajax_configSave.php:242 msgid "La clave maestra actual no coincide" msgstr "Aktuelles Master-Passwort stimmt nicht" -#: ../../../../ajax/ajax_configSave.php:261 +#: ../../../../ajax/ajax_configSave.php:251 msgid "Errores al actualizar las claves de las cuentas" msgstr "Fehler beim Ändern der Passwörter eines Kontos" -#: ../../../../ajax/ajax_configSave.php:267 +#: ../../../../ajax/ajax_configSave.php:257 msgid "Errores al actualizar las claves de las cuentas del histórico" msgstr "" -#: ../../../../ajax/ajax_configSave.php:280 +#: ../../../../ajax/ajax_configSave.php:270 #: ../../../../inc/Account.class.php:497 msgid "Actualizar Clave Maestra" msgstr "Master-Passwort ändern" -#: ../../../../ajax/ajax_configSave.php:284 +#: ../../../../ajax/ajax_configSave.php:274 msgid "Error al guardar el hash de la clave maestra" msgstr "Fehler beim Speichern des Hash für das Master-Passwort" -#: ../../../../ajax/ajax_configSave.php:292 +#: ../../../../ajax/ajax_configSave.php:282 msgid "Generar Clave Temporal" msgstr "temporäres Passwort erstellen" -#: ../../../../ajax/ajax_configSave.php:292 +#: ../../../../ajax/ajax_configSave.php:282 #: ../../../../inc/themes/classic/account.inc:83 #: ../../../../inc/themes/classic/editpass.inc:25 #: ../../../../inc/themes/classic/install.inc:38 @@ -670,6 +663,7 @@ msgstr "temporäres Passwort erstellen" #: ../../../../inc/themes/classic/login.inc:22 #: ../../../../inc/themes/classic/mail.inc:55 #: ../../../../inc/themes/classic/passreset.inc:29 +#: ../../../../inc/themes/classic/passreset.inc:34 #: ../../../../inc/themes/classic/users.inc:75 #: ../../../../inc/themes/classic/userspass.inc:8 #: ../../../../inc/themes/classic/userspass.inc:11 @@ -679,13 +673,13 @@ msgstr "temporäres Passwort erstellen" #: ../../../../inc/themes/material-blue/editpass.inc:26 #: ../../../../inc/themes/material-blue/editpass.inc:31 #: ../../../../inc/themes/material-blue/editpass.inc:41 -#: ../../../../inc/themes/material-blue/install.inc:44 +#: ../../../../inc/themes/material-blue/install.inc:46 #: ../../../../inc/themes/material-blue/ldap.inc:105 #: ../../../../inc/themes/material-blue/login.inc:17 #: ../../../../inc/themes/material-blue/login.inc:40 #: ../../../../inc/themes/material-blue/mail.inc:73 #: ../../../../inc/themes/material-blue/mail.inc:80 -#: ../../../../inc/themes/material-blue/passreset.inc:31 +#: ../../../../inc/themes/material-blue/passreset.inc:30 #: ../../../../inc/themes/material-blue/users.inc:89 #: ../../../../inc/themes/material-blue/users.inc:96 #: ../../../../inc/themes/material-blue/userspass.inc:8 @@ -693,7 +687,7 @@ msgstr "temporäres Passwort erstellen" msgid "Clave" msgstr "Passwort" -#: ../../../../ajax/ajax_configSave.php:294 +#: ../../../../ajax/ajax_configSave.php:284 msgid "Clave Temporal Generada" msgstr "temporäres Passwort erstellt" @@ -701,43 +695,43 @@ msgstr "temporäres Passwort erstellt" msgid "Usuario/Clave no introducidos" msgstr "Keine Benutzername/Passwort eingegeben" -#: ../../../../ajax/ajax_doLogin.php:65 +#: ../../../../ajax/ajax_doLogin.php:58 msgid "Inicio sesión" msgstr "Anmelden" -#: ../../../../ajax/ajax_doLogin.php:70 +#: ../../../../ajax/ajax_doLogin.php:63 msgid "Servidor Login" msgstr "Anmeldeserver" -#: ../../../../ajax/ajax_doLogin.php:76 +#: ../../../../ajax/ajax_doLogin.php:69 msgid "Error al guardar los datos de LDAP" msgstr "Fehler beim Speichern der LDAP-Benutzerdaten" -#: ../../../../ajax/ajax_doLogin.php:79 ../../../../ajax/ajax_doLogin.php:87 -#: ../../../../ajax/ajax_doLogin.php:139 ../../../../ajax/ajax_doLogin.php:185 +#: ../../../../ajax/ajax_doLogin.php:72 ../../../../ajax/ajax_doLogin.php:80 +#: ../../../../ajax/ajax_doLogin.php:132 ../../../../ajax/ajax_doLogin.php:176 #: ../../../../inc/ApiTokens.class.php:140 #: ../../../../inc/ApiTokens.class.php:186 #: ../../../../inc/ApiTokens.class.php:217 #: ../../../../inc/ApiTokens.class.php:243 #: ../../../../inc/ApiTokens.class.php:262 #: ../../../../inc/ApiTokens.class.php:304 -#: ../../../../inc/ApiTokens.class.php:328 ../../../../inc/Crypt.class.php:235 -#: ../../../../inc/Crypt.class.php:246 +#: ../../../../inc/ApiTokens.class.php:328 ../../../../inc/Crypt.class.php:180 +#: ../../../../inc/Crypt.class.php:191 #: ../../../../inc/XmlImportBase.class.php:74 msgid "Error interno" msgstr "Interner Fehler" -#: ../../../../ajax/ajax_doLogin.php:84 +#: ../../../../ajax/ajax_doLogin.php:77 msgid "Error al actualizar la clave del usuario en la BBDD" msgstr "Fehler beim Ändern des Benutzer-Passworts in der BD" -#: ../../../../ajax/ajax_doLogin.php:92 ../../../../ajax/ajax_doLogin.php:117 +#: ../../../../ajax/ajax_doLogin.php:85 ../../../../ajax/ajax_doLogin.php:110 msgid "Login incorrecto" msgstr "Fehlerhafte Anmeldung" -#: ../../../../ajax/ajax_doLogin.php:93 ../../../../ajax/ajax_doLogin.php:100 -#: ../../../../ajax/ajax_doLogin.php:107 ../../../../ajax/ajax_doLogin.php:118 -#: ../../../../ajax/ajax_doLogin.php:128 ../../../../ajax/ajax_doLogin.php:180 +#: ../../../../ajax/ajax_doLogin.php:86 ../../../../ajax/ajax_doLogin.php:93 +#: ../../../../ajax/ajax_doLogin.php:100 ../../../../ajax/ajax_doLogin.php:111 +#: ../../../../ajax/ajax_doLogin.php:121 ../../../../ajax/ajax_doLogin.php:171 #: ../../../../inc/ApiTokens.class.php:190 #: ../../../../inc/ApiTokens.class.php:308 ../../../../inc/Auth.class.php:108 #: ../../../../inc/Init.class.php:517 ../../../../inc/UserBase.class.php:382 @@ -766,43 +760,43 @@ msgstr "Fehlerhafte Anmeldung" #: ../../../../inc/themes/material-blue/login.inc:33 #: ../../../../inc/themes/material-blue/mail.inc:61 #: ../../../../inc/themes/material-blue/mail.inc:67 -#: ../../../../inc/themes/material-blue/passreset.inc:17 +#: ../../../../inc/themes/material-blue/passreset.inc:16 #: ../../../../inc/themes/material-blue/request.inc:20 #: ../../../../inc/themes/material-blue/search.inc:55 #: ../../../../inc/themes/material-blue/tokens.inc:8 msgid "Usuario" msgstr "Benutzer" -#: ../../../../ajax/ajax_doLogin.php:96 ../../../../ajax/ajax_doLogin.php:110 -#: ../../../../ajax/ajax_doLogin.php:121 +#: ../../../../ajax/ajax_doLogin.php:89 ../../../../ajax/ajax_doLogin.php:103 +#: ../../../../ajax/ajax_doLogin.php:114 msgid "Usuario/Clave incorrectos" msgstr "Falscher/s Benutzername/Passwort" -#: ../../../../ajax/ajax_doLogin.php:99 ../../../../ajax/ajax_doLogin.php:103 +#: ../../../../ajax/ajax_doLogin.php:92 ../../../../ajax/ajax_doLogin.php:96 msgid "Cuenta expirada" msgstr "Konto abgelaufen" -#: ../../../../ajax/ajax_doLogin.php:106 +#: ../../../../ajax/ajax_doLogin.php:99 msgid "El usuario no tiene grupos asociados" msgstr "Der Benutzer hat keine zugewiesene Gruppe" -#: ../../../../ajax/ajax_doLogin.php:127 ../../../../ajax/ajax_doLogin.php:131 +#: ../../../../ajax/ajax_doLogin.php:120 ../../../../ajax/ajax_doLogin.php:124 msgid "Usuario deshabilitado" msgstr "Benutzer gespert" -#: ../../../../ajax/ajax_doLogin.php:136 +#: ../../../../ajax/ajax_doLogin.php:129 msgid "Error al obtener los datos del usuario de la BBDD" msgstr "Fehler beim Laden der Benutzerdaten aus der Datenbank" -#: ../../../../ajax/ajax_doLogin.php:146 +#: ../../../../ajax/ajax_doLogin.php:139 msgid "La clave maestra no ha sido guardada o es incorrecta" msgstr "Master-Passwort ist nicht sicher oder stimmt nicht" -#: ../../../../ajax/ajax_doLogin.php:155 ../../../../ajax/ajax_doLogin.php:158 +#: ../../../../ajax/ajax_doLogin.php:146 ../../../../ajax/ajax_doLogin.php:149 msgid "Clave maestra incorrecta" msgstr "Ungültiges Master-Passwort" -#: ../../../../ajax/ajax_doLogin.php:181 +#: ../../../../ajax/ajax_doLogin.php:172 #: ../../../../inc/ProfileBase.class.php:512 #: ../../../../inc/ProfileBase.class.php:550 #: ../../../../inc/ProfileBase.class.php:593 @@ -812,7 +806,7 @@ msgstr "Ungültiges Master-Passwort" msgid "Perfil" msgstr "Profil" -#: ../../../../ajax/ajax_doLogin.php:182 ../../../../inc/Groups.class.php:158 +#: ../../../../ajax/ajax_doLogin.php:173 ../../../../inc/Groups.class.php:158 #: ../../../../inc/Groups.class.php:259 ../../../../inc/Groups.class.php:375 #: ../../../../web/UsersMgmtC.class.php:90 #: ../../../../inc/themes/classic/ldap.inc:116 @@ -964,14 +958,14 @@ msgstr "" #: ../../../../ajax/ajax_passReset.php:72 #: ../../../../inc/UserBase.class.php:568 -#: ../../../../inc/UserUtil.class.php:664 +#: ../../../../inc/UserUtil.class.php:662 msgid "Modificar Clave Usuario" msgstr "Benutzer-Passwort ändern" #: ../../../../ajax/ajax_passReset.php:72 #: ../../../../inc/UserBase.class.php:568 #: ../../../../inc/UserBase.class.php:592 -#: ../../../../inc/UserUtil.class.php:664 +#: ../../../../inc/UserUtil.class.php:662 #: ../../../../web/UsersMgmtC.class.php:88 #: ../../../../inc/themes/classic/users.inc:21 #: ../../../../inc/themes/material-blue/users.inc:24 @@ -1099,7 +1093,7 @@ msgstr "" #: ../../../../inc/Log.class.php:28 ../../../../inc/Migrate.class.php:28 #: ../../../../inc/Profile.class.php:29 #: ../../../../inc/ProfileBase.class.php:28 -#: ../../../../inc/Request.class.php:111 ../../../../inc/Session.class.php:28 +#: ../../../../inc/Request.class.php:110 ../../../../inc/Session.class.php:28 #: ../../../../inc/SyspassImport.class.php:28 #: ../../../../inc/Upgrade.class.php:29 ../../../../inc/User.class.php:28 #: ../../../../inc/UserLdap.class.php:28 @@ -1401,7 +1395,7 @@ msgstr "" msgid "Usuario no pertenece al grupo" msgstr "" -#: ../../../../inc/Auth.class.php:187 +#: ../../../../inc/Auth.class.php:186 #: ../../../../inc/themes/classic/users.inc:117 #: ../../../../inc/themes/classic/userspass.inc:2 #: ../../../../inc/themes/material-blue/users.inc:161 @@ -1409,15 +1403,15 @@ msgstr "" msgid "Cambio de Clave" msgstr "Passwortänderung" -#: ../../../../inc/Auth.class.php:189 +#: ../../../../inc/Auth.class.php:188 msgid "Se ha solicitado el cambio de su clave de usuario." msgstr "Ein Anfrage zum Ändern ihres Benutzerpassworts wurde begonnen." -#: ../../../../inc/Auth.class.php:191 +#: ../../../../inc/Auth.class.php:190 msgid "Para completar el proceso es necesario que acceda a la siguiente URL:" msgstr "Zum Abschluss dieses Vorgangs, gehen Sie bitte zu der URL: " -#: ../../../../inc/Auth.class.php:195 +#: ../../../../inc/Auth.class.php:194 msgid "Si no ha solicitado esta acción, ignore este mensaje." msgstr "" "Wenn Sie diese Aktion nicht ausgelöst haben, dann ignorieren Sie bitte diese " @@ -1521,11 +1515,20 @@ msgstr "Sie haben keine Erlaubnis auf diese Seite zuzugreifen" msgid "No tiene permisos para realizar esta operación" msgstr "Sie haben keine Erlaubnis für diese Aktion" -#: ../../../../inc/Crypt.class.php:236 +#: ../../../../inc/Crypt.class.php:119 ../../../../inc/Email.class.php:146 +msgid "Aviso" +msgstr "Warnung" + +#: ../../../../inc/Crypt.class.php:119 +msgid "" +"Se ha regenerado el HASH de clave maestra. No es necesaria ninguna acción." +msgstr "" + +#: ../../../../inc/Crypt.class.php:181 msgid "No se puede usar el módulo de encriptación" msgstr "Kryptographie-Modul konnte nicht geladen werden" -#: ../../../../inc/Crypt.class.php:247 +#: ../../../../inc/Crypt.class.php:192 msgid "Error al generar datos cifrados" msgstr "Fehler beim Erzeugen der verschlüsselten Daten" @@ -1638,7 +1641,7 @@ msgstr "Verbindung zum Datenbank-Server kann nicht hergestellt werden" msgid "Compruebe los datos de conexión" msgstr "Bitte überprüfen Sie Ihre Verbindungseinstellungen" -#: ../../../../inc/Email.class.php:59 ../../../../inc/UserUtil.class.php:567 +#: ../../../../inc/Email.class.php:59 ../../../../inc/UserUtil.class.php:565 msgid "N/D" msgstr "N/A" @@ -1672,10 +1675,6 @@ msgstr "Empfänger" msgid "CC" msgstr "CC" -#: ../../../../inc/Email.class.php:146 -msgid "Aviso" -msgstr "Warnung" - #: ../../../../inc/FileImport.class.php:105 msgid "Archivo no subido correctamente" msgstr "Datei erfolgreich hochgeladen" @@ -2196,6 +2195,21 @@ msgstr "" msgid "No hay cuentas para importar" msgstr "" +#: ../../../../inc/Template.class.php:89 +#, fuzzy, php-format +msgid "No es posible obtener la plantilla \"%s\" : %s" +msgstr "Kunde kann nicht angelegt werden" + +#: ../../../../inc/Template.class.php:128 +#, fuzzy, php-format +msgid "No es posible obtener la variable \"%s\"" +msgstr "Kunde kann nicht angelegt werden" + +#: ../../../../inc/Template.class.php:171 +#, fuzzy, php-format +msgid "No es posible destruir la variable \"%s\"" +msgstr "Kunde kann nicht angelegt werden" + #: ../../../../inc/Upgrade.class.php:51 msgid "Error al aplicar la actualización de la Base de Datos" msgstr "Fehler beim Ändern der Datenbank" @@ -2219,23 +2233,23 @@ msgstr "" msgid "Actualizar BBDD" msgstr "DB aktualisieren" -#: ../../../../inc/Upgrade.class.php:121 +#: ../../../../inc/Upgrade.class.php:127 msgid "No es necesario actualizar la Base de Datos." msgstr "Keine Datenbankaktualisierung notwendig" -#: ../../../../inc/Upgrade.class.php:129 +#: ../../../../inc/Upgrade.class.php:135 msgid "Error al aplicar la actualización de la Base de Datos." msgstr "Fehler beim Ändern der Datenbank" -#: ../../../../inc/Upgrade.class.php:138 +#: ../../../../inc/Upgrade.class.php:144 msgid "Actualización de la Base de Datos realizada correctamente." msgstr "Aktualisierung der Datenbank war erfolgreich." -#: ../../../../inc/Upgrade.class.php:215 +#: ../../../../inc/Upgrade.class.php:221 msgid "Actualizar Configuración" msgstr "Konfiguration aktualisieren" -#: ../../../../inc/Upgrade.class.php:215 +#: ../../../../inc/Upgrade.class.php:221 msgid "Actualización de la Configuración realizada correctamente." msgstr "Configuration Aktualisierung erfolgreich durchgeführt." @@ -2269,11 +2283,11 @@ msgstr "Sie bekommen in Kürze eine Bestätigungs-Mail" msgid "Nuevo usuario de LDAP" msgstr "Neuer LDAP Benutzer" -#: ../../../../inc/UserUtil.class.php:705 +#: ../../../../inc/UserUtil.class.php:703 msgid "Migrar Grupos" msgstr "Gurppen migrieren" -#: ../../../../inc/UserUtil.class.php:705 +#: ../../../../inc/UserUtil.class.php:703 msgid "Error al migrar grupo del usuario" msgstr "" @@ -2720,20 +2734,25 @@ msgstr "" "Ohne diese Funktion könnte an Angreifer Ihren Zugang oder Ihr Passwort " "zurücksetzen." -#: ../../../../web/MainC.class.php:288 +#: ../../../../web/MainC.class.php:284 +#, fuzzy +msgid "Error en clave RSA" +msgstr "Abfrage-Fehler" + +#: ../../../../web/MainC.class.php:304 msgid "Instalación finalizada" msgstr "Installation beendet" -#: ../../../../web/MainC.class.php:289 +#: ../../../../web/MainC.class.php:305 msgid "Pulse aquí para acceder" msgstr "" "Klicken Sie hier für den Zugriff" -#: ../../../../web/MainC.class.php:384 +#: ../../../../web/MainC.class.php:400 msgid "Descargar nueva versión" msgstr "Neu Version herunterladen" -#: ../../../../web/MainC.class.php:395 +#: ../../../../web/MainC.class.php:411 msgid "Avisos de sysPass" msgstr "" @@ -2862,12 +2881,14 @@ msgstr "Benutzer für Zugriff" #: ../../../../inc/themes/classic/account.inc:90 #: ../../../../inc/themes/classic/editpass.inc:31 +#: ../../../../inc/themes/classic/passreset.inc:35 #: ../../../../inc/themes/classic/users.inc:83 #: ../../../../inc/themes/classic/userspass.inc:19 #: ../../../../inc/themes/classic/userspass.inc:21 #: ../../../../inc/themes/material-blue/account.inc:105 #: ../../../../inc/themes/material-blue/editpass.inc:36 -#: ../../../../inc/themes/material-blue/install.inc:64 +#: ../../../../inc/themes/material-blue/install.inc:66 +#: ../../../../inc/themes/material-blue/passreset.inc:36 #: ../../../../inc/themes/material-blue/users.inc:102 #: ../../../../inc/themes/material-blue/users.inc:109 #: ../../../../inc/themes/material-blue/userspass.inc:19 @@ -3002,7 +3023,7 @@ msgstr "Ansehen" #: ../../../../inc/themes/classic/account.inc:406 #: ../../../../inc/themes/classic/editpass.inc:45 #: ../../../../inc/themes/classic/passreset.inc:46 -#: ../../../../inc/themes/material-blue/passreset.inc:43 +#: ../../../../inc/themes/material-blue/passreset.inc:48 msgid "Volver" msgstr "Zurück" @@ -3426,8 +3447,8 @@ msgstr "" #: ../../../../inc/themes/classic/login.inc:15 #: ../../../../inc/themes/classic/login.inc:27 #: ../../../../inc/themes/material-blue/encryption.inc:8 -#: ../../../../inc/themes/material-blue/install.inc:49 -#: ../../../../inc/themes/material-blue/install.inc:56 +#: ../../../../inc/themes/material-blue/install.inc:51 +#: ../../../../inc/themes/material-blue/install.inc:58 #: ../../../../inc/themes/material-blue/login.inc:25 #: ../../../../inc/themes/material-blue/login.inc:48 msgid "Clave Maestra" @@ -3606,25 +3627,23 @@ msgid "Ver Archivo" msgstr "Datei ansehen" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 +#: ../../../../inc/themes/material-blue/footer.inc:29 msgid "Indica si la conexión utiliza HTTPS." msgstr "" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 +#: ../../../../inc/themes/material-blue/footer.inc:29 msgid "" "Las claves de formularios enviados se encriptan mediante PKI, el resto de " "datos no." msgstr "" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 #, fuzzy msgid "Seguro" msgstr "Sicherheit" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 msgid "Inseguro" msgstr "" @@ -3855,12 +3874,12 @@ msgid "Crear cuenta de admin de sysPass" msgstr "Administrator-Konto anlegen" #: ../../../../inc/themes/classic/install.inc:32 -#: ../../../../inc/themes/material-blue/install.inc:36 +#: ../../../../inc/themes/material-blue/install.inc:37 msgid "Login del usuario administrador de sysPass" msgstr "sysPass Administrator Anmeldung" #: ../../../../inc/themes/classic/install.inc:58 -#: ../../../../inc/themes/material-blue/install.inc:69 +#: ../../../../inc/themes/material-blue/install.inc:71 msgid "Configurar BBDD" msgstr "Datenbank-Konfiguration" @@ -3869,7 +3888,7 @@ msgid "Login de usuario con permisos de administrador de MySQL" msgstr "Benutzer-Anmeldung mit administrativen Datenbank-Rechten" #: ../../../../inc/themes/classic/install.inc:83 -#: ../../../../inc/themes/material-blue/install.inc:102 +#: ../../../../inc/themes/material-blue/install.inc:105 msgid "Nombre de la base de datos para sysPass" msgstr "Name der sysPass-Datenbank" @@ -3878,18 +3897,18 @@ msgid "Nombre del servidor de la base de datos de sysPass" msgstr "Server der sysPass-Datenbank eingeben" #: ../../../../inc/themes/classic/install.inc:97 -#: ../../../../inc/themes/material-blue/install.inc:120 +#: ../../../../inc/themes/material-blue/install.inc:123 msgid "Modo Hosting" msgstr "Hosting-Modus" #: ../../../../inc/themes/classic/install.inc:104 -#: ../../../../inc/themes/material-blue/install.inc:127 +#: ../../../../inc/themes/material-blue/install.inc:130 msgid "No crea ni verifica los permisos del usuario sobre la BBDD" msgstr "Zugangsberechtigungen zur DB werden weder angelegt nocht überprüft" #: ../../../../inc/themes/classic/install.inc:108 -#: ../../../../inc/themes/material-blue/install.inc:134 -#: ../../../../inc/themes/material-blue/install.inc:135 +#: ../../../../inc/themes/material-blue/install.inc:137 +#: ../../../../inc/themes/material-blue/install.inc:138 msgid "Instalar" msgstr "Installieren" @@ -4058,7 +4077,7 @@ msgid "Más Acciones" msgstr "Weitere Aktionen" #: ../../../../inc/themes/classic/passreset.inc:13 -#: ../../../../inc/themes/material-blue/passreset.inc:10 +#: ../../../../inc/themes/material-blue/passreset.inc:9 msgid "Solicitud de Cambio de Clave" msgstr "Passwortänderung initiiert." @@ -4067,7 +4086,7 @@ msgid "Login del Usuario" msgstr "Benutzer-Anmeldung" #: ../../../../inc/themes/classic/passreset.inc:21 -#: ../../../../inc/themes/material-blue/passreset.inc:24 +#: ../../../../inc/themes/material-blue/passreset.inc:23 msgid "Email del Usuario" msgstr "Benutzer-E-Mail" @@ -4081,23 +4100,15 @@ msgstr "E-Mail" msgid "Nueva Clave" msgstr "Neues Passwort" -#: ../../../../inc/themes/classic/passreset.inc:34 -msgid "Nueva Clave (Verificar)" -msgstr "Neues Passwort (Wіederholung)" - -#: ../../../../inc/themes/classic/passreset.inc:35 -msgid "Clave (Verificar)" -msgstr "Passwort (Wiederholung)" - #: ../../../../inc/themes/classic/passreset.inc:46 -#: ../../../../inc/themes/material-blue/passreset.inc:42 +#: ../../../../inc/themes/material-blue/passreset.inc:47 msgid "Volver a iniciar sesión" msgstr "Zurück zur Anmeldung" #: ../../../../inc/themes/classic/passreset.inc:48 #: ../../../../inc/themes/material-blue/2fa.inc:27 -#: ../../../../inc/themes/material-blue/passreset.inc:48 -#: ../../../../inc/themes/material-blue/passreset.inc:49 +#: ../../../../inc/themes/material-blue/passreset.inc:53 +#: ../../../../inc/themes/material-blue/passreset.inc:54 msgid "Solicitar" msgstr "Anfrage" @@ -4106,8 +4117,8 @@ msgid "Solicitar cambio de clave" msgstr "Starte Passwortänderung" #: ../../../../inc/themes/classic/passreset.inc:51 -#: ../../../../inc/themes/material-blue/passreset.inc:53 -#: ../../../../inc/themes/material-blue/passreset.inc:54 +#: ../../../../inc/themes/material-blue/passreset.inc:58 +#: ../../../../inc/themes/material-blue/passreset.inc:59 msgid "Cambiar" msgstr "Ändern" @@ -4684,31 +4695,31 @@ msgid "" "archivos XML y CSV." msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:31 +#: ../../../../inc/themes/material-blue/install.inc:32 msgid "Usuario administrador de sysPass" msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:78 +#: ../../../../inc/themes/material-blue/install.inc:80 msgid "Usuario acceso BBDD" msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:83 +#: ../../../../inc/themes/material-blue/install.inc:85 msgid "Usuario con permisos de administrador de MySQL" msgstr "Benutzer mit MySQL Admin Rechte" -#: ../../../../inc/themes/material-blue/install.inc:90 +#: ../../../../inc/themes/material-blue/install.inc:93 msgid "Clave acceso BBDD" msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:97 +#: ../../../../inc/themes/material-blue/install.inc:100 msgid "Nombre BBDD para sysPass" msgstr "sysPass Datenbankname" -#: ../../../../inc/themes/material-blue/install.inc:109 +#: ../../../../inc/themes/material-blue/install.inc:112 msgid "Servidor BBDD para sysPass" msgstr "sysPass Datenbankserver" -#: ../../../../inc/themes/material-blue/install.inc:114 +#: ../../../../inc/themes/material-blue/install.inc:117 msgid "Nombre del servidor para instalar la base de datos de sysPass" msgstr "" @@ -4753,3 +4764,9 @@ msgstr "Backup erstellen und exportieren" #: ../../../../inc/themes/material-blue/security.inc:4 msgid "Autentificación" msgstr "Authentifizierung" + +#~ msgid "Nueva Clave (Verificar)" +#~ msgstr "Neues Passwort (Wіederholung)" + +#~ msgid "Clave (Verificar)" +#~ msgstr "Passwort (Wiederholung)" diff --git a/inc/locales/en_US/LC_MESSAGES/messages.mo b/inc/locales/en_US/LC_MESSAGES/messages.mo index ea23fe2c..868520e1 100644 Binary files a/inc/locales/en_US/LC_MESSAGES/messages.mo and b/inc/locales/en_US/LC_MESSAGES/messages.mo differ diff --git a/inc/locales/en_US/LC_MESSAGES/messages.po b/inc/locales/en_US/LC_MESSAGES/messages.po index f1e2f590..0f4f44da 100644 --- a/inc/locales/en_US/LC_MESSAGES/messages.po +++ b/inc/locales/en_US/LC_MESSAGES/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: sysPass\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-23 12:58+0100\n" -"PO-Revision-Date: 2015-09-23 12:59+0100\n" +"POT-Creation-Date: 2015-09-30 02:56+0100\n" +"PO-Revision-Date: 2015-09-30 02:59+0100\n" "Last-Translator: nuxsmin \n" "Language-Team: nuxsmin@syspass.org\n" "Language: en_US\n" @@ -60,7 +60,7 @@ msgstr "An account name needed" #: ../../../../ajax/ajax_accountSave.php:77 #: ../../../../ajax/ajax_accountSave.php:88 -#: ../../../../ajax/ajax_appMgmtSave.php:337 +#: ../../../../ajax/ajax_appMgmtSave.php:328 msgid "Es necesario un nombre de cliente" msgstr "A customer name needed" @@ -85,63 +85,63 @@ msgid "Id inválido" msgstr "Invalid Id" #: ../../../../ajax/ajax_accountSave.php:110 -#: ../../../../ajax/ajax_accountSave.php:263 -#: ../../../../ajax/ajax_appMgmtSave.php:543 -#: ../../../../ajax/ajax_configSave.php:297 +#: ../../../../ajax/ajax_accountSave.php:258 +#: ../../../../ajax/ajax_appMgmtSave.php:534 +#: ../../../../ajax/ajax_configSave.php:287 #: ../../../../ajax/ajax_userPrefsSave.php:79 ../../../../api.php:53 msgid "Acción Inválida" msgstr "Invalid Action" -#: ../../../../ajax/ajax_accountSave.php:122 +#: ../../../../ajax/ajax_accountSave.php:117 #: ../../../../ajax/ajax_appMgmtSave.php:111 -#: ../../../../ajax/ajax_appMgmtSave.php:155 -#: ../../../../ajax/ajax_backup.php:70 +#: ../../../../ajax/ajax_appMgmtSave.php:148 +#: ../../../../ajax/ajax_backup.php:62 msgid "Las claves no coinciden" msgstr "The passwords do not match" -#: ../../../../ajax/ajax_accountSave.php:173 +#: ../../../../ajax/ajax_accountSave.php:168 msgid "Cuenta creada" msgstr "Account added" -#: ../../../../ajax/ajax_accountSave.php:176 +#: ../../../../ajax/ajax_accountSave.php:171 msgid "Error al crear la cuenta" msgstr "Error on account creation" -#: ../../../../ajax/ajax_accountSave.php:211 +#: ../../../../ajax/ajax_accountSave.php:206 msgid "Sin cambios" msgstr "No changes" -#: ../../../../ajax/ajax_accountSave.php:223 +#: ../../../../ajax/ajax_accountSave.php:218 msgid "Cuenta actualizada" msgstr "Account updated" -#: ../../../../ajax/ajax_accountSave.php:226 +#: ../../../../ajax/ajax_accountSave.php:221 msgid "Error al modificar la cuenta" msgstr "Error on updating account" -#: ../../../../ajax/ajax_accountSave.php:233 +#: ../../../../ajax/ajax_accountSave.php:228 msgid "Cuenta eliminada" msgstr "Account deleted" -#: ../../../../ajax/ajax_accountSave.php:236 +#: ../../../../ajax/ajax_accountSave.php:231 msgid "Error al eliminar la cuenta" msgstr "Error on account deletion" -#: ../../../../ajax/ajax_accountSave.php:246 -#: ../../../../ajax/ajax_appMgmtSave.php:161 +#: ../../../../ajax/ajax_accountSave.php:241 +#: ../../../../ajax/ajax_appMgmtSave.php:152 #: ../../../../ajax/ajax_passReset.php:74 msgid "Clave actualizada" msgstr "Password updated" -#: ../../../../ajax/ajax_accountSave.php:249 +#: ../../../../ajax/ajax_accountSave.php:244 msgid "Error al actualizar la clave" msgstr "Error on updating password" -#: ../../../../ajax/ajax_accountSave.php:256 +#: ../../../../ajax/ajax_accountSave.php:251 msgid "Cuenta restaurada" msgstr "Account restored" -#: ../../../../ajax/ajax_accountSave.php:259 +#: ../../../../ajax/ajax_accountSave.php:254 msgid "Error al restaurar cuenta" msgstr "Error on restoring account" @@ -267,8 +267,8 @@ msgstr "An email is needed" #: ../../../../ajax/ajax_appMgmtSave.php:95 #: ../../../../ajax/ajax_appMgmtSave.php:144 -#: ../../../../ajax/ajax_appMgmtSave.php:168 -#: ../../../../ajax/ajax_configSave.php:272 +#: ../../../../ajax/ajax_appMgmtSave.php:159 +#: ../../../../ajax/ajax_configSave.php:262 #: ../../../../ajax/ajax_import.php:39 ../../../../ajax/ajax_migrate.php:39 #: ../../../../ajax/ajax_userPrefsSave.php:55 msgid "Ey, esto es una DEMO!!" @@ -304,49 +304,49 @@ msgstr "User updated" msgid "Error al actualizar el usuario" msgstr "Error on user update" -#: ../../../../ajax/ajax_appMgmtSave.php:164 +#: ../../../../ajax/ajax_appMgmtSave.php:155 #: ../../../../ajax/ajax_passReset.php:78 msgid "Error al modificar la clave" msgstr "Error on updating password" -#: ../../../../ajax/ajax_appMgmtSave.php:170 +#: ../../../../ajax/ajax_appMgmtSave.php:161 msgid "No es posible eliminar, usuario en uso" msgstr "Unable to delete, user in use" -#: ../../../../ajax/ajax_appMgmtSave.php:174 +#: ../../../../ajax/ajax_appMgmtSave.php:165 msgid "Usuario eliminado" msgstr "User deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:177 +#: ../../../../ajax/ajax_appMgmtSave.php:168 msgid "Error al eliminar el usuario" msgstr "Error on user deletion" -#: ../../../../ajax/ajax_appMgmtSave.php:192 +#: ../../../../ajax/ajax_appMgmtSave.php:183 msgid "Es necesario un nombre de grupo" msgstr "A group name is needed" -#: ../../../../ajax/ajax_appMgmtSave.php:200 +#: ../../../../ajax/ajax_appMgmtSave.php:191 msgid "Nombre de grupo duplicado" msgstr "Duplicated group name" -#: ../../../../ajax/ajax_appMgmtSave.php:212 +#: ../../../../ajax/ajax_appMgmtSave.php:203 msgid "Grupo creado" msgstr "Group added" -#: ../../../../ajax/ajax_appMgmtSave.php:214 +#: ../../../../ajax/ajax_appMgmtSave.php:205 msgid "Error al crear el grupo" msgstr "Error on group creation" -#: ../../../../ajax/ajax_appMgmtSave.php:225 +#: ../../../../ajax/ajax_appMgmtSave.php:216 msgid "Grupo actualizado" msgstr "Group updated" -#: ../../../../ajax/ajax_appMgmtSave.php:228 +#: ../../../../ajax/ajax_appMgmtSave.php:219 msgid "Error al actualizar el grupo" msgstr "Error on updating group" -#: ../../../../ajax/ajax_appMgmtSave.php:237 -#: ../../../../ajax/ajax_appMgmtSave.php:314 +#: ../../../../ajax/ajax_appMgmtSave.php:228 +#: ../../../../ajax/ajax_appMgmtSave.php:305 #: ../../../../inc/CustomFieldsBase.class.php:83 #: ../../../../inc/themes/classic/account.inc:109 #: ../../../../inc/themes/classic/groups.inc:24 @@ -357,7 +357,7 @@ msgstr "Error on updating group" msgid "Usuarios" msgstr "Users" -#: ../../../../ajax/ajax_appMgmtSave.php:241 +#: ../../../../ajax/ajax_appMgmtSave.php:232 #: ../../../../inc/Category.class.php:266 #: ../../../../inc/CustomFieldsBase.class.php:80 #: ../../../../inc/Customer.class.php:150 @@ -367,126 +367,126 @@ msgstr "Users" msgid "Cuentas" msgstr "Accounts" -#: ../../../../ajax/ajax_appMgmtSave.php:244 -#: ../../../../ajax/ajax_appMgmtSave.php:316 +#: ../../../../ajax/ajax_appMgmtSave.php:235 +#: ../../../../ajax/ajax_appMgmtSave.php:307 #: ../../../../inc/Category.class.php:119 #: ../../../../inc/Customer.class.php:150 msgid "No es posible eliminar" msgstr "Unable to delete" -#: ../../../../ajax/ajax_appMgmtSave.php:244 +#: ../../../../ajax/ajax_appMgmtSave.php:235 msgid "Grupo en uso por:" msgstr "Group in use by:" -#: ../../../../ajax/ajax_appMgmtSave.php:249 +#: ../../../../ajax/ajax_appMgmtSave.php:240 msgid "Grupo eliminado" msgstr "Group deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:252 +#: ../../../../ajax/ajax_appMgmtSave.php:243 msgid "Error al eliminar el grupo" msgstr "Error on group deletion" -#: ../../../../ajax/ajax_appMgmtSave.php:291 +#: ../../../../ajax/ajax_appMgmtSave.php:282 msgid "Es necesario un nombre de perfil" msgstr "A profile name is needed" -#: ../../../../ajax/ajax_appMgmtSave.php:293 +#: ../../../../ajax/ajax_appMgmtSave.php:284 msgid "Nombre de perfil duplicado" msgstr "Duplicated profile name" -#: ../../../../ajax/ajax_appMgmtSave.php:298 +#: ../../../../ajax/ajax_appMgmtSave.php:289 msgid "Perfil creado" msgstr "Profile added" -#: ../../../../ajax/ajax_appMgmtSave.php:301 +#: ../../../../ajax/ajax_appMgmtSave.php:292 msgid "Error al crear el perfil" msgstr "Error on creating profile" -#: ../../../../ajax/ajax_appMgmtSave.php:304 +#: ../../../../ajax/ajax_appMgmtSave.php:295 msgid "Perfil actualizado" msgstr "Profile updated" -#: ../../../../ajax/ajax_appMgmtSave.php:307 +#: ../../../../ajax/ajax_appMgmtSave.php:298 msgid "Error al actualizar el perfil" msgstr "Error on updating profile" -#: ../../../../ajax/ajax_appMgmtSave.php:316 +#: ../../../../ajax/ajax_appMgmtSave.php:307 msgid "Perfil en uso por:" msgstr "Profiles in use by:" -#: ../../../../ajax/ajax_appMgmtSave.php:319 +#: ../../../../ajax/ajax_appMgmtSave.php:310 msgid "Perfil eliminado" msgstr "Profile deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:322 +#: ../../../../ajax/ajax_appMgmtSave.php:313 msgid "Error al eliminar el perfil" msgstr "Error on profile deletion" -#: ../../../../ajax/ajax_appMgmtSave.php:357 +#: ../../../../ajax/ajax_appMgmtSave.php:348 msgid "Cliente creado" msgstr "Customer added" -#: ../../../../ajax/ajax_appMgmtSave.php:372 +#: ../../../../ajax/ajax_appMgmtSave.php:363 msgid "Cliente actualizado" msgstr "Customer updated" -#: ../../../../ajax/ajax_appMgmtSave.php:382 +#: ../../../../ajax/ajax_appMgmtSave.php:373 msgid "Cliente eliminado" msgstr "Customer deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:396 +#: ../../../../ajax/ajax_appMgmtSave.php:387 msgid "Es necesario un nombre de categoría" msgstr "A category name needed" -#: ../../../../ajax/ajax_appMgmtSave.php:416 +#: ../../../../ajax/ajax_appMgmtSave.php:407 msgid "Categoría creada" msgstr "Category added" -#: ../../../../ajax/ajax_appMgmtSave.php:431 +#: ../../../../ajax/ajax_appMgmtSave.php:422 msgid "Categoría actualizada" msgstr "Category updated" -#: ../../../../ajax/ajax_appMgmtSave.php:442 +#: ../../../../ajax/ajax_appMgmtSave.php:433 msgid "Categoría eliminada" msgstr "Category deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:458 +#: ../../../../ajax/ajax_appMgmtSave.php:449 msgid "Usuario o acción no indicado" msgstr "User or action not set" -#: ../../../../ajax/ajax_appMgmtSave.php:468 +#: ../../../../ajax/ajax_appMgmtSave.php:459 msgid "Autorización creada" msgstr "Authorization added" -#: ../../../../ajax/ajax_appMgmtSave.php:476 +#: ../../../../ajax/ajax_appMgmtSave.php:467 msgid "Autorización actualizada" msgstr "Authorization Updated" -#: ../../../../ajax/ajax_appMgmtSave.php:486 +#: ../../../../ajax/ajax_appMgmtSave.php:477 msgid "Autorización eliminada" msgstr "Authorization deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:503 +#: ../../../../ajax/ajax_appMgmtSave.php:494 msgid "Nombre del campo no indicado" msgstr "Field name not set" -#: ../../../../ajax/ajax_appMgmtSave.php:505 +#: ../../../../ajax/ajax_appMgmtSave.php:496 msgid "Tipo del campo no indicado" msgstr "Field type not set" -#: ../../../../ajax/ajax_appMgmtSave.php:507 +#: ../../../../ajax/ajax_appMgmtSave.php:498 msgid "Módulo del campo no indicado" msgstr "Field module not set" -#: ../../../../ajax/ajax_appMgmtSave.php:521 +#: ../../../../ajax/ajax_appMgmtSave.php:512 msgid "Campo creado" msgstr "Field added" -#: ../../../../ajax/ajax_appMgmtSave.php:530 +#: ../../../../ajax/ajax_appMgmtSave.php:521 msgid "Campo actualizado" msgstr "Field updated" -#: ../../../../ajax/ajax_appMgmtSave.php:540 +#: ../../../../ajax/ajax_appMgmtSave.php:531 msgid "Campo eliminado" msgstr "Field deleted" @@ -499,7 +499,7 @@ msgstr "Make Backup" msgid "Error al realizar el backup" msgstr "Error on doing backup" -#: ../../../../ajax/ajax_backup.php:54 ../../../../ajax/ajax_backup.php:76 +#: ../../../../ajax/ajax_backup.php:54 ../../../../ajax/ajax_backup.php:68 #: ../../../../ajax/ajax_checkLdap.php:57 ../../../../inc/Import.class.php:128 #: ../../../../inc/Migrate.class.php:93 msgid "Revise el registro de eventos para más detalles" @@ -513,29 +513,23 @@ msgstr "Application and database backup successfully done" msgid "Proceso de backup finalizado" msgstr "Backup process finished" -#: ../../../../ajax/ajax_backup.php:66 -#: ../../../../ajax/ajax_configSave.php:244 -#: ../../../../ajax/ajax_doLogin.php:53 ../../../../ajax/ajax_import.php:56 -msgid "Error en clave RSA" -msgstr "Error on RSA key" - -#: ../../../../ajax/ajax_backup.php:74 ../../../../ajax/ajax_backup.php:79 +#: ../../../../ajax/ajax_backup.php:66 ../../../../ajax/ajax_backup.php:71 msgid "Realizar Exportación" msgstr "Run Export" -#: ../../../../ajax/ajax_backup.php:74 +#: ../../../../ajax/ajax_backup.php:66 msgid "Error al realizar la exportación de cuentas" msgstr "Error while exporting accounts" -#: ../../../../ajax/ajax_backup.php:76 +#: ../../../../ajax/ajax_backup.php:68 msgid "Error al realizar la exportación" msgstr "Error doing export" -#: ../../../../ajax/ajax_backup.php:79 +#: ../../../../ajax/ajax_backup.php:71 msgid "Exportación de cuentas realizada correctamente" msgstr "Export done successfully" -#: ../../../../ajax/ajax_backup.php:81 +#: ../../../../ajax/ajax_backup.php:73 msgid "Proceso de exportación finalizado" msgstr "Export process finished" @@ -612,7 +606,7 @@ msgid "Configuración actualizada" msgstr "Configuration updated" #: ../../../../ajax/ajax_configSave.php:230 -#: ../../../../ajax/ajax_configSave.php:282 +#: ../../../../ajax/ajax_configSave.php:272 #: ../../../../ajax/ajax_viewpass.php:60 #: ../../../../inc/Controller.class.php:169 msgid "Clave maestra actualizada" @@ -632,40 +626,40 @@ msgstr "Master Password needed" msgid "Se ha de confirmar el cambio de clave" msgstr "The password update must be confirmed" -#: ../../../../ajax/ajax_configSave.php:248 +#: ../../../../ajax/ajax_configSave.php:238 msgid "Las claves son idénticas" msgstr "The passwords are the same" -#: ../../../../ajax/ajax_configSave.php:250 +#: ../../../../ajax/ajax_configSave.php:240 msgid "Las claves maestras no coinciden" msgstr "The master passwords do not match" -#: ../../../../ajax/ajax_configSave.php:252 +#: ../../../../ajax/ajax_configSave.php:242 msgid "La clave maestra actual no coincide" msgstr "The current master password does not match" -#: ../../../../ajax/ajax_configSave.php:261 +#: ../../../../ajax/ajax_configSave.php:251 msgid "Errores al actualizar las claves de las cuentas" msgstr "Error on updating accounts' passwords" -#: ../../../../ajax/ajax_configSave.php:267 +#: ../../../../ajax/ajax_configSave.php:257 msgid "Errores al actualizar las claves de las cuentas del histórico" msgstr "Error while updating acounts passwords in history" -#: ../../../../ajax/ajax_configSave.php:280 +#: ../../../../ajax/ajax_configSave.php:270 #: ../../../../inc/Account.class.php:497 msgid "Actualizar Clave Maestra" msgstr "Update Master Password" -#: ../../../../ajax/ajax_configSave.php:284 +#: ../../../../ajax/ajax_configSave.php:274 msgid "Error al guardar el hash de la clave maestra" msgstr "Error on saving master password's hash" -#: ../../../../ajax/ajax_configSave.php:292 +#: ../../../../ajax/ajax_configSave.php:282 msgid "Generar Clave Temporal" msgstr "Generate Temporary Password" -#: ../../../../ajax/ajax_configSave.php:292 +#: ../../../../ajax/ajax_configSave.php:282 #: ../../../../inc/themes/classic/account.inc:83 #: ../../../../inc/themes/classic/editpass.inc:25 #: ../../../../inc/themes/classic/install.inc:38 @@ -674,6 +668,7 @@ msgstr "Generate Temporary Password" #: ../../../../inc/themes/classic/login.inc:22 #: ../../../../inc/themes/classic/mail.inc:55 #: ../../../../inc/themes/classic/passreset.inc:29 +#: ../../../../inc/themes/classic/passreset.inc:34 #: ../../../../inc/themes/classic/users.inc:75 #: ../../../../inc/themes/classic/userspass.inc:8 #: ../../../../inc/themes/classic/userspass.inc:11 @@ -683,13 +678,13 @@ msgstr "Generate Temporary Password" #: ../../../../inc/themes/material-blue/editpass.inc:26 #: ../../../../inc/themes/material-blue/editpass.inc:31 #: ../../../../inc/themes/material-blue/editpass.inc:41 -#: ../../../../inc/themes/material-blue/install.inc:44 +#: ../../../../inc/themes/material-blue/install.inc:46 #: ../../../../inc/themes/material-blue/ldap.inc:105 #: ../../../../inc/themes/material-blue/login.inc:17 #: ../../../../inc/themes/material-blue/login.inc:40 #: ../../../../inc/themes/material-blue/mail.inc:73 #: ../../../../inc/themes/material-blue/mail.inc:80 -#: ../../../../inc/themes/material-blue/passreset.inc:31 +#: ../../../../inc/themes/material-blue/passreset.inc:30 #: ../../../../inc/themes/material-blue/users.inc:89 #: ../../../../inc/themes/material-blue/users.inc:96 #: ../../../../inc/themes/material-blue/userspass.inc:8 @@ -697,7 +692,7 @@ msgstr "Generate Temporary Password" msgid "Clave" msgstr "Password" -#: ../../../../ajax/ajax_configSave.php:294 +#: ../../../../ajax/ajax_configSave.php:284 msgid "Clave Temporal Generada" msgstr "Temporary Password Generated" @@ -705,43 +700,43 @@ msgstr "Temporary Password Generated" msgid "Usuario/Clave no introducidos" msgstr "User/Pass not entered" -#: ../../../../ajax/ajax_doLogin.php:65 +#: ../../../../ajax/ajax_doLogin.php:58 msgid "Inicio sesión" msgstr "Log in" -#: ../../../../ajax/ajax_doLogin.php:70 +#: ../../../../ajax/ajax_doLogin.php:63 msgid "Servidor Login" msgstr "Login Server" -#: ../../../../ajax/ajax_doLogin.php:76 +#: ../../../../ajax/ajax_doLogin.php:69 msgid "Error al guardar los datos de LDAP" msgstr "Error on saving LDAP user data" -#: ../../../../ajax/ajax_doLogin.php:79 ../../../../ajax/ajax_doLogin.php:87 -#: ../../../../ajax/ajax_doLogin.php:139 ../../../../ajax/ajax_doLogin.php:185 +#: ../../../../ajax/ajax_doLogin.php:72 ../../../../ajax/ajax_doLogin.php:80 +#: ../../../../ajax/ajax_doLogin.php:132 ../../../../ajax/ajax_doLogin.php:176 #: ../../../../inc/ApiTokens.class.php:140 #: ../../../../inc/ApiTokens.class.php:186 #: ../../../../inc/ApiTokens.class.php:217 #: ../../../../inc/ApiTokens.class.php:243 #: ../../../../inc/ApiTokens.class.php:262 #: ../../../../inc/ApiTokens.class.php:304 -#: ../../../../inc/ApiTokens.class.php:328 ../../../../inc/Crypt.class.php:235 -#: ../../../../inc/Crypt.class.php:246 +#: ../../../../inc/ApiTokens.class.php:328 ../../../../inc/Crypt.class.php:180 +#: ../../../../inc/Crypt.class.php:191 #: ../../../../inc/XmlImportBase.class.php:74 msgid "Error interno" msgstr "Internal error" -#: ../../../../ajax/ajax_doLogin.php:84 +#: ../../../../ajax/ajax_doLogin.php:77 msgid "Error al actualizar la clave del usuario en la BBDD" msgstr "Error on updating user password in BD" -#: ../../../../ajax/ajax_doLogin.php:92 ../../../../ajax/ajax_doLogin.php:117 +#: ../../../../ajax/ajax_doLogin.php:85 ../../../../ajax/ajax_doLogin.php:110 msgid "Login incorrecto" msgstr "Incorrect login" -#: ../../../../ajax/ajax_doLogin.php:93 ../../../../ajax/ajax_doLogin.php:100 -#: ../../../../ajax/ajax_doLogin.php:107 ../../../../ajax/ajax_doLogin.php:118 -#: ../../../../ajax/ajax_doLogin.php:128 ../../../../ajax/ajax_doLogin.php:180 +#: ../../../../ajax/ajax_doLogin.php:86 ../../../../ajax/ajax_doLogin.php:93 +#: ../../../../ajax/ajax_doLogin.php:100 ../../../../ajax/ajax_doLogin.php:111 +#: ../../../../ajax/ajax_doLogin.php:121 ../../../../ajax/ajax_doLogin.php:171 #: ../../../../inc/ApiTokens.class.php:190 #: ../../../../inc/ApiTokens.class.php:308 ../../../../inc/Auth.class.php:108 #: ../../../../inc/Init.class.php:517 ../../../../inc/UserBase.class.php:382 @@ -770,43 +765,43 @@ msgstr "Incorrect login" #: ../../../../inc/themes/material-blue/login.inc:33 #: ../../../../inc/themes/material-blue/mail.inc:61 #: ../../../../inc/themes/material-blue/mail.inc:67 -#: ../../../../inc/themes/material-blue/passreset.inc:17 +#: ../../../../inc/themes/material-blue/passreset.inc:16 #: ../../../../inc/themes/material-blue/request.inc:20 #: ../../../../inc/themes/material-blue/search.inc:55 #: ../../../../inc/themes/material-blue/tokens.inc:8 msgid "Usuario" msgstr "User" -#: ../../../../ajax/ajax_doLogin.php:96 ../../../../ajax/ajax_doLogin.php:110 -#: ../../../../ajax/ajax_doLogin.php:121 +#: ../../../../ajax/ajax_doLogin.php:89 ../../../../ajax/ajax_doLogin.php:103 +#: ../../../../ajax/ajax_doLogin.php:114 msgid "Usuario/Clave incorrectos" msgstr "Wrong user/pass" -#: ../../../../ajax/ajax_doLogin.php:99 ../../../../ajax/ajax_doLogin.php:103 +#: ../../../../ajax/ajax_doLogin.php:92 ../../../../ajax/ajax_doLogin.php:96 msgid "Cuenta expirada" msgstr "Account expired" -#: ../../../../ajax/ajax_doLogin.php:106 +#: ../../../../ajax/ajax_doLogin.php:99 msgid "El usuario no tiene grupos asociados" msgstr "The user have no associated groups" -#: ../../../../ajax/ajax_doLogin.php:127 ../../../../ajax/ajax_doLogin.php:131 +#: ../../../../ajax/ajax_doLogin.php:120 ../../../../ajax/ajax_doLogin.php:124 msgid "Usuario deshabilitado" msgstr "User disabled" -#: ../../../../ajax/ajax_doLogin.php:136 +#: ../../../../ajax/ajax_doLogin.php:129 msgid "Error al obtener los datos del usuario de la BBDD" msgstr "Error on retrieving user data from DB" -#: ../../../../ajax/ajax_doLogin.php:146 +#: ../../../../ajax/ajax_doLogin.php:139 msgid "La clave maestra no ha sido guardada o es incorrecta" msgstr "The master password not saved or is wrong" -#: ../../../../ajax/ajax_doLogin.php:155 ../../../../ajax/ajax_doLogin.php:158 +#: ../../../../ajax/ajax_doLogin.php:146 ../../../../ajax/ajax_doLogin.php:149 msgid "Clave maestra incorrecta" msgstr "Invalid Master Password" -#: ../../../../ajax/ajax_doLogin.php:181 +#: ../../../../ajax/ajax_doLogin.php:172 #: ../../../../inc/ProfileBase.class.php:512 #: ../../../../inc/ProfileBase.class.php:550 #: ../../../../inc/ProfileBase.class.php:593 @@ -816,7 +811,7 @@ msgstr "Invalid Master Password" msgid "Perfil" msgstr "Profile" -#: ../../../../ajax/ajax_doLogin.php:182 ../../../../inc/Groups.class.php:158 +#: ../../../../ajax/ajax_doLogin.php:173 ../../../../inc/Groups.class.php:158 #: ../../../../inc/Groups.class.php:259 ../../../../inc/Groups.class.php:375 #: ../../../../web/UsersMgmtC.class.php:90 #: ../../../../inc/themes/classic/ldap.inc:116 @@ -967,14 +962,14 @@ msgstr "The request cannot be done. Please contact to the administrator" #: ../../../../ajax/ajax_passReset.php:72 #: ../../../../inc/UserBase.class.php:568 -#: ../../../../inc/UserUtil.class.php:664 +#: ../../../../inc/UserUtil.class.php:662 msgid "Modificar Clave Usuario" msgstr "Edit User Password" #: ../../../../ajax/ajax_passReset.php:72 #: ../../../../inc/UserBase.class.php:568 #: ../../../../inc/UserBase.class.php:592 -#: ../../../../inc/UserUtil.class.php:664 +#: ../../../../inc/UserUtil.class.php:662 #: ../../../../web/UsersMgmtC.class.php:88 #: ../../../../inc/themes/classic/users.inc:21 #: ../../../../inc/themes/material-blue/users.inc:24 @@ -1102,7 +1097,7 @@ msgstr "Parameters help" #: ../../../../inc/Log.class.php:28 ../../../../inc/Migrate.class.php:28 #: ../../../../inc/Profile.class.php:29 #: ../../../../inc/ProfileBase.class.php:28 -#: ../../../../inc/Request.class.php:111 ../../../../inc/Session.class.php:28 +#: ../../../../inc/Request.class.php:110 ../../../../inc/Session.class.php:28 #: ../../../../inc/SyspassImport.class.php:28 #: ../../../../inc/Upgrade.class.php:29 ../../../../inc/User.class.php:28 #: ../../../../inc/UserLdap.class.php:28 @@ -1404,7 +1399,7 @@ msgstr "Delete Authorization" msgid "Usuario no pertenece al grupo" msgstr "The user doesn't belong to the group" -#: ../../../../inc/Auth.class.php:187 +#: ../../../../inc/Auth.class.php:186 #: ../../../../inc/themes/classic/users.inc:117 #: ../../../../inc/themes/classic/userspass.inc:2 #: ../../../../inc/themes/material-blue/users.inc:161 @@ -1412,15 +1407,15 @@ msgstr "The user doesn't belong to the group" msgid "Cambio de Clave" msgstr "Password Change" -#: ../../../../inc/Auth.class.php:189 +#: ../../../../inc/Auth.class.php:188 msgid "Se ha solicitado el cambio de su clave de usuario." msgstr "A request for changing your user password has been done." -#: ../../../../inc/Auth.class.php:191 +#: ../../../../inc/Auth.class.php:190 msgid "Para completar el proceso es necesario que acceda a la siguiente URL:" msgstr "In order to complete the process, please go to this URL:" -#: ../../../../inc/Auth.class.php:195 +#: ../../../../inc/Auth.class.php:194 msgid "Si no ha solicitado esta acción, ignore este mensaje." msgstr "If you have not requested this action, please dismiss this message." @@ -1522,11 +1517,21 @@ msgstr "You don't have permission to access to this page" msgid "No tiene permisos para realizar esta operación" msgstr "You don't have permission to do this operation" -#: ../../../../inc/Crypt.class.php:236 +#: ../../../../inc/Crypt.class.php:119 ../../../../inc/Email.class.php:146 +msgid "Aviso" +msgstr "Warning" + +#: ../../../../inc/Crypt.class.php:119 +msgid "" +"Se ha regenerado el HASH de clave maestra. No es necesaria ninguna acción." +msgstr "" +"The master password HASH has been regenerated. No further action is needed." + +#: ../../../../inc/Crypt.class.php:181 msgid "No se puede usar el módulo de encriptación" msgstr "Crypto module cannot be loaded" -#: ../../../../inc/Crypt.class.php:247 +#: ../../../../inc/Crypt.class.php:192 msgid "Error al generar datos cifrados" msgstr "Error on creating encryption data" @@ -1637,7 +1642,7 @@ msgstr "Unable to connect to the DB" msgid "Compruebe los datos de conexión" msgstr "Please, check connection parameters" -#: ../../../../inc/Email.class.php:59 ../../../../inc/UserUtil.class.php:567 +#: ../../../../inc/Email.class.php:59 ../../../../inc/UserUtil.class.php:565 msgid "N/D" msgstr "N/A" @@ -1671,10 +1676,6 @@ msgstr "Recipient" msgid "CC" msgstr "CC" -#: ../../../../inc/Email.class.php:146 -msgid "Aviso" -msgstr "Warning" - #: ../../../../inc/FileImport.class.php:105 msgid "Archivo no subido correctamente" msgstr "File successfully uploaded" @@ -2196,6 +2197,21 @@ msgstr "There is no customers to import" msgid "No hay cuentas para importar" msgstr "There is no accounts to import" +#: ../../../../inc/Template.class.php:89 +#, php-format +msgid "No es posible obtener la plantilla \"%s\" : %s" +msgstr "Unable to retrieve the \"%s\" template: %s" + +#: ../../../../inc/Template.class.php:128 +#, php-format +msgid "No es posible obtener la variable \"%s\"" +msgstr "Unable to retrieve the \"%s\" variable" + +#: ../../../../inc/Template.class.php:171 +#, php-format +msgid "No es posible destruir la variable \"%s\"" +msgstr "Unable to unset the \"%s\" variable" + #: ../../../../inc/Upgrade.class.php:51 msgid "Error al aplicar la actualización de la Base de Datos" msgstr "Error on updating database" @@ -2219,23 +2235,23 @@ msgstr "Error while applying auxiliary update" msgid "Actualizar BBDD" msgstr "Update DB" -#: ../../../../inc/Upgrade.class.php:121 +#: ../../../../inc/Upgrade.class.php:127 msgid "No es necesario actualizar la Base de Datos." msgstr "Database update not needed." -#: ../../../../inc/Upgrade.class.php:129 +#: ../../../../inc/Upgrade.class.php:135 msgid "Error al aplicar la actualización de la Base de Datos." msgstr "Error on updating database." -#: ../../../../inc/Upgrade.class.php:138 +#: ../../../../inc/Upgrade.class.php:144 msgid "Actualización de la Base de Datos realizada correctamente." msgstr "Database updating was done successfully." -#: ../../../../inc/Upgrade.class.php:215 +#: ../../../../inc/Upgrade.class.php:221 msgid "Actualizar Configuración" msgstr "Update Configuration" -#: ../../../../inc/Upgrade.class.php:215 +#: ../../../../inc/Upgrade.class.php:221 msgid "Actualización de la Configuración realizada correctamente." msgstr "Configuration updating was done successfully." @@ -2269,11 +2285,11 @@ msgstr "You will receive a confirmation email in short." msgid "Nuevo usuario de LDAP" msgstr "New LDAP user" -#: ../../../../inc/UserUtil.class.php:705 +#: ../../../../inc/UserUtil.class.php:703 msgid "Migrar Grupos" msgstr "Migrate Groups" -#: ../../../../inc/UserUtil.class.php:705 +#: ../../../../inc/UserUtil.class.php:703 msgid "Error al migrar grupo del usuario" msgstr "Error while migrating user group" @@ -2712,19 +2728,23 @@ msgid "" msgstr "" "Without this function, an attacker could take your account on password reset." -#: ../../../../web/MainC.class.php:288 +#: ../../../../web/MainC.class.php:284 +msgid "Error en clave RSA" +msgstr "Error on RSA key" + +#: ../../../../web/MainC.class.php:304 msgid "Instalación finalizada" msgstr "Installation finished" -#: ../../../../web/MainC.class.php:289 +#: ../../../../web/MainC.class.php:305 msgid "Pulse aquí para acceder" msgstr "Click here to sign in" -#: ../../../../web/MainC.class.php:384 +#: ../../../../web/MainC.class.php:400 msgid "Descargar nueva versión" msgstr "Download new version" -#: ../../../../web/MainC.class.php:395 +#: ../../../../web/MainC.class.php:411 msgid "Avisos de sysPass" msgstr "sysPass Notices" @@ -2853,12 +2873,14 @@ msgstr "Access user" #: ../../../../inc/themes/classic/account.inc:90 #: ../../../../inc/themes/classic/editpass.inc:31 +#: ../../../../inc/themes/classic/passreset.inc:35 #: ../../../../inc/themes/classic/users.inc:83 #: ../../../../inc/themes/classic/userspass.inc:19 #: ../../../../inc/themes/classic/userspass.inc:21 #: ../../../../inc/themes/material-blue/account.inc:105 #: ../../../../inc/themes/material-blue/editpass.inc:36 -#: ../../../../inc/themes/material-blue/install.inc:64 +#: ../../../../inc/themes/material-blue/install.inc:66 +#: ../../../../inc/themes/material-blue/passreset.inc:36 #: ../../../../inc/themes/material-blue/users.inc:102 #: ../../../../inc/themes/material-blue/users.inc:109 #: ../../../../inc/themes/material-blue/userspass.inc:19 @@ -2993,7 +3015,7 @@ msgstr "View Current" #: ../../../../inc/themes/classic/account.inc:406 #: ../../../../inc/themes/classic/editpass.inc:45 #: ../../../../inc/themes/classic/passreset.inc:46 -#: ../../../../inc/themes/material-blue/passreset.inc:43 +#: ../../../../inc/themes/material-blue/passreset.inc:48 msgid "Volver" msgstr "Back" @@ -3436,8 +3458,8 @@ msgstr "Required" #: ../../../../inc/themes/classic/login.inc:15 #: ../../../../inc/themes/classic/login.inc:27 #: ../../../../inc/themes/material-blue/encryption.inc:8 -#: ../../../../inc/themes/material-blue/install.inc:49 -#: ../../../../inc/themes/material-blue/install.inc:56 +#: ../../../../inc/themes/material-blue/install.inc:51 +#: ../../../../inc/themes/material-blue/install.inc:58 #: ../../../../inc/themes/material-blue/login.inc:25 #: ../../../../inc/themes/material-blue/login.inc:48 msgid "Clave Maestra" @@ -3622,12 +3644,12 @@ msgid "Ver Archivo" msgstr "View File" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 +#: ../../../../inc/themes/material-blue/footer.inc:29 msgid "Indica si la conexión utiliza HTTPS." msgstr "It tells if the connection uses HTTPS" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 +#: ../../../../inc/themes/material-blue/footer.inc:29 msgid "" "Las claves de formularios enviados se encriptan mediante PKI, el resto de " "datos no." @@ -3635,12 +3657,10 @@ msgstr "" "The passwords sent from the forms are encrypted with PKI, the other data not." #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 msgid "Seguro" msgstr "Secure" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 msgid "Inseguro" msgstr "Insecure" @@ -3877,12 +3897,12 @@ msgid "Crear cuenta de admin de sysPass" msgstr "Create sysPass admin account" #: ../../../../inc/themes/classic/install.inc:32 -#: ../../../../inc/themes/material-blue/install.inc:36 +#: ../../../../inc/themes/material-blue/install.inc:37 msgid "Login del usuario administrador de sysPass" msgstr "sysPass administrator's login" #: ../../../../inc/themes/classic/install.inc:58 -#: ../../../../inc/themes/material-blue/install.inc:69 +#: ../../../../inc/themes/material-blue/install.inc:71 msgid "Configurar BBDD" msgstr "DB Configuration" @@ -3891,7 +3911,7 @@ msgid "Login de usuario con permisos de administrador de MySQL" msgstr "User login with with database administrative rights" #: ../../../../inc/themes/classic/install.inc:83 -#: ../../../../inc/themes/material-blue/install.inc:102 +#: ../../../../inc/themes/material-blue/install.inc:105 msgid "Nombre de la base de datos para sysPass" msgstr "sysPass database name" @@ -3900,18 +3920,18 @@ msgid "Nombre del servidor de la base de datos de sysPass" msgstr "sysPass database server name" #: ../../../../inc/themes/classic/install.inc:97 -#: ../../../../inc/themes/material-blue/install.inc:120 +#: ../../../../inc/themes/material-blue/install.inc:123 msgid "Modo Hosting" msgstr "Hosting Mode" #: ../../../../inc/themes/classic/install.inc:104 -#: ../../../../inc/themes/material-blue/install.inc:127 +#: ../../../../inc/themes/material-blue/install.inc:130 msgid "No crea ni verifica los permisos del usuario sobre la BBDD" msgstr "It does not create or verify the user's permissions on the DB" #: ../../../../inc/themes/classic/install.inc:108 -#: ../../../../inc/themes/material-blue/install.inc:134 -#: ../../../../inc/themes/material-blue/install.inc:135 +#: ../../../../inc/themes/material-blue/install.inc:137 +#: ../../../../inc/themes/material-blue/install.inc:138 msgid "Instalar" msgstr "Install" @@ -4080,7 +4100,7 @@ msgid "Más Acciones" msgstr "More Actions" #: ../../../../inc/themes/classic/passreset.inc:13 -#: ../../../../inc/themes/material-blue/passreset.inc:10 +#: ../../../../inc/themes/material-blue/passreset.inc:9 msgid "Solicitud de Cambio de Clave" msgstr "Request Password Change" @@ -4089,7 +4109,7 @@ msgid "Login del Usuario" msgstr "User login" #: ../../../../inc/themes/classic/passreset.inc:21 -#: ../../../../inc/themes/material-blue/passreset.inc:24 +#: ../../../../inc/themes/material-blue/passreset.inc:23 msgid "Email del Usuario" msgstr "User's Email" @@ -4103,23 +4123,15 @@ msgstr "Email" msgid "Nueva Clave" msgstr "New Password" -#: ../../../../inc/themes/classic/passreset.inc:34 -msgid "Nueva Clave (Verificar)" -msgstr "New Password (Verify)" - -#: ../../../../inc/themes/classic/passreset.inc:35 -msgid "Clave (Verificar)" -msgstr "Password (Verify)" - #: ../../../../inc/themes/classic/passreset.inc:46 -#: ../../../../inc/themes/material-blue/passreset.inc:42 +#: ../../../../inc/themes/material-blue/passreset.inc:47 msgid "Volver a iniciar sesión" msgstr "Go back to login" #: ../../../../inc/themes/classic/passreset.inc:48 #: ../../../../inc/themes/material-blue/2fa.inc:27 -#: ../../../../inc/themes/material-blue/passreset.inc:48 -#: ../../../../inc/themes/material-blue/passreset.inc:49 +#: ../../../../inc/themes/material-blue/passreset.inc:53 +#: ../../../../inc/themes/material-blue/passreset.inc:54 msgid "Solicitar" msgstr "Request" @@ -4128,8 +4140,8 @@ msgid "Solicitar cambio de clave" msgstr "Request password change" #: ../../../../inc/themes/classic/passreset.inc:51 -#: ../../../../inc/themes/material-blue/passreset.inc:53 -#: ../../../../inc/themes/material-blue/passreset.inc:54 +#: ../../../../inc/themes/material-blue/passreset.inc:58 +#: ../../../../inc/themes/material-blue/passreset.inc:59 msgid "Cambiar" msgstr "Change" @@ -4713,31 +4725,31 @@ msgstr "" "Allows to do the Accounts, Categories and Customers import form XML and CSV " "files." -#: ../../../../inc/themes/material-blue/install.inc:31 +#: ../../../../inc/themes/material-blue/install.inc:32 msgid "Usuario administrador de sysPass" msgstr "sysPass admin user" -#: ../../../../inc/themes/material-blue/install.inc:78 +#: ../../../../inc/themes/material-blue/install.inc:80 msgid "Usuario acceso BBDD" msgstr "DB access user" -#: ../../../../inc/themes/material-blue/install.inc:83 +#: ../../../../inc/themes/material-blue/install.inc:85 msgid "Usuario con permisos de administrador de MySQL" msgstr "An user with MySQL admin rights" -#: ../../../../inc/themes/material-blue/install.inc:90 +#: ../../../../inc/themes/material-blue/install.inc:93 msgid "Clave acceso BBDD" msgstr "DB access password" -#: ../../../../inc/themes/material-blue/install.inc:97 +#: ../../../../inc/themes/material-blue/install.inc:100 msgid "Nombre BBDD para sysPass" msgstr "sysPass database name" -#: ../../../../inc/themes/material-blue/install.inc:109 +#: ../../../../inc/themes/material-blue/install.inc:112 msgid "Servidor BBDD para sysPass" msgstr "sysPass database server" -#: ../../../../inc/themes/material-blue/install.inc:114 +#: ../../../../inc/themes/material-blue/install.inc:117 msgid "Nombre del servidor para instalar la base de datos de sysPass" msgstr "Server name to install the sysPass database" @@ -4784,3 +4796,9 @@ msgstr "Make a backup and export" #: ../../../../inc/themes/material-blue/security.inc:4 msgid "Autentificación" msgstr "Authentication" + +#~ msgid "Nueva Clave (Verificar)" +#~ msgstr "New Password (Verify)" + +#~ msgid "Clave (Verificar)" +#~ msgstr "Password (Verify)" diff --git a/inc/locales/fr_FR/LC_MESSAGES/messages.mo b/inc/locales/fr_FR/LC_MESSAGES/messages.mo index afb71f7a..eadf7d7a 100644 Binary files a/inc/locales/fr_FR/LC_MESSAGES/messages.mo and b/inc/locales/fr_FR/LC_MESSAGES/messages.mo differ diff --git a/inc/locales/fr_FR/LC_MESSAGES/messages.po b/inc/locales/fr_FR/LC_MESSAGES/messages.po index d5a29354..13aec7e7 100644 --- a/inc/locales/fr_FR/LC_MESSAGES/messages.po +++ b/inc/locales/fr_FR/LC_MESSAGES/messages.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: sysPass\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-23 12:59+0100\n" -"PO-Revision-Date: 2015-09-23 12:59+0100\n" +"POT-Creation-Date: 2015-09-30 03:01+0100\n" +"PO-Revision-Date: 2015-09-30 03:01+0100\n" "Last-Translator: nuxsmin \n" "Language-Team: \n" "Language: fr_FR\n" @@ -54,7 +54,7 @@ msgstr "Nom de compte requis" #: ../../../../ajax/ajax_accountSave.php:77 #: ../../../../ajax/ajax_accountSave.php:88 -#: ../../../../ajax/ajax_appMgmtSave.php:337 +#: ../../../../ajax/ajax_appMgmtSave.php:328 msgid "Es necesario un nombre de cliente" msgstr "Nom de client requis" @@ -80,63 +80,63 @@ msgid "Id inválido" msgstr "Id Invalide" #: ../../../../ajax/ajax_accountSave.php:110 -#: ../../../../ajax/ajax_accountSave.php:263 -#: ../../../../ajax/ajax_appMgmtSave.php:543 -#: ../../../../ajax/ajax_configSave.php:297 +#: ../../../../ajax/ajax_accountSave.php:258 +#: ../../../../ajax/ajax_appMgmtSave.php:534 +#: ../../../../ajax/ajax_configSave.php:287 #: ../../../../ajax/ajax_userPrefsSave.php:79 ../../../../api.php:53 msgid "Acción Inválida" msgstr "Action Invalide" -#: ../../../../ajax/ajax_accountSave.php:122 +#: ../../../../ajax/ajax_accountSave.php:117 #: ../../../../ajax/ajax_appMgmtSave.php:111 -#: ../../../../ajax/ajax_appMgmtSave.php:155 -#: ../../../../ajax/ajax_backup.php:70 +#: ../../../../ajax/ajax_appMgmtSave.php:148 +#: ../../../../ajax/ajax_backup.php:62 msgid "Las claves no coinciden" msgstr "Les mots de passe ne correspondent pas" -#: ../../../../ajax/ajax_accountSave.php:173 +#: ../../../../ajax/ajax_accountSave.php:168 msgid "Cuenta creada" msgstr "Compte ajouté" -#: ../../../../ajax/ajax_accountSave.php:176 +#: ../../../../ajax/ajax_accountSave.php:171 msgid "Error al crear la cuenta" msgstr "Erreur pendant la création de compte" -#: ../../../../ajax/ajax_accountSave.php:211 +#: ../../../../ajax/ajax_accountSave.php:206 msgid "Sin cambios" msgstr "Aucun changement" -#: ../../../../ajax/ajax_accountSave.php:223 +#: ../../../../ajax/ajax_accountSave.php:218 msgid "Cuenta actualizada" msgstr "Compte actualisé" -#: ../../../../ajax/ajax_accountSave.php:226 +#: ../../../../ajax/ajax_accountSave.php:221 msgid "Error al modificar la cuenta" msgstr "Erreur pendant la modification du compte" -#: ../../../../ajax/ajax_accountSave.php:233 +#: ../../../../ajax/ajax_accountSave.php:228 msgid "Cuenta eliminada" msgstr "Compte supprimé" -#: ../../../../ajax/ajax_accountSave.php:236 +#: ../../../../ajax/ajax_accountSave.php:231 msgid "Error al eliminar la cuenta" msgstr "Erreur pendant la suppression du compte" -#: ../../../../ajax/ajax_accountSave.php:246 -#: ../../../../ajax/ajax_appMgmtSave.php:161 +#: ../../../../ajax/ajax_accountSave.php:241 +#: ../../../../ajax/ajax_appMgmtSave.php:152 #: ../../../../ajax/ajax_passReset.php:74 msgid "Clave actualizada" msgstr "Mot de passe actualisé" -#: ../../../../ajax/ajax_accountSave.php:249 +#: ../../../../ajax/ajax_accountSave.php:244 msgid "Error al actualizar la clave" msgstr "Erreur pendant l'actualisation du mot de passe" -#: ../../../../ajax/ajax_accountSave.php:256 +#: ../../../../ajax/ajax_accountSave.php:251 msgid "Cuenta restaurada" msgstr "Compte restauré" -#: ../../../../ajax/ajax_accountSave.php:259 +#: ../../../../ajax/ajax_accountSave.php:254 msgid "Error al restaurar cuenta" msgstr "Erreur pendant la restauration du compte" @@ -262,8 +262,8 @@ msgstr "Courriel requis" #: ../../../../ajax/ajax_appMgmtSave.php:95 #: ../../../../ajax/ajax_appMgmtSave.php:144 -#: ../../../../ajax/ajax_appMgmtSave.php:168 -#: ../../../../ajax/ajax_configSave.php:272 +#: ../../../../ajax/ajax_appMgmtSave.php:159 +#: ../../../../ajax/ajax_configSave.php:262 #: ../../../../ajax/ajax_import.php:39 ../../../../ajax/ajax_migrate.php:39 #: ../../../../ajax/ajax_userPrefsSave.php:55 msgid "Ey, esto es una DEMO!!" @@ -299,49 +299,49 @@ msgstr "Utilisateur actualisé" msgid "Error al actualizar el usuario" msgstr "Erreur pendant l'actualisation de l'utilisateur" -#: ../../../../ajax/ajax_appMgmtSave.php:164 +#: ../../../../ajax/ajax_appMgmtSave.php:155 #: ../../../../ajax/ajax_passReset.php:78 msgid "Error al modificar la clave" msgstr "Erreur pendant la modification du mot de passe" -#: ../../../../ajax/ajax_appMgmtSave.php:170 +#: ../../../../ajax/ajax_appMgmtSave.php:161 msgid "No es posible eliminar, usuario en uso" msgstr "Impossible à supprimer, utilisateur en activité" -#: ../../../../ajax/ajax_appMgmtSave.php:174 +#: ../../../../ajax/ajax_appMgmtSave.php:165 msgid "Usuario eliminado" msgstr "Utilisateur supprimé" -#: ../../../../ajax/ajax_appMgmtSave.php:177 +#: ../../../../ajax/ajax_appMgmtSave.php:168 msgid "Error al eliminar el usuario" msgstr "Erreur pendant la suppression de l'utilisateur" -#: ../../../../ajax/ajax_appMgmtSave.php:192 +#: ../../../../ajax/ajax_appMgmtSave.php:183 msgid "Es necesario un nombre de grupo" msgstr "Nom de groupe requis" -#: ../../../../ajax/ajax_appMgmtSave.php:200 +#: ../../../../ajax/ajax_appMgmtSave.php:191 msgid "Nombre de grupo duplicado" msgstr "Nom de groupe dupliqué" -#: ../../../../ajax/ajax_appMgmtSave.php:212 +#: ../../../../ajax/ajax_appMgmtSave.php:203 msgid "Grupo creado" msgstr "Groupe ajouté" -#: ../../../../ajax/ajax_appMgmtSave.php:214 +#: ../../../../ajax/ajax_appMgmtSave.php:205 msgid "Error al crear el grupo" msgstr "Erreur pendant la création de groupe" -#: ../../../../ajax/ajax_appMgmtSave.php:225 +#: ../../../../ajax/ajax_appMgmtSave.php:216 msgid "Grupo actualizado" msgstr "Gropue actualisé" -#: ../../../../ajax/ajax_appMgmtSave.php:228 +#: ../../../../ajax/ajax_appMgmtSave.php:219 msgid "Error al actualizar el grupo" msgstr "Erreur pendant l'actualisation du groupe" -#: ../../../../ajax/ajax_appMgmtSave.php:237 -#: ../../../../ajax/ajax_appMgmtSave.php:314 +#: ../../../../ajax/ajax_appMgmtSave.php:228 +#: ../../../../ajax/ajax_appMgmtSave.php:305 #: ../../../../inc/CustomFieldsBase.class.php:83 #: ../../../../inc/themes/classic/account.inc:109 #: ../../../../inc/themes/classic/groups.inc:24 @@ -352,7 +352,7 @@ msgstr "Erreur pendant l'actualisation du groupe" msgid "Usuarios" msgstr "Utilisateurs" -#: ../../../../ajax/ajax_appMgmtSave.php:241 +#: ../../../../ajax/ajax_appMgmtSave.php:232 #: ../../../../inc/Category.class.php:266 #: ../../../../inc/CustomFieldsBase.class.php:80 #: ../../../../inc/Customer.class.php:150 @@ -362,126 +362,126 @@ msgstr "Utilisateurs" msgid "Cuentas" msgstr "Comptes" -#: ../../../../ajax/ajax_appMgmtSave.php:244 -#: ../../../../ajax/ajax_appMgmtSave.php:316 +#: ../../../../ajax/ajax_appMgmtSave.php:235 +#: ../../../../ajax/ajax_appMgmtSave.php:307 #: ../../../../inc/Category.class.php:119 #: ../../../../inc/Customer.class.php:150 msgid "No es posible eliminar" msgstr "Impossible de supprimer" -#: ../../../../ajax/ajax_appMgmtSave.php:244 +#: ../../../../ajax/ajax_appMgmtSave.php:235 msgid "Grupo en uso por:" msgstr "Groupe utilisé par:" -#: ../../../../ajax/ajax_appMgmtSave.php:249 +#: ../../../../ajax/ajax_appMgmtSave.php:240 msgid "Grupo eliminado" msgstr "Groupe supprimé" -#: ../../../../ajax/ajax_appMgmtSave.php:252 +#: ../../../../ajax/ajax_appMgmtSave.php:243 msgid "Error al eliminar el grupo" msgstr "Erreur pendant la supression du groupe" -#: ../../../../ajax/ajax_appMgmtSave.php:291 +#: ../../../../ajax/ajax_appMgmtSave.php:282 msgid "Es necesario un nombre de perfil" msgstr "Nom de profil requis" -#: ../../../../ajax/ajax_appMgmtSave.php:293 +#: ../../../../ajax/ajax_appMgmtSave.php:284 msgid "Nombre de perfil duplicado" msgstr "Nom de profil dupliqué" -#: ../../../../ajax/ajax_appMgmtSave.php:298 +#: ../../../../ajax/ajax_appMgmtSave.php:289 msgid "Perfil creado" msgstr "Profil ajouté" -#: ../../../../ajax/ajax_appMgmtSave.php:301 +#: ../../../../ajax/ajax_appMgmtSave.php:292 msgid "Error al crear el perfil" msgstr "Erreur pendant la création de profil" -#: ../../../../ajax/ajax_appMgmtSave.php:304 +#: ../../../../ajax/ajax_appMgmtSave.php:295 msgid "Perfil actualizado" msgstr "Profil actualisé" -#: ../../../../ajax/ajax_appMgmtSave.php:307 +#: ../../../../ajax/ajax_appMgmtSave.php:298 msgid "Error al actualizar el perfil" msgstr "Erreur pendant l'actualisation du profil" -#: ../../../../ajax/ajax_appMgmtSave.php:316 +#: ../../../../ajax/ajax_appMgmtSave.php:307 msgid "Perfil en uso por:" msgstr "Profil utilisé par:" -#: ../../../../ajax/ajax_appMgmtSave.php:319 +#: ../../../../ajax/ajax_appMgmtSave.php:310 msgid "Perfil eliminado" msgstr "Profil supprimé" -#: ../../../../ajax/ajax_appMgmtSave.php:322 +#: ../../../../ajax/ajax_appMgmtSave.php:313 msgid "Error al eliminar el perfil" msgstr "Erreur pendant la suppression du profil" -#: ../../../../ajax/ajax_appMgmtSave.php:357 +#: ../../../../ajax/ajax_appMgmtSave.php:348 msgid "Cliente creado" msgstr "Client ajouté" -#: ../../../../ajax/ajax_appMgmtSave.php:372 +#: ../../../../ajax/ajax_appMgmtSave.php:363 msgid "Cliente actualizado" msgstr "Compte actualisé" -#: ../../../../ajax/ajax_appMgmtSave.php:382 +#: ../../../../ajax/ajax_appMgmtSave.php:373 msgid "Cliente eliminado" msgstr "Client supprimé" -#: ../../../../ajax/ajax_appMgmtSave.php:396 +#: ../../../../ajax/ajax_appMgmtSave.php:387 msgid "Es necesario un nombre de categoría" msgstr "Nom de catégorie requis" -#: ../../../../ajax/ajax_appMgmtSave.php:416 +#: ../../../../ajax/ajax_appMgmtSave.php:407 msgid "Categoría creada" msgstr "Catégorie ajoutée" -#: ../../../../ajax/ajax_appMgmtSave.php:431 +#: ../../../../ajax/ajax_appMgmtSave.php:422 msgid "Categoría actualizada" msgstr "Catégorie actualisée" -#: ../../../../ajax/ajax_appMgmtSave.php:442 +#: ../../../../ajax/ajax_appMgmtSave.php:433 msgid "Categoría eliminada" msgstr "Catégorie supprimé" -#: ../../../../ajax/ajax_appMgmtSave.php:458 +#: ../../../../ajax/ajax_appMgmtSave.php:449 msgid "Usuario o acción no indicado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:468 +#: ../../../../ajax/ajax_appMgmtSave.php:459 msgid "Autorización creada" msgstr "Autorisation ajoutée" -#: ../../../../ajax/ajax_appMgmtSave.php:476 +#: ../../../../ajax/ajax_appMgmtSave.php:467 msgid "Autorización actualizada" msgstr "Autorisation mise à jour" -#: ../../../../ajax/ajax_appMgmtSave.php:486 +#: ../../../../ajax/ajax_appMgmtSave.php:477 msgid "Autorización eliminada" msgstr "Autorisation supprimée" -#: ../../../../ajax/ajax_appMgmtSave.php:503 +#: ../../../../ajax/ajax_appMgmtSave.php:494 msgid "Nombre del campo no indicado" msgstr "Nom de champ pas configurer" -#: ../../../../ajax/ajax_appMgmtSave.php:505 +#: ../../../../ajax/ajax_appMgmtSave.php:496 msgid "Tipo del campo no indicado" msgstr "Type de champ pas configurer" -#: ../../../../ajax/ajax_appMgmtSave.php:507 +#: ../../../../ajax/ajax_appMgmtSave.php:498 msgid "Módulo del campo no indicado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:521 +#: ../../../../ajax/ajax_appMgmtSave.php:512 msgid "Campo creado" msgstr "Champ ajouté" -#: ../../../../ajax/ajax_appMgmtSave.php:530 +#: ../../../../ajax/ajax_appMgmtSave.php:521 msgid "Campo actualizado" msgstr "Champ mis à jour" -#: ../../../../ajax/ajax_appMgmtSave.php:540 +#: ../../../../ajax/ajax_appMgmtSave.php:531 msgid "Campo eliminado" msgstr "Champ supprimé" @@ -494,7 +494,7 @@ msgstr "Effectuer une sauvegarde" msgid "Error al realizar el backup" msgstr "Erreur pendant la sauvegarde" -#: ../../../../ajax/ajax_backup.php:54 ../../../../ajax/ajax_backup.php:76 +#: ../../../../ajax/ajax_backup.php:54 ../../../../ajax/ajax_backup.php:68 #: ../../../../ajax/ajax_checkLdap.php:57 ../../../../inc/Import.class.php:128 #: ../../../../inc/Migrate.class.php:93 msgid "Revise el registro de eventos para más detalles" @@ -509,30 +509,23 @@ msgstr "" msgid "Proceso de backup finalizado" msgstr "Processus de sauvegarde terminé" -#: ../../../../ajax/ajax_backup.php:66 -#: ../../../../ajax/ajax_configSave.php:244 -#: ../../../../ajax/ajax_doLogin.php:53 ../../../../ajax/ajax_import.php:56 -#, fuzzy -msgid "Error en clave RSA" -msgstr "Erreur pendant la requête" - -#: ../../../../ajax/ajax_backup.php:74 ../../../../ajax/ajax_backup.php:79 +#: ../../../../ajax/ajax_backup.php:66 ../../../../ajax/ajax_backup.php:71 msgid "Realizar Exportación" msgstr "Exporter" -#: ../../../../ajax/ajax_backup.php:74 +#: ../../../../ajax/ajax_backup.php:66 msgid "Error al realizar la exportación de cuentas" msgstr "Erreur pendant l'exportation de comptes" -#: ../../../../ajax/ajax_backup.php:76 +#: ../../../../ajax/ajax_backup.php:68 msgid "Error al realizar la exportación" msgstr "Problème durant l'export" -#: ../../../../ajax/ajax_backup.php:79 +#: ../../../../ajax/ajax_backup.php:71 msgid "Exportación de cuentas realizada correctamente" msgstr "Export réalisé avec succès" -#: ../../../../ajax/ajax_backup.php:81 +#: ../../../../ajax/ajax_backup.php:73 msgid "Proceso de exportación finalizado" msgstr "Processus d'export terminé" @@ -609,7 +602,7 @@ msgid "Configuración actualizada" msgstr "Configuration actualisée" #: ../../../../ajax/ajax_configSave.php:230 -#: ../../../../ajax/ajax_configSave.php:282 +#: ../../../../ajax/ajax_configSave.php:272 #: ../../../../ajax/ajax_viewpass.php:60 #: ../../../../inc/Controller.class.php:169 msgid "Clave maestra actualizada" @@ -629,40 +622,40 @@ msgstr "Mot de passe maître requis" msgid "Se ha de confirmar el cambio de clave" msgstr "Le changement de mot de passe doit être confirmé" -#: ../../../../ajax/ajax_configSave.php:248 +#: ../../../../ajax/ajax_configSave.php:238 msgid "Las claves son idénticas" msgstr "Les mots de passe sont identiques" -#: ../../../../ajax/ajax_configSave.php:250 +#: ../../../../ajax/ajax_configSave.php:240 msgid "Las claves maestras no coinciden" msgstr "Les mots de passe maîtres ne correspondent pas" -#: ../../../../ajax/ajax_configSave.php:252 +#: ../../../../ajax/ajax_configSave.php:242 msgid "La clave maestra actual no coincide" msgstr "Le mot de passe maître actuel ne correspond pas" -#: ../../../../ajax/ajax_configSave.php:261 +#: ../../../../ajax/ajax_configSave.php:251 msgid "Errores al actualizar las claves de las cuentas" msgstr "Erreur pendant la modification des mots de passe des comptes" -#: ../../../../ajax/ajax_configSave.php:267 +#: ../../../../ajax/ajax_configSave.php:257 msgid "Errores al actualizar las claves de las cuentas del histórico" msgstr "Erreur lors de la mise à jour des mots de passe dans l'historique" -#: ../../../../ajax/ajax_configSave.php:280 +#: ../../../../ajax/ajax_configSave.php:270 #: ../../../../inc/Account.class.php:497 msgid "Actualizar Clave Maestra" msgstr "Mettre à jour le Mot de passe Maître" -#: ../../../../ajax/ajax_configSave.php:284 +#: ../../../../ajax/ajax_configSave.php:274 msgid "Error al guardar el hash de la clave maestra" msgstr "Erreur pendant la sauvegarde du hash du mot de passe maître" -#: ../../../../ajax/ajax_configSave.php:292 +#: ../../../../ajax/ajax_configSave.php:282 msgid "Generar Clave Temporal" msgstr "Générer un mot de passe temporaire" -#: ../../../../ajax/ajax_configSave.php:292 +#: ../../../../ajax/ajax_configSave.php:282 #: ../../../../inc/themes/classic/account.inc:83 #: ../../../../inc/themes/classic/editpass.inc:25 #: ../../../../inc/themes/classic/install.inc:38 @@ -671,6 +664,7 @@ msgstr "Générer un mot de passe temporaire" #: ../../../../inc/themes/classic/login.inc:22 #: ../../../../inc/themes/classic/mail.inc:55 #: ../../../../inc/themes/classic/passreset.inc:29 +#: ../../../../inc/themes/classic/passreset.inc:34 #: ../../../../inc/themes/classic/users.inc:75 #: ../../../../inc/themes/classic/userspass.inc:8 #: ../../../../inc/themes/classic/userspass.inc:11 @@ -680,13 +674,13 @@ msgstr "Générer un mot de passe temporaire" #: ../../../../inc/themes/material-blue/editpass.inc:26 #: ../../../../inc/themes/material-blue/editpass.inc:31 #: ../../../../inc/themes/material-blue/editpass.inc:41 -#: ../../../../inc/themes/material-blue/install.inc:44 +#: ../../../../inc/themes/material-blue/install.inc:46 #: ../../../../inc/themes/material-blue/ldap.inc:105 #: ../../../../inc/themes/material-blue/login.inc:17 #: ../../../../inc/themes/material-blue/login.inc:40 #: ../../../../inc/themes/material-blue/mail.inc:73 #: ../../../../inc/themes/material-blue/mail.inc:80 -#: ../../../../inc/themes/material-blue/passreset.inc:31 +#: ../../../../inc/themes/material-blue/passreset.inc:30 #: ../../../../inc/themes/material-blue/users.inc:89 #: ../../../../inc/themes/material-blue/users.inc:96 #: ../../../../inc/themes/material-blue/userspass.inc:8 @@ -694,7 +688,7 @@ msgstr "Générer un mot de passe temporaire" msgid "Clave" msgstr "Mot de passe" -#: ../../../../ajax/ajax_configSave.php:294 +#: ../../../../ajax/ajax_configSave.php:284 msgid "Clave Temporal Generada" msgstr "Mot de passe temporel generé" @@ -702,45 +696,45 @@ msgstr "Mot de passe temporel generé" msgid "Usuario/Clave no introducidos" msgstr "Utilisateur/Mot de passe non saisi" -#: ../../../../ajax/ajax_doLogin.php:65 +#: ../../../../ajax/ajax_doLogin.php:58 msgid "Inicio sesión" msgstr "Se connecter" -#: ../../../../ajax/ajax_doLogin.php:70 +#: ../../../../ajax/ajax_doLogin.php:63 msgid "Servidor Login" msgstr "Connexion au serveur" -#: ../../../../ajax/ajax_doLogin.php:76 +#: ../../../../ajax/ajax_doLogin.php:69 msgid "Error al guardar los datos de LDAP" msgstr "Erreur pendant la sauvegarde des données utilisateur LDAP" -#: ../../../../ajax/ajax_doLogin.php:79 ../../../../ajax/ajax_doLogin.php:87 -#: ../../../../ajax/ajax_doLogin.php:139 ../../../../ajax/ajax_doLogin.php:185 +#: ../../../../ajax/ajax_doLogin.php:72 ../../../../ajax/ajax_doLogin.php:80 +#: ../../../../ajax/ajax_doLogin.php:132 ../../../../ajax/ajax_doLogin.php:176 #: ../../../../inc/ApiTokens.class.php:140 #: ../../../../inc/ApiTokens.class.php:186 #: ../../../../inc/ApiTokens.class.php:217 #: ../../../../inc/ApiTokens.class.php:243 #: ../../../../inc/ApiTokens.class.php:262 #: ../../../../inc/ApiTokens.class.php:304 -#: ../../../../inc/ApiTokens.class.php:328 ../../../../inc/Crypt.class.php:235 -#: ../../../../inc/Crypt.class.php:246 +#: ../../../../inc/ApiTokens.class.php:328 ../../../../inc/Crypt.class.php:180 +#: ../../../../inc/Crypt.class.php:191 #: ../../../../inc/XmlImportBase.class.php:74 msgid "Error interno" msgstr "Erreur Interne" -#: ../../../../ajax/ajax_doLogin.php:84 +#: ../../../../ajax/ajax_doLogin.php:77 msgid "Error al actualizar la clave del usuario en la BBDD" msgstr "" "Erreur pendant l'actualisation du mot de passe utilisateur dans la base de " "données" -#: ../../../../ajax/ajax_doLogin.php:92 ../../../../ajax/ajax_doLogin.php:117 +#: ../../../../ajax/ajax_doLogin.php:85 ../../../../ajax/ajax_doLogin.php:110 msgid "Login incorrecto" msgstr "Login incorrecte" -#: ../../../../ajax/ajax_doLogin.php:93 ../../../../ajax/ajax_doLogin.php:100 -#: ../../../../ajax/ajax_doLogin.php:107 ../../../../ajax/ajax_doLogin.php:118 -#: ../../../../ajax/ajax_doLogin.php:128 ../../../../ajax/ajax_doLogin.php:180 +#: ../../../../ajax/ajax_doLogin.php:86 ../../../../ajax/ajax_doLogin.php:93 +#: ../../../../ajax/ajax_doLogin.php:100 ../../../../ajax/ajax_doLogin.php:111 +#: ../../../../ajax/ajax_doLogin.php:121 ../../../../ajax/ajax_doLogin.php:171 #: ../../../../inc/ApiTokens.class.php:190 #: ../../../../inc/ApiTokens.class.php:308 ../../../../inc/Auth.class.php:108 #: ../../../../inc/Init.class.php:517 ../../../../inc/UserBase.class.php:382 @@ -769,44 +763,44 @@ msgstr "Login incorrecte" #: ../../../../inc/themes/material-blue/login.inc:33 #: ../../../../inc/themes/material-blue/mail.inc:61 #: ../../../../inc/themes/material-blue/mail.inc:67 -#: ../../../../inc/themes/material-blue/passreset.inc:17 +#: ../../../../inc/themes/material-blue/passreset.inc:16 #: ../../../../inc/themes/material-blue/request.inc:20 #: ../../../../inc/themes/material-blue/search.inc:55 #: ../../../../inc/themes/material-blue/tokens.inc:8 msgid "Usuario" msgstr "Utilisateur" -#: ../../../../ajax/ajax_doLogin.php:96 ../../../../ajax/ajax_doLogin.php:110 -#: ../../../../ajax/ajax_doLogin.php:121 +#: ../../../../ajax/ajax_doLogin.php:89 ../../../../ajax/ajax_doLogin.php:103 +#: ../../../../ajax/ajax_doLogin.php:114 msgid "Usuario/Clave incorrectos" msgstr "Utilisateur/Mot de passe incorrecte" -#: ../../../../ajax/ajax_doLogin.php:99 ../../../../ajax/ajax_doLogin.php:103 +#: ../../../../ajax/ajax_doLogin.php:92 ../../../../ajax/ajax_doLogin.php:96 msgid "Cuenta expirada" msgstr "Compte expiré" -#: ../../../../ajax/ajax_doLogin.php:106 +#: ../../../../ajax/ajax_doLogin.php:99 msgid "El usuario no tiene grupos asociados" msgstr "L'utilisateur n'a pas de groupe associé" -#: ../../../../ajax/ajax_doLogin.php:127 ../../../../ajax/ajax_doLogin.php:131 +#: ../../../../ajax/ajax_doLogin.php:120 ../../../../ajax/ajax_doLogin.php:124 msgid "Usuario deshabilitado" msgstr "Utilisateur désactivé" -#: ../../../../ajax/ajax_doLogin.php:136 +#: ../../../../ajax/ajax_doLogin.php:129 msgid "Error al obtener los datos del usuario de la BBDD" msgstr "" "Erreur pendant la récupération des données utilisateur à partir de la BDD" -#: ../../../../ajax/ajax_doLogin.php:146 +#: ../../../../ajax/ajax_doLogin.php:139 msgid "La clave maestra no ha sido guardada o es incorrecta" msgstr "Mot de passe maître non sauvegardé ou incorrecte" -#: ../../../../ajax/ajax_doLogin.php:155 ../../../../ajax/ajax_doLogin.php:158 +#: ../../../../ajax/ajax_doLogin.php:146 ../../../../ajax/ajax_doLogin.php:149 msgid "Clave maestra incorrecta" msgstr "Mot de passe maître invalide" -#: ../../../../ajax/ajax_doLogin.php:181 +#: ../../../../ajax/ajax_doLogin.php:172 #: ../../../../inc/ProfileBase.class.php:512 #: ../../../../inc/ProfileBase.class.php:550 #: ../../../../inc/ProfileBase.class.php:593 @@ -816,7 +810,7 @@ msgstr "Mot de passe maître invalide" msgid "Perfil" msgstr "Profil" -#: ../../../../ajax/ajax_doLogin.php:182 ../../../../inc/Groups.class.php:158 +#: ../../../../ajax/ajax_doLogin.php:173 ../../../../inc/Groups.class.php:158 #: ../../../../inc/Groups.class.php:259 ../../../../inc/Groups.class.php:375 #: ../../../../web/UsersMgmtC.class.php:90 #: ../../../../inc/themes/classic/ldap.inc:116 @@ -967,14 +961,14 @@ msgstr "La requête ne peut aboutir. Veuillez contacter l'administrateur" #: ../../../../ajax/ajax_passReset.php:72 #: ../../../../inc/UserBase.class.php:568 -#: ../../../../inc/UserUtil.class.php:664 +#: ../../../../inc/UserUtil.class.php:662 msgid "Modificar Clave Usuario" msgstr "Modifier Mot de passe Utilisateur" #: ../../../../ajax/ajax_passReset.php:72 #: ../../../../inc/UserBase.class.php:568 #: ../../../../inc/UserBase.class.php:592 -#: ../../../../inc/UserUtil.class.php:664 +#: ../../../../inc/UserUtil.class.php:662 #: ../../../../web/UsersMgmtC.class.php:88 #: ../../../../inc/themes/classic/users.inc:21 #: ../../../../inc/themes/material-blue/users.inc:24 @@ -1102,7 +1096,7 @@ msgstr "" #: ../../../../inc/Log.class.php:28 ../../../../inc/Migrate.class.php:28 #: ../../../../inc/Profile.class.php:29 #: ../../../../inc/ProfileBase.class.php:28 -#: ../../../../inc/Request.class.php:111 ../../../../inc/Session.class.php:28 +#: ../../../../inc/Request.class.php:110 ../../../../inc/Session.class.php:28 #: ../../../../inc/SyspassImport.class.php:28 #: ../../../../inc/Upgrade.class.php:29 ../../../../inc/User.class.php:28 #: ../../../../inc/UserLdap.class.php:28 @@ -1404,7 +1398,7 @@ msgstr "Supprimer l'autorisation" msgid "Usuario no pertenece al grupo" msgstr "L'utilisateur ne fait pas partie du groupe" -#: ../../../../inc/Auth.class.php:187 +#: ../../../../inc/Auth.class.php:186 #: ../../../../inc/themes/classic/users.inc:117 #: ../../../../inc/themes/classic/userspass.inc:2 #: ../../../../inc/themes/material-blue/users.inc:161 @@ -1412,16 +1406,16 @@ msgstr "L'utilisateur ne fait pas partie du groupe" msgid "Cambio de Clave" msgstr "Changement de Mot de passe" -#: ../../../../inc/Auth.class.php:189 +#: ../../../../inc/Auth.class.php:188 msgid "Se ha solicitado el cambio de su clave de usuario." msgstr "" "Une demande de changement de mot de passe pour votre utilisateur a été faite" -#: ../../../../inc/Auth.class.php:191 +#: ../../../../inc/Auth.class.php:190 msgid "Para completar el proceso es necesario que acceda a la siguiente URL:" msgstr "Afin de terminer le traitement, veuillez aller sur cet URL:" -#: ../../../../inc/Auth.class.php:195 +#: ../../../../inc/Auth.class.php:194 msgid "Si no ha solicitado esta acción, ignore este mensaje." msgstr "" "Si vous n'êtes pas à l'origine de cette demande, ne tenez pas compte de ce " @@ -1525,11 +1519,20 @@ msgstr "Vous n'avez pas les permissions pour accéder à cette page" msgid "No tiene permisos para realizar esta operación" msgstr "Vous n'avez pas les permissions pour effectuer cette opération" -#: ../../../../inc/Crypt.class.php:236 +#: ../../../../inc/Crypt.class.php:119 ../../../../inc/Email.class.php:146 +msgid "Aviso" +msgstr "Avertissement" + +#: ../../../../inc/Crypt.class.php:119 +msgid "" +"Se ha regenerado el HASH de clave maestra. No es necesaria ninguna acción." +msgstr "" + +#: ../../../../inc/Crypt.class.php:181 msgid "No se puede usar el módulo de encriptación" msgstr "Le module d'encryption ne peut pas être chargé" -#: ../../../../inc/Crypt.class.php:247 +#: ../../../../inc/Crypt.class.php:192 msgid "Error al generar datos cifrados" msgstr "Erreur pendant la création des données d'encryption" @@ -1642,7 +1645,7 @@ msgstr "Impossible de se connecter à la base de données" msgid "Compruebe los datos de conexión" msgstr "Veillez vérifier les parmètres de connexion" -#: ../../../../inc/Email.class.php:59 ../../../../inc/UserUtil.class.php:567 +#: ../../../../inc/Email.class.php:59 ../../../../inc/UserUtil.class.php:565 msgid "N/D" msgstr "N/A" @@ -1676,10 +1679,6 @@ msgstr "Destinataire" msgid "CC" msgstr "CC" -#: ../../../../inc/Email.class.php:146 -msgid "Aviso" -msgstr "Avertissement" - #: ../../../../inc/FileImport.class.php:105 msgid "Archivo no subido correctamente" msgstr "Fichier transféré avec succès" @@ -2207,6 +2206,21 @@ msgstr "Il n'y a pas de clients à importer" msgid "No hay cuentas para importar" msgstr "Il n'y a pas de comptes à importer" +#: ../../../../inc/Template.class.php:89 +#, fuzzy, php-format +msgid "No es posible obtener la plantilla \"%s\" : %s" +msgstr "Impossible de créer le client" + +#: ../../../../inc/Template.class.php:128 +#, fuzzy, php-format +msgid "No es posible obtener la variable \"%s\"" +msgstr "Impossible de créer le client" + +#: ../../../../inc/Template.class.php:171 +#, fuzzy, php-format +msgid "No es posible destruir la variable \"%s\"" +msgstr "Impossible de créer le client" + #: ../../../../inc/Upgrade.class.php:51 msgid "Error al aplicar la actualización de la Base de Datos" msgstr "Erreur pendant la mise à jour de la base de données." @@ -2230,23 +2244,23 @@ msgstr "Erreur lors de l'application d'une mise à jour auxiliaire" msgid "Actualizar BBDD" msgstr "Mis à jour BDD" -#: ../../../../inc/Upgrade.class.php:121 +#: ../../../../inc/Upgrade.class.php:127 msgid "No es necesario actualizar la Base de Datos." msgstr "La mise à jour de la base de données n'est pas nécessaire." -#: ../../../../inc/Upgrade.class.php:129 +#: ../../../../inc/Upgrade.class.php:135 msgid "Error al aplicar la actualización de la Base de Datos." msgstr "Erreur pendant la mise à jour de la base de données." -#: ../../../../inc/Upgrade.class.php:138 +#: ../../../../inc/Upgrade.class.php:144 msgid "Actualización de la Base de Datos realizada correctamente." msgstr "Mise à jour de la base de données effectuée." -#: ../../../../inc/Upgrade.class.php:215 +#: ../../../../inc/Upgrade.class.php:221 msgid "Actualizar Configuración" msgstr "Mettre à jour la Configuration" -#: ../../../../inc/Upgrade.class.php:215 +#: ../../../../inc/Upgrade.class.php:221 msgid "Actualización de la Configuración realizada correctamente." msgstr "Mise à jour de la configuration effectuée correctement." @@ -2280,11 +2294,11 @@ msgstr "Vous recevrez un courriel de confirmation sous peu." msgid "Nuevo usuario de LDAP" msgstr "Nouvel utilisateur LDAP" -#: ../../../../inc/UserUtil.class.php:705 +#: ../../../../inc/UserUtil.class.php:703 msgid "Migrar Grupos" msgstr "" -#: ../../../../inc/UserUtil.class.php:705 +#: ../../../../inc/UserUtil.class.php:703 msgid "Error al migrar grupo del usuario" msgstr "" @@ -2733,20 +2747,25 @@ msgstr "" "Sans cette fonction, un attaquant pourrait prendre votre compte sur un " "changement de mot de passe" -#: ../../../../web/MainC.class.php:288 +#: ../../../../web/MainC.class.php:284 +#, fuzzy +msgid "Error en clave RSA" +msgstr "Erreur pendant la requête" + +#: ../../../../web/MainC.class.php:304 msgid "Instalación finalizada" msgstr "Installation terminée" -#: ../../../../web/MainC.class.php:289 +#: ../../../../web/MainC.class.php:305 msgid "Pulse aquí para acceder" msgstr "" "Pressez ici pour vous connecter" -#: ../../../../web/MainC.class.php:384 +#: ../../../../web/MainC.class.php:400 msgid "Descargar nueva versión" msgstr "Télécharger nouvelle version" -#: ../../../../web/MainC.class.php:395 +#: ../../../../web/MainC.class.php:411 msgid "Avisos de sysPass" msgstr "" @@ -2875,12 +2894,14 @@ msgstr "Utilisateur d'accès" #: ../../../../inc/themes/classic/account.inc:90 #: ../../../../inc/themes/classic/editpass.inc:31 +#: ../../../../inc/themes/classic/passreset.inc:35 #: ../../../../inc/themes/classic/users.inc:83 #: ../../../../inc/themes/classic/userspass.inc:19 #: ../../../../inc/themes/classic/userspass.inc:21 #: ../../../../inc/themes/material-blue/account.inc:105 #: ../../../../inc/themes/material-blue/editpass.inc:36 -#: ../../../../inc/themes/material-blue/install.inc:64 +#: ../../../../inc/themes/material-blue/install.inc:66 +#: ../../../../inc/themes/material-blue/passreset.inc:36 #: ../../../../inc/themes/material-blue/users.inc:102 #: ../../../../inc/themes/material-blue/users.inc:109 #: ../../../../inc/themes/material-blue/userspass.inc:19 @@ -3015,7 +3036,7 @@ msgstr "Voir Actuel" #: ../../../../inc/themes/classic/account.inc:406 #: ../../../../inc/themes/classic/editpass.inc:45 #: ../../../../inc/themes/classic/passreset.inc:46 -#: ../../../../inc/themes/material-blue/passreset.inc:43 +#: ../../../../inc/themes/material-blue/passreset.inc:48 msgid "Volver" msgstr "Retour" @@ -3451,8 +3472,8 @@ msgstr "Requis" #: ../../../../inc/themes/classic/login.inc:15 #: ../../../../inc/themes/classic/login.inc:27 #: ../../../../inc/themes/material-blue/encryption.inc:8 -#: ../../../../inc/themes/material-blue/install.inc:49 -#: ../../../../inc/themes/material-blue/install.inc:56 +#: ../../../../inc/themes/material-blue/install.inc:51 +#: ../../../../inc/themes/material-blue/install.inc:58 #: ../../../../inc/themes/material-blue/login.inc:25 #: ../../../../inc/themes/material-blue/login.inc:48 msgid "Clave Maestra" @@ -3637,25 +3658,23 @@ msgid "Ver Archivo" msgstr "Voir Fichier" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 +#: ../../../../inc/themes/material-blue/footer.inc:29 msgid "Indica si la conexión utiliza HTTPS." msgstr "" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 +#: ../../../../inc/themes/material-blue/footer.inc:29 msgid "" "Las claves de formularios enviados se encriptan mediante PKI, el resto de " "datos no." msgstr "" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 #, fuzzy msgid "Seguro" msgstr "Sécurité" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 msgid "Inseguro" msgstr "" @@ -3889,12 +3908,12 @@ msgid "Crear cuenta de admin de sysPass" msgstr "Créer le compte admin sysPass" #: ../../../../inc/themes/classic/install.inc:32 -#: ../../../../inc/themes/material-blue/install.inc:36 +#: ../../../../inc/themes/material-blue/install.inc:37 msgid "Login del usuario administrador de sysPass" msgstr "Login administrateur de sysPass" #: ../../../../inc/themes/classic/install.inc:58 -#: ../../../../inc/themes/material-blue/install.inc:69 +#: ../../../../inc/themes/material-blue/install.inc:71 msgid "Configurar BBDD" msgstr "Configuration BDD" @@ -3903,7 +3922,7 @@ msgid "Login de usuario con permisos de administrador de MySQL" msgstr "Un utilisateur avec des droits d'administration sur la BDD" #: ../../../../inc/themes/classic/install.inc:83 -#: ../../../../inc/themes/material-blue/install.inc:102 +#: ../../../../inc/themes/material-blue/install.inc:105 msgid "Nombre de la base de datos para sysPass" msgstr "Nom de la base de données sysPass" @@ -3912,20 +3931,20 @@ msgid "Nombre del servidor de la base de datos de sysPass" msgstr "Nom du serveur de base de données sysPass" #: ../../../../inc/themes/classic/install.inc:97 -#: ../../../../inc/themes/material-blue/install.inc:120 +#: ../../../../inc/themes/material-blue/install.inc:123 msgid "Modo Hosting" msgstr "Mode Hébergé" #: ../../../../inc/themes/classic/install.inc:104 -#: ../../../../inc/themes/material-blue/install.inc:127 +#: ../../../../inc/themes/material-blue/install.inc:130 msgid "No crea ni verifica los permisos del usuario sobre la BBDD" msgstr "" "Ne crée pas ni ne vérifie les permissions de l'utilisateur dans la base de " "données" #: ../../../../inc/themes/classic/install.inc:108 -#: ../../../../inc/themes/material-blue/install.inc:134 -#: ../../../../inc/themes/material-blue/install.inc:135 +#: ../../../../inc/themes/material-blue/install.inc:137 +#: ../../../../inc/themes/material-blue/install.inc:138 msgid "Instalar" msgstr "Installer" @@ -4095,7 +4114,7 @@ msgid "Más Acciones" msgstr "Plus d'Actions" #: ../../../../inc/themes/classic/passreset.inc:13 -#: ../../../../inc/themes/material-blue/passreset.inc:10 +#: ../../../../inc/themes/material-blue/passreset.inc:9 msgid "Solicitud de Cambio de Clave" msgstr "Demande de changement de Mot de passe" @@ -4104,7 +4123,7 @@ msgid "Login del Usuario" msgstr "Login de l'utilisateur" #: ../../../../inc/themes/classic/passreset.inc:21 -#: ../../../../inc/themes/material-blue/passreset.inc:24 +#: ../../../../inc/themes/material-blue/passreset.inc:23 msgid "Email del Usuario" msgstr "Courriel de l'utilisateur" @@ -4118,23 +4137,15 @@ msgstr "Courriel" msgid "Nueva Clave" msgstr "Nouveau Mot de passe" -#: ../../../../inc/themes/classic/passreset.inc:34 -msgid "Nueva Clave (Verificar)" -msgstr "Nouveau Mot de passe (Vérifier)" - -#: ../../../../inc/themes/classic/passreset.inc:35 -msgid "Clave (Verificar)" -msgstr "Mot de passe (Vérifier)" - #: ../../../../inc/themes/classic/passreset.inc:46 -#: ../../../../inc/themes/material-blue/passreset.inc:42 +#: ../../../../inc/themes/material-blue/passreset.inc:47 msgid "Volver a iniciar sesión" msgstr "Retour au login" #: ../../../../inc/themes/classic/passreset.inc:48 #: ../../../../inc/themes/material-blue/2fa.inc:27 -#: ../../../../inc/themes/material-blue/passreset.inc:48 -#: ../../../../inc/themes/material-blue/passreset.inc:49 +#: ../../../../inc/themes/material-blue/passreset.inc:53 +#: ../../../../inc/themes/material-blue/passreset.inc:54 msgid "Solicitar" msgstr "Demander" @@ -4143,8 +4154,8 @@ msgid "Solicitar cambio de clave" msgstr "Demander le changement de mot de passe" #: ../../../../inc/themes/classic/passreset.inc:51 -#: ../../../../inc/themes/material-blue/passreset.inc:53 -#: ../../../../inc/themes/material-blue/passreset.inc:54 +#: ../../../../inc/themes/material-blue/passreset.inc:58 +#: ../../../../inc/themes/material-blue/passreset.inc:59 msgid "Cambiar" msgstr "Changer" @@ -4723,31 +4734,31 @@ msgid "" "archivos XML y CSV." msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:31 +#: ../../../../inc/themes/material-blue/install.inc:32 msgid "Usuario administrador de sysPass" msgstr "Utilisateur \"administrateur\" de Syspass" -#: ../../../../inc/themes/material-blue/install.inc:78 +#: ../../../../inc/themes/material-blue/install.inc:80 msgid "Usuario acceso BBDD" msgstr "Utilisateur pour accéder à la base de données" -#: ../../../../inc/themes/material-blue/install.inc:83 +#: ../../../../inc/themes/material-blue/install.inc:85 msgid "Usuario con permisos de administrador de MySQL" msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:90 +#: ../../../../inc/themes/material-blue/install.inc:93 msgid "Clave acceso BBDD" msgstr "Mot de passe pour accéder à la base de données" -#: ../../../../inc/themes/material-blue/install.inc:97 +#: ../../../../inc/themes/material-blue/install.inc:100 msgid "Nombre BBDD para sysPass" msgstr "Nom de la base de données sysPass" -#: ../../../../inc/themes/material-blue/install.inc:109 +#: ../../../../inc/themes/material-blue/install.inc:112 msgid "Servidor BBDD para sysPass" msgstr "Adresse du serveur de base de données sysPass" -#: ../../../../inc/themes/material-blue/install.inc:114 +#: ../../../../inc/themes/material-blue/install.inc:117 msgid "Nombre del servidor para instalar la base de datos de sysPass" msgstr "Nom du serveur ou installer la base de données syPass" @@ -4792,3 +4803,9 @@ msgstr "Faire une sauvegarder et exporter" #: ../../../../inc/themes/material-blue/security.inc:4 msgid "Autentificación" msgstr "Authentification" + +#~ msgid "Nueva Clave (Verificar)" +#~ msgstr "Nouveau Mot de passe (Vérifier)" + +#~ msgid "Clave (Verificar)" +#~ msgstr "Mot de passe (Vérifier)" diff --git a/inc/locales/hu_HU/LC_MESSAGES/messages.mo b/inc/locales/hu_HU/LC_MESSAGES/messages.mo index 405a537f..dcd00726 100644 Binary files a/inc/locales/hu_HU/LC_MESSAGES/messages.mo and b/inc/locales/hu_HU/LC_MESSAGES/messages.mo differ diff --git a/inc/locales/hu_HU/LC_MESSAGES/messages.po b/inc/locales/hu_HU/LC_MESSAGES/messages.po index 9d7a1550..26e47d39 100644 --- a/inc/locales/hu_HU/LC_MESSAGES/messages.po +++ b/inc/locales/hu_HU/LC_MESSAGES/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: sysPass\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-23 12:59+0100\n" -"PO-Revision-Date: 2015-09-23 13:00+0100\n" +"POT-Creation-Date: 2015-09-30 03:01+0100\n" +"PO-Revision-Date: 2015-09-30 03:01+0100\n" "Last-Translator: nuxsmin \n" "Language-Team: \n" "Language: hu_HU\n" @@ -68,7 +68,7 @@ msgstr "Fiók név szükséges" # "Customer name needed" #: ../../../../ajax/ajax_accountSave.php:77 #: ../../../../ajax/ajax_accountSave.php:88 -#: ../../../../ajax/ajax_appMgmtSave.php:337 +#: ../../../../ajax/ajax_appMgmtSave.php:328 msgid "Es necesario un nombre de cliente" msgstr "Ügyfél név szükséges" @@ -100,75 +100,75 @@ msgstr "Érvénytelen Id" # "Invalid Action" #: ../../../../ajax/ajax_accountSave.php:110 -#: ../../../../ajax/ajax_accountSave.php:263 -#: ../../../../ajax/ajax_appMgmtSave.php:543 -#: ../../../../ajax/ajax_configSave.php:297 +#: ../../../../ajax/ajax_accountSave.php:258 +#: ../../../../ajax/ajax_appMgmtSave.php:534 +#: ../../../../ajax/ajax_configSave.php:287 #: ../../../../ajax/ajax_userPrefsSave.php:79 ../../../../api.php:53 msgid "Acción Inválida" msgstr "Érvénytelen Akció" # "Passwords mismatch" -#: ../../../../ajax/ajax_accountSave.php:122 +#: ../../../../ajax/ajax_accountSave.php:117 #: ../../../../ajax/ajax_appMgmtSave.php:111 -#: ../../../../ajax/ajax_appMgmtSave.php:155 -#: ../../../../ajax/ajax_backup.php:70 +#: ../../../../ajax/ajax_appMgmtSave.php:148 +#: ../../../../ajax/ajax_backup.php:62 msgid "Las claves no coinciden" msgstr "A jelszó nem egyezik" # "Account added" -#: ../../../../ajax/ajax_accountSave.php:173 +#: ../../../../ajax/ajax_accountSave.php:168 msgid "Cuenta creada" msgstr "Fiók hozzáadva" # "Error on account creation" -#: ../../../../ajax/ajax_accountSave.php:176 +#: ../../../../ajax/ajax_accountSave.php:171 msgid "Error al crear la cuenta" msgstr "Hiba a fiók létrehozása közben" # "No changes" -#: ../../../../ajax/ajax_accountSave.php:211 +#: ../../../../ajax/ajax_accountSave.php:206 msgid "Sin cambios" msgstr "Nincsenek változások" # "Account updated" -#: ../../../../ajax/ajax_accountSave.php:223 +#: ../../../../ajax/ajax_accountSave.php:218 msgid "Cuenta actualizada" msgstr "Fiók frissítve" # "Error on updating account" -#: ../../../../ajax/ajax_accountSave.php:226 +#: ../../../../ajax/ajax_accountSave.php:221 msgid "Error al modificar la cuenta" msgstr "Hiba a fiók frissítése közben" # "Account deleted" -#: ../../../../ajax/ajax_accountSave.php:233 +#: ../../../../ajax/ajax_accountSave.php:228 msgid "Cuenta eliminada" msgstr "Fiók törölve" # "Error on account deletion" -#: ../../../../ajax/ajax_accountSave.php:236 +#: ../../../../ajax/ajax_accountSave.php:231 msgid "Error al eliminar la cuenta" msgstr "Hiba a fiók törlése közben" # "Password updated" -#: ../../../../ajax/ajax_accountSave.php:246 -#: ../../../../ajax/ajax_appMgmtSave.php:161 +#: ../../../../ajax/ajax_accountSave.php:241 +#: ../../../../ajax/ajax_appMgmtSave.php:152 #: ../../../../ajax/ajax_passReset.php:74 msgid "Clave actualizada" msgstr "Jelszó frissítve" # "Error on updating password" -#: ../../../../ajax/ajax_accountSave.php:249 +#: ../../../../ajax/ajax_accountSave.php:244 msgid "Error al actualizar la clave" msgstr "Hiba a jelszó frissítése közben" # "Account restored" -#: ../../../../ajax/ajax_accountSave.php:256 +#: ../../../../ajax/ajax_accountSave.php:251 msgid "Cuenta restaurada" msgstr "Fiók restaurált" # "Error on restoring account" -#: ../../../../ajax/ajax_accountSave.php:259 +#: ../../../../ajax/ajax_accountSave.php:254 msgid "Error al restaurar cuenta" msgstr "Hiba történt helyreállítása számla" @@ -330,8 +330,8 @@ msgstr "Email szükséges" # "Ey, this is a DEMO!!" #: ../../../../ajax/ajax_appMgmtSave.php:95 #: ../../../../ajax/ajax_appMgmtSave.php:144 -#: ../../../../ajax/ajax_appMgmtSave.php:168 -#: ../../../../ajax/ajax_configSave.php:272 +#: ../../../../ajax/ajax_appMgmtSave.php:159 +#: ../../../../ajax/ajax_configSave.php:262 #: ../../../../ajax/ajax_import.php:39 ../../../../ajax/ajax_migrate.php:39 #: ../../../../ajax/ajax_userPrefsSave.php:55 msgid "Ey, esto es una DEMO!!" @@ -375,59 +375,59 @@ msgid "Error al actualizar el usuario" msgstr "Hiba a felhasználó frissítése közben" # "Error on updating password" -#: ../../../../ajax/ajax_appMgmtSave.php:164 +#: ../../../../ajax/ajax_appMgmtSave.php:155 #: ../../../../ajax/ajax_passReset.php:78 msgid "Error al modificar la clave" msgstr "Hiba a jelszó frissítése közben" # "Unable to delete, user in use" -#: ../../../../ajax/ajax_appMgmtSave.php:170 +#: ../../../../ajax/ajax_appMgmtSave.php:161 msgid "No es posible eliminar, usuario en uso" msgstr "Nem lehet törölni, a felhaszánáló használatban van" # "User deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:174 +#: ../../../../ajax/ajax_appMgmtSave.php:165 msgid "Usuario eliminado" msgstr "Felhasználó törölve" # "Error on user deletion" -#: ../../../../ajax/ajax_appMgmtSave.php:177 +#: ../../../../ajax/ajax_appMgmtSave.php:168 msgid "Error al eliminar el usuario" msgstr "Hiba a felhasználó törlése közben" # "Group name required" -#: ../../../../ajax/ajax_appMgmtSave.php:192 +#: ../../../../ajax/ajax_appMgmtSave.php:183 msgid "Es necesario un nombre de grupo" msgstr "Csoport név szükséges" # "Duplicated group name" -#: ../../../../ajax/ajax_appMgmtSave.php:200 +#: ../../../../ajax/ajax_appMgmtSave.php:191 msgid "Nombre de grupo duplicado" msgstr "Kettõzött csoport név" # "Group added" -#: ../../../../ajax/ajax_appMgmtSave.php:212 +#: ../../../../ajax/ajax_appMgmtSave.php:203 msgid "Grupo creado" msgstr "Csoport hozzáadva" # "Error on group creation" -#: ../../../../ajax/ajax_appMgmtSave.php:214 +#: ../../../../ajax/ajax_appMgmtSave.php:205 msgid "Error al crear el grupo" msgstr "Hiba a csoport létrehozása közben" # "Group updated" -#: ../../../../ajax/ajax_appMgmtSave.php:225 +#: ../../../../ajax/ajax_appMgmtSave.php:216 msgid "Grupo actualizado" msgstr "Csoport frissítve" # "Error on updating group" -#: ../../../../ajax/ajax_appMgmtSave.php:228 +#: ../../../../ajax/ajax_appMgmtSave.php:219 msgid "Error al actualizar el grupo" msgstr "Hiba a csoport frissítése közben" # "Users" -#: ../../../../ajax/ajax_appMgmtSave.php:237 -#: ../../../../ajax/ajax_appMgmtSave.php:314 +#: ../../../../ajax/ajax_appMgmtSave.php:228 +#: ../../../../ajax/ajax_appMgmtSave.php:305 #: ../../../../inc/CustomFieldsBase.class.php:83 #: ../../../../inc/themes/classic/account.inc:109 #: ../../../../inc/themes/classic/groups.inc:24 @@ -439,7 +439,7 @@ msgid "Usuarios" msgstr "Felhasználók" # "Accounts" -#: ../../../../ajax/ajax_appMgmtSave.php:241 +#: ../../../../ajax/ajax_appMgmtSave.php:232 #: ../../../../inc/Category.class.php:266 #: ../../../../inc/CustomFieldsBase.class.php:80 #: ../../../../inc/Customer.class.php:150 @@ -450,162 +450,162 @@ msgid "Cuentas" msgstr "Fiókok" # "Unable to delete" -#: ../../../../ajax/ajax_appMgmtSave.php:244 -#: ../../../../ajax/ajax_appMgmtSave.php:316 +#: ../../../../ajax/ajax_appMgmtSave.php:235 +#: ../../../../ajax/ajax_appMgmtSave.php:307 #: ../../../../inc/Category.class.php:119 #: ../../../../inc/Customer.class.php:150 msgid "No es posible eliminar" msgstr "Nem lehet törölni" # "Group in use by:" -#: ../../../../ajax/ajax_appMgmtSave.php:244 +#: ../../../../ajax/ajax_appMgmtSave.php:235 msgid "Grupo en uso por:" msgstr "Csoportot használja a:" # "Group deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:249 +#: ../../../../ajax/ajax_appMgmtSave.php:240 msgid "Grupo eliminado" msgstr "Csoport törölve" # "Error on group deletion" -#: ../../../../ajax/ajax_appMgmtSave.php:252 +#: ../../../../ajax/ajax_appMgmtSave.php:243 msgid "Error al eliminar el grupo" msgstr "Hiba a csoport törlése közben" # "Profile name needed" -#: ../../../../ajax/ajax_appMgmtSave.php:291 +#: ../../../../ajax/ajax_appMgmtSave.php:282 msgid "Es necesario un nombre de perfil" msgstr "Profil név szükséges" # "Duplicated profile name" -#: ../../../../ajax/ajax_appMgmtSave.php:293 +#: ../../../../ajax/ajax_appMgmtSave.php:284 msgid "Nombre de perfil duplicado" msgstr "Kettözõtt profil név" # "Profile added" -#: ../../../../ajax/ajax_appMgmtSave.php:298 +#: ../../../../ajax/ajax_appMgmtSave.php:289 msgid "Perfil creado" msgstr "Profil hozzáadva" # "Error on creating profile" -#: ../../../../ajax/ajax_appMgmtSave.php:301 +#: ../../../../ajax/ajax_appMgmtSave.php:292 msgid "Error al crear el perfil" msgstr "Hiba a profil létrehozása közben" # "Profile updated" -#: ../../../../ajax/ajax_appMgmtSave.php:304 +#: ../../../../ajax/ajax_appMgmtSave.php:295 msgid "Perfil actualizado" msgstr "Profil frissítve" # "Error on updating profile" -#: ../../../../ajax/ajax_appMgmtSave.php:307 +#: ../../../../ajax/ajax_appMgmtSave.php:298 msgid "Error al actualizar el perfil" msgstr "Hiba a profil frissítése közben" # "Profiles in use by:" -#: ../../../../ajax/ajax_appMgmtSave.php:316 +#: ../../../../ajax/ajax_appMgmtSave.php:307 msgid "Perfil en uso por:" msgstr "A profilt használja:" # "Profile deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:319 +#: ../../../../ajax/ajax_appMgmtSave.php:310 msgid "Perfil eliminado" msgstr "Profil törölve" # "Error on profile deletion" -#: ../../../../ajax/ajax_appMgmtSave.php:322 +#: ../../../../ajax/ajax_appMgmtSave.php:313 msgid "Error al eliminar el perfil" msgstr "Hiba a profil törlése közben" # "Customer added" -#: ../../../../ajax/ajax_appMgmtSave.php:357 +#: ../../../../ajax/ajax_appMgmtSave.php:348 msgid "Cliente creado" msgstr "Ügyfél hozzáadva" # "Customer updated" -#: ../../../../ajax/ajax_appMgmtSave.php:372 +#: ../../../../ajax/ajax_appMgmtSave.php:363 msgid "Cliente actualizado" msgstr "Ügyfél frissítve" # "Customer deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:382 +#: ../../../../ajax/ajax_appMgmtSave.php:373 msgid "Cliente eliminado" msgstr "Ügyfél törölve" # "Category name needed" -#: ../../../../ajax/ajax_appMgmtSave.php:396 +#: ../../../../ajax/ajax_appMgmtSave.php:387 msgid "Es necesario un nombre de categoría" msgstr "Kategória név szükséges" # "Category added" -#: ../../../../ajax/ajax_appMgmtSave.php:416 +#: ../../../../ajax/ajax_appMgmtSave.php:407 msgid "Categoría creada" msgstr "Kategória hozzáadva" # "Category updated" -#: ../../../../ajax/ajax_appMgmtSave.php:431 +#: ../../../../ajax/ajax_appMgmtSave.php:422 msgid "Categoría actualizada" msgstr "Kategória frissítve" # "Category deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:442 +#: ../../../../ajax/ajax_appMgmtSave.php:433 msgid "Categoría eliminada" msgstr "Kategória törölve" # "User/Pass not entered" -#: ../../../../ajax/ajax_appMgmtSave.php:458 +#: ../../../../ajax/ajax_appMgmtSave.php:449 #, fuzzy msgid "Usuario o acción no indicado" msgstr "Felhasználó/jelszó nem lett kitöltve" # "Account Activation" -#: ../../../../ajax/ajax_appMgmtSave.php:468 +#: ../../../../ajax/ajax_appMgmtSave.php:459 #, fuzzy msgid "Autorización creada" msgstr "Fiók hozzáadva" # "Configuration updated" -#: ../../../../ajax/ajax_appMgmtSave.php:476 +#: ../../../../ajax/ajax_appMgmtSave.php:467 #, fuzzy msgid "Autorización actualizada" msgstr "Fiók frissítve" # "Account deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:486 +#: ../../../../ajax/ajax_appMgmtSave.php:477 #, fuzzy msgid "Autorización eliminada" msgstr "Fiók törölve" # "Duplicated group name" -#: ../../../../ajax/ajax_appMgmtSave.php:503 +#: ../../../../ajax/ajax_appMgmtSave.php:494 #, fuzzy msgid "Nombre del campo no indicado" msgstr "Ügyfél név" # "File type not allowed" -#: ../../../../ajax/ajax_appMgmtSave.php:505 +#: ../../../../ajax/ajax_appMgmtSave.php:496 #, fuzzy msgid "Tipo del campo no indicado" msgstr "Fájltípus nem engedélyezett" -#: ../../../../ajax/ajax_appMgmtSave.php:507 +#: ../../../../ajax/ajax_appMgmtSave.php:498 msgid "Módulo del campo no indicado" msgstr "" # "Group added" -#: ../../../../ajax/ajax_appMgmtSave.php:521 +#: ../../../../ajax/ajax_appMgmtSave.php:512 #, fuzzy msgid "Campo creado" msgstr "Felhasználó hozzáadva" # "Group updated" -#: ../../../../ajax/ajax_appMgmtSave.php:530 +#: ../../../../ajax/ajax_appMgmtSave.php:521 #, fuzzy msgid "Campo actualizado" msgstr "Frissítve" # "Group deleted" -#: ../../../../ajax/ajax_appMgmtSave.php:540 +#: ../../../../ajax/ajax_appMgmtSave.php:531 #, fuzzy msgid "Campo eliminado" msgstr "Felhasználó törölve" @@ -622,7 +622,7 @@ msgid "Error al realizar el backup" msgstr "Hiba Archiválás közben" # "Please, check the event log for more details" -#: ../../../../ajax/ajax_backup.php:54 ../../../../ajax/ajax_backup.php:76 +#: ../../../../ajax/ajax_backup.php:54 ../../../../ajax/ajax_backup.php:68 #: ../../../../ajax/ajax_checkLdap.php:57 ../../../../inc/Import.class.php:128 #: ../../../../inc/Migrate.class.php:93 msgid "Revise el registro de eventos para más detalles" @@ -639,40 +639,32 @@ msgstr "Application and database backup successfully done" msgid "Proceso de backup finalizado" msgstr "Archiválás kész" -# "Query error" -#: ../../../../ajax/ajax_backup.php:66 -#: ../../../../ajax/ajax_configSave.php:244 -#: ../../../../ajax/ajax_doLogin.php:53 ../../../../ajax/ajax_import.php:56 -#, fuzzy -msgid "Error en clave RSA" -msgstr "Lekérdezési hiba" - # "Enable debug" -#: ../../../../ajax/ajax_backup.php:74 ../../../../ajax/ajax_backup.php:79 +#: ../../../../ajax/ajax_backup.php:66 ../../../../ajax/ajax_backup.php:71 #, fuzzy msgid "Realizar Exportación" msgstr "Archívum készítés" # "Error on creating accounts files" -#: ../../../../ajax/ajax_backup.php:74 +#: ../../../../ajax/ajax_backup.php:66 #, fuzzy msgid "Error al realizar la exportación de cuentas" msgstr "Hiba a fiók fájlok létrehozása közben" # "Error while doing backup" -#: ../../../../ajax/ajax_backup.php:76 +#: ../../../../ajax/ajax_backup.php:68 #, fuzzy msgid "Error al realizar la exportación" msgstr "Hiba Archiválás közben" # "Application successfully updated" -#: ../../../../ajax/ajax_backup.php:79 +#: ../../../../ajax/ajax_backup.php:71 #, fuzzy msgid "Exportación de cuentas realizada correctamente" msgstr "A beállítások elmentve" # "Backup process finished" -#: ../../../../ajax/ajax_backup.php:81 +#: ../../../../ajax/ajax_backup.php:73 #, fuzzy msgid "Proceso de exportación finalizado" msgstr "Archiválás kész" @@ -768,7 +760,7 @@ msgstr "Beállítások frissítve" # "Master Password updated" #: ../../../../ajax/ajax_configSave.php:230 -#: ../../../../ajax/ajax_configSave.php:282 +#: ../../../../ajax/ajax_configSave.php:272 #: ../../../../ajax/ajax_viewpass.php:60 #: ../../../../inc/Controller.class.php:169 msgid "Clave maestra actualizada" @@ -792,50 +784,50 @@ msgid "Se ha de confirmar el cambio de clave" msgstr "A jelszó frissítéshez megerõsítés szükséges" # "Password are the same" -#: ../../../../ajax/ajax_configSave.php:248 +#: ../../../../ajax/ajax_configSave.php:238 msgid "Las claves son idénticas" msgstr "A jelszó megegyezik" # "Master passwords mismatch" -#: ../../../../ajax/ajax_configSave.php:250 +#: ../../../../ajax/ajax_configSave.php:240 msgid "Las claves maestras no coinciden" msgstr "A mester jelszó nem egyezik" # "Current master password mismatch" -#: ../../../../ajax/ajax_configSave.php:252 +#: ../../../../ajax/ajax_configSave.php:242 msgid "La clave maestra actual no coincide" msgstr "A jelenlegi mester jelszó nem egyezik" # "Error on updating accounts' passwords" -#: ../../../../ajax/ajax_configSave.php:261 +#: ../../../../ajax/ajax_configSave.php:251 msgid "Errores al actualizar las claves de las cuentas" msgstr "Hiba a fiókok jelszavainak frissítése közben" # "Error on updating accounts' passwords" -#: ../../../../ajax/ajax_configSave.php:267 +#: ../../../../ajax/ajax_configSave.php:257 #, fuzzy msgid "Errores al actualizar las claves de las cuentas del histórico" msgstr "Hiba a fiókok jelszavainak frissítése közben" # "Update Master Password" -#: ../../../../ajax/ajax_configSave.php:280 +#: ../../../../ajax/ajax_configSave.php:270 #: ../../../../inc/Account.class.php:497 msgid "Actualizar Clave Maestra" msgstr "Frissítse a mester jelszót" # "Error on saving master password's hash" -#: ../../../../ajax/ajax_configSave.php:284 +#: ../../../../ajax/ajax_configSave.php:274 msgid "Error al guardar el hash de la clave maestra" msgstr "Hiba a mester jelszó hash-ének elmentése közben" # "Generate random password" -#: ../../../../ajax/ajax_configSave.php:292 +#: ../../../../ajax/ajax_configSave.php:282 #, fuzzy msgid "Generar Clave Temporal" msgstr "Generate Temporary Password" # "Password" -#: ../../../../ajax/ajax_configSave.php:292 +#: ../../../../ajax/ajax_configSave.php:282 #: ../../../../inc/themes/classic/account.inc:83 #: ../../../../inc/themes/classic/editpass.inc:25 #: ../../../../inc/themes/classic/install.inc:38 @@ -844,6 +836,7 @@ msgstr "Generate Temporary Password" #: ../../../../inc/themes/classic/login.inc:22 #: ../../../../inc/themes/classic/mail.inc:55 #: ../../../../inc/themes/classic/passreset.inc:29 +#: ../../../../inc/themes/classic/passreset.inc:34 #: ../../../../inc/themes/classic/users.inc:75 #: ../../../../inc/themes/classic/userspass.inc:8 #: ../../../../inc/themes/classic/userspass.inc:11 @@ -853,13 +846,13 @@ msgstr "Generate Temporary Password" #: ../../../../inc/themes/material-blue/editpass.inc:26 #: ../../../../inc/themes/material-blue/editpass.inc:31 #: ../../../../inc/themes/material-blue/editpass.inc:41 -#: ../../../../inc/themes/material-blue/install.inc:44 +#: ../../../../inc/themes/material-blue/install.inc:46 #: ../../../../inc/themes/material-blue/ldap.inc:105 #: ../../../../inc/themes/material-blue/login.inc:17 #: ../../../../inc/themes/material-blue/login.inc:40 #: ../../../../inc/themes/material-blue/mail.inc:73 #: ../../../../inc/themes/material-blue/mail.inc:80 -#: ../../../../inc/themes/material-blue/passreset.inc:31 +#: ../../../../inc/themes/material-blue/passreset.inc:30 #: ../../../../inc/themes/material-blue/users.inc:89 #: ../../../../inc/themes/material-blue/users.inc:96 #: ../../../../inc/themes/material-blue/userspass.inc:8 @@ -868,7 +861,7 @@ msgid "Clave" msgstr "Jelszó" # "Generated Password" -#: ../../../../ajax/ajax_configSave.php:294 +#: ../../../../ajax/ajax_configSave.php:284 #, fuzzy msgid "Clave Temporal Generada" msgstr "Generált Jelszó" @@ -879,51 +872,51 @@ msgid "Usuario/Clave no introducidos" msgstr "Felhasználó/jelszó nem lett kitöltve" # "Session start (LDAP)" -#: ../../../../ajax/ajax_doLogin.php:65 +#: ../../../../ajax/ajax_doLogin.php:58 #, fuzzy msgid "Inicio sesión" msgstr "munkamenet elindult (LDAP)" # "Server" -#: ../../../../ajax/ajax_doLogin.php:70 +#: ../../../../ajax/ajax_doLogin.php:63 #, fuzzy msgid "Servidor Login" msgstr "Belépés" # "Error on saving LDAP user data" -#: ../../../../ajax/ajax_doLogin.php:76 +#: ../../../../ajax/ajax_doLogin.php:69 msgid "Error al guardar los datos de LDAP" msgstr "Hiba az LDAP felhasználók adatainak elmentése közben" # "Internal error" -#: ../../../../ajax/ajax_doLogin.php:79 ../../../../ajax/ajax_doLogin.php:87 -#: ../../../../ajax/ajax_doLogin.php:139 ../../../../ajax/ajax_doLogin.php:185 +#: ../../../../ajax/ajax_doLogin.php:72 ../../../../ajax/ajax_doLogin.php:80 +#: ../../../../ajax/ajax_doLogin.php:132 ../../../../ajax/ajax_doLogin.php:176 #: ../../../../inc/ApiTokens.class.php:140 #: ../../../../inc/ApiTokens.class.php:186 #: ../../../../inc/ApiTokens.class.php:217 #: ../../../../inc/ApiTokens.class.php:243 #: ../../../../inc/ApiTokens.class.php:262 #: ../../../../inc/ApiTokens.class.php:304 -#: ../../../../inc/ApiTokens.class.php:328 ../../../../inc/Crypt.class.php:235 -#: ../../../../inc/Crypt.class.php:246 +#: ../../../../inc/ApiTokens.class.php:328 ../../../../inc/Crypt.class.php:180 +#: ../../../../inc/Crypt.class.php:191 #: ../../../../inc/XmlImportBase.class.php:74 msgid "Error interno" msgstr "Belsõ hiba" # "Error on updating user password in BD" -#: ../../../../ajax/ajax_doLogin.php:84 +#: ../../../../ajax/ajax_doLogin.php:77 msgid "Error al actualizar la clave del usuario en la BBDD" msgstr "Adatbázis Hiba a felhasználói jelszó frissítése közben" # "Incorrect login" -#: ../../../../ajax/ajax_doLogin.php:92 ../../../../ajax/ajax_doLogin.php:117 +#: ../../../../ajax/ajax_doLogin.php:85 ../../../../ajax/ajax_doLogin.php:110 msgid "Login incorrecto" msgstr "Hibás felhasználónév vagy jelszó" # "User" -#: ../../../../ajax/ajax_doLogin.php:93 ../../../../ajax/ajax_doLogin.php:100 -#: ../../../../ajax/ajax_doLogin.php:107 ../../../../ajax/ajax_doLogin.php:118 -#: ../../../../ajax/ajax_doLogin.php:128 ../../../../ajax/ajax_doLogin.php:180 +#: ../../../../ajax/ajax_doLogin.php:86 ../../../../ajax/ajax_doLogin.php:93 +#: ../../../../ajax/ajax_doLogin.php:100 ../../../../ajax/ajax_doLogin.php:111 +#: ../../../../ajax/ajax_doLogin.php:121 ../../../../ajax/ajax_doLogin.php:171 #: ../../../../inc/ApiTokens.class.php:190 #: ../../../../inc/ApiTokens.class.php:308 ../../../../inc/Auth.class.php:108 #: ../../../../inc/Init.class.php:517 ../../../../inc/UserBase.class.php:382 @@ -952,7 +945,7 @@ msgstr "Hibás felhasználónév vagy jelszó" #: ../../../../inc/themes/material-blue/login.inc:33 #: ../../../../inc/themes/material-blue/mail.inc:61 #: ../../../../inc/themes/material-blue/mail.inc:67 -#: ../../../../inc/themes/material-blue/passreset.inc:17 +#: ../../../../inc/themes/material-blue/passreset.inc:16 #: ../../../../inc/themes/material-blue/request.inc:20 #: ../../../../inc/themes/material-blue/search.inc:55 #: ../../../../inc/themes/material-blue/tokens.inc:8 @@ -960,44 +953,44 @@ msgid "Usuario" msgstr "Felhasználó" # "Wrong user/pass" -#: ../../../../ajax/ajax_doLogin.php:96 ../../../../ajax/ajax_doLogin.php:110 -#: ../../../../ajax/ajax_doLogin.php:121 +#: ../../../../ajax/ajax_doLogin.php:89 ../../../../ajax/ajax_doLogin.php:103 +#: ../../../../ajax/ajax_doLogin.php:114 msgid "Usuario/Clave incorrectos" msgstr "Hibás felhasználó/jelszó" # Account Expired -#: ../../../../ajax/ajax_doLogin.php:99 ../../../../ajax/ajax_doLogin.php:103 +#: ../../../../ajax/ajax_doLogin.php:92 ../../../../ajax/ajax_doLogin.php:96 #, fuzzy msgid "Cuenta expirada" msgstr "Fiók" # "The user have no associated groups" -#: ../../../../ajax/ajax_doLogin.php:106 +#: ../../../../ajax/ajax_doLogin.php:99 msgid "El usuario no tiene grupos asociados" msgstr "a felhasználó nincs csoporthoz társítva" # "User disabled" -#: ../../../../ajax/ajax_doLogin.php:127 ../../../../ajax/ajax_doLogin.php:131 +#: ../../../../ajax/ajax_doLogin.php:120 ../../../../ajax/ajax_doLogin.php:124 msgid "Usuario deshabilitado" msgstr "Felhasználó letiltva" # "Error on retrieving user data from DB" -#: ../../../../ajax/ajax_doLogin.php:136 +#: ../../../../ajax/ajax_doLogin.php:129 msgid "Error al obtener los datos del usuario de la BBDD" msgstr "Hiba a felhasználói adatok adatbázisból való betöltése közben" # "The master password not saved or is incorrect" -#: ../../../../ajax/ajax_doLogin.php:146 +#: ../../../../ajax/ajax_doLogin.php:139 msgid "La clave maestra no ha sido guardada o es incorrecta" msgstr "A mester jelszó nem lett elmentve, vagy helytelen" # "Invalid Master Password" -#: ../../../../ajax/ajax_doLogin.php:155 ../../../../ajax/ajax_doLogin.php:158 +#: ../../../../ajax/ajax_doLogin.php:146 ../../../../ajax/ajax_doLogin.php:149 msgid "Clave maestra incorrecta" msgstr "Érvénytelen mester jelszó" # "Profile" -#: ../../../../ajax/ajax_doLogin.php:181 +#: ../../../../ajax/ajax_doLogin.php:172 #: ../../../../inc/ProfileBase.class.php:512 #: ../../../../inc/ProfileBase.class.php:550 #: ../../../../inc/ProfileBase.class.php:593 @@ -1008,7 +1001,7 @@ msgid "Perfil" msgstr "Profil" # "Group" -#: ../../../../ajax/ajax_doLogin.php:182 ../../../../inc/Groups.class.php:158 +#: ../../../../ajax/ajax_doLogin.php:173 ../../../../inc/Groups.class.php:158 #: ../../../../inc/Groups.class.php:259 ../../../../inc/Groups.class.php:375 #: ../../../../web/UsersMgmtC.class.php:90 #: ../../../../inc/themes/classic/ldap.inc:116 @@ -1190,7 +1183,7 @@ msgstr "" # "Edit User Password" #: ../../../../ajax/ajax_passReset.php:72 #: ../../../../inc/UserBase.class.php:568 -#: ../../../../inc/UserUtil.class.php:664 +#: ../../../../inc/UserUtil.class.php:662 msgid "Modificar Clave Usuario" msgstr "Felhasználó jelszavának szerkesztése" @@ -1198,7 +1191,7 @@ msgstr "Felhasználó jelszavának szerkesztése" #: ../../../../ajax/ajax_passReset.php:72 #: ../../../../inc/UserBase.class.php:568 #: ../../../../inc/UserBase.class.php:592 -#: ../../../../inc/UserUtil.class.php:664 +#: ../../../../inc/UserUtil.class.php:662 #: ../../../../web/UsersMgmtC.class.php:88 #: ../../../../inc/themes/classic/users.inc:21 #: ../../../../inc/themes/material-blue/users.inc:24 @@ -1346,7 +1339,7 @@ msgstr "Segítség :: GYIK :: Változások Listája" #: ../../../../inc/Log.class.php:28 ../../../../inc/Migrate.class.php:28 #: ../../../../inc/Profile.class.php:29 #: ../../../../inc/ProfileBase.class.php:28 -#: ../../../../inc/Request.class.php:111 ../../../../inc/Session.class.php:28 +#: ../../../../inc/Request.class.php:110 ../../../../inc/Session.class.php:28 #: ../../../../inc/SyspassImport.class.php:28 #: ../../../../inc/Upgrade.class.php:29 ../../../../inc/User.class.php:28 #: ../../../../inc/UserLdap.class.php:28 @@ -1739,7 +1732,7 @@ msgid "Usuario no pertenece al grupo" msgstr "a felhasználó nincs csoporthoz társítva" # "Password Change" -#: ../../../../inc/Auth.class.php:187 +#: ../../../../inc/Auth.class.php:186 #: ../../../../inc/themes/classic/users.inc:117 #: ../../../../inc/themes/classic/userspass.inc:2 #: ../../../../inc/themes/material-blue/users.inc:161 @@ -1748,17 +1741,17 @@ msgid "Cambio de Clave" msgstr "Jelszó változtatás" # A request for updating your user password has been done. -#: ../../../../inc/Auth.class.php:189 +#: ../../../../inc/Auth.class.php:188 msgid "Se ha solicitado el cambio de su clave de usuario." msgstr "A kérelmet frissíteni a felhasználói jelszót megtörtént." # "In order to complete the process, please go to this URL:" -#: ../../../../inc/Auth.class.php:191 +#: ../../../../inc/Auth.class.php:190 msgid "Para completar el proceso es necesario que acceda a la siguiente URL:" msgstr "A folyamat befejezéséhez látogass el a következõ oldalra:" # "If you have not requested this action, please dismiss this message." -#: ../../../../inc/Auth.class.php:195 +#: ../../../../inc/Auth.class.php:194 msgid "Si no ha solicitado esta acción, ignore este mensaje." msgstr "Amennyiben nincs szüksége erre a folyamatra, zárja be ezt az üzenetet" @@ -1882,13 +1875,23 @@ msgstr "Nincs jogosultságod belépni ebbe az oldalba" msgid "No tiene permisos para realizar esta operación" msgstr "Nincs jogosultságod végrehajtani ezt a mûveletet" +# "Warning" +#: ../../../../inc/Crypt.class.php:119 ../../../../inc/Email.class.php:146 +msgid "Aviso" +msgstr "Figyelem" + +#: ../../../../inc/Crypt.class.php:119 +msgid "" +"Se ha regenerado el HASH de clave maestra. No es necesaria ninguna acción." +msgstr "" + # "Crypto module can't be loaded" -#: ../../../../inc/Crypt.class.php:236 +#: ../../../../inc/Crypt.class.php:181 msgid "No se puede usar el módulo de encriptación" msgstr "A Crypto modul nem tölthetõ be" # "Error on creating encryption data" -#: ../../../../inc/Crypt.class.php:247 +#: ../../../../inc/Crypt.class.php:192 msgid "Error al generar datos cifrados" msgstr "Hiba a titkosítási folyamat közben" @@ -2023,7 +2026,7 @@ msgid "Compruebe los datos de conexión" msgstr "Please, check connection parameters" # "N/A" -#: ../../../../inc/Email.class.php:59 ../../../../inc/UserUtil.class.php:567 +#: ../../../../inc/Email.class.php:59 ../../../../inc/UserUtil.class.php:565 msgid "N/D" msgstr "n.a." @@ -2064,11 +2067,6 @@ msgstr "Címzett" msgid "CC" msgstr "CC" -# "Warning" -#: ../../../../inc/Email.class.php:146 -msgid "Aviso" -msgstr "Figyelem" - # "File successfully uploaded" #: ../../../../inc/FileImport.class.php:105 msgid "Archivo no subido correctamente" @@ -2729,6 +2727,24 @@ msgstr "Ügyfelek importálása" msgid "No hay cuentas para importar" msgstr "Nincsenek letölthetõ Archívumok" +# "Unable to create customer" +#: ../../../../inc/Template.class.php:89 +#, fuzzy, php-format +msgid "No es posible obtener la plantilla \"%s\" : %s" +msgstr "Ügyfél létrehozása meghiusúlt" + +# "Unable to create customer" +#: ../../../../inc/Template.class.php:128 +#, fuzzy, php-format +msgid "No es posible obtener la variable \"%s\"" +msgstr "Ügyfél létrehozása meghiusúlt" + +# "Unable to create customer" +#: ../../../../inc/Template.class.php:171 +#, fuzzy, php-format +msgid "No es posible destruir la variable \"%s\"" +msgstr "Ügyfél létrehozása meghiusúlt" + # "Error on updating database" #: ../../../../inc/Upgrade.class.php:51 msgid "Error al aplicar la actualización de la Base de Datos" @@ -2759,27 +2775,27 @@ msgid "Actualizar BBDD" msgstr "Frissítse az adatbázist" # "Database update not needed." -#: ../../../../inc/Upgrade.class.php:121 +#: ../../../../inc/Upgrade.class.php:127 msgid "No es necesario actualizar la Base de Datos." msgstr "Az adatbázis frissítése nem szükséges" # "Error on updating database." -#: ../../../../inc/Upgrade.class.php:129 +#: ../../../../inc/Upgrade.class.php:135 msgid "Error al aplicar la actualización de la Base de Datos." msgstr "Hiba az adatbázis frissítése közben" # "Database updating was done successfully." -#: ../../../../inc/Upgrade.class.php:138 +#: ../../../../inc/Upgrade.class.php:144 msgid "Actualización de la Base de Datos realizada correctamente." msgstr "Az adatbázis frissítés sikeresen megtörtént" # "Update Configuration" -#: ../../../../inc/Upgrade.class.php:215 +#: ../../../../inc/Upgrade.class.php:221 msgid "Actualizar Configuración" msgstr "Konfiguráció frissítése" # "Configuration updating successfully done." -#: ../../../../inc/Upgrade.class.php:215 +#: ../../../../inc/Upgrade.class.php:221 msgid "Actualización de la Configuración realizada correctamente." msgstr "A beállítások elmentve" @@ -2823,13 +2839,13 @@ msgid "Nuevo usuario de LDAP" msgstr "LDAP felhasználó" # "Edit Group" -#: ../../../../inc/UserUtil.class.php:705 +#: ../../../../inc/UserUtil.class.php:703 #, fuzzy msgid "Migrar Grupos" msgstr "Csoportok" # "Error on adding users groups" -#: ../../../../inc/UserUtil.class.php:705 +#: ../../../../inc/UserUtil.class.php:703 #, fuzzy msgid "Error al migrar grupo del usuario" msgstr "Hiba a DN felhasználó keresése közben" @@ -3365,24 +3381,30 @@ msgid "" "Sin esta función un atacante puede utilizar su cuenta al resetear la clave" msgstr "E funkció nélkül egy támadó alapállapotba állíthatja jelszavát" +# "Query error" +#: ../../../../web/MainC.class.php:284 +#, fuzzy +msgid "Error en clave RSA" +msgstr "Lekérdezési hiba" + # "Installation finished" -#: ../../../../web/MainC.class.php:288 +#: ../../../../web/MainC.class.php:304 msgid "Instalación finalizada" msgstr "A telepítés befejezõdött" # "Click here to access" -#: ../../../../web/MainC.class.php:289 +#: ../../../../web/MainC.class.php:305 msgid "Pulse aquí para acceder" msgstr "" "Kattinst here a " "bejelentkezéshez" # "Download new version" -#: ../../../../web/MainC.class.php:384 +#: ../../../../web/MainC.class.php:400 msgid "Descargar nueva versión" msgstr "Új verzió letöltése" -#: ../../../../web/MainC.class.php:395 +#: ../../../../web/MainC.class.php:411 msgid "Avisos de sysPass" msgstr "" @@ -3542,12 +3564,14 @@ msgstr "Felhasználó elérése" # "Password (repeat)" #: ../../../../inc/themes/classic/account.inc:90 #: ../../../../inc/themes/classic/editpass.inc:31 +#: ../../../../inc/themes/classic/passreset.inc:35 #: ../../../../inc/themes/classic/users.inc:83 #: ../../../../inc/themes/classic/userspass.inc:19 #: ../../../../inc/themes/classic/userspass.inc:21 #: ../../../../inc/themes/material-blue/account.inc:105 #: ../../../../inc/themes/material-blue/editpass.inc:36 -#: ../../../../inc/themes/material-blue/install.inc:64 +#: ../../../../inc/themes/material-blue/install.inc:66 +#: ../../../../inc/themes/material-blue/passreset.inc:36 #: ../../../../inc/themes/material-blue/users.inc:102 #: ../../../../inc/themes/material-blue/users.inc:109 #: ../../../../inc/themes/material-blue/userspass.inc:19 @@ -3705,7 +3729,7 @@ msgstr "Általános" #: ../../../../inc/themes/classic/account.inc:406 #: ../../../../inc/themes/classic/editpass.inc:45 #: ../../../../inc/themes/classic/passreset.inc:46 -#: ../../../../inc/themes/material-blue/passreset.inc:43 +#: ../../../../inc/themes/material-blue/passreset.inc:48 msgid "Volver" msgstr "Vissza" @@ -4206,8 +4230,8 @@ msgstr "" #: ../../../../inc/themes/classic/login.inc:15 #: ../../../../inc/themes/classic/login.inc:27 #: ../../../../inc/themes/material-blue/encryption.inc:8 -#: ../../../../inc/themes/material-blue/install.inc:49 -#: ../../../../inc/themes/material-blue/install.inc:56 +#: ../../../../inc/themes/material-blue/install.inc:51 +#: ../../../../inc/themes/material-blue/install.inc:58 #: ../../../../inc/themes/material-blue/login.inc:25 #: ../../../../inc/themes/material-blue/login.inc:48 msgid "Clave Maestra" @@ -4413,12 +4437,12 @@ msgid "Ver Archivo" msgstr "Fájl megtekintése" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 +#: ../../../../inc/themes/material-blue/footer.inc:29 msgid "Indica si la conexión utiliza HTTPS." msgstr "" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 +#: ../../../../inc/themes/material-blue/footer.inc:29 msgid "" "Las claves de formularios enviados se encriptan mediante PKI, el resto de " "datos no." @@ -4426,13 +4450,11 @@ msgstr "" # "Security" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 #, fuzzy msgid "Seguro" msgstr "Biztonság" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 msgid "Inseguro" msgstr "" @@ -4719,14 +4741,14 @@ msgstr "Create sysPass admin account" # sysPass administrator's login #: ../../../../inc/themes/classic/install.inc:32 -#: ../../../../inc/themes/material-blue/install.inc:36 +#: ../../../../inc/themes/material-blue/install.inc:37 #, fuzzy msgid "Login del usuario administrador de sysPass" msgstr "sysPass administrator's login" # "DB Configuration" #: ../../../../inc/themes/classic/install.inc:58 -#: ../../../../inc/themes/material-blue/install.inc:69 +#: ../../../../inc/themes/material-blue/install.inc:71 msgid "Configurar BBDD" msgstr "Adatbázis beállítások" @@ -4738,7 +4760,7 @@ msgstr "Adatbázis rendszergazdai jogokkal rendelkezõ felhasználó" # sysPass database name #: ../../../../inc/themes/classic/install.inc:83 -#: ../../../../inc/themes/material-blue/install.inc:102 +#: ../../../../inc/themes/material-blue/install.inc:105 #, fuzzy msgid "Nombre de la base de datos para sysPass" msgstr "Írd be a phpPMS adatbázis nevét" @@ -4751,20 +4773,20 @@ msgstr "Kérem, törölje a pontokat az adatbázis nevébõl" # "Hosting Mode" #: ../../../../inc/themes/classic/install.inc:97 -#: ../../../../inc/themes/material-blue/install.inc:120 +#: ../../../../inc/themes/material-blue/install.inc:123 msgid "Modo Hosting" msgstr "Hosting mód" # "It does not create or verify the user's permissions on the DB" #: ../../../../inc/themes/classic/install.inc:104 -#: ../../../../inc/themes/material-blue/install.inc:127 +#: ../../../../inc/themes/material-blue/install.inc:130 msgid "No crea ni verifica los permisos del usuario sobre la BBDD" msgstr "Ez nem hozza létre, illetve erõsíti meg az adatbázis jogosultságokat" # "Install" #: ../../../../inc/themes/classic/install.inc:108 -#: ../../../../inc/themes/material-blue/install.inc:134 -#: ../../../../inc/themes/material-blue/install.inc:135 +#: ../../../../inc/themes/material-blue/install.inc:137 +#: ../../../../inc/themes/material-blue/install.inc:138 msgid "Instalar" msgstr "Telepítés" @@ -4975,7 +4997,7 @@ msgstr "Több akció" # "Request Password Change" #: ../../../../inc/themes/classic/passreset.inc:13 -#: ../../../../inc/themes/material-blue/passreset.inc:10 +#: ../../../../inc/themes/material-blue/passreset.inc:9 msgid "Solicitud de Cambio de Clave" msgstr "Kérés jelszó módosítás" @@ -4986,7 +5008,7 @@ msgstr "Felhasználó bejelentkezés" # "User Email" #: ../../../../inc/themes/classic/passreset.inc:21 -#: ../../../../inc/themes/material-blue/passreset.inc:24 +#: ../../../../inc/themes/material-blue/passreset.inc:23 msgid "Email del Usuario" msgstr "Felhasználó Email" @@ -5002,27 +5024,17 @@ msgstr "Email" msgid "Nueva Clave" msgstr "Új jelszó" -# "New Password (Verify)" -#: ../../../../inc/themes/classic/passreset.inc:34 -msgid "Nueva Clave (Verificar)" -msgstr "Új jelszó (megerõsítés)" - -# "Password (Verify)" -#: ../../../../inc/themes/classic/passreset.inc:35 -msgid "Clave (Verificar)" -msgstr "Jelszó (Megerõsítés)" - # "Go back to login" #: ../../../../inc/themes/classic/passreset.inc:46 -#: ../../../../inc/themes/material-blue/passreset.inc:42 +#: ../../../../inc/themes/material-blue/passreset.inc:47 msgid "Volver a iniciar sesión" msgstr "Vissza a bejelentkezéshez" # "Request" #: ../../../../inc/themes/classic/passreset.inc:48 #: ../../../../inc/themes/material-blue/2fa.inc:27 -#: ../../../../inc/themes/material-blue/passreset.inc:48 -#: ../../../../inc/themes/material-blue/passreset.inc:49 +#: ../../../../inc/themes/material-blue/passreset.inc:53 +#: ../../../../inc/themes/material-blue/passreset.inc:54 msgid "Solicitar" msgstr "Kérés" @@ -5033,8 +5045,8 @@ msgstr "Kérés jelszó módosítás" # "Change" #: ../../../../inc/themes/classic/passreset.inc:51 -#: ../../../../inc/themes/material-blue/passreset.inc:53 -#: ../../../../inc/themes/material-blue/passreset.inc:54 +#: ../../../../inc/themes/material-blue/passreset.inc:58 +#: ../../../../inc/themes/material-blue/passreset.inc:59 msgid "Cambiar" msgstr "Változtatás" @@ -5739,43 +5751,43 @@ msgid "" msgstr "" # sysPass administrator's login -#: ../../../../inc/themes/material-blue/install.inc:31 +#: ../../../../inc/themes/material-blue/install.inc:32 #, fuzzy msgid "Usuario administrador de sysPass" msgstr "sysPass administrator's login" # "Access user" -#: ../../../../inc/themes/material-blue/install.inc:78 +#: ../../../../inc/themes/material-blue/install.inc:80 #, fuzzy msgid "Usuario acceso BBDD" msgstr "Felhasználó elérése" # User login with with database administrative rights -#: ../../../../inc/themes/material-blue/install.inc:83 +#: ../../../../inc/themes/material-blue/install.inc:85 #, fuzzy msgid "Usuario con permisos de administrador de MySQL" msgstr "User login with with database administrative rights" # "DB Password" -#: ../../../../inc/themes/material-blue/install.inc:90 +#: ../../../../inc/themes/material-blue/install.inc:93 #, fuzzy msgid "Clave acceso BBDD" msgstr "Adatbázis jelszó" # sysPass database name -#: ../../../../inc/themes/material-blue/install.inc:97 +#: ../../../../inc/themes/material-blue/install.inc:100 #, fuzzy msgid "Nombre BBDD para sysPass" msgstr "ÍsysPass database name" # "DB Server" -#: ../../../../inc/themes/material-blue/install.inc:109 +#: ../../../../inc/themes/material-blue/install.inc:112 #, fuzzy msgid "Servidor BBDD para sysPass" msgstr "DB szerver" # sysPass database server name -#: ../../../../inc/themes/material-blue/install.inc:114 +#: ../../../../inc/themes/material-blue/install.inc:117 #, fuzzy msgid "Nombre del servidor para instalar la base de datos de sysPass" msgstr "sysPass database server name" @@ -5839,3 +5851,11 @@ msgstr "archívum készítés" #, fuzzy msgid "Autentificación" msgstr "Engedélyezése Hitelesítés" + +# "New Password (Verify)" +#~ msgid "Nueva Clave (Verificar)" +#~ msgstr "Új jelszó (megerõsítés)" + +# "Password (Verify)" +#~ msgid "Clave (Verificar)" +#~ msgstr "Jelszó (Megerõsítés)" diff --git a/inc/locales/it_IT/LC_MESSAGES/messages.mo b/inc/locales/it_IT/LC_MESSAGES/messages.mo index 6328adb1..d050ec4c 100644 Binary files a/inc/locales/it_IT/LC_MESSAGES/messages.mo and b/inc/locales/it_IT/LC_MESSAGES/messages.mo differ diff --git a/inc/locales/it_IT/LC_MESSAGES/messages.po b/inc/locales/it_IT/LC_MESSAGES/messages.po index 6f46edda..5407938e 100644 --- a/inc/locales/it_IT/LC_MESSAGES/messages.po +++ b/inc/locales/it_IT/LC_MESSAGES/messages.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: sysPass\n" -"POT-Creation-Date: 2015-09-23 13:00+0100\n" -"PO-Revision-Date: 2015-09-23 13:00+0100\n" +"POT-Creation-Date: 2015-09-30 03:02+0100\n" +"PO-Revision-Date: 2015-09-30 03:02+0100\n" "Last-Translator: nuxsmin \n" "Language-Team: nuxsmin@syspass.org \n" "Language: it_IT\n" @@ -53,7 +53,7 @@ msgstr "" #: ../../../../ajax/ajax_accountSave.php:77 #: ../../../../ajax/ajax_accountSave.php:88 -#: ../../../../ajax/ajax_appMgmtSave.php:337 +#: ../../../../ajax/ajax_appMgmtSave.php:328 msgid "Es necesario un nombre de cliente" msgstr "" @@ -78,63 +78,63 @@ msgid "Id inválido" msgstr "" #: ../../../../ajax/ajax_accountSave.php:110 -#: ../../../../ajax/ajax_accountSave.php:263 -#: ../../../../ajax/ajax_appMgmtSave.php:543 -#: ../../../../ajax/ajax_configSave.php:297 +#: ../../../../ajax/ajax_accountSave.php:258 +#: ../../../../ajax/ajax_appMgmtSave.php:534 +#: ../../../../ajax/ajax_configSave.php:287 #: ../../../../ajax/ajax_userPrefsSave.php:79 ../../../../api.php:53 msgid "Acción Inválida" msgstr "" -#: ../../../../ajax/ajax_accountSave.php:122 +#: ../../../../ajax/ajax_accountSave.php:117 #: ../../../../ajax/ajax_appMgmtSave.php:111 -#: ../../../../ajax/ajax_appMgmtSave.php:155 -#: ../../../../ajax/ajax_backup.php:70 +#: ../../../../ajax/ajax_appMgmtSave.php:148 +#: ../../../../ajax/ajax_backup.php:62 msgid "Las claves no coinciden" msgstr "" -#: ../../../../ajax/ajax_accountSave.php:173 +#: ../../../../ajax/ajax_accountSave.php:168 msgid "Cuenta creada" msgstr "" -#: ../../../../ajax/ajax_accountSave.php:176 +#: ../../../../ajax/ajax_accountSave.php:171 msgid "Error al crear la cuenta" msgstr "" -#: ../../../../ajax/ajax_accountSave.php:211 +#: ../../../../ajax/ajax_accountSave.php:206 msgid "Sin cambios" msgstr "" -#: ../../../../ajax/ajax_accountSave.php:223 +#: ../../../../ajax/ajax_accountSave.php:218 msgid "Cuenta actualizada" msgstr "" -#: ../../../../ajax/ajax_accountSave.php:226 +#: ../../../../ajax/ajax_accountSave.php:221 msgid "Error al modificar la cuenta" msgstr "" -#: ../../../../ajax/ajax_accountSave.php:233 +#: ../../../../ajax/ajax_accountSave.php:228 msgid "Cuenta eliminada" msgstr "" -#: ../../../../ajax/ajax_accountSave.php:236 +#: ../../../../ajax/ajax_accountSave.php:231 msgid "Error al eliminar la cuenta" msgstr "" -#: ../../../../ajax/ajax_accountSave.php:246 -#: ../../../../ajax/ajax_appMgmtSave.php:161 +#: ../../../../ajax/ajax_accountSave.php:241 +#: ../../../../ajax/ajax_appMgmtSave.php:152 #: ../../../../ajax/ajax_passReset.php:74 msgid "Clave actualizada" msgstr "" -#: ../../../../ajax/ajax_accountSave.php:249 +#: ../../../../ajax/ajax_accountSave.php:244 msgid "Error al actualizar la clave" msgstr "" -#: ../../../../ajax/ajax_accountSave.php:256 +#: ../../../../ajax/ajax_accountSave.php:251 msgid "Cuenta restaurada" msgstr "" -#: ../../../../ajax/ajax_accountSave.php:259 +#: ../../../../ajax/ajax_accountSave.php:254 msgid "Error al restaurar cuenta" msgstr "" @@ -260,8 +260,8 @@ msgstr "" #: ../../../../ajax/ajax_appMgmtSave.php:95 #: ../../../../ajax/ajax_appMgmtSave.php:144 -#: ../../../../ajax/ajax_appMgmtSave.php:168 -#: ../../../../ajax/ajax_configSave.php:272 +#: ../../../../ajax/ajax_appMgmtSave.php:159 +#: ../../../../ajax/ajax_configSave.php:262 #: ../../../../ajax/ajax_import.php:39 ../../../../ajax/ajax_migrate.php:39 #: ../../../../ajax/ajax_userPrefsSave.php:55 msgid "Ey, esto es una DEMO!!" @@ -297,49 +297,49 @@ msgstr "" msgid "Error al actualizar el usuario" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:164 +#: ../../../../ajax/ajax_appMgmtSave.php:155 #: ../../../../ajax/ajax_passReset.php:78 msgid "Error al modificar la clave" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:170 +#: ../../../../ajax/ajax_appMgmtSave.php:161 msgid "No es posible eliminar, usuario en uso" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:174 +#: ../../../../ajax/ajax_appMgmtSave.php:165 msgid "Usuario eliminado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:177 +#: ../../../../ajax/ajax_appMgmtSave.php:168 msgid "Error al eliminar el usuario" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:192 +#: ../../../../ajax/ajax_appMgmtSave.php:183 msgid "Es necesario un nombre de grupo" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:200 +#: ../../../../ajax/ajax_appMgmtSave.php:191 msgid "Nombre de grupo duplicado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:212 +#: ../../../../ajax/ajax_appMgmtSave.php:203 msgid "Grupo creado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:214 +#: ../../../../ajax/ajax_appMgmtSave.php:205 msgid "Error al crear el grupo" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:225 +#: ../../../../ajax/ajax_appMgmtSave.php:216 msgid "Grupo actualizado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:228 +#: ../../../../ajax/ajax_appMgmtSave.php:219 msgid "Error al actualizar el grupo" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:237 -#: ../../../../ajax/ajax_appMgmtSave.php:314 +#: ../../../../ajax/ajax_appMgmtSave.php:228 +#: ../../../../ajax/ajax_appMgmtSave.php:305 #: ../../../../inc/CustomFieldsBase.class.php:83 #: ../../../../inc/themes/classic/account.inc:109 #: ../../../../inc/themes/classic/groups.inc:24 @@ -350,7 +350,7 @@ msgstr "" msgid "Usuarios" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:241 +#: ../../../../ajax/ajax_appMgmtSave.php:232 #: ../../../../inc/Category.class.php:266 #: ../../../../inc/CustomFieldsBase.class.php:80 #: ../../../../inc/Customer.class.php:150 @@ -360,126 +360,126 @@ msgstr "" msgid "Cuentas" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:244 -#: ../../../../ajax/ajax_appMgmtSave.php:316 +#: ../../../../ajax/ajax_appMgmtSave.php:235 +#: ../../../../ajax/ajax_appMgmtSave.php:307 #: ../../../../inc/Category.class.php:119 #: ../../../../inc/Customer.class.php:150 msgid "No es posible eliminar" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:244 +#: ../../../../ajax/ajax_appMgmtSave.php:235 msgid "Grupo en uso por:" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:249 +#: ../../../../ajax/ajax_appMgmtSave.php:240 msgid "Grupo eliminado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:252 +#: ../../../../ajax/ajax_appMgmtSave.php:243 msgid "Error al eliminar el grupo" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:291 +#: ../../../../ajax/ajax_appMgmtSave.php:282 msgid "Es necesario un nombre de perfil" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:293 +#: ../../../../ajax/ajax_appMgmtSave.php:284 msgid "Nombre de perfil duplicado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:298 +#: ../../../../ajax/ajax_appMgmtSave.php:289 msgid "Perfil creado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:301 +#: ../../../../ajax/ajax_appMgmtSave.php:292 msgid "Error al crear el perfil" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:304 +#: ../../../../ajax/ajax_appMgmtSave.php:295 msgid "Perfil actualizado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:307 +#: ../../../../ajax/ajax_appMgmtSave.php:298 msgid "Error al actualizar el perfil" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:316 +#: ../../../../ajax/ajax_appMgmtSave.php:307 msgid "Perfil en uso por:" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:319 +#: ../../../../ajax/ajax_appMgmtSave.php:310 msgid "Perfil eliminado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:322 +#: ../../../../ajax/ajax_appMgmtSave.php:313 msgid "Error al eliminar el perfil" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:357 +#: ../../../../ajax/ajax_appMgmtSave.php:348 msgid "Cliente creado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:372 +#: ../../../../ajax/ajax_appMgmtSave.php:363 msgid "Cliente actualizado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:382 +#: ../../../../ajax/ajax_appMgmtSave.php:373 msgid "Cliente eliminado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:396 +#: ../../../../ajax/ajax_appMgmtSave.php:387 msgid "Es necesario un nombre de categoría" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:416 +#: ../../../../ajax/ajax_appMgmtSave.php:407 msgid "Categoría creada" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:431 +#: ../../../../ajax/ajax_appMgmtSave.php:422 msgid "Categoría actualizada" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:442 +#: ../../../../ajax/ajax_appMgmtSave.php:433 msgid "Categoría eliminada" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:458 +#: ../../../../ajax/ajax_appMgmtSave.php:449 msgid "Usuario o acción no indicado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:468 +#: ../../../../ajax/ajax_appMgmtSave.php:459 msgid "Autorización creada" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:476 +#: ../../../../ajax/ajax_appMgmtSave.php:467 msgid "Autorización actualizada" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:486 +#: ../../../../ajax/ajax_appMgmtSave.php:477 msgid "Autorización eliminada" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:503 +#: ../../../../ajax/ajax_appMgmtSave.php:494 msgid "Nombre del campo no indicado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:505 +#: ../../../../ajax/ajax_appMgmtSave.php:496 msgid "Tipo del campo no indicado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:507 +#: ../../../../ajax/ajax_appMgmtSave.php:498 msgid "Módulo del campo no indicado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:521 +#: ../../../../ajax/ajax_appMgmtSave.php:512 msgid "Campo creado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:530 +#: ../../../../ajax/ajax_appMgmtSave.php:521 msgid "Campo actualizado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:540 +#: ../../../../ajax/ajax_appMgmtSave.php:531 msgid "Campo eliminado" msgstr "" @@ -492,7 +492,7 @@ msgstr "" msgid "Error al realizar el backup" msgstr "" -#: ../../../../ajax/ajax_backup.php:54 ../../../../ajax/ajax_backup.php:76 +#: ../../../../ajax/ajax_backup.php:54 ../../../../ajax/ajax_backup.php:68 #: ../../../../ajax/ajax_checkLdap.php:57 ../../../../inc/Import.class.php:128 #: ../../../../inc/Migrate.class.php:93 msgid "Revise el registro de eventos para más detalles" @@ -506,29 +506,23 @@ msgstr "" msgid "Proceso de backup finalizado" msgstr "" -#: ../../../../ajax/ajax_backup.php:66 -#: ../../../../ajax/ajax_configSave.php:244 -#: ../../../../ajax/ajax_doLogin.php:53 ../../../../ajax/ajax_import.php:56 -msgid "Error en clave RSA" -msgstr "" - -#: ../../../../ajax/ajax_backup.php:74 ../../../../ajax/ajax_backup.php:79 +#: ../../../../ajax/ajax_backup.php:66 ../../../../ajax/ajax_backup.php:71 msgid "Realizar Exportación" msgstr "" -#: ../../../../ajax/ajax_backup.php:74 +#: ../../../../ajax/ajax_backup.php:66 msgid "Error al realizar la exportación de cuentas" msgstr "" -#: ../../../../ajax/ajax_backup.php:76 +#: ../../../../ajax/ajax_backup.php:68 msgid "Error al realizar la exportación" msgstr "" -#: ../../../../ajax/ajax_backup.php:79 +#: ../../../../ajax/ajax_backup.php:71 msgid "Exportación de cuentas realizada correctamente" msgstr "" -#: ../../../../ajax/ajax_backup.php:81 +#: ../../../../ajax/ajax_backup.php:73 msgid "Proceso de exportación finalizado" msgstr "" @@ -605,7 +599,7 @@ msgid "Configuración actualizada" msgstr "" #: ../../../../ajax/ajax_configSave.php:230 -#: ../../../../ajax/ajax_configSave.php:282 +#: ../../../../ajax/ajax_configSave.php:272 #: ../../../../ajax/ajax_viewpass.php:60 #: ../../../../inc/Controller.class.php:169 msgid "Clave maestra actualizada" @@ -625,40 +619,40 @@ msgstr "" msgid "Se ha de confirmar el cambio de clave" msgstr "" -#: ../../../../ajax/ajax_configSave.php:248 +#: ../../../../ajax/ajax_configSave.php:238 msgid "Las claves son idénticas" msgstr "" -#: ../../../../ajax/ajax_configSave.php:250 +#: ../../../../ajax/ajax_configSave.php:240 msgid "Las claves maestras no coinciden" msgstr "" -#: ../../../../ajax/ajax_configSave.php:252 +#: ../../../../ajax/ajax_configSave.php:242 msgid "La clave maestra actual no coincide" msgstr "" -#: ../../../../ajax/ajax_configSave.php:261 +#: ../../../../ajax/ajax_configSave.php:251 msgid "Errores al actualizar las claves de las cuentas" msgstr "" -#: ../../../../ajax/ajax_configSave.php:267 +#: ../../../../ajax/ajax_configSave.php:257 msgid "Errores al actualizar las claves de las cuentas del histórico" msgstr "" -#: ../../../../ajax/ajax_configSave.php:280 +#: ../../../../ajax/ajax_configSave.php:270 #: ../../../../inc/Account.class.php:497 msgid "Actualizar Clave Maestra" msgstr "" -#: ../../../../ajax/ajax_configSave.php:284 +#: ../../../../ajax/ajax_configSave.php:274 msgid "Error al guardar el hash de la clave maestra" msgstr "" -#: ../../../../ajax/ajax_configSave.php:292 +#: ../../../../ajax/ajax_configSave.php:282 msgid "Generar Clave Temporal" msgstr "" -#: ../../../../ajax/ajax_configSave.php:292 +#: ../../../../ajax/ajax_configSave.php:282 #: ../../../../inc/themes/classic/account.inc:83 #: ../../../../inc/themes/classic/editpass.inc:25 #: ../../../../inc/themes/classic/install.inc:38 @@ -667,6 +661,7 @@ msgstr "" #: ../../../../inc/themes/classic/login.inc:22 #: ../../../../inc/themes/classic/mail.inc:55 #: ../../../../inc/themes/classic/passreset.inc:29 +#: ../../../../inc/themes/classic/passreset.inc:34 #: ../../../../inc/themes/classic/users.inc:75 #: ../../../../inc/themes/classic/userspass.inc:8 #: ../../../../inc/themes/classic/userspass.inc:11 @@ -676,13 +671,13 @@ msgstr "" #: ../../../../inc/themes/material-blue/editpass.inc:26 #: ../../../../inc/themes/material-blue/editpass.inc:31 #: ../../../../inc/themes/material-blue/editpass.inc:41 -#: ../../../../inc/themes/material-blue/install.inc:44 +#: ../../../../inc/themes/material-blue/install.inc:46 #: ../../../../inc/themes/material-blue/ldap.inc:105 #: ../../../../inc/themes/material-blue/login.inc:17 #: ../../../../inc/themes/material-blue/login.inc:40 #: ../../../../inc/themes/material-blue/mail.inc:73 #: ../../../../inc/themes/material-blue/mail.inc:80 -#: ../../../../inc/themes/material-blue/passreset.inc:31 +#: ../../../../inc/themes/material-blue/passreset.inc:30 #: ../../../../inc/themes/material-blue/users.inc:89 #: ../../../../inc/themes/material-blue/users.inc:96 #: ../../../../inc/themes/material-blue/userspass.inc:8 @@ -690,7 +685,7 @@ msgstr "" msgid "Clave" msgstr "" -#: ../../../../ajax/ajax_configSave.php:294 +#: ../../../../ajax/ajax_configSave.php:284 msgid "Clave Temporal Generada" msgstr "" @@ -698,43 +693,43 @@ msgstr "" msgid "Usuario/Clave no introducidos" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:65 +#: ../../../../ajax/ajax_doLogin.php:58 msgid "Inicio sesión" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:70 +#: ../../../../ajax/ajax_doLogin.php:63 msgid "Servidor Login" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:76 +#: ../../../../ajax/ajax_doLogin.php:69 msgid "Error al guardar los datos de LDAP" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:79 ../../../../ajax/ajax_doLogin.php:87 -#: ../../../../ajax/ajax_doLogin.php:139 ../../../../ajax/ajax_doLogin.php:185 +#: ../../../../ajax/ajax_doLogin.php:72 ../../../../ajax/ajax_doLogin.php:80 +#: ../../../../ajax/ajax_doLogin.php:132 ../../../../ajax/ajax_doLogin.php:176 #: ../../../../inc/ApiTokens.class.php:140 #: ../../../../inc/ApiTokens.class.php:186 #: ../../../../inc/ApiTokens.class.php:217 #: ../../../../inc/ApiTokens.class.php:243 #: ../../../../inc/ApiTokens.class.php:262 #: ../../../../inc/ApiTokens.class.php:304 -#: ../../../../inc/ApiTokens.class.php:328 ../../../../inc/Crypt.class.php:235 -#: ../../../../inc/Crypt.class.php:246 +#: ../../../../inc/ApiTokens.class.php:328 ../../../../inc/Crypt.class.php:180 +#: ../../../../inc/Crypt.class.php:191 #: ../../../../inc/XmlImportBase.class.php:74 msgid "Error interno" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:84 +#: ../../../../ajax/ajax_doLogin.php:77 msgid "Error al actualizar la clave del usuario en la BBDD" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:92 ../../../../ajax/ajax_doLogin.php:117 +#: ../../../../ajax/ajax_doLogin.php:85 ../../../../ajax/ajax_doLogin.php:110 msgid "Login incorrecto" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:93 ../../../../ajax/ajax_doLogin.php:100 -#: ../../../../ajax/ajax_doLogin.php:107 ../../../../ajax/ajax_doLogin.php:118 -#: ../../../../ajax/ajax_doLogin.php:128 ../../../../ajax/ajax_doLogin.php:180 +#: ../../../../ajax/ajax_doLogin.php:86 ../../../../ajax/ajax_doLogin.php:93 +#: ../../../../ajax/ajax_doLogin.php:100 ../../../../ajax/ajax_doLogin.php:111 +#: ../../../../ajax/ajax_doLogin.php:121 ../../../../ajax/ajax_doLogin.php:171 #: ../../../../inc/ApiTokens.class.php:190 #: ../../../../inc/ApiTokens.class.php:308 ../../../../inc/Auth.class.php:108 #: ../../../../inc/Init.class.php:517 ../../../../inc/UserBase.class.php:382 @@ -763,43 +758,43 @@ msgstr "" #: ../../../../inc/themes/material-blue/login.inc:33 #: ../../../../inc/themes/material-blue/mail.inc:61 #: ../../../../inc/themes/material-blue/mail.inc:67 -#: ../../../../inc/themes/material-blue/passreset.inc:17 +#: ../../../../inc/themes/material-blue/passreset.inc:16 #: ../../../../inc/themes/material-blue/request.inc:20 #: ../../../../inc/themes/material-blue/search.inc:55 #: ../../../../inc/themes/material-blue/tokens.inc:8 msgid "Usuario" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:96 ../../../../ajax/ajax_doLogin.php:110 -#: ../../../../ajax/ajax_doLogin.php:121 +#: ../../../../ajax/ajax_doLogin.php:89 ../../../../ajax/ajax_doLogin.php:103 +#: ../../../../ajax/ajax_doLogin.php:114 msgid "Usuario/Clave incorrectos" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:99 ../../../../ajax/ajax_doLogin.php:103 +#: ../../../../ajax/ajax_doLogin.php:92 ../../../../ajax/ajax_doLogin.php:96 msgid "Cuenta expirada" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:106 +#: ../../../../ajax/ajax_doLogin.php:99 msgid "El usuario no tiene grupos asociados" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:127 ../../../../ajax/ajax_doLogin.php:131 +#: ../../../../ajax/ajax_doLogin.php:120 ../../../../ajax/ajax_doLogin.php:124 msgid "Usuario deshabilitado" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:136 +#: ../../../../ajax/ajax_doLogin.php:129 msgid "Error al obtener los datos del usuario de la BBDD" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:146 +#: ../../../../ajax/ajax_doLogin.php:139 msgid "La clave maestra no ha sido guardada o es incorrecta" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:155 ../../../../ajax/ajax_doLogin.php:158 +#: ../../../../ajax/ajax_doLogin.php:146 ../../../../ajax/ajax_doLogin.php:149 msgid "Clave maestra incorrecta" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:181 +#: ../../../../ajax/ajax_doLogin.php:172 #: ../../../../inc/ProfileBase.class.php:512 #: ../../../../inc/ProfileBase.class.php:550 #: ../../../../inc/ProfileBase.class.php:593 @@ -809,7 +804,7 @@ msgstr "" msgid "Perfil" msgstr "" -#: ../../../../ajax/ajax_doLogin.php:182 ../../../../inc/Groups.class.php:158 +#: ../../../../ajax/ajax_doLogin.php:173 ../../../../inc/Groups.class.php:158 #: ../../../../inc/Groups.class.php:259 ../../../../inc/Groups.class.php:375 #: ../../../../web/UsersMgmtC.class.php:90 #: ../../../../inc/themes/classic/ldap.inc:116 @@ -960,14 +955,14 @@ msgstr "" #: ../../../../ajax/ajax_passReset.php:72 #: ../../../../inc/UserBase.class.php:568 -#: ../../../../inc/UserUtil.class.php:664 +#: ../../../../inc/UserUtil.class.php:662 msgid "Modificar Clave Usuario" msgstr "" #: ../../../../ajax/ajax_passReset.php:72 #: ../../../../inc/UserBase.class.php:568 #: ../../../../inc/UserBase.class.php:592 -#: ../../../../inc/UserUtil.class.php:664 +#: ../../../../inc/UserUtil.class.php:662 #: ../../../../web/UsersMgmtC.class.php:88 #: ../../../../inc/themes/classic/users.inc:21 #: ../../../../inc/themes/material-blue/users.inc:24 @@ -1095,7 +1090,7 @@ msgstr "" #: ../../../../inc/Log.class.php:28 ../../../../inc/Migrate.class.php:28 #: ../../../../inc/Profile.class.php:29 #: ../../../../inc/ProfileBase.class.php:28 -#: ../../../../inc/Request.class.php:111 ../../../../inc/Session.class.php:28 +#: ../../../../inc/Request.class.php:110 ../../../../inc/Session.class.php:28 #: ../../../../inc/SyspassImport.class.php:28 #: ../../../../inc/Upgrade.class.php:29 ../../../../inc/User.class.php:28 #: ../../../../inc/UserLdap.class.php:28 @@ -1397,7 +1392,7 @@ msgstr "" msgid "Usuario no pertenece al grupo" msgstr "" -#: ../../../../inc/Auth.class.php:187 +#: ../../../../inc/Auth.class.php:186 #: ../../../../inc/themes/classic/users.inc:117 #: ../../../../inc/themes/classic/userspass.inc:2 #: ../../../../inc/themes/material-blue/users.inc:161 @@ -1405,15 +1400,15 @@ msgstr "" msgid "Cambio de Clave" msgstr "" -#: ../../../../inc/Auth.class.php:189 +#: ../../../../inc/Auth.class.php:188 msgid "Se ha solicitado el cambio de su clave de usuario." msgstr "" -#: ../../../../inc/Auth.class.php:191 +#: ../../../../inc/Auth.class.php:190 msgid "Para completar el proceso es necesario que acceda a la siguiente URL:" msgstr "" -#: ../../../../inc/Auth.class.php:195 +#: ../../../../inc/Auth.class.php:194 msgid "Si no ha solicitado esta acción, ignore este mensaje." msgstr "" @@ -1515,11 +1510,20 @@ msgstr "" msgid "No tiene permisos para realizar esta operación" msgstr "" -#: ../../../../inc/Crypt.class.php:236 +#: ../../../../inc/Crypt.class.php:119 ../../../../inc/Email.class.php:146 +msgid "Aviso" +msgstr "" + +#: ../../../../inc/Crypt.class.php:119 +msgid "" +"Se ha regenerado el HASH de clave maestra. No es necesaria ninguna acción." +msgstr "" + +#: ../../../../inc/Crypt.class.php:181 msgid "No se puede usar el módulo de encriptación" msgstr "" -#: ../../../../inc/Crypt.class.php:247 +#: ../../../../inc/Crypt.class.php:192 msgid "Error al generar datos cifrados" msgstr "" @@ -1630,7 +1634,7 @@ msgstr "" msgid "Compruebe los datos de conexión" msgstr "" -#: ../../../../inc/Email.class.php:59 ../../../../inc/UserUtil.class.php:567 +#: ../../../../inc/Email.class.php:59 ../../../../inc/UserUtil.class.php:565 msgid "N/D" msgstr "" @@ -1664,10 +1668,6 @@ msgstr "" msgid "CC" msgstr "" -#: ../../../../inc/Email.class.php:146 -msgid "Aviso" -msgstr "" - #: ../../../../inc/FileImport.class.php:105 msgid "Archivo no subido correctamente" msgstr "" @@ -2187,6 +2187,21 @@ msgstr "" msgid "No hay cuentas para importar" msgstr "" +#: ../../../../inc/Template.class.php:89 +#, php-format +msgid "No es posible obtener la plantilla \"%s\" : %s" +msgstr "" + +#: ../../../../inc/Template.class.php:128 +#, php-format +msgid "No es posible obtener la variable \"%s\"" +msgstr "" + +#: ../../../../inc/Template.class.php:171 +#, php-format +msgid "No es posible destruir la variable \"%s\"" +msgstr "" + #: ../../../../inc/Upgrade.class.php:51 msgid "Error al aplicar la actualización de la Base de Datos" msgstr "" @@ -2210,23 +2225,23 @@ msgstr "" msgid "Actualizar BBDD" msgstr "" -#: ../../../../inc/Upgrade.class.php:121 +#: ../../../../inc/Upgrade.class.php:127 msgid "No es necesario actualizar la Base de Datos." msgstr "" -#: ../../../../inc/Upgrade.class.php:129 +#: ../../../../inc/Upgrade.class.php:135 msgid "Error al aplicar la actualización de la Base de Datos." msgstr "" -#: ../../../../inc/Upgrade.class.php:138 +#: ../../../../inc/Upgrade.class.php:144 msgid "Actualización de la Base de Datos realizada correctamente." msgstr "" -#: ../../../../inc/Upgrade.class.php:215 +#: ../../../../inc/Upgrade.class.php:221 msgid "Actualizar Configuración" msgstr "" -#: ../../../../inc/Upgrade.class.php:215 +#: ../../../../inc/Upgrade.class.php:221 msgid "Actualización de la Configuración realizada correctamente." msgstr "" @@ -2260,11 +2275,11 @@ msgstr "" msgid "Nuevo usuario de LDAP" msgstr "" -#: ../../../../inc/UserUtil.class.php:705 +#: ../../../../inc/UserUtil.class.php:703 msgid "Migrar Grupos" msgstr "" -#: ../../../../inc/UserUtil.class.php:705 +#: ../../../../inc/UserUtil.class.php:703 msgid "Error al migrar grupo del usuario" msgstr "" @@ -2702,19 +2717,23 @@ msgid "" "Sin esta función un atacante puede utilizar su cuenta al resetear la clave" msgstr "" -#: ../../../../web/MainC.class.php:288 +#: ../../../../web/MainC.class.php:284 +msgid "Error en clave RSA" +msgstr "" + +#: ../../../../web/MainC.class.php:304 msgid "Instalación finalizada" msgstr "" -#: ../../../../web/MainC.class.php:289 +#: ../../../../web/MainC.class.php:305 msgid "Pulse aquí para acceder" msgstr "" -#: ../../../../web/MainC.class.php:384 +#: ../../../../web/MainC.class.php:400 msgid "Descargar nueva versión" msgstr "" -#: ../../../../web/MainC.class.php:395 +#: ../../../../web/MainC.class.php:411 msgid "Avisos de sysPass" msgstr "" @@ -2843,12 +2862,14 @@ msgstr "" #: ../../../../inc/themes/classic/account.inc:90 #: ../../../../inc/themes/classic/editpass.inc:31 +#: ../../../../inc/themes/classic/passreset.inc:35 #: ../../../../inc/themes/classic/users.inc:83 #: ../../../../inc/themes/classic/userspass.inc:19 #: ../../../../inc/themes/classic/userspass.inc:21 #: ../../../../inc/themes/material-blue/account.inc:105 #: ../../../../inc/themes/material-blue/editpass.inc:36 -#: ../../../../inc/themes/material-blue/install.inc:64 +#: ../../../../inc/themes/material-blue/install.inc:66 +#: ../../../../inc/themes/material-blue/passreset.inc:36 #: ../../../../inc/themes/material-blue/users.inc:102 #: ../../../../inc/themes/material-blue/users.inc:109 #: ../../../../inc/themes/material-blue/userspass.inc:19 @@ -2983,7 +3004,7 @@ msgstr "" #: ../../../../inc/themes/classic/account.inc:406 #: ../../../../inc/themes/classic/editpass.inc:45 #: ../../../../inc/themes/classic/passreset.inc:46 -#: ../../../../inc/themes/material-blue/passreset.inc:43 +#: ../../../../inc/themes/material-blue/passreset.inc:48 msgid "Volver" msgstr "" @@ -3407,8 +3428,8 @@ msgstr "" #: ../../../../inc/themes/classic/login.inc:15 #: ../../../../inc/themes/classic/login.inc:27 #: ../../../../inc/themes/material-blue/encryption.inc:8 -#: ../../../../inc/themes/material-blue/install.inc:49 -#: ../../../../inc/themes/material-blue/install.inc:56 +#: ../../../../inc/themes/material-blue/install.inc:51 +#: ../../../../inc/themes/material-blue/install.inc:58 #: ../../../../inc/themes/material-blue/login.inc:25 #: ../../../../inc/themes/material-blue/login.inc:48 msgid "Clave Maestra" @@ -3587,24 +3608,22 @@ msgid "Ver Archivo" msgstr "" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 +#: ../../../../inc/themes/material-blue/footer.inc:29 msgid "Indica si la conexión utiliza HTTPS." msgstr "" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 +#: ../../../../inc/themes/material-blue/footer.inc:29 msgid "" "Las claves de formularios enviados se encriptan mediante PKI, el resto de " "datos no." msgstr "" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 msgid "Seguro" msgstr "" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 msgid "Inseguro" msgstr "" @@ -3835,12 +3854,12 @@ msgid "Crear cuenta de admin de sysPass" msgstr "" #: ../../../../inc/themes/classic/install.inc:32 -#: ../../../../inc/themes/material-blue/install.inc:36 +#: ../../../../inc/themes/material-blue/install.inc:37 msgid "Login del usuario administrador de sysPass" msgstr "" #: ../../../../inc/themes/classic/install.inc:58 -#: ../../../../inc/themes/material-blue/install.inc:69 +#: ../../../../inc/themes/material-blue/install.inc:71 msgid "Configurar BBDD" msgstr "" @@ -3849,7 +3868,7 @@ msgid "Login de usuario con permisos de administrador de MySQL" msgstr "" #: ../../../../inc/themes/classic/install.inc:83 -#: ../../../../inc/themes/material-blue/install.inc:102 +#: ../../../../inc/themes/material-blue/install.inc:105 msgid "Nombre de la base de datos para sysPass" msgstr "" @@ -3858,18 +3877,18 @@ msgid "Nombre del servidor de la base de datos de sysPass" msgstr "" #: ../../../../inc/themes/classic/install.inc:97 -#: ../../../../inc/themes/material-blue/install.inc:120 +#: ../../../../inc/themes/material-blue/install.inc:123 msgid "Modo Hosting" msgstr "" #: ../../../../inc/themes/classic/install.inc:104 -#: ../../../../inc/themes/material-blue/install.inc:127 +#: ../../../../inc/themes/material-blue/install.inc:130 msgid "No crea ni verifica los permisos del usuario sobre la BBDD" msgstr "" #: ../../../../inc/themes/classic/install.inc:108 -#: ../../../../inc/themes/material-blue/install.inc:134 -#: ../../../../inc/themes/material-blue/install.inc:135 +#: ../../../../inc/themes/material-blue/install.inc:137 +#: ../../../../inc/themes/material-blue/install.inc:138 msgid "Instalar" msgstr "" @@ -4038,7 +4057,7 @@ msgid "Más Acciones" msgstr "" #: ../../../../inc/themes/classic/passreset.inc:13 -#: ../../../../inc/themes/material-blue/passreset.inc:10 +#: ../../../../inc/themes/material-blue/passreset.inc:9 msgid "Solicitud de Cambio de Clave" msgstr "" @@ -4047,7 +4066,7 @@ msgid "Login del Usuario" msgstr "" #: ../../../../inc/themes/classic/passreset.inc:21 -#: ../../../../inc/themes/material-blue/passreset.inc:24 +#: ../../../../inc/themes/material-blue/passreset.inc:23 msgid "Email del Usuario" msgstr "" @@ -4061,23 +4080,15 @@ msgstr "" msgid "Nueva Clave" msgstr "" -#: ../../../../inc/themes/classic/passreset.inc:34 -msgid "Nueva Clave (Verificar)" -msgstr "" - -#: ../../../../inc/themes/classic/passreset.inc:35 -msgid "Clave (Verificar)" -msgstr "" - #: ../../../../inc/themes/classic/passreset.inc:46 -#: ../../../../inc/themes/material-blue/passreset.inc:42 +#: ../../../../inc/themes/material-blue/passreset.inc:47 msgid "Volver a iniciar sesión" msgstr "" #: ../../../../inc/themes/classic/passreset.inc:48 #: ../../../../inc/themes/material-blue/2fa.inc:27 -#: ../../../../inc/themes/material-blue/passreset.inc:48 -#: ../../../../inc/themes/material-blue/passreset.inc:49 +#: ../../../../inc/themes/material-blue/passreset.inc:53 +#: ../../../../inc/themes/material-blue/passreset.inc:54 msgid "Solicitar" msgstr "" @@ -4086,8 +4097,8 @@ msgid "Solicitar cambio de clave" msgstr "" #: ../../../../inc/themes/classic/passreset.inc:51 -#: ../../../../inc/themes/material-blue/passreset.inc:53 -#: ../../../../inc/themes/material-blue/passreset.inc:54 +#: ../../../../inc/themes/material-blue/passreset.inc:58 +#: ../../../../inc/themes/material-blue/passreset.inc:59 msgid "Cambiar" msgstr "" @@ -4664,31 +4675,31 @@ msgid "" "archivos XML y CSV." msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:31 +#: ../../../../inc/themes/material-blue/install.inc:32 msgid "Usuario administrador de sysPass" msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:78 +#: ../../../../inc/themes/material-blue/install.inc:80 msgid "Usuario acceso BBDD" msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:83 +#: ../../../../inc/themes/material-blue/install.inc:85 msgid "Usuario con permisos de administrador de MySQL" msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:90 +#: ../../../../inc/themes/material-blue/install.inc:93 msgid "Clave acceso BBDD" msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:97 +#: ../../../../inc/themes/material-blue/install.inc:100 msgid "Nombre BBDD para sysPass" msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:109 +#: ../../../../inc/themes/material-blue/install.inc:112 msgid "Servidor BBDD para sysPass" msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:114 +#: ../../../../inc/themes/material-blue/install.inc:117 msgid "Nombre del servidor para instalar la base de datos de sysPass" msgstr "" diff --git a/inc/locales/ru_RU/LC_MESSAGES/messages.mo b/inc/locales/ru_RU/LC_MESSAGES/messages.mo index 19e1c124..35b15234 100644 Binary files a/inc/locales/ru_RU/LC_MESSAGES/messages.mo and b/inc/locales/ru_RU/LC_MESSAGES/messages.mo differ diff --git a/inc/locales/ru_RU/LC_MESSAGES/messages.po b/inc/locales/ru_RU/LC_MESSAGES/messages.po index 338f63ab..25676cfe 100644 --- a/inc/locales/ru_RU/LC_MESSAGES/messages.po +++ b/inc/locales/ru_RU/LC_MESSAGES/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: sysPass\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-23 13:00+0100\n" -"PO-Revision-Date: 2015-09-23 13:00+0100\n" +"POT-Creation-Date: 2015-09-30 03:02+0100\n" +"PO-Revision-Date: 2015-09-30 03:02+0100\n" "Last-Translator: nuxsmin \n" "Language-Team: \n" "Language: ru_RU\n" @@ -64,7 +64,7 @@ msgstr "Необходимо имя учетной записи" #: ../../../../ajax/ajax_accountSave.php:77 #: ../../../../ajax/ajax_accountSave.php:88 -#: ../../../../ajax/ajax_appMgmtSave.php:337 +#: ../../../../ajax/ajax_appMgmtSave.php:328 msgid "Es necesario un nombre de cliente" msgstr "Необходимо имя заказчика" @@ -91,63 +91,63 @@ msgid "Id inválido" msgstr "Ошибочный ID" #: ../../../../ajax/ajax_accountSave.php:110 -#: ../../../../ajax/ajax_accountSave.php:263 -#: ../../../../ajax/ajax_appMgmtSave.php:543 -#: ../../../../ajax/ajax_configSave.php:297 +#: ../../../../ajax/ajax_accountSave.php:258 +#: ../../../../ajax/ajax_appMgmtSave.php:534 +#: ../../../../ajax/ajax_configSave.php:287 #: ../../../../ajax/ajax_userPrefsSave.php:79 ../../../../api.php:53 msgid "Acción Inválida" msgstr "Ошибочное действие" -#: ../../../../ajax/ajax_accountSave.php:122 +#: ../../../../ajax/ajax_accountSave.php:117 #: ../../../../ajax/ajax_appMgmtSave.php:111 -#: ../../../../ajax/ajax_appMgmtSave.php:155 -#: ../../../../ajax/ajax_backup.php:70 +#: ../../../../ajax/ajax_appMgmtSave.php:148 +#: ../../../../ajax/ajax_backup.php:62 msgid "Las claves no coinciden" msgstr "Пароль и подтверждение не совпадают" -#: ../../../../ajax/ajax_accountSave.php:173 +#: ../../../../ajax/ajax_accountSave.php:168 msgid "Cuenta creada" msgstr "Аккаунт создан" -#: ../../../../ajax/ajax_accountSave.php:176 +#: ../../../../ajax/ajax_accountSave.php:171 msgid "Error al crear la cuenta" msgstr "Ошибка при создании учетной записи" -#: ../../../../ajax/ajax_accountSave.php:211 +#: ../../../../ajax/ajax_accountSave.php:206 msgid "Sin cambios" msgstr "Нет изменений" -#: ../../../../ajax/ajax_accountSave.php:223 +#: ../../../../ajax/ajax_accountSave.php:218 msgid "Cuenta actualizada" msgstr "Информация об учетной записи изменена" -#: ../../../../ajax/ajax_accountSave.php:226 +#: ../../../../ajax/ajax_accountSave.php:221 msgid "Error al modificar la cuenta" msgstr "Ошибка при изменении учетной записи" -#: ../../../../ajax/ajax_accountSave.php:233 +#: ../../../../ajax/ajax_accountSave.php:228 msgid "Cuenta eliminada" msgstr "Аккаунт удален" -#: ../../../../ajax/ajax_accountSave.php:236 +#: ../../../../ajax/ajax_accountSave.php:231 msgid "Error al eliminar la cuenta" msgstr "Ошибка при удалении учетной записи" -#: ../../../../ajax/ajax_accountSave.php:246 -#: ../../../../ajax/ajax_appMgmtSave.php:161 +#: ../../../../ajax/ajax_accountSave.php:241 +#: ../../../../ajax/ajax_appMgmtSave.php:152 #: ../../../../ajax/ajax_passReset.php:74 msgid "Clave actualizada" msgstr "Пароль изменен" -#: ../../../../ajax/ajax_accountSave.php:249 +#: ../../../../ajax/ajax_accountSave.php:244 msgid "Error al actualizar la clave" msgstr "Ошибка изменения пароля" -#: ../../../../ajax/ajax_accountSave.php:256 +#: ../../../../ajax/ajax_accountSave.php:251 msgid "Cuenta restaurada" msgstr "Аккаунт восстановлен" -#: ../../../../ajax/ajax_accountSave.php:259 +#: ../../../../ajax/ajax_accountSave.php:254 msgid "Error al restaurar cuenta" msgstr "Ошибка восстановления учетной записи" @@ -283,8 +283,8 @@ msgstr "Необходим email" #: ../../../../ajax/ajax_appMgmtSave.php:95 #: ../../../../ajax/ajax_appMgmtSave.php:144 -#: ../../../../ajax/ajax_appMgmtSave.php:168 -#: ../../../../ajax/ajax_configSave.php:272 +#: ../../../../ajax/ajax_appMgmtSave.php:159 +#: ../../../../ajax/ajax_configSave.php:262 #: ../../../../ajax/ajax_import.php:39 ../../../../ajax/ajax_migrate.php:39 #: ../../../../ajax/ajax_userPrefsSave.php:55 msgid "Ey, esto es una DEMO!!" @@ -320,49 +320,49 @@ msgstr "Данные пользователя обновлены" msgid "Error al actualizar el usuario" msgstr "Ошибка при обновлении данных пользователя" -#: ../../../../ajax/ajax_appMgmtSave.php:164 +#: ../../../../ajax/ajax_appMgmtSave.php:155 #: ../../../../ajax/ajax_passReset.php:78 msgid "Error al modificar la clave" msgstr "Ошибка изменения пароля" -#: ../../../../ajax/ajax_appMgmtSave.php:170 +#: ../../../../ajax/ajax_appMgmtSave.php:161 msgid "No es posible eliminar, usuario en uso" msgstr "Не могу удалить, пользователь работает" -#: ../../../../ajax/ajax_appMgmtSave.php:174 +#: ../../../../ajax/ajax_appMgmtSave.php:165 msgid "Usuario eliminado" msgstr "Пользователь удален" -#: ../../../../ajax/ajax_appMgmtSave.php:177 +#: ../../../../ajax/ajax_appMgmtSave.php:168 msgid "Error al eliminar el usuario" msgstr "Ошибка удаления пользователя" -#: ../../../../ajax/ajax_appMgmtSave.php:192 +#: ../../../../ajax/ajax_appMgmtSave.php:183 msgid "Es necesario un nombre de grupo" msgstr "Необходимо имя группы" -#: ../../../../ajax/ajax_appMgmtSave.php:200 +#: ../../../../ajax/ajax_appMgmtSave.php:191 msgid "Nombre de grupo duplicado" msgstr "Указанное имя группы уже существует" -#: ../../../../ajax/ajax_appMgmtSave.php:212 +#: ../../../../ajax/ajax_appMgmtSave.php:203 msgid "Grupo creado" msgstr "Группа создана" -#: ../../../../ajax/ajax_appMgmtSave.php:214 +#: ../../../../ajax/ajax_appMgmtSave.php:205 msgid "Error al crear el grupo" msgstr "Ошибка при создании группы" -#: ../../../../ajax/ajax_appMgmtSave.php:225 +#: ../../../../ajax/ajax_appMgmtSave.php:216 msgid "Grupo actualizado" msgstr "Группа обновлена" -#: ../../../../ajax/ajax_appMgmtSave.php:228 +#: ../../../../ajax/ajax_appMgmtSave.php:219 msgid "Error al actualizar el grupo" msgstr "Ошибка при обновлении группы" -#: ../../../../ajax/ajax_appMgmtSave.php:237 -#: ../../../../ajax/ajax_appMgmtSave.php:314 +#: ../../../../ajax/ajax_appMgmtSave.php:228 +#: ../../../../ajax/ajax_appMgmtSave.php:305 #: ../../../../inc/CustomFieldsBase.class.php:83 #: ../../../../inc/themes/classic/account.inc:109 #: ../../../../inc/themes/classic/groups.inc:24 @@ -373,7 +373,7 @@ msgstr "Ошибка при обновлении группы" msgid "Usuarios" msgstr "Пользователи" -#: ../../../../ajax/ajax_appMgmtSave.php:241 +#: ../../../../ajax/ajax_appMgmtSave.php:232 #: ../../../../inc/Category.class.php:266 #: ../../../../inc/CustomFieldsBase.class.php:80 #: ../../../../inc/Customer.class.php:150 @@ -383,134 +383,134 @@ msgstr "Пользователи" msgid "Cuentas" msgstr "Учетные записи" -#: ../../../../ajax/ajax_appMgmtSave.php:244 -#: ../../../../ajax/ajax_appMgmtSave.php:316 +#: ../../../../ajax/ajax_appMgmtSave.php:235 +#: ../../../../ajax/ajax_appMgmtSave.php:307 #: ../../../../inc/Category.class.php:119 #: ../../../../inc/Customer.class.php:150 msgid "No es posible eliminar" msgstr "Невозможно удалить" -#: ../../../../ajax/ajax_appMgmtSave.php:244 +#: ../../../../ajax/ajax_appMgmtSave.php:235 msgid "Grupo en uso por:" msgstr "Группа используется:" -#: ../../../../ajax/ajax_appMgmtSave.php:249 +#: ../../../../ajax/ajax_appMgmtSave.php:240 msgid "Grupo eliminado" msgstr "Группа удалена" -#: ../../../../ajax/ajax_appMgmtSave.php:252 +#: ../../../../ajax/ajax_appMgmtSave.php:243 msgid "Error al eliminar el grupo" msgstr "Ошибка при удалении группы" -#: ../../../../ajax/ajax_appMgmtSave.php:291 +#: ../../../../ajax/ajax_appMgmtSave.php:282 msgid "Es necesario un nombre de perfil" msgstr "Необходимо имя профиля" -#: ../../../../ajax/ajax_appMgmtSave.php:293 +#: ../../../../ajax/ajax_appMgmtSave.php:284 msgid "Nombre de perfil duplicado" msgstr "Профиль с таким именем уже существует" -#: ../../../../ajax/ajax_appMgmtSave.php:298 +#: ../../../../ajax/ajax_appMgmtSave.php:289 msgid "Perfil creado" msgstr "Профиль создан" -#: ../../../../ajax/ajax_appMgmtSave.php:301 +#: ../../../../ajax/ajax_appMgmtSave.php:292 msgid "Error al crear el perfil" msgstr "Ошибка при создании профиля" -#: ../../../../ajax/ajax_appMgmtSave.php:304 +#: ../../../../ajax/ajax_appMgmtSave.php:295 msgid "Perfil actualizado" msgstr "Профиль изменен" -#: ../../../../ajax/ajax_appMgmtSave.php:307 +#: ../../../../ajax/ajax_appMgmtSave.php:298 msgid "Error al actualizar el perfil" msgstr "Ошибка при изменении профиля" -#: ../../../../ajax/ajax_appMgmtSave.php:316 +#: ../../../../ajax/ajax_appMgmtSave.php:307 msgid "Perfil en uso por:" msgstr "Профиль используется:" -#: ../../../../ajax/ajax_appMgmtSave.php:319 +#: ../../../../ajax/ajax_appMgmtSave.php:310 msgid "Perfil eliminado" msgstr "Профиль удален" -#: ../../../../ajax/ajax_appMgmtSave.php:322 +#: ../../../../ajax/ajax_appMgmtSave.php:313 msgid "Error al eliminar el perfil" msgstr "Ошибка при удалении профиля" -#: ../../../../ajax/ajax_appMgmtSave.php:357 +#: ../../../../ajax/ajax_appMgmtSave.php:348 msgid "Cliente creado" msgstr "Заказчик добавлен" -#: ../../../../ajax/ajax_appMgmtSave.php:372 +#: ../../../../ajax/ajax_appMgmtSave.php:363 msgid "Cliente actualizado" msgstr "Информация о заказчике обновлена" -#: ../../../../ajax/ajax_appMgmtSave.php:382 +#: ../../../../ajax/ajax_appMgmtSave.php:373 msgid "Cliente eliminado" msgstr "Заказчик удален" -#: ../../../../ajax/ajax_appMgmtSave.php:396 +#: ../../../../ajax/ajax_appMgmtSave.php:387 msgid "Es necesario un nombre de categoría" msgstr "Необходимо имя категории" -#: ../../../../ajax/ajax_appMgmtSave.php:416 +#: ../../../../ajax/ajax_appMgmtSave.php:407 msgid "Categoría creada" msgstr "Категория создана" -#: ../../../../ajax/ajax_appMgmtSave.php:431 +#: ../../../../ajax/ajax_appMgmtSave.php:422 msgid "Categoría actualizada" msgstr "Информация о категории изменена" -#: ../../../../ajax/ajax_appMgmtSave.php:442 +#: ../../../../ajax/ajax_appMgmtSave.php:433 msgid "Categoría eliminada" msgstr "Категория удалена" -#: ../../../../ajax/ajax_appMgmtSave.php:458 +#: ../../../../ajax/ajax_appMgmtSave.php:449 #, fuzzy msgid "Usuario o acción no indicado" msgstr "Пользователь / пароль не введены" -#: ../../../../ajax/ajax_appMgmtSave.php:468 +#: ../../../../ajax/ajax_appMgmtSave.php:459 #, fuzzy msgid "Autorización creada" msgstr "Аккаунт создан" -#: ../../../../ajax/ajax_appMgmtSave.php:476 +#: ../../../../ajax/ajax_appMgmtSave.php:467 #, fuzzy msgid "Autorización actualizada" msgstr "Информация об учетной записи изменена" -#: ../../../../ajax/ajax_appMgmtSave.php:486 +#: ../../../../ajax/ajax_appMgmtSave.php:477 #, fuzzy msgid "Autorización eliminada" msgstr "Аккаунт удален" -#: ../../../../ajax/ajax_appMgmtSave.php:503 +#: ../../../../ajax/ajax_appMgmtSave.php:494 #, fuzzy msgid "Nombre del campo no indicado" msgstr "Имя заказчика" -#: ../../../../ajax/ajax_appMgmtSave.php:505 +#: ../../../../ajax/ajax_appMgmtSave.php:496 #, fuzzy msgid "Tipo del campo no indicado" msgstr "Данный тип файлов запрещен" -#: ../../../../ajax/ajax_appMgmtSave.php:507 +#: ../../../../ajax/ajax_appMgmtSave.php:498 msgid "Módulo del campo no indicado" msgstr "" -#: ../../../../ajax/ajax_appMgmtSave.php:521 +#: ../../../../ajax/ajax_appMgmtSave.php:512 #, fuzzy msgid "Campo creado" msgstr "Пользователь создан" -#: ../../../../ajax/ajax_appMgmtSave.php:530 +#: ../../../../ajax/ajax_appMgmtSave.php:521 #, fuzzy msgid "Campo actualizado" msgstr "Обновлено" -#: ../../../../ajax/ajax_appMgmtSave.php:540 +#: ../../../../ajax/ajax_appMgmtSave.php:531 #, fuzzy msgid "Campo eliminado" msgstr "Пользователь удален" @@ -524,7 +524,7 @@ msgstr "Выполнить резервное копирование" msgid "Error al realizar el backup" msgstr "Ошибка при выполнении резервной копии" -#: ../../../../ajax/ajax_backup.php:54 ../../../../ajax/ajax_backup.php:76 +#: ../../../../ajax/ajax_backup.php:54 ../../../../ajax/ajax_backup.php:68 #: ../../../../ajax/ajax_checkLdap.php:57 ../../../../inc/Import.class.php:128 #: ../../../../inc/Migrate.class.php:93 msgid "Revise el registro de eventos para más detalles" @@ -538,34 +538,27 @@ msgstr "Резервная копия программы и базы успеш msgid "Proceso de backup finalizado" msgstr "Процесс резервного копирования закончен." -#: ../../../../ajax/ajax_backup.php:66 -#: ../../../../ajax/ajax_configSave.php:244 -#: ../../../../ajax/ajax_doLogin.php:53 ../../../../ajax/ajax_import.php:56 -#, fuzzy -msgid "Error en clave RSA" -msgstr "Ошибка запроса" - -#: ../../../../ajax/ajax_backup.php:74 ../../../../ajax/ajax_backup.php:79 +#: ../../../../ajax/ajax_backup.php:66 ../../../../ajax/ajax_backup.php:71 #, fuzzy msgid "Realizar Exportación" msgstr "Выполнить резервное копирование" -#: ../../../../ajax/ajax_backup.php:74 +#: ../../../../ajax/ajax_backup.php:66 #, fuzzy msgid "Error al realizar la exportación de cuentas" msgstr "Ошибка создания файлов учетных записей" -#: ../../../../ajax/ajax_backup.php:76 +#: ../../../../ajax/ajax_backup.php:68 #, fuzzy msgid "Error al realizar la exportación" msgstr "Ошибка при выполнении резервной копии" -#: ../../../../ajax/ajax_backup.php:79 +#: ../../../../ajax/ajax_backup.php:71 #, fuzzy msgid "Exportación de cuentas realizada correctamente" msgstr "Конфигурация была успешно обновлена." -#: ../../../../ajax/ajax_backup.php:81 +#: ../../../../ajax/ajax_backup.php:73 #, fuzzy msgid "Proceso de exportación finalizado" msgstr "Процесс резервного копирования закончен." @@ -645,7 +638,7 @@ msgid "Configuración actualizada" msgstr "Конфигурация изменена" #: ../../../../ajax/ajax_configSave.php:230 -#: ../../../../ajax/ajax_configSave.php:282 +#: ../../../../ajax/ajax_configSave.php:272 #: ../../../../ajax/ajax_viewpass.php:60 #: ../../../../inc/Controller.class.php:169 msgid "Clave maestra actualizada" @@ -665,42 +658,42 @@ msgstr "Необходим мастер-пароль" msgid "Se ha de confirmar el cambio de clave" msgstr "Изменение пароля должно быть подтверждено" -#: ../../../../ajax/ajax_configSave.php:248 +#: ../../../../ajax/ajax_configSave.php:238 msgid "Las claves son idénticas" msgstr "Пароли одинаковы" -#: ../../../../ajax/ajax_configSave.php:250 +#: ../../../../ajax/ajax_configSave.php:240 msgid "Las claves maestras no coinciden" msgstr "Мастер-пароль не совпадает" -#: ../../../../ajax/ajax_configSave.php:252 +#: ../../../../ajax/ajax_configSave.php:242 msgid "La clave maestra actual no coincide" msgstr "Текущий мастер-пароль ошибочен" -#: ../../../../ajax/ajax_configSave.php:261 +#: ../../../../ajax/ajax_configSave.php:251 msgid "Errores al actualizar las claves de las cuentas" msgstr "Ошибка при изменении паролей учетной записи" -#: ../../../../ajax/ajax_configSave.php:267 +#: ../../../../ajax/ajax_configSave.php:257 #, fuzzy msgid "Errores al actualizar las claves de las cuentas del histórico" msgstr "Ошибка при изменении паролей учетной записи" -#: ../../../../ajax/ajax_configSave.php:280 +#: ../../../../ajax/ajax_configSave.php:270 #: ../../../../inc/Account.class.php:497 msgid "Actualizar Clave Maestra" msgstr "Изменить мастер-пароль" -#: ../../../../ajax/ajax_configSave.php:284 +#: ../../../../ajax/ajax_configSave.php:274 msgid "Error al guardar el hash de la clave maestra" msgstr "Ошибка при сохранении хеша мастер-пароля" -#: ../../../../ajax/ajax_configSave.php:292 +#: ../../../../ajax/ajax_configSave.php:282 #, fuzzy msgid "Generar Clave Temporal" msgstr "Сгенерировать пароль" -#: ../../../../ajax/ajax_configSave.php:292 +#: ../../../../ajax/ajax_configSave.php:282 #: ../../../../inc/themes/classic/account.inc:83 #: ../../../../inc/themes/classic/editpass.inc:25 #: ../../../../inc/themes/classic/install.inc:38 @@ -709,6 +702,7 @@ msgstr "Сгенерировать пароль" #: ../../../../inc/themes/classic/login.inc:22 #: ../../../../inc/themes/classic/mail.inc:55 #: ../../../../inc/themes/classic/passreset.inc:29 +#: ../../../../inc/themes/classic/passreset.inc:34 #: ../../../../inc/themes/classic/users.inc:75 #: ../../../../inc/themes/classic/userspass.inc:8 #: ../../../../inc/themes/classic/userspass.inc:11 @@ -718,13 +712,13 @@ msgstr "Сгенерировать пароль" #: ../../../../inc/themes/material-blue/editpass.inc:26 #: ../../../../inc/themes/material-blue/editpass.inc:31 #: ../../../../inc/themes/material-blue/editpass.inc:41 -#: ../../../../inc/themes/material-blue/install.inc:44 +#: ../../../../inc/themes/material-blue/install.inc:46 #: ../../../../inc/themes/material-blue/ldap.inc:105 #: ../../../../inc/themes/material-blue/login.inc:17 #: ../../../../inc/themes/material-blue/login.inc:40 #: ../../../../inc/themes/material-blue/mail.inc:73 #: ../../../../inc/themes/material-blue/mail.inc:80 -#: ../../../../inc/themes/material-blue/passreset.inc:31 +#: ../../../../inc/themes/material-blue/passreset.inc:30 #: ../../../../inc/themes/material-blue/users.inc:89 #: ../../../../inc/themes/material-blue/users.inc:96 #: ../../../../inc/themes/material-blue/userspass.inc:8 @@ -732,7 +726,7 @@ msgstr "Сгенерировать пароль" msgid "Clave" msgstr "Пароль" -#: ../../../../ajax/ajax_configSave.php:294 +#: ../../../../ajax/ajax_configSave.php:284 #, fuzzy msgid "Clave Temporal Generada" msgstr "Сгенерированный пароль" @@ -741,45 +735,45 @@ msgstr "Сгенерированный пароль" msgid "Usuario/Clave no introducidos" msgstr "Пользователь / пароль не введены" -#: ../../../../ajax/ajax_doLogin.php:65 +#: ../../../../ajax/ajax_doLogin.php:58 #, fuzzy msgid "Inicio sesión" msgstr "Начало сессии (LDAP)" -#: ../../../../ajax/ajax_doLogin.php:70 +#: ../../../../ajax/ajax_doLogin.php:63 #, fuzzy msgid "Servidor Login" msgstr "Логин" -#: ../../../../ajax/ajax_doLogin.php:76 +#: ../../../../ajax/ajax_doLogin.php:69 msgid "Error al guardar los datos de LDAP" msgstr "Ошибка сохранении данных пользователя из LDAP" -#: ../../../../ajax/ajax_doLogin.php:79 ../../../../ajax/ajax_doLogin.php:87 -#: ../../../../ajax/ajax_doLogin.php:139 ../../../../ajax/ajax_doLogin.php:185 +#: ../../../../ajax/ajax_doLogin.php:72 ../../../../ajax/ajax_doLogin.php:80 +#: ../../../../ajax/ajax_doLogin.php:132 ../../../../ajax/ajax_doLogin.php:176 #: ../../../../inc/ApiTokens.class.php:140 #: ../../../../inc/ApiTokens.class.php:186 #: ../../../../inc/ApiTokens.class.php:217 #: ../../../../inc/ApiTokens.class.php:243 #: ../../../../inc/ApiTokens.class.php:262 #: ../../../../inc/ApiTokens.class.php:304 -#: ../../../../inc/ApiTokens.class.php:328 ../../../../inc/Crypt.class.php:235 -#: ../../../../inc/Crypt.class.php:246 +#: ../../../../inc/ApiTokens.class.php:328 ../../../../inc/Crypt.class.php:180 +#: ../../../../inc/Crypt.class.php:191 #: ../../../../inc/XmlImportBase.class.php:74 msgid "Error interno" msgstr "Внутренняя ошибка" -#: ../../../../ajax/ajax_doLogin.php:84 +#: ../../../../ajax/ajax_doLogin.php:77 msgid "Error al actualizar la clave del usuario en la BBDD" msgstr "Ошибка изменения пароля пользователя в БД" -#: ../../../../ajax/ajax_doLogin.php:92 ../../../../ajax/ajax_doLogin.php:117 +#: ../../../../ajax/ajax_doLogin.php:85 ../../../../ajax/ajax_doLogin.php:110 msgid "Login incorrecto" msgstr "Ошибка входа" -#: ../../../../ajax/ajax_doLogin.php:93 ../../../../ajax/ajax_doLogin.php:100 -#: ../../../../ajax/ajax_doLogin.php:107 ../../../../ajax/ajax_doLogin.php:118 -#: ../../../../ajax/ajax_doLogin.php:128 ../../../../ajax/ajax_doLogin.php:180 +#: ../../../../ajax/ajax_doLogin.php:86 ../../../../ajax/ajax_doLogin.php:93 +#: ../../../../ajax/ajax_doLogin.php:100 ../../../../ajax/ajax_doLogin.php:111 +#: ../../../../ajax/ajax_doLogin.php:121 ../../../../ajax/ajax_doLogin.php:171 #: ../../../../inc/ApiTokens.class.php:190 #: ../../../../inc/ApiTokens.class.php:308 ../../../../inc/Auth.class.php:108 #: ../../../../inc/Init.class.php:517 ../../../../inc/UserBase.class.php:382 @@ -808,43 +802,43 @@ msgstr "Ошибка входа" #: ../../../../inc/themes/material-blue/login.inc:33 #: ../../../../inc/themes/material-blue/mail.inc:61 #: ../../../../inc/themes/material-blue/mail.inc:67 -#: ../../../../inc/themes/material-blue/passreset.inc:17 +#: ../../../../inc/themes/material-blue/passreset.inc:16 #: ../../../../inc/themes/material-blue/request.inc:20 #: ../../../../inc/themes/material-blue/search.inc:55 #: ../../../../inc/themes/material-blue/tokens.inc:8 msgid "Usuario" msgstr "Пользователь" -#: ../../../../ajax/ajax_doLogin.php:96 ../../../../ajax/ajax_doLogin.php:110 -#: ../../../../ajax/ajax_doLogin.php:121 +#: ../../../../ajax/ajax_doLogin.php:89 ../../../../ajax/ajax_doLogin.php:103 +#: ../../../../ajax/ajax_doLogin.php:114 msgid "Usuario/Clave incorrectos" msgstr "Неправильный пользователь / пароль" -#: ../../../../ajax/ajax_doLogin.php:99 ../../../../ajax/ajax_doLogin.php:103 +#: ../../../../ajax/ajax_doLogin.php:92 ../../../../ajax/ajax_doLogin.php:96 msgid "Cuenta expirada" msgstr "Аккаунт просрочен" -#: ../../../../ajax/ajax_doLogin.php:106 +#: ../../../../ajax/ajax_doLogin.php:99 msgid "El usuario no tiene grupos asociados" msgstr "Для пользователя не указаны группы" -#: ../../../../ajax/ajax_doLogin.php:127 ../../../../ajax/ajax_doLogin.php:131 +#: ../../../../ajax/ajax_doLogin.php:120 ../../../../ajax/ajax_doLogin.php:124 msgid "Usuario deshabilitado" msgstr "Пользователь заблокирован" -#: ../../../../ajax/ajax_doLogin.php:136 +#: ../../../../ajax/ajax_doLogin.php:129 msgid "Error al obtener los datos del usuario de la BBDD" msgstr "Ошибка получения данных о пользователе из DB" -#: ../../../../ajax/ajax_doLogin.php:146 +#: ../../../../ajax/ajax_doLogin.php:139 msgid "La clave maestra no ha sido guardada o es incorrecta" msgstr "Мастер-пароль не сохранен или ошибочен" -#: ../../../../ajax/ajax_doLogin.php:155 ../../../../ajax/ajax_doLogin.php:158 +#: ../../../../ajax/ajax_doLogin.php:146 ../../../../ajax/ajax_doLogin.php:149 msgid "Clave maestra incorrecta" msgstr "Неправильный мастер-пароль" -#: ../../../../ajax/ajax_doLogin.php:181 +#: ../../../../ajax/ajax_doLogin.php:172 #: ../../../../inc/ProfileBase.class.php:512 #: ../../../../inc/ProfileBase.class.php:550 #: ../../../../inc/ProfileBase.class.php:593 @@ -854,7 +848,7 @@ msgstr "Неправильный мастер-пароль" msgid "Perfil" msgstr "Профиль" -#: ../../../../ajax/ajax_doLogin.php:182 ../../../../inc/Groups.class.php:158 +#: ../../../../ajax/ajax_doLogin.php:173 ../../../../inc/Groups.class.php:158 #: ../../../../inc/Groups.class.php:259 ../../../../inc/Groups.class.php:375 #: ../../../../web/UsersMgmtC.class.php:90 #: ../../../../inc/themes/classic/ldap.inc:116 @@ -1006,14 +1000,14 @@ msgstr "" #: ../../../../ajax/ajax_passReset.php:72 #: ../../../../inc/UserBase.class.php:568 -#: ../../../../inc/UserUtil.class.php:664 +#: ../../../../inc/UserUtil.class.php:662 msgid "Modificar Clave Usuario" msgstr "Изменить пароль пользователя" #: ../../../../ajax/ajax_passReset.php:72 #: ../../../../inc/UserBase.class.php:568 #: ../../../../inc/UserBase.class.php:592 -#: ../../../../inc/UserUtil.class.php:664 +#: ../../../../inc/UserUtil.class.php:662 #: ../../../../web/UsersMgmtC.class.php:88 #: ../../../../inc/themes/classic/users.inc:21 #: ../../../../inc/themes/material-blue/users.inc:24 @@ -1145,7 +1139,7 @@ msgstr "Help :: FAQ :: Changelog" #: ../../../../inc/Log.class.php:28 ../../../../inc/Migrate.class.php:28 #: ../../../../inc/Profile.class.php:29 #: ../../../../inc/ProfileBase.class.php:28 -#: ../../../../inc/Request.class.php:111 ../../../../inc/Session.class.php:28 +#: ../../../../inc/Request.class.php:110 ../../../../inc/Session.class.php:28 #: ../../../../inc/SyspassImport.class.php:28 #: ../../../../inc/Upgrade.class.php:29 ../../../../inc/User.class.php:28 #: ../../../../inc/UserLdap.class.php:28 @@ -1480,7 +1474,7 @@ msgstr "Удалить учетную запись" msgid "Usuario no pertenece al grupo" msgstr "Пользователь не состоит в группах" -#: ../../../../inc/Auth.class.php:187 +#: ../../../../inc/Auth.class.php:186 #: ../../../../inc/themes/classic/users.inc:117 #: ../../../../inc/themes/classic/userspass.inc:2 #: ../../../../inc/themes/material-blue/users.inc:161 @@ -1488,15 +1482,15 @@ msgstr "Пользователь не состоит в группах" msgid "Cambio de Clave" msgstr "Изменение пароля" -#: ../../../../inc/Auth.class.php:189 +#: ../../../../inc/Auth.class.php:188 msgid "Se ha solicitado el cambio de su clave de usuario." msgstr "Запрос на смену пароля выполнен." -#: ../../../../inc/Auth.class.php:191 +#: ../../../../inc/Auth.class.php:190 msgid "Para completar el proceso es necesario que acceda a la siguiente URL:" msgstr "Для завершения, пожалуйста пройдите по ссылке :" -#: ../../../../inc/Auth.class.php:195 +#: ../../../../inc/Auth.class.php:194 msgid "Si no ha solicitado esta acción, ignore este mensaje." msgstr "" "Если Вы не запрашивали данное действие, пожалуйста, проигнорируйте данное " @@ -1601,11 +1595,20 @@ msgstr "Нет прав для доступа к данной странице" msgid "No tiene permisos para realizar esta operación" msgstr "Нет прав для данной операции" -#: ../../../../inc/Crypt.class.php:236 +#: ../../../../inc/Crypt.class.php:119 ../../../../inc/Email.class.php:146 +msgid "Aviso" +msgstr "Предупреждение" + +#: ../../../../inc/Crypt.class.php:119 +msgid "" +"Se ha regenerado el HASH de clave maestra. No es necesaria ninguna acción." +msgstr "" + +#: ../../../../inc/Crypt.class.php:181 msgid "No se puede usar el módulo de encriptación" msgstr "Модуль криптографии не может быть загружен" -#: ../../../../inc/Crypt.class.php:247 +#: ../../../../inc/Crypt.class.php:192 msgid "Error al generar datos cifrados" msgstr "Ошибка при создании шифрованных данных" @@ -1718,7 +1721,7 @@ msgstr "Невозможно подключиться к базе данных" msgid "Compruebe los datos de conexión" msgstr "Пожалуйста, проверьте параметры подключения" -#: ../../../../inc/Email.class.php:59 ../../../../inc/UserUtil.class.php:567 +#: ../../../../inc/Email.class.php:59 ../../../../inc/UserUtil.class.php:565 msgid "N/D" msgstr "N/A" @@ -1752,10 +1755,6 @@ msgstr "Получатель" msgid "CC" msgstr "CC" -#: ../../../../inc/Email.class.php:146 -msgid "Aviso" -msgstr "Предупреждение" - #: ../../../../inc/FileImport.class.php:105 msgid "Archivo no subido correctamente" msgstr "Файл успешно закачан" @@ -2291,6 +2290,21 @@ msgstr "Импорт заказчиков" msgid "No hay cuentas para importar" msgstr "Нет резервных копий для скачивания" +#: ../../../../inc/Template.class.php:89 +#, fuzzy, php-format +msgid "No es posible obtener la plantilla \"%s\" : %s" +msgstr "Невозможно создать заказчика" + +#: ../../../../inc/Template.class.php:128 +#, fuzzy, php-format +msgid "No es posible obtener la variable \"%s\"" +msgstr "Невозможно создать заказчика" + +#: ../../../../inc/Template.class.php:171 +#, fuzzy, php-format +msgid "No es posible destruir la variable \"%s\"" +msgstr "Невозможно создать заказчика" + #: ../../../../inc/Upgrade.class.php:51 msgid "Error al aplicar la actualización de la Base de Datos" msgstr "Ошибка обновления базы данных" @@ -2315,23 +2329,23 @@ msgstr "Ошибка обновления базы данных" msgid "Actualizar BBDD" msgstr "Обновление БД" -#: ../../../../inc/Upgrade.class.php:121 +#: ../../../../inc/Upgrade.class.php:127 msgid "No es necesario actualizar la Base de Datos." msgstr "Обновление базы данных не требуется." -#: ../../../../inc/Upgrade.class.php:129 +#: ../../../../inc/Upgrade.class.php:135 msgid "Error al aplicar la actualización de la Base de Datos." msgstr "Ошибка обновления базы данных." -#: ../../../../inc/Upgrade.class.php:138 +#: ../../../../inc/Upgrade.class.php:144 msgid "Actualización de la Base de Datos realizada correctamente." msgstr "Обновление базы данных завершено успешно." -#: ../../../../inc/Upgrade.class.php:215 +#: ../../../../inc/Upgrade.class.php:221 msgid "Actualizar Configuración" msgstr "Обновить конфигурацию" -#: ../../../../inc/Upgrade.class.php:215 +#: ../../../../inc/Upgrade.class.php:221 msgid "Actualización de la Configuración realizada correctamente." msgstr "Конфигурация была успешно обновлена." @@ -2366,12 +2380,12 @@ msgstr "Вы получите письмо в скором времени." msgid "Nuevo usuario de LDAP" msgstr "Пользователь LDAP" -#: ../../../../inc/UserUtil.class.php:705 +#: ../../../../inc/UserUtil.class.php:703 #, fuzzy msgid "Migrar Grupos" msgstr "Ошибка импорта учетной записи" -#: ../../../../inc/UserUtil.class.php:705 +#: ../../../../inc/UserUtil.class.php:703 #, fuzzy msgid "Error al migrar grupo del usuario" msgstr "Ошибка поиска пользователя в DN" @@ -2834,19 +2848,24 @@ msgstr "" "Без этой функции, атакующий может завладеть вашим аккаунтом при сбросе " "пароля." -#: ../../../../web/MainC.class.php:288 +#: ../../../../web/MainC.class.php:284 +#, fuzzy +msgid "Error en clave RSA" +msgstr "Ошибка запроса" + +#: ../../../../web/MainC.class.php:304 msgid "Instalación finalizada" msgstr "Установка завершена" -#: ../../../../web/MainC.class.php:289 +#: ../../../../web/MainC.class.php:305 msgid "Pulse aquí para acceder" msgstr "Назмите здесь для входа" -#: ../../../../web/MainC.class.php:384 +#: ../../../../web/MainC.class.php:400 msgid "Descargar nueva versión" msgstr "Скачать новую версию" -#: ../../../../web/MainC.class.php:395 +#: ../../../../web/MainC.class.php:411 msgid "Avisos de sysPass" msgstr "" @@ -2981,12 +3000,14 @@ msgstr "Пользователь доступа" #: ../../../../inc/themes/classic/account.inc:90 #: ../../../../inc/themes/classic/editpass.inc:31 +#: ../../../../inc/themes/classic/passreset.inc:35 #: ../../../../inc/themes/classic/users.inc:83 #: ../../../../inc/themes/classic/userspass.inc:19 #: ../../../../inc/themes/classic/userspass.inc:21 #: ../../../../inc/themes/material-blue/account.inc:105 #: ../../../../inc/themes/material-blue/editpass.inc:36 -#: ../../../../inc/themes/material-blue/install.inc:64 +#: ../../../../inc/themes/material-blue/install.inc:66 +#: ../../../../inc/themes/material-blue/passreset.inc:36 #: ../../../../inc/themes/material-blue/users.inc:102 #: ../../../../inc/themes/material-blue/users.inc:109 #: ../../../../inc/themes/material-blue/userspass.inc:19 @@ -3121,7 +3142,7 @@ msgstr "Просмотр текущей версии" #: ../../../../inc/themes/classic/account.inc:406 #: ../../../../inc/themes/classic/editpass.inc:45 #: ../../../../inc/themes/classic/passreset.inc:46 -#: ../../../../inc/themes/material-blue/passreset.inc:43 +#: ../../../../inc/themes/material-blue/passreset.inc:48 msgid "Volver" msgstr "Назад" @@ -3569,8 +3590,8 @@ msgstr "" #: ../../../../inc/themes/classic/login.inc:15 #: ../../../../inc/themes/classic/login.inc:27 #: ../../../../inc/themes/material-blue/encryption.inc:8 -#: ../../../../inc/themes/material-blue/install.inc:49 -#: ../../../../inc/themes/material-blue/install.inc:56 +#: ../../../../inc/themes/material-blue/install.inc:51 +#: ../../../../inc/themes/material-blue/install.inc:58 #: ../../../../inc/themes/material-blue/login.inc:25 #: ../../../../inc/themes/material-blue/login.inc:48 msgid "Clave Maestra" @@ -3753,25 +3774,23 @@ msgid "Ver Archivo" msgstr "Показать файл" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 +#: ../../../../inc/themes/material-blue/footer.inc:29 msgid "Indica si la conexión utiliza HTTPS." msgstr "" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 +#: ../../../../inc/themes/material-blue/footer.inc:29 msgid "" "Las claves de formularios enviados se encriptan mediante PKI, el resto de " "datos no." msgstr "" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 #, fuzzy msgid "Seguro" msgstr "Безопасность" #: ../../../../inc/themes/classic/footer.inc:6 -#: ../../../../inc/themes/material-blue/footer.inc:27 msgid "Inseguro" msgstr "" @@ -4019,12 +4038,12 @@ msgid "Crear cuenta de admin de sysPass" msgstr "Создать аккаунт администратора sysPass" #: ../../../../inc/themes/classic/install.inc:32 -#: ../../../../inc/themes/material-blue/install.inc:36 +#: ../../../../inc/themes/material-blue/install.inc:37 msgid "Login del usuario administrador de sysPass" msgstr "Учетная запись администратора sysPass" #: ../../../../inc/themes/classic/install.inc:58 -#: ../../../../inc/themes/material-blue/install.inc:69 +#: ../../../../inc/themes/material-blue/install.inc:71 msgid "Configurar BBDD" msgstr "Конфигурация БД" @@ -4033,7 +4052,7 @@ msgid "Login de usuario con permisos de administrador de MySQL" msgstr "Используйте учетную запись с правами администратора базы данных" #: ../../../../inc/themes/classic/install.inc:83 -#: ../../../../inc/themes/material-blue/install.inc:102 +#: ../../../../inc/themes/material-blue/install.inc:105 msgid "Nombre de la base de datos para sysPass" msgstr "Имя базы данных sysPass" @@ -4042,18 +4061,18 @@ msgid "Nombre del servidor de la base de datos de sysPass" msgstr "Имя сервера базы данных sysPass" #: ../../../../inc/themes/classic/install.inc:97 -#: ../../../../inc/themes/material-blue/install.inc:120 +#: ../../../../inc/themes/material-blue/install.inc:123 msgid "Modo Hosting" msgstr "Режим хостинга" #: ../../../../inc/themes/classic/install.inc:104 -#: ../../../../inc/themes/material-blue/install.inc:127 +#: ../../../../inc/themes/material-blue/install.inc:130 msgid "No crea ni verifica los permisos del usuario sobre la BBDD" msgstr "Права доступа к БД не создаются и не проеряются" #: ../../../../inc/themes/classic/install.inc:108 -#: ../../../../inc/themes/material-blue/install.inc:134 -#: ../../../../inc/themes/material-blue/install.inc:135 +#: ../../../../inc/themes/material-blue/install.inc:137 +#: ../../../../inc/themes/material-blue/install.inc:138 msgid "Instalar" msgstr "Установка" @@ -4231,7 +4250,7 @@ msgid "Más Acciones" msgstr "Другие действия" #: ../../../../inc/themes/classic/passreset.inc:13 -#: ../../../../inc/themes/material-blue/passreset.inc:10 +#: ../../../../inc/themes/material-blue/passreset.inc:9 msgid "Solicitud de Cambio de Clave" msgstr "Запросить смену пароля" @@ -4240,7 +4259,7 @@ msgid "Login del Usuario" msgstr "Логин" #: ../../../../inc/themes/classic/passreset.inc:21 -#: ../../../../inc/themes/material-blue/passreset.inc:24 +#: ../../../../inc/themes/material-blue/passreset.inc:23 msgid "Email del Usuario" msgstr "Email" @@ -4254,23 +4273,15 @@ msgstr "Email" msgid "Nueva Clave" msgstr "Новый пароль" -#: ../../../../inc/themes/classic/passreset.inc:34 -msgid "Nueva Clave (Verificar)" -msgstr "Новый пароль (подтверждение)" - -#: ../../../../inc/themes/classic/passreset.inc:35 -msgid "Clave (Verificar)" -msgstr "Пароль (подтверждение)" - #: ../../../../inc/themes/classic/passreset.inc:46 -#: ../../../../inc/themes/material-blue/passreset.inc:42 +#: ../../../../inc/themes/material-blue/passreset.inc:47 msgid "Volver a iniciar sesión" msgstr "Назад ко входу" #: ../../../../inc/themes/classic/passreset.inc:48 #: ../../../../inc/themes/material-blue/2fa.inc:27 -#: ../../../../inc/themes/material-blue/passreset.inc:48 -#: ../../../../inc/themes/material-blue/passreset.inc:49 +#: ../../../../inc/themes/material-blue/passreset.inc:53 +#: ../../../../inc/themes/material-blue/passreset.inc:54 msgid "Solicitar" msgstr "Запрос" @@ -4279,8 +4290,8 @@ msgid "Solicitar cambio de clave" msgstr "Запрос на изменение пароля" #: ../../../../inc/themes/classic/passreset.inc:51 -#: ../../../../inc/themes/material-blue/passreset.inc:53 -#: ../../../../inc/themes/material-blue/passreset.inc:54 +#: ../../../../inc/themes/material-blue/passreset.inc:58 +#: ../../../../inc/themes/material-blue/passreset.inc:59 msgid "Cambiar" msgstr "Изменение" @@ -4887,37 +4898,37 @@ msgid "" "archivos XML y CSV." msgstr "" -#: ../../../../inc/themes/material-blue/install.inc:31 +#: ../../../../inc/themes/material-blue/install.inc:32 #, fuzzy msgid "Usuario administrador de sysPass" msgstr "Учетная запись администратора sysPass" -#: ../../../../inc/themes/material-blue/install.inc:78 +#: ../../../../inc/themes/material-blue/install.inc:80 #, fuzzy msgid "Usuario acceso BBDD" msgstr "Пользователь доступа" -#: ../../../../inc/themes/material-blue/install.inc:83 +#: ../../../../inc/themes/material-blue/install.inc:85 #, fuzzy msgid "Usuario con permisos de administrador de MySQL" msgstr "Используйте учетную запись с правами администратора базы данных" -#: ../../../../inc/themes/material-blue/install.inc:90 +#: ../../../../inc/themes/material-blue/install.inc:93 #, fuzzy msgid "Clave acceso BBDD" msgstr "Пароль DB" -#: ../../../../inc/themes/material-blue/install.inc:97 +#: ../../../../inc/themes/material-blue/install.inc:100 #, fuzzy msgid "Nombre BBDD para sysPass" msgstr "Имя базы данных sysPass" -#: ../../../../inc/themes/material-blue/install.inc:109 +#: ../../../../inc/themes/material-blue/install.inc:112 #, fuzzy msgid "Servidor BBDD para sysPass" msgstr "Сервер DB" -#: ../../../../inc/themes/material-blue/install.inc:114 +#: ../../../../inc/themes/material-blue/install.inc:117 #, fuzzy msgid "Nombre del servidor para instalar la base de datos de sysPass" msgstr "Имя сервера базы данных sysPass" @@ -4972,3 +4983,9 @@ msgstr "Выполнить резервное копирование" #, fuzzy msgid "Autentificación" msgstr "Включить аутентификацию" + +#~ msgid "Nueva Clave (Verificar)" +#~ msgstr "Новый пароль (подтверждение)" + +#~ msgid "Clave (Verificar)" +#~ msgstr "Пароль (подтверждение)" diff --git a/inc/themes/classic/passreset.inc b/inc/themes/classic/passreset.inc index 6b978da8..452f0452 100644 --- a/inc/themes/classic/passreset.inc +++ b/inc/themes/classic/passreset.inc @@ -31,9 +31,9 @@

+ title="" + placeholder="" + value="" required/>

@@ -53,4 +53,18 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/inc/themes/material-blue/config.inc b/inc/themes/material-blue/config.inc index cf895502..ea928aa6 100644 --- a/inc/themes/material-blue/config.inc +++ b/inc/themes/material-blue/config.inc @@ -21,7 +21,7 @@ - > $themeName): ?> diff --git a/inc/themes/material-blue/passreset.inc b/inc/themes/material-blue/passreset.inc index b0b81666..5ee9f3cc 100644 --- a/inc/themes/material-blue/passreset.inc +++ b/inc/themes/material-blue/passreset.inc @@ -4,8 +4,7 @@ sysPass logo -
+
@@ -30,6 +29,12 @@ +
+ + +
@@ -62,6 +67,13 @@ $(function(){ $('#btnBack').click(function(){ window.history.back(); - }) + }); + + $('#frmPassReset').submit(function(){ + sysPassUtil.Common.encryptFormValue('#pass'); + sysPassUtil.Common.encryptFormValue('#passR'); + + sysPassUtil.Common.sendAjax($(this).serialize(),'/ajax/ajax_passReset.php'); + }); }) \ No newline at end of file diff --git a/js/functions.js b/js/functions.js index 1710fe26..11a71999 100644 --- a/js/functions.js +++ b/js/functions.js @@ -420,8 +420,10 @@ sysPass.Util.Common = function () { location.href = description; } else if (status === 3 || status === 4) { resMsg("error", description); + $('#user').val('').focus(); + $('#pass').val(''); $("#mpass").prop('disabled', false); - $('#smpass').show().focus(); + $('#smpass').val('').show(); } else if (status === 5) { resMsg("warn", description, '', "location.href = 'index.php';"); } else { @@ -538,6 +540,10 @@ sysPass.Util.Common = function () { switch (action) { case "config": + encryptFormValue('#proxy_pass'); + encryptFormValue('#ldap_bindpass'); + encryptFormValue('#mail_pass'); + encryptFormValue('#curMasterPwd'); encryptFormValue('#newMasterPwd'); encryptFormValue('#newMasterPwdR'); @@ -552,6 +558,7 @@ sysPass.Util.Common = function () { break; case "import": encryptFormValue('#importPwd'); + encryptFormValue('#dbpass'); url = '/ajax/ajax_migrate.php'; break; @@ -1129,27 +1136,12 @@ sysPass.Util.Common = function () { var input = $(inputId); var curValue = input.val(); - if (validateBase64(curValue)){ - return; - } - if (curValue !== '') { var passEncrypted = encrypt.encrypt(curValue); input.val(passEncrypted); } }; - /** - * Comprobar si una cadena está en Base64 - * @param string - * @returns {boolean} - */ - var validateBase64 = function (string) { - // Expresión regular para comprobar si una cadena está codificada en base64 - var base64Matcher = new RegExp("^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})$"); - return base64Matcher.test(string); - }; - return { accSearch: accSearch, appMgmtData: appMgmtData, diff --git a/sql/upgrade.sql b/sql/upgrade.sql index a2a85e18..068335c3 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -24,7 +24,7 @@ ALTER TABLE `accounts` CHANGE COLUMN `account_pass` `account_pass` VARBINARY(255 ALTER TABLE `accHistory` CHANGE COLUMN `acchistory_pass` `acchistory_pass` VARBINARY(255) NOT NULL ; -- To 1.1.2.20 ALTER TABLE `usrData` CHANGE COLUMN `user_pass` `user_pass` VARBINARY(255) NOT NULL,CHANGE COLUMN `user_mPass` `acchistory_pass` VARBINARY(255) DEFAULT NULL ; --- To 1.2.0.1: +-- To 1.2.0.1 ALTER TABLE `accounts` CHANGE COLUMN `account_userEditId` `account_userEditId` TINYINT(3) UNSIGNED NULL DEFAULT NULL, CHANGE COLUMN `account_dateEdit` `account_dateEdit` DATETIME NULL DEFAULT NULL; ALTER TABLE `accHistory` CHANGE COLUMN `acchistory_userEditId` `acchistory_userEditId` TINYINT(3) UNSIGNED NULL DEFAULT NULL, CHANGE COLUMN `acchistory_dateEdit` `acchistory_dateEdit` DATETIME NULL DEFAULT NULL; ALTER TABLE `accHistory` CHANGE COLUMN `accHistory_otherGroupEdit` `accHistory_otherGroupEdit` BIT NULL DEFAULT b\'0\'; @@ -35,4 +35,9 @@ CREATE INDEX IDX_accountId ON usrToGroups (usertogroup_userId) ALTER TABLE `accFiles` ADD `accFile_thumb` BLOB NULL; CREATE TABLE `authTokens` (`authtoken_id` int(11) NOT NULL AUTO_INCREMENT,`authtoken_userId` int(11) NOT NULL,`authtoken_token` varbinary(100) NOT NULL,`authtoken_actionId` smallint(5) unsigned NOT NULL,`authtoken_createdBy` smallint(5) unsigned NOT NULL,`authtoken_startDate` int(10) unsigned NOT NULL,PRIMARY KEY (`authtoken_id`),UNIQUE KEY `unique_authtoken_id` (`authtoken_id`),KEY `IDX_checkToken` (`authtoken_userId`,`authtoken_actionId`,`authtoken_token`)) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `customFieldsDef` (`customfielddef_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `customfielddef_module` smallint(5) unsigned NOT NULL, `customfielddef_field` blob NOT NULL, PRIMARY KEY (`customfielddef_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE `customFieldsData` (`customfielddata_id` int(10) unsigned NOT NULL AUTO_INCREMENT,`customfielddata_moduleId` smallint(5) unsigned NOT NULL,`customfielddata_itemId` int(10) unsigned NOT NULL,`customfielddata_defId` int(10) unsigned NOT NULL,`customfielddata_data` longblob,`customfielddata_iv` varbinary(128) DEFAULT NULL, PRIMARY KEY (`customfielddata_id`), KEY `IDX_DEFID` (`customfielddata_defId`), KEY `IDX_DELETE` (`customfielddata_itemId`,`customfielddata_moduleId`), KEY `IDX_UPDATE` (`customfielddata_moduleId`,`customfielddata_itemId`,`customfielddata_defId`), KEY `IDX_ITEM` (`customfielddata_itemId`), KEY `IDX_MODULE` (`customfielddata_moduleId`)) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file +CREATE TABLE `customFieldsData` (`customfielddata_id` int(10) unsigned NOT NULL AUTO_INCREMENT,`customfielddata_moduleId` smallint(5) unsigned NOT NULL,`customfielddata_itemId` int(10) unsigned NOT NULL,`customfielddata_defId` int(10) unsigned NOT NULL,`customfielddata_data` longblob,`customfielddata_iv` varbinary(128) DEFAULT NULL, PRIMARY KEY (`customfielddata_id`), KEY `IDX_DEFID` (`customfielddata_defId`), KEY `IDX_DELETE` (`customfielddata_itemId`,`customfielddata_moduleId`), KEY `IDX_UPDATE` (`customfielddata_moduleId`,`customfielddata_itemId`,`customfielddata_defId`), KEY `IDX_ITEM` (`customfielddata_itemId`), KEY `IDX_MODULE` (`customfielddata_moduleId`)) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- To 1.2.0.2 +ALTER TABLE config CHANGE config_value config_value VARCHAR(255); +ALTER TABLE usrData CHANGE user_pass user_pass VARBINARY(128); +ALTER TABLE usrData CHANGE user_hashSalt user_hashSalt VARBINARY(128); +ALTER TABLE accHistory CHANGE acchistory_mPassHash acchistory_mPassHash VARBINARY(255); \ No newline at end of file diff --git a/web/AccountC.class.php b/web/AccountC.class.php index ceb31af6..90595c97 100644 --- a/web/AccountC.class.php +++ b/web/AccountC.class.php @@ -488,9 +488,12 @@ class AccountC extends Controller implements ActionsInterface */ private function getCustomFieldsForItem() { + // Establecer el id de la cuenta en activo y no del historial + $id = (Session::getLastAcountId() !== 0) ? Session::getLastAcountId() : $this->getId(); + // Se comprueba que hayan campos con valores para la cuenta actual - if($this->isGotData() && CustomFields::checkCustomFieldExists(ActionsInterface::ACTION_ACC_NEW, $this->_id)){ - $this->view->assign('customFields', CustomFields::getCustomFieldsData(ActionsInterface::ACTION_ACC_NEW, $this->_id)); + if($this->isGotData() && CustomFields::checkCustomFieldExists(ActionsInterface::ACTION_ACC_NEW, $id)){ + $this->view->assign('customFields', CustomFields::getCustomFieldsData(ActionsInterface::ACTION_ACC_NEW, $id)); } else { $this->view->assign('customFields', CustomFields::getCustomFieldsForModule(ActionsInterface::ACTION_ACC_NEW)); } diff --git a/web/MainC.class.php b/web/MainC.class.php index c46459e0..18828e7a 100644 --- a/web/MainC.class.php +++ b/web/MainC.class.php @@ -246,10 +246,10 @@ class MainC extends Controller implements ActionsInterface $this->view->assign('isCompleted', false); $this->view->assign('version', \SP\Util::getVersionString()); $this->view->assign('adminlogin', Request::analyze('adminlogin', 'admin')); - $this->view->assign('adminpass', Request::analyze('adminpass', '', false, false, false)); - $this->view->assign('masterpassword', Request::analyze('masterpassword', '', false, false, false)); + $this->view->assign('adminpass', Request::analyzeEncrypted('adminpass')); + $this->view->assign('masterpassword', Request::analyzeEncrypted('masterpassword')); $this->view->assign('dbuser', Request::analyze('dbuser', 'root')); - $this->view->assign('dbpass', Request::analyze('dbpass', '', false, false, false)); + $this->view->assign('dbpass', Request::analyzeEncrypted('dbpass')); $this->view->assign('dbname', Request::analyze('dbname', 'syspass')); $this->view->assign('dbhost', Request::analyze('dbhost', 'localhost')); $this->view->assign('hostingmode', Request::analyze('hostingmode', false)); @@ -271,27 +271,11 @@ class MainC extends Controller implements ActionsInterface } if (Request::analyze('install', false)) { - - try { - // Desencriptar con la clave RSA - $CryptPKI = new \SP\CryptPKI(); - $clearAdminPass = $CryptPKI->decryptRSA(base64_decode($this->view->adminpass)); - $clearMasterPassword = $CryptPKI->decryptRSA(base64_decode($this->view->masterpassword)); - $clearDbPass = $CryptPKI->decryptRSA(base64_decode($this->view->dbpass)); - } catch (\Exception $e) { - $this->view->append('errors', array( - 'type' => SPException::SP_CRITICAL, - 'description' => _('Error en clave RSA'), - 'hint' => $e->getMessage() - )); - return false; - } - Installer::setUsername($this->view->adminlogin); - Installer::setPassword($clearAdminPass); - Installer::setMasterPassword($clearMasterPassword); + Installer::setPassword($this->view->adminpass); + Installer::setMasterPassword($this->view->masterpassword); Installer::setDbuser($this->view->dbuser); - Installer::setDbpass($clearDbPass); + Installer::setDbpass($this->view->dbpass); Installer::setDbname($this->view->dbname); Installer::setDbhost($this->view->dbhost); Installer::setIsHostingMode($this->view->hostingmode);