From d3569f917d64cc5dfbc849baf87cd14d1d8fa693 Mon Sep 17 00:00:00 2001 From: alberth Date: Sun, 6 Mar 2011 16:00:24 +0000 Subject: (svn r22219) -Codechange: Unduplicate npf/yapf strings. --- src/lang/english.txt | 7 +++---- src/table/settings.ini | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 0a5514bae..d48758081 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1340,12 +1340,11 @@ STR_CONFIG_SETTING_VEHICLES_TRAINS :{ORANGE}Trains STR_CONFIG_SETTING_ECONOMY_TOWNS :{ORANGE}Towns STR_CONFIG_SETTING_ECONOMY_INDUSTRIES :{ORANGE}Industries +STR_CONFIG_SETTING_PATHFINDER_NPF :NPF +STR_CONFIG_SETTING_PATHFINDER_YAPF_RECOMMENDED :YAPF {BLUE}(Recommended) + STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :{LTBLUE}Pathfinder for trains: {ORANGE}{STRING1} -STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF :NPF -STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF :YAPF {BLUE}(Recommended) STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES :{LTBLUE}Pathfinder for road vehicles: {ORANGE}{STRING1} -STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_NPF :NPF -STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_YAPF :YAPF {BLUE}(Recommended) STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS :{LTBLUE}Pathfinder for ships: {ORANGE}{STRING1} STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_OPF :Original {BLUE}(Recommended) STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_NPF :NPF diff --git a/src/table/settings.ini b/src/table/settings.ini index 3ed5c0973..7d7c6ee3e 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -653,7 +653,7 @@ min = 1 max = 2 interval = 1 str = STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS -strval = STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF +strval = STR_CONFIG_SETTING_PATHFINDER_NPF [SDT_VAR] base = GameSettings @@ -666,7 +666,7 @@ min = 1 max = 2 interval = 1 str = STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES -strval = STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_NPF +strval = STR_CONFIG_SETTING_PATHFINDER_NPF [SDT_VAR] base = GameSettings -- cgit v1.2.3-54-g00ecf