Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Codechange: rename and move some strings to make them more consistent with the rest of the strings

Browse Source
pull/451/head
Rubidium 2 years ago committed by rubidium42
parent 4031894aef
commit d5aafaee15
7 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File

2
src/ai/ai_gui.cpp
Unescape Escape View File

@ -688,7 +688,7 @@ static const NWidgetPart _nested_ai_config_widgets[] = {
NWidget(WWT_PUSHARROWBTN, COLOUR_YELLOW, WID_AIC_DECREASE), SetDataTip(AWV_DECREASE, STR_NULL),
NWidget(WWT_PUSHARROWBTN, COLOUR_YELLOW, WID_AIC_INCREASE), SetDataTip(AWV_INCREASE, STR_NULL),
NWidget(NWID_SPACER), SetMinimalSize(6, 0),
NWidget(WWT_TEXT, COLOUR_MAUVE, WID_AIC_NUMBER), SetDataTip(STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS, STR_NULL), SetFill(1, 0),
NWidget(WWT_TEXT, COLOUR_MAUVE, WID_AIC_NUMBER), SetDataTip(STR_AI_CONFIG_MAX_COMPETITORS, STR_NULL), SetFill(1, 0),
EndContainer(),
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(7, 0, 7),
NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_MOVE_UP), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_AI_CONFIG_MOVE_UP, STR_AI_CONFIG_MOVE_UP_TOOLTIP),

2
src/fios_gui.cpp
Unescape Escape View File

@ -499,7 +499,7 @@ public:
/* Climate */
byte landscape = _load_check_data.settings.game_creation.landscape;
if (landscape < NUM_LANDSCAPE) {
SetDParam(0, STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE + landscape);
SetDParam(0, STR_CLIMATE_TEMPERATE_LANDSCAPE + landscape);
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_SERVER_LIST_LANDSCAPE);
y += FONT_HEIGHT_NORMAL;
}

12
src/genworld_gui.cpp
Unescape Escape View File

