Commit Graph

379 Commits (e3d167f9f08946636bf76356a0ad2deb94d878c3)

Author SHA1 Message Date
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 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
translators 3014213186 Update: Translations from eints
malay: 11 changes by eidan_shafie
6 years ago
translators 85ef5acf29 Update: Translations from eints
malay: 10 changes by eidan_shafie
spanish (mexican): 9 changes by Absay
6 years ago
translators ae13f88c12 Update: Translations from eints
malay: 9 changes by eidan_shafie
6 years ago
translators 2ed0e30a8f Update: Translations from eints
malay: 37 changes by eidan_shafie
6 years ago
Jonathan G Rennison 8e9d68048a Merge branch 'master' into jgrpp
# Conflicts:
#	src/string.cpp
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
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
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 4fca142bfb (svn r27925) -Update from Eints:
malay: 5 changes by rionix88
7 years ago
translators 2fcb215abb (svn r27925) -Update from Eints:
malay: 5 changes by rionix88
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 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
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
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 49c0facf2e (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 7 years ago
alberth 17b46109ad (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 7 years ago
alberth 2f1d808781 (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 7 years ago
alberth 119965125d (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 7 years ago
alberth 85ed4975bf (svn r27798) -Change: Also remove obsolete string from the other languages 7 years ago
alberth 7c3004c785 (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 15032bd765 (svn r27777) -Doc: Yearly increment 7 years ago
frosch bc61ff380a (svn r27777) -Doc: Yearly increment 7 years ago
translators f21798c1ba (svn r27771) -Update from Eints:
malay: 27 changes by stress_043
7 years ago
translators 4d12cce1c4 (svn r27771) -Update from Eints:
malay: 27 changes by stress_043
7 years ago
Jonathan G Rennison 54494a0a7c Merge branch 'send_money_company' into jgrpp 7 years ago
patch-import f820543391 Import give money to company patch
From: https://www.tt-forums.net/viewtopic.php?p=1183311#p1183311

Fix language files and minor formatting issues
7 years ago
translators b264dd2a8d (svn r27753) -Update from Eints: 7 years ago
translators d5c6760c85 (svn r27753) -Update from Eints: 7 years ago
alberth 07254a238d (svn r27752) -Cleanup: Remove obsolete strings from other languages as well. 7 years ago
alberth fa81e20390 (svn r27752) -Cleanup: Remove obsolete strings from other languages as well. 7 years ago
frosch 050271ed2d (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 8 years ago
frosch 7b553d255e (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 8 years ago
frosch f294258b18 (svn r27685) -Change: Preemptively invalidate translation changes of next commit for eints. 8 years ago
frosch acc817b3f5 (svn r27685) -Change: Preemptively invalidate translation changes of next commit for eints. 8 years ago
frosch da76191afc (svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default. 8 years ago