From 3d6246ba9e2eecd84923e03a8c7ae7200339ddf0 Mon Sep 17 00:00:00 2001 From: alberth Date: Sun, 6 Mar 2011 15:56:12 +0000 Subject: (svn r22213) -Codechange: Unduplicate company on/off strings. --- src/lang/english.txt | 11 +++++------ src/table/settings.ini | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index d980f10d0..532aa00c6 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1089,6 +1089,11 @@ STR_CONFIG_SETTING_CAPTION :{WHITE}Advanced STR_CONFIG_SETTING_OFF :Off STR_CONFIG_SETTING_ON :On STR_CONFIG_SETTING_DISABLED :disabled + +STR_CONFIG_SETTING_COMPANIES_OFF :Off +STR_CONFIG_SETTING_COMPANIES_OWN :Own company +STR_CONFIG_SETTING_COMPANIES_ALL :All companies + STR_CONFIG_SETTING_BUILDONSLOPES :{LTBLUE}Allow building on slopes and coasts: {ORANGE}{STRING1} STR_CONFIG_SETTING_AUTOSLOPE :{LTBLUE}Allow landscaping under buildings, tracks, etc. (autoslope): {ORANGE}{STRING1} STR_CONFIG_SETTING_CATCHMENT :{LTBLUE}Allow more realistically sized catchment areas: {ORANGE}{STRING1} @@ -1224,13 +1229,7 @@ STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION :all non-constru STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING :all but landscape modifying actions STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS :all actions STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS :{LTBLUE}Use the advanced vehicle list: {ORANGE}{STRING1} -STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_OFF :Off -STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_OWN :Own company -STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_ALL :All companies STR_CONFIG_SETTING_LOADING_INDICATORS :{LTBLUE}Use loading indicators: {ORANGE}{STRING1} -STR_CONFIG_SETTING_LOADING_INDICATORS_OFF :Off -STR_CONFIG_SETTING_LOADING_INDICATORS_OWN :Own company -STR_CONFIG_SETTING_LOADING_INDICATORS_ALL :All companies STR_CONFIG_SETTING_TIMETABLE_IN_TICKS :{LTBLUE}Show timetable in ticks rather than days: {ORANGE}{STRING1} STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE :{LTBLUE}Show arrival and departure in timetables: {ORANGE}{STRING1} STR_CONFIG_SETTING_QUICKGOTO :{LTBLUE}Quick creation of vehicle orders: {ORANGE}{STRING1} diff --git a/src/table/settings.ini b/src/table/settings.ini index e70eba3b2..7893520be 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -2117,7 +2117,7 @@ def = 1 min = 0 max = 2 str = STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS -strval = STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_OFF +strval = STR_CONFIG_SETTING_COMPANIES_OFF [SDTC_BOOL] var = gui.timetable_in_ticks @@ -2148,7 +2148,7 @@ def = 1 min = 0 max = 2 str = STR_CONFIG_SETTING_LOADING_INDICATORS -strval = STR_CONFIG_SETTING_LOADING_INDICATORS_OFF +strval = STR_CONFIG_SETTING_COMPANIES_OFF proc = RedrawScreen [SDTC_VAR] -- cgit v1.2.3-54-g00ecf