diff options
| -rw-r--r-- | src/economy.cpp | 2 | ||||
| -rw-r--r-- | src/genworld_gui.cpp | 2 | ||||
| -rw-r--r-- | src/intro_gui.cpp | 6 | ||||
| -rw-r--r-- | src/lang/english.txt | 122 | ||||
| -rw-r--r-- | src/main_gui.cpp | 2 | ||||
| -rw-r--r-- | src/misc_gui.cpp | 2 | ||||
| -rw-r--r-- | src/order_gui.cpp | 28 | ||||
| -rw-r--r-- | src/rail_gui.cpp | 16 | ||||
| -rw-r--r-- | src/road_gui.cpp | 54 | ||||
| -rw-r--r-- | src/roadveh_cmd.cpp | 4 | ||||
| -rw-r--r-- | src/settings_gui.cpp | 4 | ||||
| -rw-r--r-- | src/station_cmd.cpp | 16 | ||||
| -rw-r--r-- | src/timetable_gui.cpp | 4 | ||||
| -rw-r--r-- | src/train_gui.cpp | 4 | ||||
| -rw-r--r-- | src/vehicle_gui.cpp | 2 |
15 files changed, 134 insertions, 134 deletions
diff --git a/src/economy.cpp b/src/economy.cpp index 0891d27a1..995b63afe 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1871,7 +1871,7 @@ CommandCost CmdBuyShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 if (!p->is_active) return CMD_ERROR; /* Protect new companies from hostile takeovers */ - if (_cur_year - p->inaugurated_year < 6) return_cmd_error(STR_7080_PROTECTED); + if (_cur_year - p->inaugurated_year < 6) return_cmd_error(STR_PROTECTED); /* Those lines are here for network-protection (clients can be slow) */ if (GetAmountOwnedBy(p, PLAYER_SPECTATOR) == 0) return cost; diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index d81ea430a..a6b5498fe 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -250,7 +250,7 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e) static const StringID rotation[] = {STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE, STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE, INVALID_STRING_ID}; static const StringID landscape[] = {STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL, STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS, INVALID_STRING_ID}; static const StringID num_towns[] = {STR_NUM_VERY_LOW, STR_6816_LOW, STR_6817_NORMAL, STR_6818_HIGH, INVALID_STRING_ID}; - static const StringID num_inds[] = {STR_26816_NONE, STR_NUM_VERY_LOW, STR_6816_LOW, STR_6817_NORMAL, STR_6818_HIGH, INVALID_STRING_ID}; + static const StringID num_inds[] = {STR_NONE, STR_NUM_VERY_LOW, STR_6816_LOW, STR_6817_NORMAL, STR_6818_HIGH, INVALID_STRING_ID}; /* Data used for the generate seed edit box */ static querystr_d _genseed_query; diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp index 8112e7049..bab71acf2 100644 --- a/src/intro_gui.cpp +++ b/src/intro_gui.cpp @@ -143,9 +143,9 @@ static void AskExitGameCallback(Window *w, bool confirmed) void AskExitGame() { #if defined(_WIN32) - SetDParam(0, STR_0133_WINDOWS); + SetDParam(0, STR_OSNAME_WINDOWS); #elif defined(__APPLE__) - SetDParam(0, STR_0135_OSX); + SetDParam(0, STR_OSNAME_OSX); #elif defined(__BEOS__) SetDParam(0, STR_OSNAME_BEOS); #elif defined(__MORPHOS__) @@ -157,7 +157,7 @@ void AskExitGame() #elif defined(SUNOS) SetDParam(0, STR_OSNAME_SUNOS); #else - SetDParam(0, STR_0134_UNIX); + SetDParam(0, STR_OSNAME_UNIX); #endif ShowQuery( STR_00C7_QUIT, diff --git a/src/lang/english.txt b/src/lang/english.txt index 41d48e373..31c9b552c 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -273,9 +273,9 @@ STR_0130_RENAME :{BLACK}Rename STR_0131_TOO_MANY_NAMES_DEFINED :{WHITE}Too many names defined STR_0132_CHOSEN_NAME_IN_USE_ALREADY :{WHITE}Chosen name already in use -STR_0133_WINDOWS :Windows -STR_0134_UNIX :Unix -STR_0135_OSX :OS X +STR_OSNAME_WINDOWS :Windows +STR_OSNAME_UNIX :Unix +STR_OSNAME_OSX :OS X STR_OSNAME_BEOS :BeOS STR_OSNAME_MORPHOS :MorphOS STR_OSNAME_AMIGAOS :AmigaOS @@ -286,11 +286,11 @@ STR_013B_OWNED_BY :{WHITE}...owned STR_013C_CARGO :{BLACK}Cargo STR_013D_INFORMATION :{BLACK}Information STR_013E_CAPACITIES :{BLACK}Capacities -STR_013E_TOTAL_CARGO :{BLACK}Total Cargo +STR_TOTAL_CARGO :{BLACK}Total Cargo STR_013F_CAPACITY :{BLACK}Capacity: {LTBLUE}{CARGO} STR_CAPACITY_MULT :{BLACK}Capacity: {LTBLUE}{CARGO} (x{NUM}) -STR_013F_TOTAL_CAPACITY_TEXT :{BLACK}Total cargo capacity of this train: -STR_013F_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO}) +STR_TOTAL_CAPACITY_TEXT :{BLACK}Total cargo capacity of this train: +STR_TOTAL_CAPACITY :{LTBLUE}- {CARGO} ({SHORTCARGO}) STR_TOTAL_CAPACITY_MULT :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM}) STR_0140_NEW_GAME :{BLACK}New Game STR_0141_LOAD_GAME :{BLACK}Load Game @@ -730,7 +730,7 @@ STR_0290_DELETE :{BLACK}Delete STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Delete this town completely STR_0292_SAVE_SCENARIO :Save scenario STR_0293_LOAD_SCENARIO :Load scenario -STR_LOAD_HEIGHTMAP :Load heightmap +STR_MENU_LOAD_HEIGHTMAP :Load heightmap STR_0294_QUIT_EDITOR :Quit editor STR_0295 : STR_0296_QUIT :Quit @@ -770,9 +770,9 @@ STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Save cus STR_CHECKMARK :{CHECKMARK} ############ range for menu starts -STR_02C3_GAME_OPTIONS :Game options -STR_02C5_DIFFICULTY_SETTINGS :Difficulty settings -STR_02C7_CONFIG_PATCHES :Configure patches +STR_02C4_GAME_OPTIONS :Game options +STR_02C6_DIFFICULTY_SETTINGS :Difficulty settings +STR_MENU_CONFIG_PATCHES :Configure patches STR_NEWGRF_SETTINGS :NewGRF settings STR_TRANSPARENCY_OPTIONS :Transparency options STR_GAMEOPTMENU_0A : @@ -872,8 +872,8 @@ STR_SAVING_GAME :{RED}* * SAVI STR_SAVE_STILL_IN_PROGRESS :{WHITE}Saving still in progress,{}please wait until it is finished! STR_0330_SELECT_EZY_STREET_STYLE :{BLACK}Select 'Ezy Street style music' programme -STR_0335_6 :{BLACK}6 -STR_0336_7 :{BLACK}7 +STR_6 :{BLACK}6 +STR_7 :{BLACK}7 ############ start of townname region STR_TOWNNAME_ORIGINAL_ENGLISH :English (Original) @@ -1648,42 +1648,42 @@ STR_MUST_REMOVE_RAILWAY_STATION_FIRST :{WHITE}Must rem STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Must remove road first STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Road works in progress STR_1802_ROAD_CONSTRUCTION :{WHITE}Road Construction -STR_1802_TRAMWAY_CONSTRUCTION :{WHITE}Tramway Construction +STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Tramway Construction STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Select Road Bridge STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... one way roads can't have junctions STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Can't build road here... -STR_1804_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Can't build tramway here... +STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Can't build tramway here... STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Can't remove road from here... -STR_1805_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Can't remove tramway from here... +STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Can't remove tramway from here... STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Road Depot Orientation -STR_1806_TRAM_DEPOT_ORIENTATION :{WHITE}Tram Depot Orientation +STR_TRAM_DEPOT_ORIENTATION :{WHITE}Tram Depot Orientation STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Can't build road vehicle depot here... -STR_1807_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Can't build tram vehicle depot here... +STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Can't build tram vehicle depot here... STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Can't build bus station... STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Can't build lorry station... -STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Can't build passenger tram station... -STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Can't build freight tram station... +STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Can't build passenger tram station... +STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Can't build freight tram station... STR_180A_ROAD_CONSTRUCTION :Road construction -STR_180A_TRAMWAY_CONSTRUCTION :Tramway construction +STR_TRAMWAY_CONSTRUCTION :Tramway construction STR_180B_BUILD_ROAD_SECTION :{BLACK}Build road section STR_BUILD_AUTOROAD_TIP :{BLACK}Build road section using the Autoroad mode -STR_180B_BUILD_TRAMWAY_SECTION :{BLACK}Build tramway section +STR_BUILD_TRAMWAY_SECTION :{BLACK}Build tramway section STR_BUILD_AUTOTRAM_TIP :{BLACK}Build tramway section using the Autotram mode STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Build road vehicle depot (for building and servicing vehicles) -STR_180C_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Build tram vehicle depot (for building and servicing vehicles) +STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Build tram vehicle depot (for building and servicing vehicles) STR_180D_BUILD_BUS_STATION :{BLACK}Build bus station STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Build lorry loading bay -STR_180D_BUILD_PASSENGER_TRAM_STATION :{BLACK}Build passenger tram station -STR_180E_BUILD_CARGO_TRAM_STATION :{BLACK}Build freight tram station +STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Build passenger tram station +STR_BUILD_CARGO_TRAM_STATION :{BLACK}Build freight tram station STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Build road bridge -STR_180F_BUILD_TRAMWAY_BRIDGE :{BLACK}Build tramway bridge +STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Build tramway bridge STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Build road tunnel -STR_1810_BUILD_TRAMWAY_TUNNEL :{BLACK}Build tramway tunnel +STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Build tramway tunnel STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Activate/Deactivate one way roads STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Toggle build/remove for road construction -STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Toggle build/remove for tramway construction +STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Toggle build/remove for tramway construction STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Select road vehicle depot orientation -STR_1813_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Select tram vehicle depot orientation +STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Select tram vehicle depot orientation STR_1814_ROAD :Road STR_1815_ROAD_WITH_STREETLIGHTS :Road with streetlights STR_1816_TREE_LINED_ROAD :Tree-lined road @@ -1826,8 +1826,8 @@ STR_3005_TOO_CLOSE_TO_ANOTHER_RAILROAD :{WHITE}Too clos STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Adjoins more than one existing station/loading area STR_3007_TOO_MANY_STATIONS_LOADING :{WHITE}Too many stations/loading areas in this town STR_3008_TOO_MANY_STATIONS_LOADING :{WHITE}Too many stations/loading areas -STR_3008A_TOO_MANY_BUS_STOPS :{WHITE}Too many bus stops -STR_3008B_TOO_MANY_TRUCK_STOPS :{WHITE}Too many lorry stations +STR_TOO_MANY_BUS_STOPS :{WHITE}Too many bus stops +STR_TOO_MANY_TRUCK_STOPS :{WHITE}Too many lorry stations STR_3009_TOO_CLOSE_TO_ANOTHER_STATION :{WHITE}Too close to another station/loading area STR_300A_0 :{WHITE}{STATION} {STATIONFEATURES} STR_300B_MUST_DEMOLISH_RAILROAD :{WHITE}Must demolish railway station first @@ -1858,12 +1858,12 @@ STR_3040_NOW_ACCEPTS :{WHITE}{STATION STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} now accepts {STRING} and {STRING} STR_3042_BUS_STATION_ORIENTATION :{WHITE}Bus Station Orientation STR_3043_TRUCK_STATION_ORIENT :{WHITE}Lorry Station Orientation -STR_3042_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Passenger Tram Orientation -STR_3043_CARGO_TRAM_STATION_ORIENT :{WHITE}Freight Tram Orientation +STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Passenger Tram Orientation +STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Freight Tram Orientation STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Must demolish bus station first STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Must demolish lorry station first -STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Must demolish passenger tram station first -STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Must demolish freight tram station first +STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Must demolish passenger tram station first +STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Must demolish freight tram station first STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Station{P "" s} STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES} STR_304A_NONE :{YELLOW}- None - @@ -1875,8 +1875,8 @@ STR_304F_SELECT_NUMBER_OF_PLATFORMS :{BLACK}Select n STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Select length of railway station STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Select bus station orientation STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Select lorry loading bay orientation -STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Select passenger tram station orientation -STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Select freight tram station orientation +STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Select passenger tram station orientation +STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Select freight tram station orientation STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Centre main view on station location STR_3054_SHOW_STATION_RATINGS :{BLACK}Show station ratings STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Change name of station @@ -1898,7 +1898,7 @@ STR_3068_DOCK :{WHITE}Dock STR_3069_BUOY :Buoy STR_306A_BUOY_IN_THE_WAY :{WHITE}...buoy in the way STR_306C_STATION_TOO_SPREAD_OUT :{WHITE}...station too spread out -STR_306D_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...nonuniform stations disabled +STR_NONUNIFORM_STATIONS_DISALLOWED :{WHITE}...nonuniform stations disabled STR_USE_CTRL_TO_SELECT_MORE :{BLACK}Hold down CTRL to select more than one item STR_UNDEFINED :(undefined string) @@ -1939,7 +1939,7 @@ STR_400D_SAVE_THE_CURRENT_GAME_USING :{BLACK}Save the STR_400E_SELECT_NEW_GAME_TYPE :{WHITE}Select New Game Type STR_400F_SELECT_SCENARIO_GREEN_PRE :{BLACK}Select scenario (green), pre-set game (blue), or random new game STR_4010_GENERATE_RANDOM_NEW_GAME :Generate random new game -STR_4011_LOAD_HEIGHTMAP :{WHITE}Load Heightmap +STR_LOAD_HEIGHTMAP :{WHITE}Load Heightmap ##id 0x4800 STR_4800_IN_THE_WAY :{WHITE}{STRING} in the way @@ -2143,10 +2143,10 @@ STR_6812_QUANTITY_OF_SEA_LAKES :{LTBLUE}Quantit STR_6813_ECONOMY :{LTBLUE}Economy: {ORANGE}{STRING} STR_6814_TRAIN_REVERSING :{LTBLUE}Train reversing: {ORANGE}{STRING} STR_6815_DISASTERS :{LTBLUE}Disasters: {ORANGE}{STRING} -STR_16816_CITY_APPROVAL :{LTBLUE}City council's attitude towards area restructuring: {ORANGE}{STRING} +STR_CITY_APPROVAL :{LTBLUE}City council's attitude towards area restructuring: {ORANGE}{STRING} ############ range for difficulty settings ends -STR_26816_NONE :None +STR_NONE :None STR_NUM_VERY_LOW :Very low STR_6816_LOW :Low STR_6817_NORMAL :Normal @@ -2184,9 +2184,9 @@ STR_6835_AT_END_OF_LINE_ONLY :At end of line STR_6836_OFF :Off STR_6837_ON :On STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Show hi-score chart -STR_6839_PERMISSIVE :Permissive -STR_683A_TOLERANT :Tolerant -STR_683B_HOSTILE :Hostile +STR_PERMISSIVE :Permissive +STR_TOLERANT :Tolerant +STR_HOSTILE :Hostile ##id 0x7000 STR_7000 : @@ -2323,7 +2323,7 @@ STR_707B_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Can't bu STR_707C_CAN_T_SELL_25_SHARE_IN :{WHITE}Can't sell 25% share in this company... STR_707D_OWNED_BY :{WHITE}({COMMA}% owned by {COMPANY}) STR_707F_HAS_BEEN_TAKEN_OVER_BY :{BLACK}{BIGFONT}{COMPANY} has been taken over by {COMPANY}! -STR_7080_PROTECTED :{WHITE}This company is not old enough to trade shares yet... +STR_PROTECTED :{WHITE}This company is not old enough to trade shares yet... STR_LIVERY_DEFAULT :Standard Livery STR_LIVERY_STEAM :Steam Engine @@ -2632,17 +2632,17 @@ STR_8803_TRAIN_IN_THE_WAY :{WHITE}Train in STR_8804 :{SETX 10}{COMMA}: {STRING1} {STRING1} STR_8805 :{RIGHTARROW}{SETX 10}{COMMA}: {STRING1} {STRING1} STR_8806_GO_TO :Go to {STATION} -STR_8807_GO_TO_TRANSFER :Go to {STATION} (Transfer and take cargo) -STR_8808_GO_TO_UNLOAD :Go to {STATION} (Unload) -STR_8809_GO_TO_TRANSFER_UNLOAD :Go to {STATION} (Transfer and leave empty) -STR_880A_GO_TO_LOAD :Go to {STATION} (Load) -STR_880B_GO_TO_TRANSFER_LOAD :Go to {STATION} (Transfer and wait for full load) -STR_880C_GO_NON_STOP_TO :Go non-stop to {STATION} -STR_880D_GO_TO_NON_STOP_TRANSFER :Go non-stop to {STATION} (Transfer and take cargo) -STR_880E_GO_NON_STOP_TO_UNLOAD :Go non-stop to {STATION} (Unload) -STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD :Go non-stop to {STATION} (Transfer and leave empty) -STR_8810_GO_NON_STOP_TO_LOAD :Go non-stop to {STATION} (Load) -STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD :Go non-stop to {STATION} (Transfer and wait for full load) +STR_GO_TO_TRANSFER :Go to {STATION} (Transfer and take cargo) +STR_8807_GO_TO_UNLOAD :Go to {STATION} (Unload) +STR_GO_TO_TRANSFER_UNLOAD :Go to {STATION} (Transfer and leave empty) +STR_8808_GO_TO_LOAD :Go to {STATION} (Load) +STR_GO_TO_TRANSFER_LOAD :Go to {STATION} (Transfer and wait for full load) +STR_880A_GO_NON_STOP_TO :Go non-stop to {STATION} +STR_GO_TO_NON_STOP_TRANSFER :Go non-stop to {STATION} (Transfer and take cargo) +STR_880B_GO_NON_STOP_TO_UNLOAD :Go non-stop to {STATION} (Unload) +STR_GO_TO_NON_STOP_TRANSFER_UNLOAD :Go non-stop to {STATION} (Transfer and leave empty) +STR_880C_GO_NON_STOP_TO_LOAD :Go non-stop to {STATION} (Load) +STR_GO_TO_NON_STOP_TRANSFER_LOAD :Go non-stop to {STATION} (Transfer and wait for full load) STR_GO_TO_TRAIN_DEPOT :Go to {TOWN} Train Depot STR_SERVICE_AT_TRAIN_DEPOT :Service at {TOWN} Train Depot STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Go non-stop to {TOWN} Train Depot @@ -2746,7 +2746,7 @@ STR_884E_DECREASE_SERVICING_INTERVAL :{BLACK}Decrease STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED :{BLACK}Show details of cargo carried STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Show details of train vehicles STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Show capacities of each vehicle -STR_8852_SHOW_TOTAL_CARGO :{BLACK}Show total capacity of train, split by cargo type +STR_SHOW_TOTAL_CARGO :{BLACK}Show total capacity of train, split by cargo type STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Orders list - click on an order to highlight it. CTRL + click scrolls to the station STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Skip the current order, and start the next. CTRL + click skips to the selected order STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Delete the highlighted order @@ -2777,8 +2777,8 @@ STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL :{BLACK}{BIGFONT STR_8869_CAN_T_REVERSE_DIRECTION :{WHITE}Can't reverse direction of train... STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Rename train vehicle type STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Can't rename train vehicle type... -STR_886D_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order force the vehicle to dump cargo -STR_886F_TRANSFER :{BLACK}Transfer +STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Make the highlighted order force the vehicle to dump cargo +STR_TRANSFER :{BLACK}Transfer STR_CLEAR_TIME :{BLACK}Clear Time STR_RESET_LATENESS :{BLACK}Reset Late Counter @@ -2856,8 +2856,8 @@ STR_902D_CAN_T_NAME_ROAD_VEHICLE :{WHITE}Can't na STR_902E_NAME_ROAD_VEHICLE :{BLACK}Name road vehicle STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Citizens celebrate . . .{}First bus arrives at {STATION}! STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Citizens celebrate . . .{}First truck arrives at {STATION}! -STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Citizens celebrate . . .{}First passenger tram arrives at {STATION}! -STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM :{BLACK}{BIGFONT}Citizens celebrate . . .{}First freight tram arrives at {STATION}! +STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Citizens celebrate . . .{}First passenger tram arrives at {STATION}! +STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Citizens celebrate . . .{}First freight tram arrives at {STATION}! STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Road Vehicle Crash!{}Driver dies in fireball after collision with train STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA} die in fireball after collision with train STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Can't make vehicle turn around... @@ -2866,7 +2866,7 @@ STR_9034_RENAME :{BLACK}Rename STR_9035_RENAME_ROAD_VEHICLE_TYPE :{BLACK}Rename road vehicle type STR_9036_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Rename road vehicle type STR_9037_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Can't rename road vehicle type... -STR_9038_GO_TO_ROADVEH_DEPOT :Go to {TOWN} Road Vehicle Depot +STR_GO_TO_ROADVEH_DEPOT :Go to {TOWN} Road Vehicle Depot STR_SERVICE_AT_ROADVEH_DEPOT :Service at {TOWN} Road Vehicle Depot STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Refit road vehicle to carry a different cargo type diff --git a/src/main_gui.cpp b/src/main_gui.cpp index 055e4761a..1e9f327ec 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -972,7 +972,7 @@ static void ToolbarOptionsClick(Window *w) { uint16 x = 0; - w = PopupMainToolbMenu(w, 2, STR_02C3_GAME_OPTIONS, 14, 0); + w = PopupMainToolbMenu(w, 2, STR_02C4_GAME_OPTIONS, 14, 0); if (HasBit(_display_opt, DO_SHOW_TOWN_NAMES)) SetBit(x, 6); if (HasBit(_display_opt, DO_SHOW_STATION_NAMES)) SetBit(x, 7); diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index aa4a96902..c6f3b73e6 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -1691,7 +1691,7 @@ void ShowSaveLoadDialog(SaveLoadDialogMode mode) STR_0298_LOAD_SCENARIO, STR_4000_SAVE_GAME, STR_0299_SAVE_SCENARIO, - STR_4011_LOAD_HEIGHTMAP, + STR_LOAD_HEIGHTMAP, }; Window *w; diff --git a/src/order_gui.cpp b/src/order_gui.cpp index c6c296e44..78d44603a 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -93,19 +93,19 @@ static int GetOrderFromOrderWndPt(Window *w, int y, const Vehicle *v) static StringID StationOrderStrings[] = { STR_8806_GO_TO, - STR_8807_GO_TO_TRANSFER, - STR_8808_GO_TO_UNLOAD, - STR_8809_GO_TO_TRANSFER_UNLOAD, - STR_880A_GO_TO_LOAD, - STR_880B_GO_TO_TRANSFER_LOAD, + STR_GO_TO_TRANSFER, + STR_8807_GO_TO_UNLOAD, + STR_GO_TO_TRANSFER_UNLOAD, + STR_8808_GO_TO_LOAD, + STR_GO_TO_TRANSFER_LOAD, STR_NULL, STR_NULL, - STR_880C_GO_NON_STOP_TO, - STR_880D_GO_TO_NON_STOP_TRANSFER, - STR_880E_GO_NON_STOP_TO_UNLOAD, - STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD, - STR_8810_GO_NON_STOP_TO_LOAD, - STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD, + STR_880A_GO_NON_STOP_TO, + STR_GO_TO_NON_STOP_TRANSFER, + STR_880B_GO_NON_STOP_TO_UNLOAD, + STR_GO_TO_NON_STOP_TRANSFER_UNLOAD, + STR_880C_GO_NON_STOP_TO_LOAD, + STR_GO_TO_NON_STOP_TRANSFER_LOAD, STR_NULL }; @@ -216,7 +216,7 @@ static void DrawOrdersWindow(Window *w) switch (v->type) { case VEH_TRAIN: s = (order->flags & OFB_NON_STOP) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break; - case VEH_ROAD: s = STR_9038_GO_TO_ROADVEH_DEPOT; break; + case VEH_ROAD: s = STR_GO_TO_ROADVEH_DEPOT; break; case VEH_SHIP: s = STR_GO_TO_SHIP_DEPOT; break; default: break; } @@ -761,7 +761,7 @@ static const Widget _orders_train_widgets[] = { { WWT_PUSHTXTBTN, RESIZE_TB, 14, 212, 264, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, // ORDER_WIDGET_FULL_LOAD { WWT_PUSHTXTBTN, RESIZE_TB, 14, 265, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_UNLOAD { WWT_PUSHTXTBTN, RESIZE_TB, 14, 265, 319, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT - { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 372, 76, 87, STR_886F_TRANSFER, STR_886D_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER + { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 372, 76, 87, STR_TRANSFER, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER { WWT_PUSHIMGBTN, RESIZE_TB, 14, 373, 386, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST @@ -798,7 +798,7 @@ static const Widget _orders_widgets[] = { { WWT_PUSHTXTBTN, RESIZE_TB, 14, 193, 256, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, // ORDER_WIDGET_FULL_LOAD { WWT_PUSHTXTBTN, RESIZE_TB, 14, 257, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_UNLOAD { WWT_PUSHTXTBTN, RESIZE_TB, 14, 257, 319, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT - { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 383, 76, 87, STR_886F_TRANSFER, STR_886D_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER + { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 383, 76, 87, STR_TRANSFER, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER { WWT_PUSHIMGBTN, RESIZE_TB, 14, 384, 397, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 698ceaa0c..59e51614d 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1079,16 +1079,16 @@ static const Widget _station_builder_widgets[] = { { WWT_TEXTBTN, RESIZE_NONE, 14, 52, 66, 87, 98, STR_00CD_3, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_3 { WWT_TEXTBTN, RESIZE_NONE, 14, 67, 81, 87, 98, STR_00CE_4, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_4 { WWT_TEXTBTN, RESIZE_NONE, 14, 82, 96, 87, 98, STR_00CF_5, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_5 -{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 87, 98, STR_0335_6, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_6 -{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 87, 98, STR_0336_7, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_7 +{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 87, 98, STR_6, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_6 +{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 87, 98, STR_7, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_7 { WWT_TEXTBTN, RESIZE_NONE, 14, 22, 36, 112, 123, STR_00CB_1, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_1 { WWT_TEXTBTN, RESIZE_NONE, 14, 37, 51, 112, 123, STR_00CC_2, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_2 { WWT_TEXTBTN, RESIZE_NONE, 14, 52, 66, 112, 123, STR_00CD_3, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_3 { WWT_TEXTBTN, RESIZE_NONE, 14, 67, 81, 112, 123, STR_00CE_4, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_4 { WWT_TEXTBTN, RESIZE_NONE, 14, 82, 96, 112, 123, STR_00CF_5, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_5 -{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 112, 123, STR_0335_6, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_6 -{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 112, 123, STR_0336_7, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_7 +{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 112, 123, STR_6, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_6 +{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 112, 123, STR_7, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_7 { WWT_TEXTBTN, RESIZE_NONE, 14, 37, 111, 126, 137, STR_DRAG_DROP, STR_STATION_DRAG_DROP}, // BRSW_PLATFORM_DRAG_N_DROP { WWT_TEXTBTN, RESIZE_NONE, 14, 14, 73, 152, 163, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE}, // BRSW_HIGHLIGHT_OFF @@ -1109,16 +1109,16 @@ static const Widget _newstation_builder_widgets[] = { { WWT_TEXTBTN, RESIZE_NONE, 14, 52, 66, 177, 188, STR_00CD_3, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_3 { WWT_TEXTBTN, RESIZE_NONE, 14, 67, 81, 177, 188, STR_00CE_4, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_4 { WWT_TEXTBTN, RESIZE_NONE, 14, 82, 96, 177, 188, STR_00CF_5, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_5 -{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 177, 188, STR_0335_6, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_6 -{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 177, 188, STR_0336_7, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_7 +{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 177, 188, STR_6, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_6 +{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 177, 188, STR_7, STR_304F_SELECT_NUMBER_OF_PLATFORMS}, // BRSW_PLATFORM_NUM_7 { WWT_TEXTBTN, RESIZE_NONE, 14, 22, 36, 202, 213, STR_00CB_1, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_1 { WWT_TEXTBTN, RESIZE_NONE, 14, 37, 51, 202, 213, STR_00CC_2, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_2 { WWT_TEXTBTN, RESIZE_NONE, 14, 52, 66, 202, 213, STR_00CD_3, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_3 { WWT_TEXTBTN, RESIZE_NONE, 14, 67, 81, 202, 213, STR_00CE_4, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_4 { WWT_TEXTBTN, RESIZE_NONE, 14, 82, 96, 202, 213, STR_00CF_5, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_5 -{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 202, 213, STR_0335_6, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_6 -{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 202, 213, STR_0336_7, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_7 +{ WWT_TEXTBTN, RESIZE_NONE, 14, 97, 111, 202, 213, STR_6, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_6 +{ WWT_TEXTBTN, RESIZE_NONE, 14, 112, 126, 202, 213, STR_7, STR_3050_SELECT_LENGTH_OF_RAILROAD}, // BRSW_PLATFORM_LEN_7 { WWT_TEXTBTN, RESIZE_NONE, 14, 37, 111, 216, 227, STR_DRAG_DROP, STR_STATION_DRAG_DROP}, // BRSW_PLATFORM_DRAG_N_DROP { WWT_TEXTBTN, RESIZE_NONE, 14, 14, 73, 242, 253, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE}, // BRSW_HIGHLIGHT_OFF diff --git a/src/road_gui.cpp b/src/road_gui.cpp index 811a20d82..5788058be 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -154,13 +154,13 @@ static const RoadTypeInfo _road_type_infos[] = { SPR_CURSOR_AUTOROAD, }, { - STR_1804_CAN_T_BUILD_TRAMWAY_HERE, - STR_1805_CAN_T_REMOVE_TRAMWAY_FROM, - STR_1807_CAN_T_BUILD_TRAM_VEHICLE, - { STR_1808_CAN_T_BUILD_PASSENGER_TRAM_STATION, STR_1809_CAN_T_BUILD_CARGO_TRAM_STATION }, - { STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION, STR_CAN_T_REMOVE_CARGO_TRAM_STATION }, - { STR_3042_PASSENGER_TRAM_STATION_ORIENTATION, STR_3043_CARGO_TRAM_STATION_ORIENT }, - { STR_3051_SELECT_PASSENGER_TRAM_STATION_ORIENTATION, STR_3052_SELECT_CARGO_TRAM_STATION_ORIENTATION }, + STR_CAN_T_BUILD_TRAMWAY_HERE, + STR_CAN_T_REMOVE_TRAMWAY_FROM, + STR_CAN_T_BUILD_TRAM_VEHICLE, + { STR_CAN_T_BUILD_PASSENGER_TRAM_STATION, STR_CAN_T_BUILD_CARGO_TRAM_STATION }, + { STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION, STR_CAN_T_REMOVE_CARGO_TRAM_STATION }, + { STR_PASSENGER_TRAM_STATION_ORIENTATION, STR_CARGO_TRAM_STATION_ORIENT }, + { STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION, STR_SELECT_CARGO_TRAM_STATION_ORIENTATION }, SPR_CURSOR_TRAMWAY_NESW, SPR_CURSOR_TRAMWAY_NWSE, @@ -602,21 +602,21 @@ static const WindowDesc _build_road_desc = { /** Widget definition of the build tram toolbar */ static const Widget _build_tramway_widgets[] = { -{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // RTW_CLOSEBOX -{ WWT_CAPTION, RESIZE_NONE, 7, 11, 228, 0, 13, STR_1802_TRAMWAY_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, // RTW_CAPTION -{ WWT_STICKYBOX, RESIZE_NONE, 7, 229, 240, 0, 13, 0x0, STR_STICKY_BUTTON}, // RTW_STICKY - -{ WWT_IMGBTN, RESIZE_NONE, 7, 0, 21, 14, 35, SPR_IMG_TRAMWAY_X_DIR, STR_180B_BUILD_TRAMWAY_SECTION}, // RTW_ROAD_X -{ WWT_IMGBTN, RESIZE_NONE, 7, 22, 43, 14, 35, SPR_IMG_TRAMWAY_Y_DIR, STR_180B_BUILD_TRAMWAY_SECTION}, // RTW_ROAD_Y -{ WWT_IMGBTN, RESIZE_NONE, 7, 44, 65, 14, 35, SPR_IMG_AUTOTRAM, STR_BUILD_AUTOTRAM_TIP}, // RTW_AUTOROAD -{ WWT_IMGBTN, RESIZE_NONE, 7, 66, 87, 14, 35, SPR_IMG_DYNAMITE, STR_018D_DEMOLISH_BUILDINGS_ETC}, // RTW_DEMOLISH -{ WWT_IMGBTN, RESIZE_NONE, 7, 88, 109, 14, 35, SPR_IMG_ROAD_DEPOT, STR_180C_BUILD_TRAM_VEHICLE_DEPOT}, // RTW_DEPOT -{ WWT_IMGBTN, RESIZE_NONE, 7, 110, 131, 14, 35, SPR_IMG_BUS_STATION, STR_180D_BUILD_PASSENGER_TRAM_STATION}, // RTW_BUS_STATION -{ WWT_IMGBTN, RESIZE_NONE, 7, 132, 153, 14, 35, SPR_IMG_TRUCK_BAY, STR_180E_BUILD_CARGO_TRAM_STATION}, // RTW_TRUCK_STATION -{ WWT_EMPTY, RESIZE_NONE, 0, 0, 0, 0, 0, 0x0, STR_NULL}, // RTW_ONE_WAY -{ WWT_IMGBTN, RESIZE_NONE, 7, 154, 196, 14, 35, SPR_IMG_BRIDGE, STR_180F_BUILD_TRAMWAY_BRIDGE}, // RTW_BUILD_BRIDGE -{ WWT_IMGBTN, RESIZE_NONE, 7, 197, 218, 14, 35, SPR_IMG_ROAD_TUNNEL, STR_1810_BUILD_TRAMWAY_TUNNEL}, // RTW_BUILD_TUNNEL -{ WWT_IMGBTN, RESIZE_NONE, 7, 219, 240, 14, 35, SPR_IMG_REMOVE, STR_1811_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS}, // RTW_REMOVE +{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // RTW_CLOSEBOX +{ WWT_CAPTION, RESIZE_NONE, 7, 11, 228, 0, 13, STR_TRAMWAY_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, // RTW_CAPTION +{ WWT_STICKYBOX, RESIZE_NONE, 7, 229, 240, 0, 13, 0x0, STR_STICKY_BUTTON}, // RTW_STICKY + +{ WWT_IMGBTN, RESIZE_NONE, 7, 0, 21, 14, 35, SPR_IMG_TRAMWAY_X_DIR, STR_BUILD_TRAMWAY_SECTION}, // RTW_ROAD_X +{ WWT_IMGBTN, RESIZE_NONE, 7, 22, 43, 14, 35, SPR_IMG_TRAMWAY_Y_DIR, STR_BUILD_TRAMWAY_SECTION}, // RTW_ROAD_Y +{ WWT_IMGBTN, RESIZE_NONE, 7, 44, 65, 14, 35, SPR_IMG_AUTOTRAM, STR_BUILD_AUTOTRAM_TIP}, // RTW_AUTOROAD +{ WWT_IMGBTN, RESIZE_NONE, 7, 66, 87, 14, 35, SPR_IMG_DYNAMITE, STR_018D_DEMOLISH_BUILDINGS_ETC}, // RTW_DEMOLISH +{ WWT_IMGBTN, RESIZE_NONE, 7, 88, 109, 14, 35, SPR_IMG_ROAD_DEPOT, STR_BUILD_TRAM_VEHICLE_DEPOT}, // RTW_DEPOT +{ WWT_IMGBTN, RESIZE_NONE, 7, 110, 131, 14, 35, SPR_IMG_BUS_STATION, STR_BUILD_PASSENGER_TRAM_STATION}, // RTW_BUS_STATION +{ WWT_IMGBTN, RESIZE_NONE, 7, 132, 153, 14, 35, SPR_IMG_TRUCK_BAY, STR_BUILD_CARGO_TRAM_STATION}, // RTW_TRUCK_STATION +{ WWT_EMPTY, RESIZE_NONE, 0, 0, 0, 0, 0, 0x0, STR_NULL}, // RTW_ONE_WAY +{ WWT_IMGBTN, RESIZE_NONE, 7, 154, 196, 14, 35, SPR_IMG_BRIDGE, STR_BUILD_TRAMWAY_BRIDGE}, // RTW_BUILD_BRIDGE +{ WWT_IMGBTN, RESIZE_NONE, 7, 197, 218, 14, 35, SPR_IMG_ROAD_TUNNEL, STR_BUILD_TRAMWAY_TUNNEL}, // RTW_BUILD_TUNNEL +{ WWT_IMGBTN, RESIZE_NONE, 7, 219, 240, 14, 35, SPR_IMG_REMOVE, STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS}, // RTW_REMOVE { WIDGETS_END}, }; @@ -738,12 +738,12 @@ static const Widget _build_road_depot_widgets[] = { /** Widget definition of the build tram depot window */ static const Widget _build_tram_depot_widgets[] = { { WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // BRDW_CLOSEBOX -{ WWT_CAPTION, RESIZE_NONE, 7, 11, 139, 0, 13, STR_1806_TRAM_DEPOT_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS}, // BRDW_CAPTION +{ WWT_CAPTION, RESIZE_NONE, 7, 11, 139, 0, 13, STR_TRAM_DEPOT_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS}, // BRDW_CAPTION { WWT_PANEL, RESIZE_NONE, 7, 0, 139, 14, 121, 0x0, STR_NULL}, // BRDW_BACKGROUND -{ WWT_PANEL, RESIZE_NONE, 14, 71, 136, 17, 66, 0x0, STR_1813_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_NE -{ WWT_PANEL, RESIZE_NONE, 14, 71, 136, 69, 118, 0x0, STR_1813_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_SE -{ WWT_PANEL, RESIZE_NONE, 14, 3, 68, 69, 118, 0x0, STR_1813_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_SW -{ WWT_PANEL, RESIZE_NONE, 14, 3, 68, 17, 66, 0x0, STR_1813_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_NW +{ WWT_PANEL, RESIZE_NONE, 14, 71, 136, 17, 66, 0x0, STR_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_NE +{ WWT_PANEL, RESIZE_NONE, 14, 71, 136, 69, 118, 0x0, STR_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_SE +{ WWT_PANEL, RESIZE_NONE, 14, 3, 68, 69, 118, 0x0, STR_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_SW +{ WWT_PANEL, RESIZE_NONE, 14, 3, 68, 17, 66, 0x0, STR_SELECT_TRAM_VEHICLE_DEPOT}, // BRDW_DEPOT_NW { WIDGETS_END}, }; diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index ead635e48..45216f88c 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -925,7 +925,7 @@ static void RoadVehArrivesAt(const Vehicle* v, Station* st) SetDParam(0, st->index); flags = (v->owner == _local_player) ? NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ARRIVAL_PLAYER, 0) : NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ARRIVAL_OTHER, 0); AddNewsItem( - v->u.road.roadtype == ROADTYPE_ROAD ? STR_902F_CITIZENS_CELEBRATE_FIRST : STR_902F_CITIZENS_CELEBRATE_FIRST_TRAM, + v->u.road.roadtype == ROADTYPE_ROAD ? STR_902F_CITIZENS_CELEBRATE_FIRST : STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM, flags, v->index, 0); @@ -939,7 +939,7 @@ static void RoadVehArrivesAt(const Vehicle* v, Station* st) SetDParam(0, st->index); flags = (v->owner == _local_player) ? NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ARRIVAL_PLAYER, 0) : NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ARRIVAL_OTHER, 0); AddNewsItem( - v->u.road.roadtype == ROADTYPE_ROAD ? STR_9030_CITIZENS_CELEBRATE_FIRST : STR_9030_CITIZENS_CELEBRATE_FIRST_TRAM, + v->u.road.roadtype == ROADTYPE_ROAD ? STR_9030_CITIZENS_CELEBRATE_FIRST : STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM, flags, v->index, 0 diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 63749de30..1c75e51f7 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -400,7 +400,7 @@ static const GameSettingData _game_setting_info[] = { { 0, 7, 1, STR_NULL}, { 0, 3, 1, STR_6830_IMMEDIATE}, { 0, 3, 1, STR_NUM_VERY_LOW}, - { 0, 4, 1, STR_26816_NONE}, + { 0, 4, 1, STR_NONE}, {100, 500, 50, STR_NULL}, { 2, 4, 1, STR_NULL}, { 0, 2, 1, STR_6820_LOW}, @@ -414,7 +414,7 @@ static const GameSettingData _game_setting_info[] = { { 0, 1, 1, STR_682E_STEADY}, { 0, 1, 1, STR_6834_AT_END_OF_LINE_AND_AT_STATIONS}, { 0, 1, 1, STR_6836_OFF}, - { 0, 2, 1, STR_6839_PERMISSIVE}, + { 0, 2, 1, STR_PERMISSIVE}, }; /* diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index a31a3d053..2f48fc850 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -798,14 +798,14 @@ static bool CanExpandRailroadStation(const Station* st, uint* fin, Axis axis) * the uniform-stations code wouldn't handle it well */ BEGIN_TILE_LOOP(t, st->trainst_w, st->trainst_h, st->train_tile) if (!st->TileBelongsToRailStation(t)) { // there may be adjoined station - _error_message = STR_306D_NONUNIFORM_STATIONS_DISALLOWED; + _error_message = STR_NONUNIFORM_STATIONS_DISALLOWED; return false; } END_TILE_LOOP(t, st->trainst_w, st->trainst_h, st->train_tile) /* check so the orientation is the same */ if (GetRailStationAxis(st->train_tile) != axis) { - _error_message = STR_306D_NONUNIFORM_STATIONS_DISALLOWED; + _error_message = STR_NONUNIFORM_STATIONS_DISALLOWED; return false; } @@ -825,7 +825,7 @@ static bool CanExpandRailroadStation(const Station* st, uint* fin, Axis axis) tile -= TileDiffXY(curw, 0); curw += w; } else { - _error_message = STR_306D_NONUNIFORM_STATIONS_DISALLOWED; + _error_message = STR_NONUNIFORM_STATIONS_DISALLOWED; return false; } } @@ -1196,7 +1196,7 @@ CommandCost CmdRemoveFromRailroadStation(TileIndex tile, uint32 flags, uint32 p1 /* Do not allow removing from stations if non-uniform stations are not enabled * The check must be here to give correct error message */ - if (!_patches.nonuniform_stations) return_cmd_error(STR_306D_NONUNIFORM_STATIONS_DISALLOWED); + if (!_patches.nonuniform_stations) return_cmd_error(STR_NONUNIFORM_STATIONS_DISALLOWED); /* If we reached here, the tile is valid so increase the quantity of tiles we will remove */ quantity++; @@ -1393,7 +1393,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) /* give us a road stop in the list, and check if something went wrong */ RoadStop *road_stop = new RoadStop(tile); if (road_stop == NULL) { - return_cmd_error(type ? STR_3008B_TOO_MANY_TRUCK_STOPS : STR_3008A_TOO_MANY_BUS_STOPS); + return_cmd_error(type ? STR_TOO_MANY_TRUCK_STOPS : STR_TOO_MANY_BUS_STOPS); } /* ensure that in case of error (or no DC_EXEC) the new road stop gets deleted upon return */ @@ -1401,7 +1401,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (st != NULL && GetNumRoadStopsInStation(st, RoadStop::BUS) + GetNumRoadStopsInStation(st, RoadStop::TRUCK) >= RoadStop::LIMIT) { - return_cmd_error(type ? STR_3008B_TOO_MANY_TRUCK_STOPS : STR_3008A_TOO_MANY_BUS_STOPS); + return_cmd_error(type ? STR_TOO_MANY_TRUCK_STOPS : STR_TOO_MANY_BUS_STOPS); } /* In case of new station if DC_EXEC is NOT set we still need to create the station @@ -2903,8 +2903,8 @@ static CommandCost ClearTile_Station(TileIndex tile, byte flags) switch (GetStationType(tile)) { case STATION_RAIL: return_cmd_error(STR_300B_MUST_DEMOLISH_RAILROAD); case STATION_AIRPORT: return_cmd_error(STR_300E_MUST_DEMOLISH_AIRPORT_FIRST); - case STATION_TRUCK: return_cmd_error(HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) ? STR_3047_MUST_DEMOLISH_CARGO_TRAM_STATION : STR_3047_MUST_DEMOLISH_TRUCK_STATION); - case STATION_BUS: return_cmd_error(HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) ? STR_3046_MUST_DEMOLISH_PASSENGER_TRAM_STATION : STR_3046_MUST_DEMOLISH_BUS_STATION); + case STATION_TRUCK: return_cmd_error(HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) ? STR_MUST_DEMOLISH_CARGO_TRAM_STATION : STR_3047_MUST_DEMOLISH_TRUCK_STATION); + case STATION_BUS: return_cmd_error(HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) ? STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION : STR_3046_MUST_DEMOLISH_BUS_STATION); case STATION_BUOY: return_cmd_error(STR_306A_BUOY_IN_THE_WAY); case STATION_DOCK: return_cmd_error(STR_304D_MUST_DEMOLISH_DOCK_FIRST); case STATION_OILRIG: diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp index 29fc03316..ca49b9673 100644 --- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -104,7 +104,7 @@ static void DrawTimetableWindow(Window *w) break; case OT_GOTO_STATION: - SetDParam(0, (order->flags & OFB_NON_STOP) ? STR_880C_GO_NON_STOP_TO : STR_8806_GO_TO); + SetDParam(0, (order->flags & OFB_NON_STOP) ? STR_880A_GO_NON_STOP_TO : STR_8806_GO_TO); SetDParam(1, order->dest); if (order->wait_time > 0) { @@ -125,7 +125,7 @@ static void DrawTimetableWindow(Window *w) switch (v->type) { case VEH_TRAIN: string = (order->flags & OFB_NON_STOP) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break; - case VEH_ROAD: string = STR_9038_GO_TO_ROADVEH_DEPOT; break; + case VEH_ROAD: string = STR_GO_TO_ROADVEH_DEPOT; break; case VEH_SHIP: string = STR_GO_TO_SHIP_DEPOT; break; default: break; } diff --git a/src/train_gui.cpp b/src/train_gui.cpp index 83407ddce..a32f0a6fd 100644 --- a/src/train_gui.cpp +++ b/src/train_gui.cpp @@ -241,7 +241,7 @@ void DrawTrainDetails(const Vehicle *v, int x, int y, int vscroll_pos, uint16 vs } /* draw total cargo tab */ - DrawString(x, y + 2, STR_013F_TOTAL_CAPACITY_TEXT, TC_FROMSTRING); + DrawString(x, y + 2, STR_TOTAL_CAPACITY_TEXT, TC_FROMSTRING); for (CargoID i = 0; i < NUM_CARGO; i++) { if (max_cargo[i] > 0 && --vscroll_pos < 0 && vscroll_pos > -vscroll_cap) { y += 14; @@ -250,7 +250,7 @@ void DrawTrainDetails(const Vehicle *v, int x, int y, int vscroll_pos, uint16 vs SetDParam(2, i); // {SHORTCARGO} #1 SetDParam(3, max_cargo[i]); // {SHORTCARGO} #2 SetDParam(4, _patches.freight_trains); - DrawString(x, y + 2, FreightWagonMult(i) > 1 ? STR_TOTAL_CAPACITY_MULT : STR_013F_TOTAL_CAPACITY, TC_FROMSTRING); + DrawString(x, y + 2, FreightWagonMult(i) > 1 ? STR_TOTAL_CAPACITY_MULT : STR_TOTAL_CAPACITY, TC_FROMSTRING); } } SetDParam(0, v->cargo.FeederShare()); diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index eff8bfa34..ca7672b6e 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -1308,7 +1308,7 @@ static const Widget _vehicle_details_widgets[] = { { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 95, 113, 124, STR_013C_CARGO, STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED}, // VLD_WIDGET_DETAILS_CARGO_CARRIED { WWT_PUSHTXTBTN, RESIZE_TB, 14, 96, 194, 113, 124, STR_013D_INFORMATION, STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES},// VLD_WIDGET_DETAILS_TRAIN_VEHICLES { WWT_PUSHTXTBTN, RESIZE_TB, 14, 195, 293, 113, 124, STR_013E_CAPACITIES, STR_8851_SHOW_CAPACITIES_OF_EACH}, // VLD_WIDGET_DETAILS_CAPACITY_OF_EACH - { WWT_PUSHTXTBTN, RESIZE_RTB, 14, 294, 392, 113, 124, STR_013E_TOTAL_CARGO, STR_8852_SHOW_TOTAL_CARGO}, // VLD_WIDGET_DETAILS_TOTAL_CARGO + { WWT_PUSHTXTBTN, RESIZE_RTB, 14, 294, 392, 113, 124, STR_TOTAL_CARGO, STR_SHOW_TOTAL_CARGO}, // VLD_WIDGET_DETAILS_TOTAL_CARGO { WWT_RESIZEBOX, RESIZE_LRTB, 14, 393, 404, 113, 124, 0x0, STR_RESIZE_BUTTON}, // VLD_RESIZE { WIDGETS_END}, }; |