Commit Graph

1659 Commits (b7118b60fef80a9035958b565a8d9957620ca98b)

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 c80608a83c Update: Translations from eints
spanish: 3 changes by SilverSurferZzZ
spanish (mexican): 3 changes by Absay
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 0e7519f33e Merge branch 'more_cond_orders-sx' into jgrpp
# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
6 years ago
translators 49ab02c084 Update: Translations from eints
spanish: 4 changes by SilverSurferZzZ
6 years ago
Jonathan G Rennison 7da1f8b592 Merge branch 'master' into jgrpp 6 years ago
translators 2ab4b5dd03 Update: Translations from eints
spanish: 3 changes by SilverSurferZzZ
6 years ago
translators 2978388153 Update: Translations from eints
spanish: 5 changes by SilverSurferZzZ
spanish (mexican): 23 changes by Absay
6 years ago
translators 863b80e880 Update: Translations from eints
spanish: 6 changes by SilverSurferZzZ
6 years ago
Jonathan G Rennison 2003a86932 Merge remote-tracking branch 'origin/master' into jgrpp
# Conflicts:
#	src/string.cpp
6 years ago
translators 68b5b11b7c Update: Translations from eints
spanish: 4 changes by SilverSurferZzZ
6 years ago
translators c63f0b3005 Update: Translations from eints
chinese (simplified): 28 changes by ww9980
spanish: 12 changes by SilverSurferZzZ
6 years ago
translators cd44e33f4e Update: Translations from eints
spanish: 4 changes by SilverSurferZzZ
portuguese: 2 changes by Samu
6 years ago
translators 587c2149b6 Update: Translations from eints
croatian: 23 changes by VoyagerOne
spanish: 8 changes by SilverSurferZzZ
6 years ago
translators 88894166e8 Update: Translations from eints
italian: 23 changes by lorenzodv
spanish: 2 changes by SilverSurferZzZ
6 years ago
translators eab3aa16aa Update: Translations from eints
spanish: 3 changes by SilverSurferZzZ
6 years ago
Jonathan G Rennison b1190b32b0 Merge branch 'master' into jgrpp 6 years ago
translators af4a21bd82 Update: Translations from eints
korean: 4 changes by telk5093
spanish: 3 changes by SilverSurferZzZ
russian: 8 changes by Lone_Wolf
6 years ago
Jonathan G Rennison f3c52f1b6c Merge branch 'master' into jgrpp 6 years ago
translators 16a36dffa0 Update: Translations from eints
spanish: 2 changes by SilverSurferZzZ
6 years ago
Jonathan G Rennison c1df63a2eb Merge branch 'master' into jgrpp
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/viewport.cpp
6 years ago
translators 71cda6ca1d Update: Translations from eints
spanish: 10 changes by SilverSurferZzZ
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
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
7 years ago
Niels Martin Hansen 683b46a5b5 Cleanup: Remove unused strings from language files 7 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) 7 years ago
Jonathan G Rennison 385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 7 years ago
frosch 91464af737 (svn r27980) -Doc: Yearly increment 7 years ago
frosch b1592787eb (svn r27980) -Doc: Yearly increment 7 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 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 52dadc9252 Merge branch 'master' into jgrpp 7 years ago
translators bf3fd277c1 (svn r27891) -Update from Eints:
spanish: 29 changes by SilverSurferZzZ
7 years ago
translators ccf7580eb8 (svn r27891) -Update from Eints:
spanish: 29 changes by SilverSurferZzZ
7 years ago
translators de2ef2b543 (svn r27890) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
7 years ago
translators 8220a8a971 (svn r27890) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
7 years ago
Jonathan G Rennison 21696cc126 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	src/lang/german.txt
7 years ago
translators 8b1bf56b29 (svn r27873) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
7 years ago
translators 7174f04322 (svn r27873) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
7 years ago
translators 092ede70fd (svn r27871) -Update from Eints:
korean: 2 changes by telk5093
spanish: 2 changes by SilverSurferZzZ
german: 6 changes by mini1025
7 years ago
translators 43a917420b (svn r27871) -Update from Eints:
korean: 2 changes by telk5093
spanish: 2 changes by SilverSurferZzZ
german: 6 changes by mini1025
7 years ago
Jonathan G Rennison 40b89902a5 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/galician.txt
8 years ago
translators 5d80417591 (svn r27869) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
hungarian: 6 changes by Brumi
8 years ago
translators 8dfa9bddd7 (svn r27869) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
hungarian: 6 changes by Brumi
8 years ago
translators 497aca8175 (svn r27868) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
8 years ago
translators 661ad02c95 (svn r27868) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
8 years ago
translators 0f89d95459 (svn r27855) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
8 years ago
translators 62eb2f1739 (svn r27855) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
8 years ago
translators 747a950920 (svn r27854) -Update from Eints:
spanish: 30 changes by SilverSurferZzZ
czech: 18 changes by djst
8 years ago
translators 8b031f6c89 (svn r27854) -Update from Eints:
spanish: 30 changes by SilverSurferZzZ
czech: 18 changes by djst
8 years ago
translators 3e772b0732 (svn r27853) -Update from Eints:
spanish: 1 change by juanjo
8 years ago
translators aa241d073a (svn r27853) -Update from Eints:
spanish: 1 change by juanjo
8 years ago
Jonathan G Rennison d1a287d73c Merge branch 'save_ext' into jgrpp 8 years ago
translators 6192780721 (svn r27852) -Update from Eints:
catalan: 31 changes by juanjo
spanish: 5 changes by SilverSurferZzZ
8 years ago
translators 60ec55b483 (svn r27852) -Update from Eints:
catalan: 31 changes by juanjo
spanish: 5 changes by SilverSurferZzZ
8 years ago
Jonathan G Rennison ca93c90b56 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
8 years ago
translators 3b6fa4e33f (svn r27848) -Update from Eints:
korean: 43 changes by telk5093
spanish: 6 changes by SilverSurferZzZ
8 years ago
translators 1644ef5f2d (svn r27848) -Update from Eints:
korean: 43 changes by telk5093
spanish: 6 changes by SilverSurferZzZ
8 years ago
Jonathan G Rennison 80d56307c7 Merge branch 'master' into jgrpp
# Conflicts:
#	src/group_gui.cpp
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/vehicle_sl.cpp
#	src/window.cpp
8 years ago
translators e37d54fb08 (svn r27842) -Update from Eints:
spanish: 9 changes by SilverSurferZzZ
8 years ago
translators 9a7fa689a1 (svn r27842) -Update from Eints:
spanish: 9 changes by SilverSurferZzZ
8 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
8 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
8 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
8 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
8 years ago
alberth 17b46109ad (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 8 years ago
alberth 49c0facf2e (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 8 years ago
alberth 119965125d (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 8 years ago
alberth 2f1d808781 (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 8 years ago
alberth 7c3004c785 (svn r27798) -Change: Also remove obsolete string from the other languages 8 years ago
alberth 85ed4975bf (svn r27798) -Change: Also remove obsolete string from the other languages 8 years ago
Jonathan G Rennison ac69b746ab Merge branch 'master' into jgrpp
# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp
8 years ago
frosch bc61ff380a (svn r27777) -Doc: Yearly increment 8 years ago
frosch 15032bd765 (svn r27777) -Doc: Yearly increment 8 years ago
Jonathan G Rennison 54494a0a7c Merge branch 'send_money_company' into jgrpp 8 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
8 years ago
translators d5c6760c85 (svn r27753) -Update from Eints: 8 years ago
translators b264dd2a8d (svn r27753) -Update from Eints: 8 years ago
alberth fa81e20390 (svn r27752) -Cleanup: Remove obsolete strings from other languages as well. 8 years ago
alberth 07254a238d (svn r27752) -Cleanup: Remove obsolete strings from other languages as well. 8 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
translators 151956d471 (svn r27717) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
8 years ago
translators de23dd0a1e (svn r27717) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
8 years ago
translators db6e65f4f3 (svn r27715) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
8 years ago
translators a4fdb3ecce (svn r27715) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
8 years ago
translators 2507487877 (svn r27704) -Update from Eints:
welsh: 29 changes by kazzie
spanish: 2 changes by SilverSurferZzZ
russian: 13 changes by Lone_Wolf
8 years ago
translators 9cba45bf18 (svn r27704) -Update from Eints:
welsh: 29 changes by kazzie
spanish: 2 changes by SilverSurferZzZ
russian: 13 changes by Lone_Wolf
8 years ago
translators 2171a56c15 (svn r27698) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
russian: 3 changes by Lone_Wolf
8 years ago
translators 63c8f8c6c4 (svn r27698) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
russian: 3 changes by Lone_Wolf
8 years ago
translators 37b6bd5702 (svn r27697) -Update from Eints:
urdu: 9 changes by siphr
spanish: 3 changes by SilverSurferZzZ
8 years ago