diff --git a/README.md b/README.md index 5c251c0e28949a84a7b3f41ea500a28d74812358..1ffa1519938200eda108baa58dce4ea548ffc935 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # ISPConfig - Hosting Control Panel -Nightly (master): [](https://git.ispconfig.org/ispconfig/ispconfig3/commits/master) -Stable branch: [](https://git.ispconfig.org/ispconfig/ispconfig3/commits/stable-3.1) +Development branch: [](https://git.ispconfig.org/ispconfig/ispconfig3/commits/develop) - Manage multiple servers from one control panel @@ -11,4 +10,4 @@ Stable branch: [ - Administrator, reseller and client login - Configuration mirroring and clusters -- Open Source software (BSD license) \ No newline at end of file +- Open Source software (BSD license) diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng index 058475169b173671f5bbfad3bbd7742c626a7e98..96df701ac7834f1c734d82993a88d14379e093f1 100644 --- a/interface/lib/lang/cz.lng +++ b/interface/lib/lang/cz.lng @@ -1,9 +1,9 @@ <?php -$wb['conf_format_dateshort'] = 'Y-d-m'; +$wb['conf_format_dateshort'] = 'd. m. Y'; $wb['conf_format_datelong'] = 'l dS of F Y'; $wb['conf_format_timeshort'] = 'H:i'; $wb['conf_format_timelong'] = 'H:i:s'; -$wb['conf_format_datetime'] = 'Y-d-m H:i'; +$wb['conf_format_datetime'] = 'd. m. Y H:i'; $wb['number_format_decimals'] = '4'; $wb['number_format_decimals_client'] = '2'; $wb['number_format_dec_point'] = '.'; @@ -69,7 +69,7 @@ $wb['monthnamesshort_dec'] = 'Pro'; $wb['datepicker_nextText'] = 'DalÅ¡Ã'; $wb['datepicker_prevText'] = 'PÅ™edchozÃ'; $wb['logout_txt'] = 'OdhlášenÃ'; -$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd'; +$wb['conf_format_dateshort_human_readable'] = 'dd. mm. yyyy'; $wb['submit_confirmation'] = 'Opravdu chcete provést tuto akci ?'; $wb['top_menu_mailuser'] = 'E-mail. uživ.'; $wb['globalsearch_resultslimit_of_txt'] = 'z'; @@ -161,4 +161,4 @@ $wb['datalog_status_d_xmpp_user'] = 'Smazat XMPP uživatele'; $wb['unlimited_txt'] = 'neomezeno'; $wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.'; $wb['datalog_changes_close_txt'] = 'Close'; -?> \ No newline at end of file +?> diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php index e71b501a7c11d2b9686c4543309c661f67327a11..ed416b6efa2d1e036c47ff9020ff5bba279e5f85 100644 --- a/server/scripts/ispconfig_update.php +++ b/server/scripts/ispconfig_update.php @@ -86,7 +86,7 @@ echo " _____ ___________ _____ __ _ |___/ "; echo "\n".str_repeat('-', 80)."\n"; echo "\n\n>> Update \n\n"; -echo "Please choose the update method. For production systems select 'stable'. \nWARNING: The update from GIT is only for development systems and may break your current setup. Do not use the GIT version on servers that host any live websites!\nNote: Update all slave server, before you update master server.\n\n"; +echo "Please choose the update method. For production systems select 'stable'. \nWARNING: The update from GIT is only for development systems and may break your current setup. Do not use the GIT version on servers that host any live websites!\nNote: On Multiserver systems, enable maintenance mode and update your master server first. Then update all slave servers, and disable maintenance mode when all servers are updated.\n\n"; $method = simple_query('Select update method', array('stable', 'nightly', 'git-develop'), 'stable');