Mercurial > hg > openttd

changeset 17465:c03b458dd6b0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22219) -Codechange: Unduplicate npf/yapf strings.
author alberth <alberth@openttd.org>
date Sun, 06 Mar 2011 16:00:24 +0000
parents be9208d521da
children 99f6ceeea163
files src/lang/english.txt src/table/settings.ini
diffstat 2 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1340,12 +1340,11 @@
 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
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -653,7 +653,7 @@
 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 @@
 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