From a304aad16ea7d01ac2ad657db119ab21eff6fa0d Mon Sep 17 00:00:00 2001
From: Lacrimosa99 <lacrimosa99@gmx.de>
Date: Fri, 8 Mar 2019 20:10:49 +0100
Subject: [PATCH] Revert "Update 6.0.5"

This reverts commit e95987167ef8790f85cd99d8dac2d2a93f561e55.
---
 install/install.php                           |  2 +-
 install/update.php                            |  6 ++--
 ...{update_600-605.php => update_600-604.php} | 16 ++--------
 languages/default/de/system_check.xml         |  4 +--
 languages/default/uk/email.xml                |  2 +-
 languages/default/uk/fastdl.xml               | 14 ++++----
 languages/default/uk/general.xml              | 16 +++++-----
 languages/default/uk/gserver.xml              | 32 +++++++++----------
 languages/default/uk/home.xml                 |  2 +-
 languages/default/uk/images.xml               |  4 +--
 languages/default/uk/lendserver.xml           |  4 +--
 languages/default/uk/login.xml                |  6 ++--
 languages/default/uk/modules.xml              |  2 +-
 languages/default/uk/mysql.xml                |  2 +-
 languages/default/uk/page.xml                 |  6 ++--
 languages/default/uk/reseller.xml             |  6 ++--
 languages/default/uk/response.xml             |  2 +-
 languages/default/uk/search.xml               |  2 +-
 languages/default/uk/settings.xml             |  2 +-
 languages/default/uk/subnets.xml              |  4 +--
 languages/default/uk/system_check.xml         |  7 ++--
 languages/default/uk/tickets.xml              |  8 ++---
 languages/default/uk/user.xml                 | 16 +++++-----
 languages/default/uk/voice.xml                |  4 ---
 languages/default/uk/web.xml                  |  4 +--
 stuff/data/gameslist.php                      |  2 +-
 stuff/methods/queries_updates.php             |  6 ++--
 27 files changed, 81 insertions(+), 100 deletions(-)
 rename install/{update_600-605.php => update_600-604.php} (92%)

