Commit a08e6c32 authored by Till Brehm's avatar Till Brehm
Browse files

- Merged language files

- Updated version number to 3.0.5.4rc1
parent 44c2ddee
...@@ -2287,7 +2287,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, ...@@ -2287,7 +2287,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
-- Dumping data for table `sys_config` -- Dumping data for table `sys_config`
-- --
INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4b1'); INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4rc1');
INSERT INTO sys_config VALUES ('interface','session_timeout','0'); INSERT INTO sys_config VALUES ('interface','session_timeout','0');
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;
...@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision); ...@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
//** Application //** Application
define('ISPC_APP_TITLE', 'ISPConfig'); define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.5.4b1'); define('ISPC_APP_VERSION', '3.0.5.4rc1');
define('DEVSYSTEM', 0); define('DEVSYSTEM', 0);
......
...@@ -44,7 +44,7 @@ $revision = str_replace(array('Revision:', '$', ' '), '', $svn_revision); ...@@ -44,7 +44,7 @@ $revision = str_replace(array('Revision:', '$', ' '), '', $svn_revision);
//** Application //** Application
define('ISPC_APP_TITLE', 'ISPConfig'); define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.5.4b1'); define('ISPC_APP_VERSION', '3.0.5.4rc1');
define('DEVSYSTEM', 0); define('DEVSYSTEM', 0);
......
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,7 +145,6 @@ $wb['strength_2'] = 'Podprůměrná'; ...@@ -145,7 +145,6 @@ $wb['strength_2'] = 'Podprůměrná';
$wb['strength_3'] = 'Dobrá'; $wb['strength_3'] = 'Dobrá';
$wb['strength_4'] = 'Silná'; $wb['strength_4'] = 'Silná';
$wb['strength_5'] = 'Velmi silná'; $wb['strength_5'] = 'Velmi silná';
$wb['weak_password_txt'] = 'Zvolené heslo neodpovídá požadavkům zásad pro tvorbu hesel. Heslo musí být alespoň {chars} znaků dlouhé a mající sílu \"{strength}\".'; $wb['weak_password_txt'] = 'Zvolené heslo neodpovídá požadavkům zásad pro tvorbu hesel. Heslo musí být alespoň {chars} znaků dlouhé a mající sílu \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'Zvolené heslo neodpovídá požadavkům zásad pro tvorbu hesel. Heslo musí být alespoň {chars} znaků dlouhé.'; $wb['weak_password_length_txt'] = 'Zvolené heslo neodpovídá požadavkům zásad pro tvorbu hesel. Heslo musí být alespoň {chars} znaků dlouhé.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Mittel'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Mittel';
$wb['strength_3'] = 'Gut'; $wb['strength_3'] = 'Gut';
$wb['strength_4'] = 'Stark'; $wb['strength_4'] = 'Stark';
$wb['strength_5'] = 'Sehr stark'; $wb['strength_5'] = 'Sehr stark';
$wb['weak_password_txt'] = 'Das gewählte Passwort erfüllt die Sicherheitsanforderungen nicht. Es muss mindestens {chars} Zeichen lang sein und die Stärke \"{strength}\" besitzen.'; $wb['weak_password_txt'] = 'Das gewählte Passwort erfüllt die Sicherheitsanforderungen nicht. Es muss mindestens {chars} Zeichen lang sein und die Stärke \\"{strength}\\" besitzen.';
$wb['weak_password_length_txt'] = 'Das gewählte Passwort erfüllt die Sicherheitsanforderungen nicht. Es muss mindestens {chars} Zeichen lang sein.'; $wb['weak_password_length_txt'] = 'Das gewählte Passwort erfüllt die Sicherheitsanforderungen nicht. Es muss mindestens {chars} Zeichen lang sein.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair'; ...@@ -145,6 +145,6 @@ $wb['strength_2'] = 'Fair';
$wb['strength_3'] = 'Good'; $wb['strength_3'] = 'Good';
$wb['strength_4'] = 'Strong'; $wb['strength_4'] = 'Strong';
$wb['strength_5'] = 'Very Strong'; $wb['strength_5'] = 'Very Strong';
$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \"{strength}\".'; $wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
$wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.'; $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
?> ?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment