Merge branch 'develop' of https://git.ispconfig.org/ispconfig/ispconfig3 into develop

Author: ms217

README.md

@@ -1,7 +1,6 @@
 # ISPConfig - Hosting Control Panel
 
-Nightly (master): [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/master/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/master)   
-Stable branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/stable-3.1/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/stable-3.1)
+Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/develop/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/develop)
 
 
 - Manage multiple servers from one control panel
@@ -11,4 +10,4 @@ Stable branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig
 - Virtualization (OpenVZ)
 - Administrator, reseller and client login
 - Configuration mirroring and clusters
-- Open Source software (BSD license)
+- Open Source software (BSD license)

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';
-?>
+?>

server/scripts/ispconfig_update.php

@@ -86,7 +86,7 @@ function simple_query($query, $answers, $default)
                                              |___/ ";
 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');