diff --git a/install/install.php b/install/install.php
index 1df9384d..c7eda91d 100644
--- a/install/install.php
+++ b/install/install.php
@@ -71,7 +71,7 @@ $languageObject = simplexml_load_file(EASYWIDIR . '/install/' . $menuLanguage .
 $displayToUser = '';
 $systemCheckOk = array();
 $systemCheckError = array();
-$easyWiVersion = ($developer == 'Y') ? '6.0.5' : '6.0.5';
+$easyWiVersion = ($developer == 'Y') ? '6.0.4' : '6.0.4';
 
 
 if ($currentStep == 0) {
diff --git a/install/update.php b/install/update.php
index 353246c9..bc109343 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 
 /**
  * File: update.php.
@@ -190,7 +190,7 @@ if (versioncheck($version, '5.30', 'update_522-530.php', $response)) {
 if (versioncheck($version, '6.0.0', 'update_530-600.php', $response)) {
     $version = '6.0.0';
 }
-if (versioncheck($version, '6.0.4', 'update_600-605.php', $response)) {
+if (versioncheck($version, '6.0.4', 'update_600-604.php', $response)) {
     $version = '6.0.4';
 }
 
@@ -201,7 +201,7 @@ try {
 
     if ($query->fetchColumn() == 'Y') {
 
-        $devVersion = '6.0.5';
+        $devVersion = '6.0.4';
 
         if (versioncheck($version, $devVersion, 'update_developer.php', $response, true)) {
             $version = $devVersion;
diff --git a/install/update_600-605.php b/install/update_600-604.php
similarity index 92%
rename from install/update_600-605.php
rename to install/update_600-604.php
index 7af3999c..f9a7f001 100644
--- a/install/update_600-605.php
+++ b/install/update_600-604.php
@@ -41,17 +41,13 @@
 if (isset($include) and $include == true) {
 
     $query = $sql->prepare("INSERT INTO `easywi_version` (`version`,`de`,`en`) VALUES
-('6.0.5','<div align=\"right\">08.03.2019</div>
+('6.0.4','<div align=\"right\">06.01.2018</div>
 <b>&Auml;nderungen:</b><br/>
 <ul>
 <li>General
 <ul>
 <li>IPv6 Addressen k&ouml;nnen nun geloggt werden</li>
 <li>Diverse Verbesserungen im italienischen Sprachpacket</li>
-<li>Unterst&uuml;tzung f&uuml;r folgende Betriebssysteme:</li>
-<li>CentOS 7</li>
-<li>Debian 9</li>
-<li>Ubuntu 18.10</li>
 </ul></li>
 <li>Game Server
 <ul>
@@ -72,8 +68,6 @@ if (isset($include) and $include == true) {
 <li>Restart Planer funktioniert nicht mit neuestem MySQL auf Ubuntu 16.04</li>
 <li>ARK Template</li>
 <li>MTA:SA Template</li>
-<li>MC Forge Template</li>
-<li>Counter-Strike: Condition Zero</li>
 <li>Seiten Liste funktioniert nicht auf neuesten MySQL Server mit Ubuntu 16.04</li>
 <li>CMS Settings nicht immer editiertbar</li>
 <li>Geh&ouml;rt ein TS3 Masterserver einem Reseller wird der Status nicht korrekt abgepr&uuml;ft</li>
@@ -89,17 +83,13 @@ if (isset($include) and $include == true) {
 <li>\"Please allow redirection settings\" bei Logout und einigen Server Konfigurationen</li>
 <li>Ticket Kategorie kann auf neuesten MySQL Server mit Ubuntu 16.04 nicht angelegt werden</li>
 <li>Redirect im Default Apache2 Vhost Template</li>
-</ul>','<div align=\"right\">08.03.2019</div>
+</ul>','<div align=\"right\">01.06.2018</div>
 <b>Changes:</b><br/>
 <ul>
 <li>General
 <ul>
 <li>IPv6 adresses can be logged</li>
 <li>Multiple improvements at the Italian language package</li>
-<li>Add Support for the following Operating Systems:</li>
-<li>CentOS 7</li>
-<li>Debian 9</li>
-<li>Ubuntu 18.10</li>
 </ul></li>
 <li>Game Server
 <ul>
@@ -120,8 +110,6 @@ if (isset($include) and $include == true) {
 <li>Restart planer not working with latest MySQL on Ubuntu 16.04</li>
 <li>ARK Template</li>
 <li>MTA:SA Template</li>
-<li>MC Forge Template</li>
-<li>Counter-Strike: Condition Zero</li>
 <li>Page list not working with latest MySQL on Ubuntu 16.04</li>
 <li>CMS cannot be edited in some cases</li>
 <li>In case a TS3 master belongs to a reseller the instances are not checked properly by status check</li>
diff --git a/languages/default/de/system_check.xml b/languages/default/de/system_check.xml
index 60dce776..dead7004 100644
--- a/languages/default/de/system_check.xml
+++ b/languages/default/de/system_check.xml
@@ -18,7 +18,7 @@
     <error_system_SimpleXML>SimpleXML Extension ist nicht installiert. Bitte installiere sie zuerst.</error_system_SimpleXML>
     <error_system_zip>zip Extension ist nicht installiert. Bitte installiere sie zuerst.</error_system_zip>
     <system_ok_curl>curl Extension ist installiert.</system_ok_curl>
-    <system_ok_fopen>fopen function can be used.</system_ok_fopen>
+    <system_ok_fopen>fopen Funktion kann verwendet werden.</system_ok_fopen>
     <system_ok_ftp>ftp Extension ist installiert.</system_ok_ftp>
     <system_ok_gd>gd Extension ist installiert.</system_ok_gd>
     <system_ok_hash>hash Extension ist installiert.</system_ok_hash>
@@ -27,6 +27,6 @@
     <system_ok_PDO>PDO Extension ist installiert.</system_ok_PDO>
     <system_ok_pdo_mysql>pdo_mysql Extension ist installiert.</system_ok_pdo_mysql>
     <system_ok_php_version>Es wird mindestens PHP 5.4 benötigt. PHP Version neu genug: </system_ok_php_version>
-    <system_ok_SimpleXML>Extension SimpleXMLis installed.</system_ok_SimpleXML>
+    <system_ok_SimpleXML>SimpleXML Extension ist installiert.</system_ok_SimpleXML>
     <system_ok_zip>zip Extension ist installiert.</system_ok_zip>
 </sprache>
\ No newline at end of file
diff --git a/languages/default/uk/email.xml b/languages/default/uk/email.xml
index c53b6651..be3b42e6 100644
--- a/languages/default/uk/email.xml
+++ b/languages/default/uk/email.xml
@@ -6,7 +6,7 @@
     <active>Y=active or N=not active</active>
     <salutation>Salutation</salutation>
     <cname>Username</cname>
-    <fullname>Firstname with lastname</fullname>
+    <fullname>Full Name</fullname>
     <name>Lastname</name>
     <vname>Firstname</vname>
     <birthday>Date of Birth</birthday>
diff --git a/languages/default/uk/fastdl.xml b/languages/default/uk/fastdl.xml
index b2d398bf..77194a5a 100644
--- a/languages/default/uk/fastdl.xml
+++ b/languages/default/uk/fastdl.xml
@@ -2,24 +2,24 @@
 <sprache>
 	<chfdluser>Change the FTP access?</chfdluser>
 	<example>Example: ftp://Yourusername:Yourftppassword@Adresse/path</example>
-	<fdlfailed>Fastdownload matching failed</fdlfailed>
-	<fdlstarted>Fastdownload matching started</fdlstarted>
+	<fdlfailed>FastDL sync matching failed</fdlfailed>
+	<fdlstarted>FastDL sync started</fdlstarted>
 	<haupt>Default fastdownload server</haupt>
 	<haupt2>Use default fastdownload server?</haupt2>
     <help_fdl>
     <![CDATA[
-	Fastdownload allows the players to download server data such as sounds and maps much swifter.<br />
+	Fastdownload allows the players to download server data such as sounds and maps at a much faster rate.<br />
 	<br />
-	Either you define a <strong>default</strong> <em>Fastdownload server</em> which will be used for all game servers or you configure an <strong>individual</strong> <em>Fastdownload server</em> for each game server.<br />
+	You can either use a <strong>default</strong> <em>Fastdownload server</em> which will be used for all game servers or you configure <strong>individual</strong> <em>Fastdownload servers</em> for each game servers.<br />
 	<br />
-	Clicking the <em>Start matching</em> button will initiate our web interface to automatically upload all required files to the Fastdownload server. Furthermore, you need to add the according HTTP URL in the server's server.cfg or dedicated.cfg file to activate Fastdownload.
+	Clicking the <em>Start FastDL Sync</em> button will initiate the FastDL sync process and automatically upload all required files to the Fastdownload server. Furthermore, you need to add the according HTTP URL in the server's server.cfg or dedicated.cfg file to activate Fastdownload.
     ]]>
     </help_fdl>
 	<neben>FTP data used for the Fastdownload server</neben>
 	<noset>No FTP data available</noset>
 	<own>Use main FTP</own>
 	<own2>Own fastdownload server</own2>
-	<server>Einzelne Server</server>
-	<startfdl>Start matching</startfdl>
+	<server>Single Server</server>
+	<startfdl>Start FastDL Sync</startfdl>
 	<udsuc>Successfully changed the FTP data</udsuc>
 </sprache>
\ No newline at end of file
diff --git a/languages/default/uk/general.xml b/languages/default/uk/general.xml
index 8518ad61..ac1cad12 100644
--- a/languages/default/uk/general.xml
+++ b/languages/default/uk/general.xml
@@ -33,7 +33,7 @@
     <dedicated>Dedicated</dedicated>
 	<del>Delete</del>
     <delSafe>Safe delete</delSafe>
-    <delAny>Delete in any case</delAny>
+    <delAny>Force delete</delAny>
     <delDB>Remove from database</delDB>
     <description>Description</description>
     <domains>Domains</domains>
@@ -53,14 +53,14 @@
     <gameserver>Game Server</gameserver>
     <gameroot>Game root server</gameroot>
     <generalsettings>General settings</generalsettings>
-    <greating_home>Welcome to the %name% web interface!</greating_home>
+    <greating_home>Welcome to the %name% panel!</greating_home>
     <groups>Groups</groups>
     <help_home>
     <![CDATA[
-	On your <em>Dashboard</em> you can find the status overview of your game and voice servers. Also, you can see the latest news for Valve games (Counter-Strike, Team Fortress, ...). Please note that the listed status information is updated every %n% minutes. For this reason a recently restarted game server might be shown as offline for a while even if it is back online already.
+	On your <em>Dashboard</em> you can find the overview of your game and voice servers. You can also see the latest news for Valve games (Counter-Strike, Team Fortress, ...). Please note that the listed status information is updated every %n% minutes. A recently restarted game server might be shown as offline even if it is back online.
 	]]>
     </help_home>
-    <help_sidebar>The status information are gathered every %n% minutes.</help_sidebar>
+    <help_sidebar>Status info is gathered every %n% minutes.</help_sidebar>
 	<hostsystem>Hostsystem</hostsystem>
 	<hotline>Hotline</hotline>
     <inactive>Inactive</inactive>
@@ -70,7 +70,7 @@
     <jobPending>Job pending</jobPending>
 	<last>Your last login was: </last>
 	<lendserver>Test/Lend server</lendserver>
-	<licence>Licencemaximum has been reached.</licence>
+	<licence>Licence maximum has been reached.</licence>
     <licence_version>You are not allowed to run this version!</licence_version>
 	<logs>Logs</logs>
 	<master>Master</master>
@@ -107,11 +107,11 @@
     <status_stop>Stopped</status_stop>
     <stop>Stop</stop>
     <subnets>Subnets</subnets>
-    <substitutes>Substitutes</substitutes>
+    <substitutes>Subusers</substitutes>
 	<support2>New support ticket</support2>
 	<support>Support</support>
 	<sure>Are you sure?</sure>
-    <sure_delete>Are you sure? All Data at the target server will be deleted!</sure_delete>
+    <sure_delete>Are you sure? All the data on the server will be deleted!</sure_delete>
     <system_check>System Check</system_check>
 	<template>Template</template>
 	<templates>Images/Templates</templates>
@@ -122,7 +122,7 @@
     <used>Used</used>
 	<user>User</user>
     <userImport>User Import</userImport>
-	<virtual>Virtuelle Server</virtual>
+	<virtual>Virtual Server</virtual>
 	<versioncheck>Version Check</versioncheck>
 	<voiceserver>Voiceserver</voiceserver>
 	<vor>Forward</vor>
diff --git a/languages/default/uk/gserver.xml b/languages/default/uk/gserver.xml
index 647e012f..0be19e1c 100644
--- a/languages/default/uk/gserver.xml
+++ b/languages/default/uk/gserver.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <sprache>
-	<abkuerz>Shorten</abkuerz>
+	<abkuerz>Minimize</abkuerz>
     <action>Action</action>
 	<active>Activate</active>
 	<all>Select all games</all>
     <anticheat>Anti-cheat</anticheat>
-    <authkey_info><![CDATA[Your personal web API authorization key which is required for downloading Steam maps. Additional information can be found <a href="https://developer.valvesoftware.com/wiki/CSGO_Workshop_For_Server_Operators#Getting_your_web_api_authorization_key" target="_blank">here</a>.]]></authkey_info>
+    <authkey_info><![CDATA[Your personal web API authorization key which is required for downloading Steam maps. It can be found here <a href="https://steamcommunity.com/dev/apikey">here</a>.]]></authkey_info>
     <backup_create>Backup will be created.</backup_create>
     <backup_recover>Backup will be recovered.</backup_recover>
     <belegt2>Existing folders</belegt2>
@@ -14,10 +14,10 @@
 	<bin>Binary</bin>
     <bin_folder>Binary folder (e.g. orangebox)</bin_folder>
     <brandname>Server tag</brandname>
-    <cant_install>Could not start installation on the server</cant_install>
-    <collection_info><![CDATA[Workshop collection ID used for downloading maps. Additional information can be found <a href="https://developer.valvesoftware.com/wiki/CSGO_Workshop_For_Server_Operators" target="_blank">here</a>.]]></collection_info>
+    <cant_install>Could not start installation</cant_install>
+    <collection_info><![CDATA[Workshop collection ID used for downloading maps. Additional information can be found at <a href="https://developer.valvesoftware.com/wiki/CSGO_Workshop_For_Server_Operators" target="_blank">here</a>.]]></collection_info>
 	<config>Server configs</config>
-	<confirm_change>Save changes?</confirm_change>
+	<confirm_change>Are you sure you want to save changes?</confirm_change>
 	<confirm_delete>Delete server?</confirm_delete>
 	<confirm_restart>(Re)start server?</confirm_restart>
 	<confirm_stop>Stop server?</confirm_stop>
@@ -50,12 +50,12 @@
     <gs_add2>Add server step 2: server details</gs_add2>
     <gs_add>Add server step 1: user, root server, games</gs_add>
     <hdd>Disk space (MB)</hdd>
-    <hddinstalled>Assigned harddisk(s)</hddinstalled>
+    <hddinstalled>Assigned harddrive(s)</hddinstalled>
     <heading_delete>Delete game server</heading_delete>
     <heading_template>Game server overview</heading_template>
     <help_calendar>
     <![CDATA[
-	You can define game server restarts at the top of every hour with our restart planner.<br />
+	You can set server restarts at the top of every hour with our restart planner.<br />
 	This feature is helpful if you want to switch the game or the template at a given time.
     ]]>
     </help_calendar>
@@ -63,23 +63,23 @@
     <![CDATA[
 	Our web interface allows you to edit the most important config files for your game server. Config files belonging to plugins will be added once they have been installed with the web interface.<br />
 	<br />
-    It might be that you cannot see the config file in the web interface, in this case you can edit it via FTP even so.
+    If you can't see files then you must edit them via FTP.
     ]]>
     </help_config>
     <help_md>
     <![CDATA[
-	On this site you can change games at any time. Specifically, our <em>Template</em> feature allows you to maintain multiple game configurations.
+	On this page you can change games at any time. Specifically, our <em>Template</em> feature allows you to maintain multiple game configurations.
 	]]>
     </help_md>
     <help_list>
     <![CDATA[
 	This overview lists detailed game server information, for example, the active template, FTP data, etc. The submenus will allow you to do extensive configuration changes.<br />
-	Games and templates can be defined at <em>Settings</em>. The <em>Server configs</em> area will allow you to manage game and addon settings. If you want to automatically change a game or template, the <em>Restart planner</em> will be of great use for you. Troubleshooting can be done with the <em>Logs</em>.
+	Games and templates can be defined at <em>Settings</em>. The <em>Server configs</em> area will allow you to manage game and addon settings. If you want to automatically change a game or template, the <em>Restart planner</em> can be useful. Troubleshooting can be done with the <em>Logs</em>.
     ]]>
     </help_list>
     <help_reinstall>
     <![CDATA[
-	<em>Resynchronization</em> will add missing files without altering existing ones. You could benefit from this feature when you have deleted files by accident or new update files are absent.<br />
+	<em>Resynchronization</em> will add missing files without altering existing ones. This is useful of you've deleted files by accident or new update files are absent.<br />
     <br />
 	<em>Reinstall</em> will result in a complete reset. All data will be lost, and the server will be reset to factory defaults.<br />
     <br />
@@ -88,10 +88,10 @@
     </help_reinstall>
     <homeDir>Home dir</homeDir>
     <hour>Hour</hour>
-    <import_corrected>Is the found path correct?</import_corrected>
+    <import_corrected>Is this path correct?</import_corrected>
     <import_destination>Destination server, game and template of import</import_destination>
     <import_source>Data source to be imported</import_source>
-    <import_start>Migration service started. This process will take some time!</import_start>
+    <import_start>Migration service started. This process may take some time!</import_start>
     <installAll>All games</installAll>
     <installGames>Preinstall games</installGames>
     <ip>Game server IP address</ip>
@@ -128,7 +128,7 @@
     <server>Server address</server>
     <serverinstalled>Installed servers</serverinstalled>
     <servername>Server name</servername>
-    <serverrestart>(Re)starting server</serverrestart>
+    <serverrestart>Restarting server</serverrestart>
     <serverstop>Stopping server</serverstop>
     <servertype>Server type</servertype>
     <server_details>Details for</server_details>
@@ -136,7 +136,7 @@
     <server_ud>Updated server data</server_ud>
     <since>Since</since>
     <slots>Player slots</slots>
-    <slotsinstalled>Installed slots</slotsinstalled>
+    <slotsinstalled>Allocated slots</slotsinstalled>
     <slotsused>Used slots</slotsused>
     <start>Start command</start>
     <startmap>Start map</startmap>
@@ -152,7 +152,7 @@
     <tvport>SourceTV</tvport>
     <tvuploadstart>SourceTV upload started</tvuploadstart>
     <type>Installation type</type>
-    <updated>The config has been edited successfully.</updated>
+    <updated>The config has been successfully edited.</updated>
     <updatetime>Status at</updatetime>
     <usage>Server allocation</usage>
     <usedports>Used ports</usedports>
diff --git a/languages/default/uk/home.xml b/languages/default/uk/home.xml
index 650d00d3..c19fa523 100644
--- a/languages/default/uk/home.xml
+++ b/languages/default/uk/home.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <sprache>
     <crashed>Crashed</crashed>
-    <gserver_crashed>potentially crashed game server</gserver_crashed>
+    <gserver_crashed>A Game server has crashed</gserver_crashed>
     <gserver_removed>game server with removed password</gserver_removed>
     <gserver_tag_removed>game server with removed server tag</gserver_tag_removed>
     <host_crashed>crashed hosts</host_crashed>
diff --git a/languages/default/uk/images.xml b/languages/default/uk/images.xml
index 7a2c95b2..65c81c41 100644
--- a/languages/default/uk/images.xml
+++ b/languages/default/uk/images.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <sprache>
-    <abkuerz>Shorten</abkuerz>
+    <abkuerz>Minimize</abkuerz>
     <active>Activate</active>
     <addon2>Menu name</addon2>
     <addon>Folder name in "masteraddons/mastermaps"</addon>
@@ -49,7 +49,7 @@
     <portMax>Port amount</portMax>
     <portStep>Port steps to the next server</portStep>
     <protect>Protection mode</protect>
-    <protectedSaveCFGs>Files to be kept while switching protection mode</protectedSaveCFGs>
+    <protectedSaveCFGs>Files to be kept while switching to protected mode</protectedSaveCFGs>
     <ramLimited>RAM limited</ramLimited>
     <rcon>Remote password (RCON)</rcon>
     <requires>Requires</requires>
diff --git a/languages/default/uk/lendserver.xml b/languages/default/uk/lendserver.xml
index ee716724..e190352a 100644
--- a/languages/default/uk/lendserver.xml
+++ b/languages/default/uk/lendserver.xml
@@ -20,8 +20,8 @@
     <mintime>Minimal lending period (minutes)</mintime>
     <minutes>Minutes</minutes>
     <nextcheck>Next status check</nextcheck>
-    <nextfree>According to plan, next game server is free in</nextfree>
-    <nextfreevo>According to plan, next voice server is free in</nextfreevo>
+    <nextfree>Next game server is free in</nextfree>
+    <nextfreevo>Next voice server is free in</nextfreevo>
     <playersteps>Slot steps</playersteps>
     <ready>Ready</ready>
     <registered>Registered</registered>
diff --git a/languages/default/uk/login.xml b/languages/default/uk/login.xml
index 7d612ecd..964a6144 100644
--- a/languages/default/uk/login.xml
+++ b/languages/default/uk/login.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <sprache>
-    <bad_ca>The entered data did not match with the captcha.</bad_ca>
+    <bad_ca>Bad captcha.</bad_ca>
     <bad_up>Either the user does not exist or the password is wrong.</bad_up>
     <back>Back</back>
     <banned>Too many bad login attemps. Please request a new password or contact us.</banned>
@@ -13,7 +13,7 @@
     <linkexpired>Link has expired.</linkexpired>
     <multipleHeader>Multiple users found</multipleHeader>
     <multipleHelper>Multiple users could be found connected to the login for %sp%. Please pick one.</multipleHelper>
-    <multipleHelperEndpoint>Usually you will have to register an app at the service provider. During creating you will be provided with a key and access token. Both need to be entered at Easy-Wi. At the app you need to configure an endpoint. The endpoint for Easy-Wi is %url%</multipleHelperEndpoint>
+    <multipleHelperEndpoint>Usually you will have to register an app at the service provider. During registration you will be provided with a key and access token. Both need to be entered at Easy-Wi. At the app you need to configure an endpoint. The endpoint for Easy-Wi is %url%</multipleHelperEndpoint>
     <nouser>There is no user with the name or e-mail address you have entered.</nouser>
     <password>Password</password>
     <passwdlost>I forgot my password</passwdlost>
@@ -23,7 +23,7 @@
     <passwordreseted>Password has been updated.</passwordreseted>
     <pwnomatch>Passwords do not match.</pwnomatch>
     <send>An e-mail with activation token has been sent to you in case an e-mail account exists.</send>
-    <sus>Your account is suspended. Please contact your host.</sus>
+    <sus>Your account is suspended. Please contact us.</sus>
     <sus_heading>Attention!</sus_heading>
     <user>User name</user>
     <urlBad>Incorrect URL in use:</urlBad>
diff --git a/languages/default/uk/modules.xml b/languages/default/uk/modules.xml
index 10ee8328..90033893 100644
--- a/languages/default/uk/modules.xml
+++ b/languages/default/uk/modules.xml
@@ -7,7 +7,7 @@
     <get>GET Value</get>
     <name>Name</name>
     <sub>Menu</sub>
-    <type>Modul type</type>
+    <type>Module type</type>
     <type_admin>Admin panel</type_admin>
     <type_cms>CMS</type_cms>
     <type_core>Easy-Wi core</type_core>
diff --git a/languages/default/uk/mysql.xml b/languages/default/uk/mysql.xml
index 0b52f3c2..7d5a33c1 100644
--- a/languages/default/uk/mysql.xml
+++ b/languages/default/uk/mysql.xml
@@ -8,7 +8,7 @@
     <description>Description</description>
     <reinstall>Reinstall</reinstall>
     <standards>Default values for the database user</standards>
-    <manage_host_table>Hosttable editable</manage_host_table>
+    <manage_host_table>Hostable editable</manage_host_table>
     <max_databases>Maximum databases</max_databases>
     <max_queries_per_hour>Maximum queries per hour</max_queries_per_hour>
     <max_updates_per_hour>Maximum updates per hour</max_updates_per_hour>
diff --git a/languages/default/uk/page.xml b/languages/default/uk/page.xml
index f159f827..e4858942 100644
--- a/languages/default/uk/page.xml
+++ b/languages/default/uk/page.xml
@@ -21,11 +21,11 @@
     <mailSend>The e-mail has been sent.</mailSend>
     <maxnews>Show the last X news messages</maxnews>
     <message>Message</message>
-    <MSIE>Internet Explorer still does not accept the W3C specifications. Due to this the display of the page can be corrupted. Please use a different browser.</MSIE>
+    <MSIE>Internet Explorer is outdated and does not meet the minimum requirements to use this panel. The display of the page may be corrupted. Please use a different browser.</MSIE>
     <moderate>Moderation required:</moderate>
     <name>Name</name>
     <naviDisplay>Display at navigation</naviDisplay>
-    <newer>Newer</newer>
+    <newer>Most recent</newer>
     <news_add>Add news</news_add>
     <newssidebar_textlength>Text length sidebar news</newssidebar_textlength>
     <older>Older</older>
@@ -53,7 +53,7 @@
     <registerErrorMail>Please use another e-mail address.</registerErrorMail>
     <registerErrorTou>Please accept the terms of use!</registerErrorTou>
     <registerErrorPassword>The passwords do not match.</registerErrorPassword>
-    <registerErrorPassword2>Please use a secure password with at least 8 characters containing of lower and upper case letters, numbers, and special characters. An example for a good password: "AKha%asLsdh12".</registerErrorPassword2>
+    <registerErrorPassword2>Please use a secure password with at least 8 characters containing lower and upper case letters, numbers, and special characters. An example for a good password: "AKha%asLsdh12".</registerErrorPassword2>
     <registerErrorPassword3>Please enter a password.</registerErrorPassword3>
     <registerErrorUnknown>An unknown error occurred. Please try again.</registerErrorUnknown>
     <registerMailSend>Registration successful. You should receive an e-mail soon.</registerMailSend>
diff --git a/languages/default/uk/reseller.xml b/languages/default/uk/reseller.xml
index ea34392b..3ae67e34 100644
--- a/languages/default/uk/reseller.xml
+++ b/languages/default/uk/reseller.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <sprache>
-    <abkuerz>Shorten</abkuerz>
+    <abkuerz>Minimize</abkuerz>
     <action>Action</action>
     <active>Activate</active>
     <all>All</all>
-    <attention>Attention: If you reinstall, all data will be lost! Please continue only if you accept the data loss!</attention>
+    <attention>Attention: If you reinstall, all data will be lost! Please continue only if you are sure!</attention>
     <bitversion>Bit-version</bitversion>
     <core>Core</core>
     <cores>Cores</cores>
@@ -54,7 +54,7 @@
     <stop>Stop</stop>
     <stopped>Stopped</stopped>
     <unused_ips>Free IPs</unused_ips>
-    <user>User name</user>
+    <user>Username</user>
     <userAdd>Please add a user/reseller first!</userAdd>
     <wwwFolder>Autorun WWW folder</wwwFolder>
 </sprache>
\ No newline at end of file
diff --git a/languages/default/uk/response.xml b/languages/default/uk/response.xml
index da9080d8..6a3b9988 100644
--- a/languages/default/uk/response.xml
+++ b/languages/default/uk/response.xml
@@ -5,7 +5,7 @@
     <error_server>Error: Could not establish a connection to the server!</error_server>
     <error_table2>Error: Adding the data to the database failed!</error_table2>
     <error_table>Error: Updating the database failed, or no new data had been entered!</error_table>
-    <error_ts_query>Error: Sending commands to the TS 3 server failed. Error message is: </error_ts_query>
+    <error_ts_query>Error: Sending commands to the TS3 server failed. Error message is: </error_ts_query>
     <error_ts_query_connect>Error: Could not connect to TS3 server query. Error message is: </error_ts_query_connect>
     <error_username>Error: User name is not allowed or exists already.</error_username>
     <reinstall_success>Reinstall successfully started</reinstall_success>
diff --git a/languages/default/uk/search.xml b/languages/default/uk/search.xml
index dbdc187e..5660656a 100644
--- a/languages/default/uk/search.xml
+++ b/languages/default/uk/search.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <sprache>
     <hint>Name/IP/PORT/IP:PORT/ID/External ID</hint>
-    <name>Name/Adresse</name>
+    <name>Name/Address</name>
     <search>Search</search>
     <type>Type</type>
 </sprache>
\ No newline at end of file
diff --git a/languages/default/uk/settings.xml b/languages/default/uk/settings.xml
index 0ab20e3f..e5408d05 100644
--- a/languages/default/uk/settings.xml
+++ b/languages/default/uk/settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <sprache>
     <brandname>Server tag:</brandname>
-    <confirm_change>Save modifications?</confirm_change>
+    <confirm_change>Save changes?</confirm_change>
     <eachday>Each X days:</eachday>
     <email2>This e-mail address will be used when sending data to the users.</email2>
     <email>E-mail:</email>
diff --git a/languages/default/uk/subnets.xml b/languages/default/uk/subnets.xml
index 94f958e2..4505370e 100644
--- a/languages/default/uk/subnets.xml
+++ b/languages/default/uk/subnets.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <sprache>
-    <error_server_exists>Error: One or more root/vserver existing with IP(s) located in this subnet!</error_server_exists>
+    <error_server_exists>Error: One or more root/vserver already exists with the same IP in this subnnet!</error_server_exists>
     <help_vlan>Easy-WI configures DHCP only. Switches and routers need to be configured manually regarding VLANs.</help_vlan>
-    <netmask>Netzworkmask</netmask>
+    <netmask>Netmask</netmask>
     <subnet>Subnet</subnet>
     <subnetOptions>Subnet Options</subnetOptions>
     <subnetStart>Subnet Start</subnetStart>
diff --git a/languages/default/uk/system_check.xml b/languages/default/uk/system_check.xml
index 37f8d2bb..2f000558 100644
--- a/languages/default/uk/system_check.xml
+++ b/languages/default/uk/system_check.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <sprache>
     <cron_external>External cronjobs</cron_external>
-    <cron_run>Cronjob last started at:</cron_run>
+    <cron_run>The Cronjob was last run at:</cron_run>
     <cron_internal>Internal Cronjobs</cron_internal>
     <cron_text>The recommended method is to use internal cronjobs. In case you cannot make use of internal cronjobs, the same files can be called with an external cronjob. If you want to make use of this you need to whitelist the calling IP(s) at the Easy-Wi settings.</cron_text>
     <error_system_curl>curl extension is not installed, please install it.</error_system_curl>
@@ -14,9 +14,7 @@
     <error_system_openssl>openssl extension is not installed, please install it.</error_system_openssl>
     <error_system_PDO>PDO extension is not installed, please install it.</error_system_PDO>
     <error_system_pdo_mysql>pdo_mysql extension is not installed, please install it.</error_system_pdo_mysql>
-    <error_system_php_version>Es wird mindestens PHP 5.4 benötigt. PHP Version zu alt: </error_system_php_version>
     <error_system_SimpleXML>SimpleXML extension is not installed, please install it.</error_system_SimpleXML>
-    <error_system_zip>zip extension is not installed, please install it.</error_system_zip>
     <system_ok_curl>curl extension is installed.</system_ok_curl>
     <system_ok_fopen>fopen function can be used.</system_ok_fopen>
     <system_ok_ftp>ftp extension is installed.</system_ok_ftp>
@@ -26,7 +24,6 @@
     <system_ok_openssl>openssl extension is installed.</system_ok_openssl>
     <system_ok_PDO>PDO extension is installed.</system_ok_PDO>
     <system_ok_pdo_mysql>pdo_mysql extension is installed.</system_ok_pdo_mysql>
-    <system_ok_php_version>At least PHP 5.4 is required. Your PHP version is ok: </system_ok_php_version>
+    <system_ok_php_version>You have the minimum PHP version installed (5.4): </system_ok_php_version>
     <system_ok_SimpleXML>Extension SimpleXMLis installed.</system_ok_SimpleXML>
-    <system_ok_zip>Extension zipis installed.</system_ok_zip>
 </sprache>
\ No newline at end of file
diff --git a/languages/default/uk/tickets.xml b/languages/default/uk/tickets.xml
index 5aeddfba..159d7c50 100644
--- a/languages/default/uk/tickets.xml
+++ b/languages/default/uk/tickets.xml
@@ -21,7 +21,7 @@
     <priority_low>low</priority_low>
     <priority_medium>medium</priority_medium>
     <priority_very_high>very high</priority_very_high>
-    <problem>Symptoms</problem>
+    <problem>Please write your issue below:</problem>
     <rating>Support rating</rating>
     <reopen>Reopen</reopen>
     <shown>Results per page</shown>
@@ -30,12 +30,12 @@
     <status_confirmed>Confirmed</status_confirmed>
     <status_done>Completed</status_done>
     <status_new>New</status_new>
-    <status_process>In process</status_process>
-    <status_reopen>For review</status_reopen>
+    <status_process>Processing</status_process>
+    <status_reopen>Staff Response</status_reopen>
     <subject>Topic</subject>
     <topic>Subcategory of</topic>
     <topic_name>Category</topic_name>
     <topic_name_sub>Subtopic</topic_name_sub>
     <username>Username</username>
-    <writer>Writer</writer>
+    <writer>Author</writer>
 </sprache>
\ No newline at end of file
diff --git a/languages/default/uk/user.xml b/languages/default/uk/user.xml
index d63a0d36..5f437193 100644
--- a/languages/default/uk/user.xml
+++ b/languages/default/uk/user.xml
@@ -18,7 +18,7 @@
     <country>Country</country>
     <einz>Automatic debit transfer system</einz>
     <email>E-mail</email>
-    <error_cname>Error: Bad username1</error_cname>
+    <error_cname>Error: Bad username!</error_cname>
     <error_id>No user selected:</error_id>
     <error_in>Not all required fields have been filled out; or illegal characters have been used.</error_in>
     <error_mail>Bad e-mail address</error_mail>
@@ -39,17 +39,17 @@
     <heading_detail>User details</heading_detail>
     <heading_list>User overview</heading_list>
     <help_substitutes_list></help_substitutes_list>
-    <hnum>House number</hnum>
+    <hnum>House Number</hnum>
     <inst>Installed server</inst>
     <ips>IPv4 addresses:</ips>
     <ips_possible1>1.1.1.1</ips_possible1>
     <ips_possible2>1.1.1.3/6</ips_possible2>
-    <mail_backup>Send e-mail when backup is created/restored.</mail_backup>
-    <mail_gsupdate>Send e-mail when master server is updated.</mail_gsupdate>
-    <mail_securitybreach>Send e-mail when game server files are manipulated.</mail_securitybreach>
-    <mail_serverdown>Send e-mail when server cannot be reached.</mail_serverdown>
-    <mail_ticket>Send e-mail when new support ticket is written.</mail_ticket>
-    <mail_vserver>Send e-mail when VPS is created, or rescue is started.</mail_vserver>
+    <mail_backup>Send an e-mail when backup is created/restored.</mail_backup>
+    <mail_gsupdate>Send an e-mail when master server is updated.</mail_gsupdate>
+    <mail_securitybreach>Send an e-mail when game server files are manipulated.</mail_securitybreach>
+    <mail_serverdown>Send an e-mail when server cannot be reached.</mail_serverdown>
+    <mail_ticket>Send an e-mail when new support ticket is created.</mail_ticket>
+    <mail_vserver>Send an e-mail when VPS is created, or rescue is started.</mail_vserver>
     <max>Maximum</max>
     <miniroot>Root</miniroot>
     <modfastdl>Edit Fastdownload access data</modfastdl>
diff --git a/languages/default/uk/voice.xml b/languages/default/uk/voice.xml
index 44d1658d..a97d8227 100644
--- a/languages/default/uk/voice.xml
+++ b/languages/default/uk/voice.xml
@@ -117,8 +117,4 @@
     <virtualserver_needed_identity_security_level>Minimum client identity security level required to connect</virtualserver_needed_identity_security_level>
     <virtualserver_reserved_slots>Reserved slots</virtualserver_reserved_slots>
     <welcome>Welcome message</welcome>
-    <reason>Reason</reason>
-    <creator>Creator</creator>
-    <created>Created</created>
-    <UserID>Name/IP/UID</UserID>
 </sprache>
\ No newline at end of file
diff --git a/languages/default/uk/web.xml b/languages/default/uk/web.xml
index 8549b122..ebd8ec46 100644
--- a/languages/default/uk/web.xml
+++ b/languages/default/uk/web.xml
@@ -9,7 +9,7 @@
     <dns>Domain</dns>
     <domainNotUsed>Skipped not allowed domain %domain%</domainNotUsed>
     <error_password_not_match>FTP passwords does not match</error_password_not_match>
-    <error_password_not_set>FTP password not allowed, not set, or not repeated.</error_password_not_set>
+    <error_password_not_set>FTP password not allowed, not set, or repeated.</error_password_not_set>
     <fdlInfo>FastDL Info</fdlInfo>
     <fpmCmd>PHP FPM Start/Reload Command</fpmCmd>
     <fpmConfigPath>PHP FPM Config Path</fpmConfigPath>
@@ -46,7 +46,7 @@
     <phpConfiguration>PHP Configuration</phpConfiguration>
     <quotaActive>Activate Quotas</quotaActive>
     <quotaCmd>Quota Command</quotaCmd>
-    <quotaWarning>Warning! Whithout Quotas user can upload data until the disk is full!</quotaWarning>
+    <quotaWarning>Warning! Whithout Quotas users can upload data until the disk is full!</quotaWarning>
     <recreate>Recreate</recreate>
     <repquotaCmd>Repquota Command</repquotaCmd>
     <serverType>Servertype</serverType>
diff --git a/stuff/data/gameslist.php b/stuff/data/gameslist.php
index bf07315a..5b76e8ff 100644
--- a/stuff/data/gameslist.php
+++ b/stuff/data/gameslist.php
@@ -129,7 +129,7 @@ $gameImages = array(
         ':fps' => 100,
         ':slots' => 12,
         ':map' => 'de_dust',
-        ':cmd' => './%binary% -game cstrike -ip %ip% -port %port% -pingboost 2 +sys_ticrate %tic% +maxplayers %slots% +map %map% +fps_max %fps%',
+        ':cmd' => './%binary% -game czero -ip %ip% -port %port% -pingboost 2 +sys_ticrate %tic% +maxplayers %slots% +map %map% +fps_max %fps%',
         ':modcmds' => null,
         ':tic' => 100,
         ':gameq' => 'cscz',
diff --git a/stuff/methods/queries_updates.php b/stuff/methods/queries_updates.php
index 0123da4e..03f59da4 100644
--- a/stuff/methods/queries_updates.php
+++ b/stuff/methods/queries_updates.php
@@ -111,9 +111,9 @@ function getCraftBukkitVersion () {
 
 function getMinecraftVersion($release = 'release') {
 
-    $responseBody = webhostRequest('https://launchermeta.mojang.com', 'https://easy-wi.com', '/mc/game/version_manifest.json');
+    $responseBody = webhostRequest('s3.amazonaws.com', 'https://easy-wi.com', '/Minecraft.Download/versions/versions.json');
 
     $json = @json_decode(cleanFsockOpenRequest($responseBody, '{', '}'));
 
-    return ($json) ? array('version' => $json->latest->$release, 'downloadPath' => 'https://launcher.mojang.com/v1/objects/' . $json->sha1->$sha1 . '/server.jar') : array('version' => '', 'downloadPath' => '');
-}
+    return ($json) ? array('version' => $json->latest->$release, 'downloadPath' => 'https://s3.amazonaws.com/Minecraft.Download/versions/' . $json->latest->$release . '/minecraft_server.' . $json->latest->$release . '.jar') : array('version' => '', 'downloadPath' => '');
+}
\ No newline at end of file