@ -127,7 +127,7 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetFill(1, 1),
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_SMOOTHNESS, STR_NULL), SetFill(1, 1),
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_QUANTITY_OF_RIVERS, STR_NULL), SetFill(1, 1),
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_GAME_OPTIONS_TOWN_NAMES_FRAME, STR_NULL), SetFill(1, 1),
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_TOWN_NAME_LABEL, STR_NULL), SetFill(1, 1),
EndContainer(),
NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GL_CLIMATE_SEL_SELECTOR),
@ -154,7 +154,7 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
EndContainer(),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_SMOOTHNESS_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_RIVER_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_TOWNNAME_DROPDOWN), SetDataTip(STR_BLACK_STRING, STR_GAME_OPTIONS_TOWN_NAMES_DROPDOWN_TOOLTIP), SetFill(1, 0),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_TOWNNAME_DROPDOWN), SetDataTip(STR_BLACK_STRING, STR_MAPGEN_TOWN_NAME_DROPDOWN_TOOLTIP), SetFill(1, 0),
EndContainer(),
EndContainer(),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREEN, WID_GL_GENERATE_BUTTON), SetMinimalSize(84, 0), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetFill(1, 1),
@ -250,7 +250,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
NWidget(NWID_SPACER),
EndContainer(),
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetFill(1, 1),
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_GAME_OPTIONS_TOWN_NAMES_FRAME, STR_NULL), SetFill(1, 1),
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_TOWN_NAME_LABEL, STR_NULL), SetFill(1, 1),
EndContainer(),
NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
NWidget(NWID_HORIZONTAL),
@ -276,7 +276,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_GL_START_DATE_TEXT), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL), SetFill(1, 0),
NWidget(WWT_IMGBTN, COLOUR_ORANGE, WID_GL_START_DATE_UP), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD), SetFill(0, 1),
EndContainer(),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_TOWNNAME_DROPDOWN), SetDataTip(STR_BLACK_STRING, STR_GAME_OPTIONS_TOWN_NAMES_DROPDOWN_TOOLTIP), SetFill(1, 0),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_TOWNNAME_DROPDOWN), SetDataTip(STR_BLACK_STRING, STR_MAPGEN_TOWN_NAME_DROPDOWN_TOOLTIP), SetFill(1, 0),
EndContainer(),
EndContainer(),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREEN, WID_GL_GENERATE_BUTTON), SetMinimalSize(84, 0), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetFill(1, 1),
@ -344,7 +344,7 @@ static DropDownList BuildTownNameDropDown()
/* Add and sort original townnames generators */
for (uint i = 0; i < BUILTIN_TOWNNAME_GENERATOR_COUNT; i++) {
list.emplace_back(new DropDownListStringItem(STR_GAME_OPTIONS_TOWN_NAME_ORIGINAL_ENGLISH + i, i, false));
list.emplace_back(new DropDownListStringItem(STR_MAPGEN_TOWN_NAME_ORIGINAL_ENGLISH + i, i, false));
}
std::sort(list.begin() + newgrf_size, list.end(), DropDownListStringItem::NatSortFunc);
@ -415,7 +415,7 @@ struct GenerateLandscapeWindow : public Window {
case WID_GL_TOWNNAME_DROPDOWN: {
uint gen = _settings_newgame.game_creation.town_name;
StringID name = gen < BUILTIN_TOWNNAME_GENERATOR_COUNT ?
STR_GAME_OPTIONS_TOWN_NAME_ORIGINAL_ENGLISH + gen :
STR_MAPGEN_TOWN_NAME_ORIGINAL_ENGLISH + gen :
GetGRFTownNameName(gen - BUILTIN_TOWNNAME_GENERATOR_COUNT);
SetDParam(0, name);
break;

76
src/lang/english.txt
Unescape Escape View File

@ -965,36 +965,6 @@ STR_GAME_OPTIONS_CURRENCY_INR :Indian Rupee (I
STR_GAME_OPTIONS_CURRENCY_IDR :Indonesian Rupiah (IDR)
STR_GAME_OPTIONS_CURRENCY_MYR :Malaysian Ringgit (MYR)
###length 2
STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_LEFT :Drive on left
STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_RIGHT :Drive on right
STR_GAME_OPTIONS_TOWN_NAMES_FRAME :{BLACK}Town names:
STR_GAME_OPTIONS_TOWN_NAMES_DROPDOWN_TOOLTIP :{BLACK}Select style of town names
###length 21
STR_GAME_OPTIONS_TOWN_NAME_ORIGINAL_ENGLISH :English (Original)
STR_GAME_OPTIONS_TOWN_NAME_FRENCH :French
STR_GAME_OPTIONS_TOWN_NAME_GERMAN :German
STR_GAME_OPTIONS_TOWN_NAME_ADDITIONAL_ENGLISH :English (Additional)
STR_GAME_OPTIONS_TOWN_NAME_LATIN_AMERICAN :Latin-American
STR_GAME_OPTIONS_TOWN_NAME_SILLY :Silly
STR_GAME_OPTIONS_TOWN_NAME_SWEDISH :Swedish
STR_GAME_OPTIONS_TOWN_NAME_DUTCH :Dutch
STR_GAME_OPTIONS_TOWN_NAME_FINNISH :Finnish
STR_GAME_OPTIONS_TOWN_NAME_POLISH :Polish
STR_GAME_OPTIONS_TOWN_NAME_SLOVAK :Slovak
STR_GAME_OPTIONS_TOWN_NAME_NORWEGIAN :Norwegian
STR_GAME_OPTIONS_TOWN_NAME_HUNGARIAN :Hungarian
STR_GAME_OPTIONS_TOWN_NAME_AUSTRIAN :Austrian
STR_GAME_OPTIONS_TOWN_NAME_ROMANIAN :Romanian
STR_GAME_OPTIONS_TOWN_NAME_CZECH :Czech
STR_GAME_OPTIONS_TOWN_NAME_SWISS :Swiss
STR_GAME_OPTIONS_TOWN_NAME_DANISH :Danish
STR_GAME_OPTIONS_TOWN_NAME_TURKISH :Turkish
STR_GAME_OPTIONS_TOWN_NAME_ITALIAN :Italian
STR_GAME_OPTIONS_TOWN_NAME_CATALAN :Catalan
STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Autosave
STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Select interval between automatic game saves
@ -1093,8 +1063,6 @@ STR_CURRENCY_PREVIEW :{LTBLUE}Preview
STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP :{BLACK}10000 Pound (£) in your currency
STR_CURRENCY_CHANGE_PARAMETER :{BLACK}Change custom currency parameter
STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS :{LTBLUE}Maximum no. competitors: {ORANGE}{COMMA}
STR_NONE :None
STR_FUNDING_ONLY :Funding only
STR_MINIMAL :Minimal
@ -1144,6 +1112,12 @@ STR_SUBSIDY_X2 :x2
STR_SUBSIDY_X3 :x3
STR_SUBSIDY_X4 :x4
###length 4
STR_CLIMATE_TEMPERATE_LANDSCAPE :Temperate landscape
STR_CLIMATE_SUB_ARCTIC_LANDSCAPE :Sub-arctic landscape
STR_CLIMATE_SUB_TROPICAL_LANDSCAPE :Sub-tropical landscape
STR_CLIMATE_TOYLAND_LANDSCAPE :Toyland landscape
###length 7
STR_TERRAIN_TYPE_VERY_FLAT :Very Flat
STR_TERRAIN_TYPE_FLAT :Flat
@ -1503,6 +1477,10 @@ STR_CONFIG_SETTING_TREE_PLACER_IMPROVED :Improved
STR_CONFIG_SETTING_ROAD_SIDE :Road vehicles: {STRING2}
STR_CONFIG_SETTING_ROAD_SIDE_HELPTEXT :Choose the driving side
###length 2
STR_CONFIG_SETTING_ROAD_SIDE_LEFT :Drive on left
STR_CONFIG_SETTING_ROAD_SIDE_RIGHT :Drive on right
STR_CONFIG_SETTING_HEIGHTMAP_ROTATION :Heightmap rotation: {STRING2}
###length 2
STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE :Counter clockwise
@ -2037,7 +2015,7 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS :Automatic rever
STR_CONFIG_SETTING_REVERSE_AT_SIGNALS_HELPTEXT :Allow trains to reverse on a signal, if they waited there a long time
###length 2
STR_CONFIG_SETTING_PATHFINDER_NPF :NPF
STR_CONFIG_SETTING_PATHFINDER_YAPF_RECOMMENDED :YAPF {BLUE}(Recommended)
STR_CONFIG_SETTING_PATHFINDER_YAPF :YAPF {BLUE}(Recommended)
STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Change setting value
@ -2132,12 +2110,6 @@ STR_CHEAT_CHANGE_DATE :{LTBLUE}Change
STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Change current year
STR_CHEAT_SETUP_PROD :{LTBLUE}Enable modifying production values: {ORANGE}{STRING1}
###length 4
STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE :Temperate landscape
STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE :Sub-arctic landscape
STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE :Sub-tropical landscape
STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE :Toyland landscape
# Livery window
STR_LIVERY_CAPTION :{WHITE}{COMPANY} - Colour Scheme
@ -3144,6 +3116,8 @@ STR_MAPGEN_MAPSIZE :{BLACK}Map size
STR_MAPGEN_MAPSIZE_TOOLTIP :{BLACK}Select the size of the map in tiles. The number of available tiles will be slightly smaller
STR_MAPGEN_BY :{BLACK}*
STR_MAPGEN_NUMBER_OF_TOWNS :{BLACK}No. of towns:
STR_MAPGEN_TOWN_NAME_LABEL :{BLACK}Town names:
STR_MAPGEN_TOWN_NAME_DROPDOWN_TOOLTIP :{BLACK}Select style of town names
STR_MAPGEN_DATE :{BLACK}Date:
STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}No. of industries:
STR_MAPGEN_HEIGHTMAP_HEIGHT :{BLACK}Highest peak:
@ -3165,6 +3139,29 @@ STR_MAPGEN_SMOOTHNESS :{BLACK}Smoothne
STR_MAPGEN_VARIETY :{BLACK}Variety distribution:
STR_MAPGEN_GENERATE :{WHITE}Generate
###length 21
STR_MAPGEN_TOWN_NAME_ORIGINAL_ENGLISH :English (Original)
STR_MAPGEN_TOWN_NAME_FRENCH :French
STR_MAPGEN_TOWN_NAME_GERMAN :German
STR_MAPGEN_TOWN_NAME_ADDITIONAL_ENGLISH :English (Additional)
STR_MAPGEN_TOWN_NAME_LATIN_AMERICAN :Latin-American
STR_MAPGEN_TOWN_NAME_SILLY :Silly
STR_MAPGEN_TOWN_NAME_SWEDISH :Swedish
STR_MAPGEN_TOWN_NAME_DUTCH :Dutch
STR_MAPGEN_TOWN_NAME_FINNISH :Finnish
STR_MAPGEN_TOWN_NAME_POLISH :Polish
STR_MAPGEN_TOWN_NAME_SLOVAK :Slovak
STR_MAPGEN_TOWN_NAME_NORWEGIAN :Norwegian
STR_MAPGEN_TOWN_NAME_HUNGARIAN :Hungarian
STR_MAPGEN_TOWN_NAME_AUSTRIAN :Austrian
STR_MAPGEN_TOWN_NAME_ROMANIAN :Romanian
STR_MAPGEN_TOWN_NAME_CZECH :Czech
STR_MAPGEN_TOWN_NAME_SWISS :Swiss
STR_MAPGEN_TOWN_NAME_DANISH :Danish
STR_MAPGEN_TOWN_NAME_TURKISH :Turkish
STR_MAPGEN_TOWN_NAME_ITALIAN :Italian
STR_MAPGEN_TOWN_NAME_CATALAN :Catalan
# Strings for map borders at game generation
STR_MAPGEN_BORDER_TYPE :{BLACK}Map edges:
STR_MAPGEN_NORTHWEST :{BLACK}Northwest
@ -4543,6 +4540,7 @@ STR_AI_CONFIG_AILIST_TOOLTIP :{BLACK}The AIs
STR_AI_CONFIG_HUMAN_PLAYER :Human player
STR_AI_CONFIG_RANDOM_AI :Random AI
STR_AI_CONFIG_NONE :(none)
STR_AI_CONFIG_MAX_COMPETITORS :{LTBLUE}Maximum no. competitors: {ORANGE}{COMMA}
STR_AI_CONFIG_MOVE_UP :{BLACK}Move Up
STR_AI_CONFIG_MOVE_UP_TOOLTIP :{BLACK}Move selected AI up in the list

2
src/network/network_gui.cpp
Unescape Escape View File

@ -667,7 +667,7 @@ public:
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_SERVER_LIST_CLIENTS);
y += FONT_HEIGHT_NORMAL;
SetDParam(0, STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE + sel->info.landscape);
SetDParam(0, STR_CLIMATE_TEMPERATE_LANDSCAPE + sel->info.landscape);
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_SERVER_LIST_LANDSCAPE); // landscape
y += FONT_HEIGHT_NORMAL;

2
src/table/settings/game_settings.ini
Unescape Escape View File

@ -144,7 +144,7 @@ max = 1
full = _roadsides
str = STR_CONFIG_SETTING_ROAD_SIDE
strhelp = STR_CONFIG_SETTING_ROAD_SIDE_HELPTEXT
strval = STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_LEFT
strval = STR_CONFIG_SETTING_ROAD_SIDE_LEFT
pre_cb = CheckRoadSide
cat = SC_BASIC

2
src/table/settings/world_settings.ini
Unescape Escape View File

@ -65,7 +65,7 @@ full = _climates
load = ConvertLandscape
str = STR_CONFIG_SETTING_LANDSCAPE
strhelp = STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT
strval = STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE
strval = STR_CLIMATE_TEMPERATE_LANDSCAPE
cat = SC_BASIC
[SDT_VAR]

Write Preview
Loading…
Cancel
Save