Jonathan G Rennison
|
e3d167f9f0
|
Merge branch 'save_ext' into jgrpp
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
|
6 years ago |
translators
|
e34a6c58ea
|
Update: Translations from eints
italian: 1 change by lorenzodv
french: 29 changes by glx
|
6 years ago |
|
Jonathan G Rennison
|
e735c1a51a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
|
6 years ago |
Oskari Leppäaho
|
b3b89257f7
|
Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION"
|
6 years ago |
|
Jonathan G Rennison
|
28c5453926
|
Merge branch 'master' into jgrpp
|
6 years ago |
|
translators
|
004f54f4c8
|
Update: Translations from eints
hebrew: 23 changes by dnd_man
french: 45 changes by glx
|
6 years ago |
|
Jonathan G Rennison
|
035f5622b9
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_cmds.cpp
# src/landscape.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/openttd.cpp
# src/roadveh_cmd.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/viewport.cpp
# src/window_type.h
|
6 years ago |
|
translators
|
6a6ffddc5f
|
Update: Translations from eints
greek: 46 changes by kyrm
italian: 44 changes by lorenzodv
|
6 years ago |
|
Jonathan G Rennison
|
3330e4cef8
|
Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
|
6 years ago |
|
Jonathan G Rennison
|
4d1bd8e4b4
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
|
6 years ago |
|
translators
|
7eca4a9b47
|
Update: Translations from eints
french: 5 changes by glx
|
6 years ago |
|
translators
|
889175f7ad
|
Update: Translations from eints
croatian: 1 change by VoyagerOne
italian: 1 change by lorenzodv
french: 1 change by glx
|
6 years ago |
|
translators
|
470ed2643e
|
Update: Translations from eints
croatian: 4 changes by VoyagerOne
french: 3 changes by glx
polish: 2 changes by McZapkie
|
6 years ago |
|
Jonathan G Rennison
|
8e9d68048a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/string.cpp
|
6 years ago |
|
translators
|
2b662b448c
|
Update: Translations from eints
french: 1 change by glx
|
6 years ago |
PeterN
|
eaa32f5ad5
|
Change: Use name of cargo instead of Passengers/Mail in town statistics. (#6801)
* Change: Use name of cargo instead of Passengers/Mail in town statistics.
* Cleanup: Remove strings from all language files.
|
6 years ago |
|
Jonathan G Rennison
|
ad1c402ad8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
|
6 years ago |
|
translators
|
3f40cd505d
|
Update: Translations from eints
croatian: 10 changes by VoyagerOne
italian: 4 changes by lorenzodv
french: 7 changes by glx
|
6 years ago |
|
translators
|
a806424ec1
|
Update: Translations from eints
italian: 6 changes by lorenzodv
french: 6 changes by glx
russian: 9 changes by Lone_Wolf
|
6 years ago |
Niels Martin Hansen
|
683b46a5b5
|
Cleanup: Remove unused strings from language files
|
6 years ago |
|
PeterN
|
cfe6a8ea4f
|
Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. (#6756)
|
6 years ago |
|
Jonathan G Rennison
|
385a2552e9
|
Merge branch 'enhanced_viewport_overlay' into jgrpp
|
6 years ago |
frosch
|
91464af737
|
(svn r27980) -Doc: Yearly increment
|
6 years ago |
|
frosch
|
b1592787eb
|
(svn r27980) -Doc: Yearly increment
|
6 years ago |
|
Jonathan G Rennison
|
4a0d949d83
|
Merge branch 'master' into jgrpp
|
7 years ago |
|
translators
|
d7ef54268d
|
(svn r27955) -Update from Eints:
french: 2 changes by glx
|
7 years ago |
|
translators
|
bfd9e30c30
|
(svn r27955) -Update from Eints:
french: 2 changes by glx
|
7 years ago |
|
frosch
|
1bc6fdef31
|
(svn r27953) -Cleanup: Adjust other languages for r27952
|
7 years ago |
|
frosch
|
b394dd8468
|
(svn r27953) -Cleanup: Adjust other languages for r27952
|
7 years ago |
|
Jonathan G Rennison
|
71c133e203
|
Merge branch 'master' into jgrpp
|
7 years ago |
|
translators
|
146e4eddb6
|
(svn r27927) -Update from Eints:
french: 6 changes by glx
|
7 years ago |
|
translators
|
461b43e649
|
(svn r27927) -Update from Eints:
french: 6 changes by glx
|
7 years ago |
|
Jonathan G Rennison
|
f77a368268
|
Merge branch 'crashlog_improvements' into jgrpp
|
7 years ago |
alberth
|
a3f30a30df
|
(svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01)
|
7 years ago |
|
alberth
|
2eae80bbfe
|
(svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01)
|
7 years ago |
|
Jonathan G Rennison
|
8317eac918
|
Merge branch 'save_ext' into jgrpp
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/window.cpp
|
7 years ago |
|
translators
|
6ceb8a0d28
|
(svn r27824) -Update from Eints:
catalan: 7 changes by juanjo
croatian: 4 changes by VoyagerOne
korean: 15 changes by telk5093
scottish gaelic: 54 changes by GunChleoc
|
7 years ago |
|
translators
|
2385f4adbc
|
(svn r27824) -Update from Eints:
catalan: 7 changes by juanjo
croatian: 4 changes by VoyagerOne
korean: 15 changes by telk5093
scottish gaelic: 54 changes by GunChleoc
|
7 years ago |
|
Jonathan G Rennison
|
fc60857b66
|
Merge branches 'adjacent_crossings' and 'zoning' into jgrpp
|
7 years ago |
|
translators
|
bf30576255
|
(svn r27804) -Update from Eints:
italian: 7 changes by lorenzodv
luxembourgish: 11 changes by Phreeze
french: 7 changes by glx
|
7 years ago |
|
translators
|
8c49f7b98a
|
(svn r27804) -Update from Eints:
italian: 7 changes by lorenzodv
luxembourgish: 11 changes by Phreeze
french: 7 changes by glx
|
7 years ago |
|
Jonathan G Rennison
|
b3fd11efd2
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse4.cpp
|
7 years ago |
|
alberth
|
17b46109ad
|
(svn r27803) -Change: Remove obsolete aircraft preview strings from other languages
|
7 years ago |
|
alberth
|
49c0facf2e
|
(svn r27803) -Change: Remove obsolete aircraft preview strings from other languages
|
7 years ago |
|
alberth
|
119965125d
|
(svn r27801) -Change: Also rename long aircraft preview window strings of other languages
|
7 years ago |
|
alberth
|
2f1d808781
|
(svn r27801) -Change: Also rename long aircraft preview window strings of other languages
|
7 years ago |
|
alberth
|
7c3004c785
|
(svn r27798) -Change: Also remove obsolete string from the other languages
|
7 years ago |
|
alberth
|
85ed4975bf
|
(svn r27798) -Change: Also remove obsolete string from the other languages
|
7 years ago |
|
Jonathan G Rennison
|
ac69b746ab
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/gfxinit.cpp
# src/saveload/saveload.cpp
|
7 years ago |
|
frosch
|
bc61ff380a
|
(svn r27777) -Doc: Yearly increment
|
7 years ago |