summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2011-03-06 15:59:23 +0000
committeralberth <alberth@openttd.org>2011-03-06 15:59:23 +0000
commitc46de7fc7b069c6aa3607cc931002a5c2f814f19 (patch)
treeb3a4fddd0f1aef32db0b87b74f45394232b85837 /src
parentf74e9c5d4989982bfdd7138873d34e9729501b92 (diff)
downloadopenttd-c46de7fc7b069c6aa3607cc931002a5c2f814f19.tar.xz
(svn r22217) -Codechange: Unduplicate horizontal positioning strings.
Diffstat (limited to 'src')
-rw-r--r--src/lang/english.txt10
-rw-r--r--src/table/settings.ini4
2 files changed, 6 insertions, 8 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 26a67b6fe..0a5514bae 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1098,6 +1098,10 @@ STR_CONFIG_SETTING_NONE :None
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_RAINFOREST :only in rain fo
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}
diff --git a/src/table/settings.ini b/src/table/settings.ini
index bc77aff22..3ed5c0973 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2002,7 +2002,7 @@ def = 1
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 @@ def = 1
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]