diff options
Diffstat (limited to 'openttd-git/signaltunnel.patch')
| -rw-r--r-- | openttd-git/signaltunnel.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/openttd-git/signaltunnel.patch b/openttd-git/signaltunnel.patch index fb178a567..376ee0341 100644 --- a/openttd-git/signaltunnel.patch +++ b/openttd-git/signaltunnel.patch @@ -1,8 +1,8 @@ diff --git a/src/lang/english.txt b/src/lang/english.txt -index 2e84d4b3a..187cd23ff 100644 +index 44d226cbf..bcccdbdd4 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt -@@ -1616,6 +1616,8 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimum company +@@ -1622,6 +1622,8 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimum company STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT :Set the minimum age of a company for others to be able to buy and sell shares from them. STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE :Percentage of leg profit to pay in feeder systems: {STRING2} STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT :Percentage of income given to the intermediate legs in feeder systems, giving more control over the income @@ -11,7 +11,7 @@ index 2e84d4b3a..187cd23ff 100644 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY :When dragging, place signals every: {STRING2} STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_HELPTEXT :Set the distance at which signals will be built on a track up to the next obstacle (signal, junction), if signals are dragged STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_VALUE :{COMMA} tile{P 0 "" s} -@@ -2790,8 +2792,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Ship depot +@@ -2811,8 +2813,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Ship depot # Industries come directly from their industry names STR_LAI_TUNNEL_DESCRIPTION_RAILROAD :Railway tunnel @@ -23,10 +23,10 @@ index 2e84d4b3a..187cd23ff 100644 STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEEL :Steel girder rail bridge STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL :Steel cantilever rail bridge diff --git a/src/lang/russian.txt b/src/lang/russian.txt -index fa367b113..94c5b1076 100644 +index 64a4abe5a..77dce0201 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt -@@ -1767,6 +1767,8 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Мин. воз +@@ -1768,6 +1768,8 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Мин. воз STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT :Минимальный возраст, которого должна достичь компания для начала выпуска акций, которыми смогут торговать другие игроки. STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE :Процент дохода, начисляемый при частичной перевозке: {STRING} STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT :Процент прибыли, начисляемый транспорту за частичную перевозку груза. @@ -35,7 +35,7 @@ index fa367b113..94c5b1076 100644 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY :При перетаскивании ставить сигналы каждые: {STRING} STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_HELPTEXT :Настройка периодичности расстановки сигналов методом перетаскивания. Сигналы будут устанавливаться до первого встреченного препятствия (пересечения или другого сигнала). STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_VALUE :{COMMA} клет{P ку ки ок} -@@ -2953,8 +2955,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Верфь +@@ -2974,8 +2976,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Верфь # Industries come directly from their industry names STR_LAI_TUNNEL_DESCRIPTION_RAILROAD :Железнодорожный туннель @@ -260,7 +260,7 @@ index 59c1d27ab..ee7d0423d 100644 /** diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp -index a63448aef..3cf10dfd2 100644 +index 04deb93eb..af3276608 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1622,6 +1622,7 @@ static SettingsContainer &GetSettingsTree() @@ -272,10 +272,10 @@ index a63448aef..3cf10dfd2 100644 construction->Add(new SettingEntry("gui.persistent_buildingtools")); construction->Add(new SettingEntry("gui.quick_goto")); diff --git a/src/settings_type.h b/src/settings_type.h -index 3377bdede..9352fffd6 100644 +index ababe718b..92aa95726 100644 --- a/src/settings_type.h +++ b/src/settings_type.h -@@ -335,6 +335,7 @@ struct ConstructionSettings { +@@ -346,6 +346,7 @@ struct ConstructionSettings { bool freeform_edges; ///< allow terraforming the tiles at the map edges uint8 extra_tree_placement; ///< (dis)allow building extra trees in-game uint8 command_pause_level; ///< level/amount of commands that can't be executed while paused |