From 8828a3da3cad12e8b0edc587617965a6e44030ca Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 21 Sep 2011 08:42:33 +0000 Subject: [PATCH] - Bugfix: Allow "255" as valid in the JOIN-IP Address o Fixed text problem in the "You must enter a valid ..." git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4654 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- MPJoinScreen.cpp | 2 +- Utils/_ChineseText.cpp | 2 +- Utils/_DutchText.cpp | 2 +- Utils/_EnglishText.cpp | 2 +- Utils/_FrenchText.cpp | 2 +- Utils/_GermanText.cpp | 2 +- Utils/_ItalianText.cpp | 2 +- Utils/_PolishText.cpp | 2 +- Utils/_RussianText.cpp | 2 +- Utils/_TaiwaneseText.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/MPJoinScreen.cpp b/MPJoinScreen.cpp index 47e79a49..6bad8382 100644 --- a/MPJoinScreen.cpp +++ b/MPJoinScreen.cpp @@ -298,7 +298,7 @@ bool ValidateJoinSettings(bool bSkipServerAddress, bool bSkipSyncDir) break; } - if (oct < 0 || oct > 254) // dont allow broadcast nums + if (oct < 0 || oct > 255) // allow 255 { // bad octet, error numOctets=0; diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index dae685ed..749e6fa0 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -5115,7 +5115,7 @@ STR16 gzMPJScreenText[] = L"游戏类型",//L"Game Type", L"Ping", L"你必须输入你的玩家名称。",//L"You must enter a player name.", - L"你必须输入有效的服务器IP地址。\n (例如 84.114.195.239).",//L"You must enter a valid server IP address.\n (eg 84.114.195.239).", + L"你必须输入有效的服务器IP地址。 (例如 84.114.195.239).",//L"You must enter a valid server IP address.\n (eg 84.114.195.239).", L"您必须输入正确的服务器端口，范围1~65535。",//L"You must enter a valid Server Port between 1 and 65535.", }; diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 949bf5f8..1a8ef64f 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -5113,7 +5113,7 @@ STR16 gzMPJScreenText[] = L"Game Type", L"Ping", L"You must enter a player name.", - L"You must enter a valid server IP address.\n (eg 84.114.195.239).", + L"You must enter a valid server IP address. For example: 84.114.195.239", L"You must enter a valid Server Port between 1 and 65535.", }; diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 864ab183..f08da229 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -5116,7 +5116,7 @@ STR16 gzMPJScreenText[] = L"Game Type", L"Ping", L"You must enter a player name.", - L"You must enter a valid server IP address.\n (eg 84.114.195.239).", + L"You must enter a valid server IP address. For example: 84.114.195.239", L"You must enter a valid Server Port between 1 and 65535.", }; diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 19493292..f0e4333a 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -5118,7 +5118,7 @@ STR16 gzMPJScreenText[] = L"Game Type", L"Ping", L"You must enter a player name", - L"You must enter a valid server IP address.\n (eg 84.114.195.239).", + L"You must enter a valid server IP address. For example: 84.114.195.239", L"You must enter a valid Server Port between 1 and 65535.", }; diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 6b4f93f7..7921c46d 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -4961,7 +4961,7 @@ STR16 gzMPJScreenText[] = L"Spieltyp", L"Ping", L"Sie mssen einen Spielernamen eingeben.", - L"Sie mssen eine gltie Server-IP-Adresse eingeben.\n (Bsp: 84.114.195.239).", + L"Sie mssen eine gltie Server-IP-Adresse eingeben. Zum Beispiel: 84.114.195.239", L"Sie mssen eine gltige Server-Portnummer zwischen 1 und 65535 eingeben.", }; diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 2f1fbdbe..83c3db62 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -5106,7 +5106,7 @@ STR16 gzMPJScreenText[] = L"Game Type", L"Ping", L"You must enter a player name.", - L"You must enter a valid server IP address.\n (eg 84.114.195.239).", + L"You must enter a valid server IP address. For example: 84.114.195.239", L"You must enter a valid Server Port between 1 and 65535.", }; diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 1c1862da..8a524755 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -5115,7 +5115,7 @@ STR16 gzMPJScreenText[] = L"Typ rozgrywki", L"Ping", L"Musisz poda nazw gracza", - L"Musisz poda odpowiedni numer IP serwera.\n (np. 84.114.195.239).", + L"Musisz poda odpowiedni numer IP serwera. (np. 84.114.195.239).", L"Musisz poda odpowiedni port serwera pomidzy 1 i 65535.", }; diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index e7b4df3c..2c70a448 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -5105,7 +5105,7 @@ STR16 gzMPJScreenText[] = L"Тип игры", //Game Type L"Ping", L"Впишите имя игрока.", - L"Впишите корректный IP адрес. \n(пример 84.114.195.239).", + L"Впишите корректный IP адрес. (пример 84.114.195.239).", L"Впишите корректный порт сервера (используйте диапазон от 1 до 65535).", }; diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index e8c00469..b52949b6 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -5119,7 +5119,7 @@ STR16 gzMPJScreenText[] = L"Game Type", L"Ping", L"You must enter a player name.", - L"You must enter a valid server IP address.\n (eg 84.114.195.239).", + L"You must enter a valid server IP address. For example: 84.114.195.239", L"You must enter a valid Server Port between 1 and 65535.", };