changeset 17463:8bec7ec6fde3 draft

(svn r22217) -Codechange: Unduplicate horizontal positioning strings.
author alberth <alberth@openttd.org>
date Sun, 06 Mar 2011 15:59:23 +0000
parents f8061e9d4122
children be9208d521da
files src/lang/english.txt src/table/settings.ini
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1098,6 +1098,10 @@
 STR_CONFIG_SETTING_ORIGINAL                                     :Original
 STR_CONFIG_SETTING_REALISTIC                                    :Realistic
 
+STR_CONFIG_SETTING_HORIZONTAL_POS_LEFT                          :Left
+STR_CONFIG_SETTING_HORIZONTAL_POS_CENTER                        :Centre
+STR_CONFIG_SETTING_HORIZONTAL_POS_RIGHT                         :Right
+
 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}
@@ -1302,13 +1306,7 @@
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :everywhere
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :{LTBLUE}Position of main toolbar: {ORANGE}{STRING1}
-STR_CONFIG_SETTING_TOOLBAR_POS_LEFT                             :Left
-STR_CONFIG_SETTING_TOOLBAR_POS_CENTER                           :Centre
-STR_CONFIG_SETTING_TOOLBAR_POS_RIGHT                            :Right
 STR_CONFIG_SETTING_STATUSBAR_POS                                :{LTBLUE}Position of statusbar: {ORANGE}{STRING1}
-STR_CONFIG_SETTING_STATUSBAR_POS_LEFT                           :Left
-STR_CONFIG_SETTING_STATUSBAR_POS_CENTER                         :Centre
-STR_CONFIG_SETTING_STATUSBAR_POS_RIGHT                          :Right
 STR_CONFIG_SETTING_SNAP_RADIUS                                  :{LTBLUE}Window snap radius: {ORANGE}{STRING1} pixel{P 0:1 "" s}
 STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED                         :{LTBLUE}Window snap radius: {ORANGE}disabled
 STR_CONFIG_SETTING_SOFT_LIMIT                                   :{LTBLUE}Maximum number of non-sticky windows: {ORANGE}{STRING1}
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2002,7 +2002,7 @@
 min      = 0
 max      = 2
 str      = STR_CONFIG_SETTING_TOOLBAR_POS
-strval   = STR_CONFIG_SETTING_TOOLBAR_POS_LEFT
+strval   = STR_CONFIG_SETTING_HORIZONTAL_POS_LEFT
 proc     = v_PositionMainToolbar
 
 [SDTC_VAR]
@@ -2014,7 +2014,7 @@
 min      = 0
 max      = 2
 str      = STR_CONFIG_SETTING_STATUSBAR_POS
-strval   = STR_CONFIG_SETTING_STATUSBAR_POS_LEFT
+strval   = STR_CONFIG_SETTING_HORIZONTAL_POS_LEFT
 proc     = v_PositionStatusbar
 
 [SDTC_VAR]