summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorplanetmaker <planetmaker@openttd.org>2013-05-19 09:07:43 +0000
committerplanetmaker <planetmaker@openttd.org>2013-05-19 09:07:43 +0000
commit7e4f68d275f98e0124c377608af118ea69338c5c (patch)
tree75d0bff95bff02737fd74ccb0e1696e6d83d89dd /src
parentc8dbb42b6056db1a28469a3289047fbd6222bb9f (diff)
downloadopenttd-7e4f68d275f98e0124c377608af118ea69338c5c.tar.xz
(svn r25253) -Codechange: Rename the strings of the advertisement settings to better reflect what they do
Diffstat (limited to 'src')
-rw-r--r--src/lang/english.txt12
-rw-r--r--src/network/network_gui.cpp22
2 files changed, 20 insertions, 14 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 778ca7217..5a31eab98 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1783,10 +1783,10 @@ STR_FACE_TIE_EARRING_TOOLTIP :{BLACK}Change t
# Network server list
STR_NETWORK_SERVER_LIST_CAPTION :{WHITE}Multiplayer
-STR_NETWORK_SERVER_LIST_CONNECTION :{BLACK}Advertised
-STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game
-STR_NETWORK_SERVER_LIST_LAN :No
-STR_NETWORK_SERVER_LIST_INTERNET :Yes
+STR_NETWORK_SERVER_LIST_ADVERTISED :{BLACK}Advertised
+STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP :{BLACK}Choose between an advertised (internet) and a not advertised (Local Area Network, LAN) game
+STR_NETWORK_SERVER_LIST_ADVERTISED_NO :No
+STR_NETWORK_SERVER_LIST_ADVERTISED_YES :Yes
STR_NETWORK_SERVER_LIST_PLAYER_NAME :{BLACK}Player name:
STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP :{BLACK}This is the name other players will identify you by
@@ -1845,8 +1845,8 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP :{BLACK}The game
STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Set password
STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Protect your game with a password if you don't want it to be publicly accessible
-STR_NETWORK_START_SERVER_LAN_INTERNET :No
-STR_NETWORK_START_SERVER_INTERNET_ADVERTISE :Yes
+STR_NETWORK_START_SERVER_UNADVERTISED :No
+STR_NETWORK_START_SERVER_ADVERTISED :Yes
STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} client{P "" s}
STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}Max clients:
STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP :{BLACK}Choose the maximum number of clients. Not all slots need to be filled
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index f93b31c77..dae8764be 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -43,15 +43,21 @@
static void ShowNetworkStartServerWindow();
static void ShowNetworkLobbyWindow(NetworkGameList *ngl);
+/**
+ * Advertisement options in the start server window
+ */
static const StringID _connection_types_dropdown[] = {
- STR_NETWORK_START_SERVER_LAN_INTERNET,
- STR_NETWORK_START_SERVER_INTERNET_ADVERTISE,
+ STR_NETWORK_START_SERVER_UNADVERTISED,
+ STR_NETWORK_START_SERVER_ADVERTISED,
INVALID_STRING_ID
};
+/**
+ * Advertisement options in the server list
+ */
static const StringID _lan_internet_types_dropdown[] = {
- STR_NETWORK_SERVER_LIST_LAN,
- STR_NETWORK_SERVER_LIST_INTERNET,
+ STR_NETWORK_SERVER_LIST_ADVERTISED_NO,
+ STR_NETWORK_SERVER_LIST_ADVERTISED_YES,
INVALID_STRING_ID
};
@@ -925,9 +931,9 @@ static const NWidgetPart _nested_network_game_widgets[] = {
/* LEFT SIDE */
NWidget(NWID_VERTICAL), SetPIP(0, 7, 0),
NWidget(NWID_HORIZONTAL), SetPIP(0, 7, 0),
- NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NG_CONNECTION), SetDataTip(STR_NETWORK_SERVER_LIST_CONNECTION, STR_NULL),
+ NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NG_CONNECTION), SetDataTip(STR_NETWORK_SERVER_LIST_ADVERTISED, STR_NULL),
NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, WID_NG_CONN_BTN),
- SetDataTip(STR_BLACK_STRING, STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP),
+ SetDataTip(STR_BLACK_STRING, STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP),
NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
EndContainer(),
NWidget(NWID_HORIZONTAL), SetPIP(0, 7, 0),
@@ -1257,8 +1263,8 @@ static const NWidgetPart _nested_network_start_server_window_widgets[] = {
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 6, 10),
NWidget(NWID_VERTICAL), SetPIP(0, 1, 0),
- NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NSS_CONNTYPE_LABEL), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_CONNECTION, STR_NULL),
- NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, WID_NSS_CONNTYPE_BTN), SetFill(1, 0), SetDataTip(STR_BLACK_STRING, STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP),
+ NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NSS_CONNTYPE_LABEL), SetFill(1, 0), SetDataTip(STR_NETWORK_SERVER_LIST_ADVERTISED, STR_NULL),
+ NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, WID_NSS_CONNTYPE_BTN), SetFill(1, 0), SetDataTip(STR_BLACK_STRING, STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP),
EndContainer(),
NWidget(NWID_VERTICAL), SetPIP(0, 1, 0),
NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, WID_NSS_LANGUAGE_LABEL), SetFill(1, 0), SetDataTip(STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN, STR_NULL),