Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta

# Conflicts:
#	src/lang/estonian.txt
#	src/lang/hungarian.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/packet.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/string_func.h

src/network/core/tcp.h

@@ -87,7 +87,7 @@ protected:
 	NetworkAddress address;
 
 public:
-	TCPConnecter(const NetworkAddress &address);
+	TCPConnecter(const std::string &connection_string, uint16 default_port);
 	/** Silence the warnings */
 	virtual ~TCPConnecter() {}