1654 Commits (38571cf0daea6f9e4ec56f489df0c9a282ef94f4)

Author	SHA1	Message	Date
translators	8bb9c3f646	Update: Translations from eints ... spanish (mexican): 29 changes by absay czech: 11 changes by JustImagine436 korean: 9 changes by telk5093 portuguese: 9 changes by azulcosta hindi: 28 changes by ritwikraghav14	3 years ago
translators	d158eba72c	Update: Translations from eints ... spanish (mexican): 74 changes by absay vietnamese: 62 changes by KhoiCanDev	3 years ago
Jonathan G Rennison	8e27202524	Add strings for velocity unit names	3 years ago
translators	8dd846bad4	Update: Translations from eints ... norwegian (bokmal): 10 changes by Anolitt korean: 9 changes by telk5093 russian: 9 changes by Ln-Wolf finnish: 10 changes by hpiirai spanish: 8 changes by MontyMontana french: 9 changes by glx22	3 years ago
translators	c562b4c527	Update: Translations from eints ... hindi: 67 changes by ritwikraghav14	3 years ago
translators	ea23a9cdb6	Update: Translations from eints ... korean: 1 change by telk5093 dutch: 1 change by Afoklala french: 1 change by MalaGaM	3 years ago
translators	c96945fa2b	Update: Translations from eints ... swedish: 27 changes by joeax910 spanish (mexican): 1 change by absay korean: 4 changes by telk5093 german: 3 changes by Wuzzy2 finnish: 3 changes by hpiirai french: 3 changes by glx22 portuguese: 3 changes by azulcosta	3 years ago
translators	6b24cd2516	Update: Translations from eints ... swedish: 50 changes by joeax910	3 years ago
translators	423a5034ee	Update: Translations from eints ... french: 2 changes by glx22	3 years ago
translators	1a1def99dc	Update: Translations from eints ... norwegian (bokmal): 24 changes by Anolitt russian: 8 changes by Ln-Wolf dutch: 46 changes by Afoklala spanish: 43 changes by MontyMontana french: 44 changes by arikover	3 years ago
Jonathan G Rennison	8eb27e1ac7	Merge branch 'master' into jgrpp ... # Conflicts: # src/company_cmd.cpp # src/lang/japanese.txt # src/network/core/config.h # src/network/core/packet.cpp # src/network/core/tcp.cpp # src/network/network_content.cpp # src/network/network_server.cpp # src/network/network_udp.cpp # src/toolbar_gui.cpp # src/vehicle_gui_base.h	3 years ago
translators	b721787c7f	Update: Translations from eints ... norwegian (bokmal): 4 changes by Anolitt spanish (mexican): 3 changes by absay japanese: 60 changes by scabtert, 38 changes by Azusa257 english (us): 3 changes by 2TallTyler korean: 3 changes by telk5093 russian: 4 changes by Ln-Wolf finnish: 3 changes by hpiirai slovak: 20 changes by FuryPapaya	3 years ago
Jonathan G Rennison	ba418f9d0d	Merge branch 'master' into jgrpp ... # Conflicts: # src/lang/simplified_chinese.txt # src/network/core/tcp_content.cpp # src/network/core/udp.cpp # src/network/network_server.cpp # src/saveload/linkgraph_sl.cpp # src/table/gameopt_settings.ini	3 years ago
translators	fe3cd185d7	Update: Translations from eints	3 years ago
Jonathan G Rennison	253d54ce05	Merge branch 'master' into jgrpp ... # Conflicts: # src/lang/french.txt # src/network/network_udp.cpp	3 years ago
translators	e722ea89f0	Update: Translations from eints ... norwegian (bokmal): 2 changes by Anolitt english (us): 2 changes by 2TallTyler korean: 3 changes by telk5093 german: 2 changes by danidoedel romanian: 35 changes by kneekoo finnish: 2 changes by hpiirai spanish: 4 changes by MontyMontana french: 3 changes by glx22 portuguese: 4 changes by azulcosta	3 years ago
Jonathan G Rennison	272e583478	Merge branch 'master' into jgrpp ... # Conflicts: # src/lang/korean.txt # src/settings.cpp	3 years ago
translators	e5b960eaeb	Update: Translations from eints ... korean: 23 changes by telk5093 romanian: 1 change by kneekoo russian: 1 change by Ln-Wolf french: 1 change by glx22	3 years ago
Jonathan G Rennison	227041008f	Merge branch 'master' into jgrpp ... # Conflicts: # src/debug.cpp # src/lang/russian.txt # src/misc_gui.cpp # src/os/windows/crashlog_win.cpp # src/os/windows/font_win32.cpp # src/os/windows/win32.cpp # src/rail_cmd.cpp # src/window_gui.h	3 years ago
Jonathan G Rennison	edfa04286b	Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/release.yml # bin/CMakeLists.txt # src/dock_gui.cpp # src/lang/brazilian_portuguese.txt # src/lang/catalan.txt # src/lang/czech.txt # src/lang/dutch.txt # src/lang/english.txt # src/lang/english_US.txt # src/lang/estonian.txt # src/lang/finnish.txt # src/lang/french.txt # src/lang/german.txt # src/lang/hungarian.txt # src/lang/indonesian.txt # src/lang/italian.txt # src/lang/japanese.txt # src/lang/korean.txt # src/lang/lithuanian.txt # src/lang/luxembourgish.txt # src/lang/norwegian_bokmal.txt # src/lang/polish.txt # src/lang/portuguese.txt # src/lang/romanian.txt # src/lang/russian.txt # src/lang/serbian.txt # src/lang/simplified_chinese.txt # src/lang/slovak.txt # src/lang/spanish.txt # src/lang/spanish_MX.txt # src/lang/swedish.txt # src/lang/tamil.txt # src/lang/ukrainian.txt # src/lang/vietnamese.txt # src/newgrf.cpp # src/newgrf_gui.cpp # src/object_gui.cpp # src/pathfinder/yapf/yapf_costrail.hpp # src/pathfinder/yapf/yapf_node_rail.hpp # src/rail_cmd.cpp # src/roadveh_cmd.cpp # src/town_cmd.cpp # src/vehicle.cpp # src/water_cmd.cpp	3 years ago
Jonathan G Rennison	f39b6f4ba3	Merge branch 'master' into jgrpp ... # Conflicts: # src/cheat_gui.cpp # src/genworld_gui.cpp # src/landscape.cpp # src/lang/english.txt # src/saveload/afterload.cpp # src/screenshot.cpp # src/settings_gui.cpp # src/settings_internal.h # src/settings_type.h # src/table/settings.ini # src/tile_type.h # src/widgets/genworld_widget.h	3 years ago
translators	2b86d42ddc	Update: Translations from eints ... english (us): 3 changes by 2TallTyler korean: 3 changes by telk5093 russian: 32 changes by Ln-Wolf spanish: 1 change by JohnBoyFan french: 4 changes by arikover portuguese: 10 changes by azulcosta	3 years ago
Jonathan G Rennison	2e6dbfee05	Merge branch 'master' into jgrpp	3 years ago
Jonathan G Rennison	5e14b54a0c	Merge branch 'master' into jgrpp	3 years ago
translators	e23ccc95f5	Update: Translations from eints ... english (us): 7 changes by HAJDog247 czech: 18 changes by PatrikSamuelTauchim luxembourgish: 99 changes by phreeze83 serbian: 4 changes by nkrs catalan: 20 changes by J0anJosep french: 1 change by arikover portuguese: 30 changes by azulcosta	3 years ago
translators	a36b286e04	Update: Translations from eints ... norwegian (bokmal): 28 changes by Anolitt spanish (mexican): 29 changes by absay galician: 1 change by JohnBoyFan vietnamese: 30 changes by KhoiCanDev estonian: 31 changes by siimsoni czech: 6 changes by tomas-vl arabic (egypt): 73 changes by AviationGamerX hungarian: 37 changes by pnpBrumi german: 24 changes by danidoedel, 4 changes by matthiasradde, 2 changes by SecretIdetity russian: 2 changes by SecretIdetity finnish: 40 changes by lanurmi catalan: 47 changes by J0anJosep lithuanian: 30 changes by devbotas spanish: 29 changes by JohnBoyFan french: 30 changes by MalaGaM portuguese (brazilian): 7 changes by jpsl00, 5 changes by Greavez polish: 31 changes by Milek7	3 years ago
translators	76e92f6751	Update: Translations from eints	3 years ago
translators	5c73f93361	Update: Translations from eints ... english (us): 8 changes by 2TallTyler estonian: 16 changes by siimsoni korean: 5 changes by telk5093 italian: 32 changes by AlphaJack german: 5 changes by Wuzzy2 danish: 15 changes by achton lithuanian: 89 changes by devbotas spanish: 3 changes by MontyMontana french: 8 changes by arikover portuguese (brazilian): 3 changes by Greavez polish: 17 changes by yazalo, 2 changes by pAter-exe	3 years ago
translators	217071aa1d	Update: Translations from eints ... norwegian (bokmal): 5 changes by Anolitt estonian: 13 changes by siimsoni korean: 5 changes by telk5093 italian: 1 change by AlphaJack german: 5 changes by danidoedel ukrainian: 15 changes by StepanIvasyn catalan: 5 changes by J0anJosep dutch: 5 changes by Afoklala lithuanian: 82 changes by devbotas spanish: 255 changes by MontyMontana portuguese (brazilian): 5 changes by Greavez	3 years ago
translators	062eeb9810	Update: Translations from eints ... english (us): 7 changes by 2TallTyler estonian: 17 changes by siimsoni hungarian: 100 changes by pnpBrumi ukrainian: 8 changes by StepanIvasyn dutch: 24 changes by Afoklala spanish: 338 changes by MontyMontana french: 29 changes by MalaGaM portuguese (brazilian): 1 change by Greavez	3 years ago
translators	65f558d6df	Update: Translations from eints ... english (us): 18 changes by 2TallTyler korean: 17 changes by telk5093 german: 13 changes by danidoedel, 4 changes by Wuzzy2 finnish: 17 changes by hpiirai catalan: 17 changes by J0anJosep lithuanian: 33 changes by devbotas spanish: 17 changes by MontyMontana portuguese (brazilian): 20 changes by Greavez polish: 9 changes by yazalo	3 years ago
translators	ee69a0dc29	Update: Translations from eints ... lithuanian: 5 changes by devbotas portuguese (brazilian): 8 changes by Greavez	3 years ago
Jonathan G Rennison	d6e2b32132	Merge branch 'master' into jgrpp ... # Conflicts: # src/screenshot.h	3 years ago
translators	879eb9c348	Update: Translations from eints ... estonian: 22 changes by siimsoni korean: 1 change by telk5093 serbian: 41 changes by nkrs german: 1 change by Wuzzy2 romanian: 14 changes by ALEX11BR russian: 5 changes by Ln-Wolf finnish: 5 changes by hpiirai ukrainian: 2 changes by StepanIvasyn lithuanian: 105 changes by devbotas spanish: 3 changes by MontyMontana french: 5 changes by MalaGaM portuguese (brazilian): 13 changes by Greavez	3 years ago
Jonathan G Rennison	f4e29071be	Merge tag '1.11.0-beta2' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # .github/workflows/release.yml # CMakeLists.txt # src/blitter/32bpp_optimized.cpp # src/debug.cpp # src/gfx.cpp # src/gfx_func.h # src/lang/czech.txt # src/lang/english.txt # src/lang/italian.txt # src/lang/swedish.txt # src/lang/ukrainian.txt # src/network/network_server.cpp # src/os/windows/crashlog_win.cpp # src/os/windows/win32.cpp # src/pathfinder/follow_track.hpp # src/screenshot.cpp # src/settings_type.h # src/spritecache.cpp # src/vehicle_gui.cpp # src/video/sdl2_v.cpp # src/video/video_driver.cpp # src/video/video_driver.hpp # src/video/win32_v.cpp	3 years ago
Tyler Trahan	8476f12432	Change: Improve graph period markings (#8732)	3 years ago
Jonathan G Rennison	1c1d272b57	Merge branch 'master' into jgrpp	3 years ago
translators	e74069e4c2	Update: Translations from eints ... estonian: 19 changes by siimsoni french: 3 changes by glx22	3 years ago
Jonathan G Rennison	e95216b59d	Merge branch 'master' into jgrpp ... # Conflicts: # src/company_cmd.cpp # src/core/geometry_func.cpp # src/date.cpp # src/genworld_gui.cpp # src/gfx.cpp # src/object_gui.cpp # src/openttd.cpp # src/settings_type.h # src/video/allegro_v.cpp # src/video/dedicated_v.cpp # src/video/null_v.cpp # src/video/sdl2_v.cpp # src/video/sdl_v.cpp # src/video/win32_v.cpp	3 years ago
translators	c9bcc12265	Update: Translations from eints ... korean: 2 changes by telk5093 indonesian: 11 changes by dimaspaf14 russian: 2 changes by Ln-Wolf finnish: 3 changes by hpiirai french: 4 changes by glx22	3 years ago
translators	db246b82ac	Update: Translations from eints ... korean: 2 changes by telk5093 german: 56 changes by Wuzzy2 finnish: 2 changes by hpiirai catalan: 2 changes by J0anJosep polish: 9 changes by yazalo	3 years ago
translators	6b04b7cf18	Update: Translations from eints ... slovak: 13 changes by FuryPapaya catalan: 7 changes by J0anJosep french: 1 change by arikover	3 years ago
translators	fa0704138d	Update: Translations from eints ... spanish (mexican): 7 changes by absay dutch: 7 changes by Afoklala french: 7 changes by arikover	3 years ago
Jonathan G Rennison	7154f8859d	Merge tag '1.11.0-beta1' into jgrpp ... # Conflicts: # src/console_cmds.cpp # src/gfx_func.h # src/industry.h # src/lang/czech.txt # src/lang/estonian.txt # src/lang/german.txt # src/lang/indonesian.txt # src/lang/japanese.txt # src/lang/norwegian_bokmal.txt # src/lang/russian.txt # src/lang/slovak.txt # src/saveload/saveload.h # src/station_gui.cpp # src/town_gui.cpp # src/vehicle_gui.cpp # src/video/sdl2_v.cpp # src/waypoint_gui.cpp	3 years ago
Jonathan G Rennison	b7ddd486cf	Merge branch 'master' into jgrpp ... # Conflicts: # cmake/CompileFlags.cmake # src/aircraft_cmd.cpp # src/blitter/32bpp_anim.cpp # src/cargopacket.cpp # src/cheat_gui.cpp # src/company_cmd.cpp # src/company_gui.cpp # src/core/pool_func.hpp # src/date.cpp # src/economy.cpp # src/error_gui.cpp # src/ground_vehicle.cpp # src/ground_vehicle.hpp # src/group_gui.cpp # src/industry_cmd.cpp # src/lang/dutch.txt # src/lang/french.txt # src/lang/german.txt # src/linkgraph/linkgraph_gui.cpp # src/linkgraph/mcf.cpp # src/network/network_content.cpp # src/network/network_server.cpp # src/network/network_udp.cpp # src/newgrf_engine.cpp # src/newgrf_station.cpp # src/order_cmd.cpp # src/order_gui.cpp # src/pathfinder/follow_track.hpp # src/pathfinder/yapf/yapf_common.hpp # src/saveload/saveload.cpp # src/settings_gui.cpp # src/station_cmd.cpp # src/station_kdtree.h # src/string_func.h # src/table/settings.ini # src/tgp.cpp # src/timetable_cmd.cpp # src/timetable_gui.cpp # src/toolbar_gui.cpp # src/town_cmd.cpp # src/train_cmd.cpp # src/train_gui.cpp # src/tree_gui.cpp # src/tunnelbridge_cmd.cpp # src/vehicle.cpp # src/vehicle_gui.cpp # src/video/sdl2_v.cpp # src/video/sdl_v.cpp # src/video/win32_v.cpp # src/viewport.cpp # src/viewport_sprite_sorter_sse4.cpp # src/window.cpp	3 years ago
Jonathan G Rennison	f9956d88c3	Merge branch 'master' into jgrpp ... # Conflicts: # src/aircraft_cmd.cpp # src/company_gui.cpp # src/lang/arabic_egypt.txt # src/lang/czech.txt # src/lang/esperanto.txt # src/lang/faroese.txt # src/lang/finnish.txt # src/lang/german.txt # src/lang/korean.txt # src/lang/latvian.txt # src/lang/malay.txt # src/lang/polish.txt # src/lang/spanish.txt # src/lang/spanish_MX.txt # src/lang/unfinished/urdu.txt # src/main_gui.cpp # src/rail_cmd.cpp # src/rail_gui.cpp # src/road_cmd.cpp # src/settings_type.h # src/station_cmd.cpp # src/table/settings.ini	3 years ago
Jonathan G Rennison	6c3e5642f8	Merge branch 'master' into jgrpp ... # Conflicts: # cmake/CompileFlags.cmake # src/crashlog.cpp # src/fileio.cpp # src/fileio_func.h # src/fios_gui.cpp # src/ini_load.cpp # src/ini_type.h # src/lang/english.txt # src/lang/german.txt # src/lang/korean.txt # src/network/network_client.cpp # src/order_base.h # src/order_cmd.cpp # src/os/windows/win32.cpp # src/road_cmd.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/settings.cpp # src/station_cmd.cpp # src/stdafx.h # src/table/settings.ini # src/tree_cmd.cpp # src/tree_gui.cpp # src/vehicle_base.h # src/video/cocoa/cocoa_v.mm # src/video/cocoa/event.mm # src/video/cocoa/wnd_quartz.mm # src/viewport.cpp # src/widgets/tree_widget.h	3 years ago
Jonathan G Rennison	39df1c49a1	Merge branch 'master' into jgrpp ... # Conflicts: # src/fileio.cpp # src/group_gui.cpp # src/industry.h # src/lang/korean.txt # src/linkgraph/linkgraphjob.cpp # src/linkgraph/linkgraphjob.h # src/linkgraph/linkgraphschedule.cpp # src/linkgraph/linkgraphschedule.h # src/openttd.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/town_cmd.cpp # src/vehicle_gui.cpp # src/vehicle_gui_base.h	3 years ago
Jonathan G Rennison	cb69611248	Merge branch 'master' into jgrpp ... # Conflicts: # .github/changelog.sh # cmake/PackageDeb.cmake # src/network/network_client.cpp # src/settings_gui.cpp	3 years ago
Jonathan G Rennison	09dc33022c	Add client setting for vehicle naming scheme	3 years ago
translators	c91a7b5e2e	Update: Translations from eints ... norwegian (bokmal): 65 changes by fnutt french: 1 change by glx22	3 years ago
translators	57c45a2c01	Update: Translations from eints ... spanish (mexican): 64 changes by absay indonesian: 7 changes by dimaspaf14 finnish: 94 changes by hpiirai slovak: 25 changes by gpalino french: 11 changes by glx22 polish: 11 changes by yazalo	3 years ago
translators	3e7c757398	Update: Translations from eints ... spanish (mexican): 1 change by absay	3 years ago
translators	eb23a6921b	Update: Translations from eints ... arabic (egypt): 30 changes by AviationGamerX indonesian: 30 changes by dimaspaf14 german: 12 changes by MagnumSociety french: 5 changes by glx22	3 years ago
translators	928276a66e	Update: Translations from eints ... korean: 4 changes by telk5093 finnish: 4 changes by hpiirai catalan: 11 changes by J0anJosep	3 years ago
translators	0f1d338dda	Update: Translations from eints ... korean: 2 changes by telk5093 finnish: 2 changes by hpiirai dutch: 49 changes by Afoklala spanish: 16 changes by Luis45ccs french: 7 changes by dimensi0n polish: 2 changes by yazalo	3 years ago
translators	c3faec4e9a	Update: Translations from eints ... polish: 7 changes by yazalo	3 years ago
translators	a7fee48b7f	Update: Translations from eints ... finnish: 4 changes by hpiirai french: 1 change by glx22	3 years ago
translators	18fccba410	Update: Translations from eints ... spanish (mexican): 42 changes by absay russian: 4 changes by Ln-Wolf finnish: 2 changes by hpiirai french: 35 changes by glx22 polish: 25 changes by yazalo	3 years ago
translators	e19b3adef3	Update: Translations from eints ... korean: 29 changes by telk5093 finnish: 8 changes by hpiirai slovak: 6 changes by FuryPapaya french: 6 changes by glx22 (cherry picked from commit 1a67954ff9)	3 years ago
translators	316cccf301	Update: Translations from eints ... french: 1 change by glx22 (cherry picked from commit 8c42f3a8d4)	3 years ago
Jonathan G Rennison	483ed2f468	Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # .github/workflows/commit-checker.yml # src/openttd.cpp	3 years ago
translators	1bb0e6ed8c	Update: Translations from eints ... russian: 19 changes by lexuslatvia finnish: 1 change by hpiirai latvian: 19 changes by lexuslatvia	3 years ago
translators	7b515fa0e2	Update: Translations from eints	3 years ago
frosch	ba49fa3b82	Codechange: Rename strings to match their usage.	3 years ago
translators	cc8301449e	Update: Translations from eints ... korean: 2 changes by telk5093 catalan: 13 changes by perezdidac	3 years ago
Xaroth Brook	86e08aa8ef	Update: Apply name changes to all languages.	3 years ago
translators	2714e0a33f	Update: Translations from eints ... russian: 10 changes by Ln-Wolf finnish: 4 changes by hpiirai slovak: 16 changes by FuryPapaya french: 1 change by glx22	3 years ago
translators	1a67954ff9	Update: Translations from eints ... korean: 29 changes by telk5093 finnish: 8 changes by hpiirai slovak: 6 changes by FuryPapaya french: 6 changes by glx22	3 years ago
translators	8c42f3a8d4	Update: Translations from eints ... french: 1 change by glx22	3 years ago
translators	20151e41ea	Update: Translations from eints ... korean: 1 change by telk5093 french: 1 change by glx22	3 years ago
translators	819ce1bf49	Update: Translations from eints ... slovak: 30 changes by FuryPapaya lithuanian: 37 changes by devastatorius	3 years ago
Jonathan G Rennison	5b78090a61	Merge branch 'master' into jgrpp ... # Conflicts: # CMakeLists.txt # src/saveload/town_sl.cpp # src/screenshot.h # src/script/api/ai/ai_date.hpp.sq # src/script/api/ai/ai_marine.hpp.sq # src/script/api/ai/ai_station.hpp.sq # src/script/api/game/game_date.hpp.sq # src/script/api/game/game_marine.hpp.sq # src/script/api/game/game_station.hpp.sq # src/script/api/game/game_window.hpp.sq # src/script/api/script_window.hpp # src/script/api/template/template_window.hpp.sq # src/signal.cpp # src/statusbar_gui.cpp # src/toolbar_gui.cpp # src/viewport.cpp # src/viewport_func.h	4 years ago
TechGeekNZ	a10013dd00	Codechange: Spell 'Viewport' consistently ... Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'. This patch makes everything consistent.	4 years ago
translators	a56bf35409	Update: Translations from eints ... french: 1 change by glx	4 years ago
Jonathan G Rennison	7467051331	Merge branch 'master' into jgrpp ... # Conflicts: # .gitignore # src/network/network_server.cpp # src/vehicle_gui.cpp	4 years ago
TrevorShelton	c39d62c245	Update: Disuse of STR_ERROR_INCOMPATIBLE_ROAD	4 years ago
Jonathan G Rennison	07c9621fcf	Merge branch 'master' into jgrpp	4 years ago
glx	f0747c8c51	Update: Lang files	4 years ago
Jonathan G Rennison	d210bc4d14	Merge branch 'master' into jgrpp ... # Conflicts: # src/lang/korean.txt # src/saveload/afterload.cpp Recalculate docking tile cache due to 57553cd8	4 years ago
translators	6fde854759	Update: Translations from eints ... french: 3 changes by glx	4 years ago
Jonathan G Rennison	4adfe0c9ae	Merge branch 'master' into jgrpp ... # Conflicts: # src/industry_gui.cpp # src/lang/korean.txt # src/town.h # src/town_gui.cpp	4 years ago
translators	5a31efd98d	Update: Translations from eints ... finnish: 1 change by hpiirai	4 years ago
Niels Martin Hansen	7413d65c2a	Cleanup: Unused music GUI strings	4 years ago
translators	1812b0cf49	Update: Translations from eints ... finnish: 4 changes by hpiirai english (us): 20 changes by Supercheese french: 7 changes by glx korean: 7 changes by telk5093	4 years ago
Jonathan G Rennison	7960db35f2	Merge branch 'master' into jgrpp ... # Conflicts: # config.lib # projects/openttd_vs140.vcxproj # projects/openttd_vs140.vcxproj.filters # projects/openttd_vs141.vcxproj # projects/openttd_vs141.vcxproj.filters # projects/openttd_vs142.vcxproj # projects/openttd_vs142.vcxproj.filters # src/aircraft_cmd.cpp # src/base_station_base.h # src/core/pool_type.hpp # src/disaster_vehicle.cpp # src/economy.cpp # src/engine.cpp # src/group.h # src/group_cmd.cpp # src/group_gui.cpp # src/lang/english.txt # src/lang/german.txt # src/linkgraph/linkgraph_gui.cpp # src/network/network_command.cpp # src/network/network_server.cpp # src/openttd.cpp # src/order_cmd.cpp # src/road_cmd.cpp # src/saveload/afterload.cpp # src/saveload/cargopacket_sl.cpp # src/saveload/linkgraph_sl.cpp # src/saveload/order_sl.cpp # src/saveload/station_sl.cpp # src/saveload/town_sl.cpp # src/saveload/vehicle_sl.cpp # src/screenshot.cpp # src/screenshot.h # src/settings_gui.cpp # src/settings_type.h # src/smallmap_gui.cpp # src/station.cpp # src/station_cmd.cpp # src/table/settings.ini # src/toolbar_gui.cpp # src/town_cmd.cpp # src/train.h # src/train_cmd.cpp # src/train_gui.cpp # src/vehicle.cpp # src/vehicle_base.h # src/vehiclelist.cpp # src/window_type.h	4 years ago
translators	9e4533dc8f	Update: Translations from eints ... luxembourgish: 131 changes by Phreeze french: 6 changes by arikover spanish (mexican): 20 changes by Absay	4 years ago
translators	3a557b0336	Update: Translations from eints ... finnish: 11 changes by hpiirai korean: 6 changes by telk5093	4 years ago
pnda	e558aa8ff4	Feature: Screenshot window	4 years ago
translators	f6ce5c4563	Update: Translations from eints ... french: 4 changes by arikover korean: 5 changes by telk5093	4 years ago
translators	d427559eba	Update: Translations from eints ... french: 1 change by arikover	4 years ago
translators	dbe44e80f1	Update: Translations from eints	4 years ago
Jonathan G Rennison	ab3a373c73	Merge branch 'master' into jgrpp	5 years ago
translators	70f8c729d4	Update: Translations from eints ... french: 7 changes by glx	5 years ago
glx	9fc6329066	Cleanup: Remove unused strings	5 years ago
Jonathan G Rennison	cbdd9f84d8	Merge branch 'master' into jgrpp ... # Conflicts: # src/console_gui.cpp # src/lang/korean.txt # src/video/sdl2_v.cpp # src/video/sdl2_v.h # src/window.cpp # src/window_gui.h	5 years ago
S. D. Cloudt	13cc8a0cee	Cleanup: Removed SVN headers	5 years ago
Jonathan G Rennison	ca3c72438e	Merge branch 'master' into jgrpp ... # Conflicts: # Makefile.bundle.in # src/os/macosx/string_osx.cpp # src/station_cmd.cpp	5 years ago
translators	c95c349dd5	Update: Translations from eints ... french: 1 change by glx	5 years ago
Jonathan G Rennison	edfd378e93	Merge branch 'master' into jgrpp ... # Conflicts: # source.list # src/blitter/32bpp_anim.cpp # src/linkgraph/linkgraphjob.cpp # src/order_cmd.cpp # src/vehicle.cpp # src/vehicle_type.h	5 years ago