Merge branch 'master' into terencehill/welcome_dialog_translatable

diff --cc qcsrc/client/main.qc
index 1c7013a83406f4da3f2e093baba2178a654004b2,0892bb6bf2bf0bd67a21ce4fa727a3c22ff988f5..5beca00bef44dd88d0d05ef17464ba8a7510e455
--- 1/qcsrc/client/main.qc
--- 2/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -1386,17 -1337,12 +1386,17 @@@ bool net_handle_ServerWelcome(
                return true;
        }
  
-       bool force_centerprint = ReadByte();
-       string hostname = ReadString();
+       welcome_msg_force_centerprint = ReadByte();
+       strcpy(hostname, ReadString());
 -      string ver = ReadString();
 -      string modifications = ReadString();
 +
 +      string hostversion = ReadString();
 +      bool version_mismatch = ReadByte();
 +      bool version_check = ReadByte();
 +      string ver = GetVersionMessage(hostversion, version_mismatch, version_check);
 +
 +      string modifications = translate_modifications(ReadString());
 +      string weaponarena_list = translate_weaponarena(ReadString());
        string cache_mutatormsg = ReadString();
 -      string mutator_msg = ReadString();
        string motd = ReadString();
  
        string msg = "";

diff --cc qcsrc/server/client.qc
Simple merge