Jonathan G Rennison
5b7db9d849
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/commit-checker.yml
# src/command.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/crashlog.cpp
# src/economy.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/misc_gui.cpp
# src/newgrf_config.cpp
# src/openttd.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/table/settings/gui_settings.ini
2 years ago
translators
1eed52f294
Update: Translations from eints
...
swedish: 7 changes by translators
norwegian (bokmal): 1 change by translators
spanish (mexican): 41 changes by translators
japanese: 28 changes by translators
english (us): 4 changes by translators
vietnamese: 7 changes by translators
estonian: 60 changes by translators
korean: 9 changes by translators
greek: 4 changes by translators
hungarian: 2 changes by translators
indonesian: 5 changes by translators
italian: 12 changes by translators, 1 change by Rivarossi
german: 33 changes by translators
romanian: 11 changes by translators
russian: 4 changes by translators
finnish: 2 changes by translators
ukrainian: 5 changes by translators
slovak: 9 changes by translators
catalan: 14 changes by translators
turkish: 1 change by translators
danish: 1 change by translators
latvian: 5 changes by translators
dutch: 5 changes by translators
spanish: 98 changes by translators
portuguese: 6 changes by translators
portuguese (brazilian): 2 changes by translators, 1 change by marlondantas
polish: 13 changes by translators
2 years ago
translators
1ed212775c
Update: Translations from eints
...
galician: 27 changes by pvillaverde
2 years ago
translators
e5c1865e76
Update: Translations from eints
...
swedish: 5 changes by joeax910
spanish (mexican): 3 changes by absay
korean: 3 changes by telk5093
italian: 56 changes by Rivarossi
german: 3 changes by danidoedel
romanian: 1 change by ALEX11BR
ukrainian: 8 changes by StepanIvasyn
2 years ago
Jonathan G Rennison
c4e2175cc9
Merge branch 'master' into jgrpp
2 years ago
translators
c36fc98137
Update: Translations from eints
2 years ago
Jonathan G Rennison
904ff6757d
Add slot support to road vehicles, ships and aircraft
2 years ago
Jonathan G Rennison
0513961b2a
Duplicate STR_SMALLMAP_LEGENDA_... veh type strings with format codes removed
2 years ago
Jonathan G Rennison
8754e1c5d0
Show scheduled dispatch marker in yellow in timetable window
2 years ago
Jonathan G Rennison
ff3473fe6a
Add support for multiple scheduled dispatch schedules per order list
2 years ago
Jonathan G Rennison
6f38769b73
Rename incorrectly named set time/date window strings
2 years ago
Jonathan G Rennison
b02b154218
Also show hours and minutes for schdispatch duration in minutes mode
2 years ago
Jonathan G Rennison
0691b25e17
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
3 years ago
translators
f6886754ff
Update: Translations from eints
...
greek: 2 changes by dionisis84
german: 2 changes by danidoedel
3 years ago
Jonathan G Rennison
58d8418f83
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/arabic_egypt.txt
3 years ago
translators
0ad40ee868
Update: Translations from eints
...
arabic (egypt): 35 changes by AviationGamerX
3 years ago
Jonathan G Rennison
9e946d4c5d
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/command.cpp
# src/console_cmds.cpp
# src/group_gui.cpp
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/greek.txt
# src/lang/hungarian.txt
# src/lang/irish.txt
# src/lang/japanese.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.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_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/saveload/afterload.cpp
# src/saveload/newgrf_sl.cpp
# src/saveload/saveload.h
# src/script/script_instance.cpp
# src/toolbar_gui.cpp
# src/toolbar_gui.h
# src/vehicle_gui.cpp
# src/widgets/rail_widget.h
# src/widgets/vehicle_widget.h
# src/window.cpp
3 years ago
Jonathan G Rennison
3ef1a0943b
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/lang/chuvash.txt
# src/lang/czech.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/german.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/latvian.txt
# src/lang/russian.txt
# src/tree_gui.cpp
# src/vehicle.cpp
3 years ago
Jonathan G Rennison
324e90e5ac
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/lang/arabic_egypt.txt
# src/lang/english.txt
# src/lang/greek.txt
# src/network/core/tcp_connect.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_gui.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/station_cmd.cpp
# src/table/settings/gui_settings.ini
# src/town_cmd.cpp
# src/widgets/rail_widget.h
3 years ago
Jonathan G Rennison
9e1bb3eea7
Merge tag '12.0-beta2' into jgrpp-beta
...
# Conflicts:
# docs/landscape_grid.html
# src/lang/simplified_chinese.txt
# src/network/network_server.cpp
# src/station_cmd.cpp
3 years ago
Jonathan G Rennison
faf32200cf
Merge tag '12.0-beta1' into jgrpp-beta
...
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/fios.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_coordinator.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_engine.cpp
# src/openttd.cpp
# src/rev.cpp.in
# src/settings_type.h
# src/train.h
# src/train_cmd.cpp
3 years ago
Jonathan G Rennison
f764fcfb1f
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/console_cmds.cpp
# src/debug.cpp
# src/lang/vietnamese.txt
# src/network/core/address.cpp
# src/network/core/address.h
# src/network/core/config.h
# src/network/core/os_abstraction.cpp
# src/network/core/os_abstraction.h
# src/network/core/tcp_listen.h
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_gamelist.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf.cpp
# src/openttd.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/table/settings/network_settings.ini
3 years ago
Jonathan G Rennison
f54d69a60a
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/economy.cpp
# src/elrail.cpp
# src/graph_gui.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/network/core/game_info.cpp
# src/newgrf_station.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/strings_func.h
# src/table/settings/network_settings.ini
# src/table/settings/settings.ini
3 years ago
Jonathan G Rennison
da282c3ecc
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/ci-build.yml
# CMakeLists.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/korean.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/spanish.txt
# src/misc_gui.cpp
# src/newgrf.cpp
3 years ago
translators
edf7b02ddb
Update: Translations from eints
...
german: 2 changes by Wuzzy2
3 years ago
translators
33a55c5fd4
Update: Translations from eints
...
hindi: 67 changes by ritwikraghav14
(cherry picked from commit c562b4c527
)
3 years ago
translators
7119903c94
Update: Translations from eints
...
german: 1 change by Wuzzy2
spanish: 1 change by ilyabakhlin
(cherry picked from commit 12de256b72
)
3 years ago
Jonathan G Rennison
4042480806
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/table/company_settings.ini
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/table/win32_settings.ini
# src/table/window_settings.ini
3 years ago
Jonathan G Rennison
fd605e3cf3
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
3 years ago
Woelfi Von Wolfhausen
f047690dc9
Fix typo, ii
...
Typo, a t was missing (Frach-art to Fracht-art)
3 years ago
Woelfi Von Wolfhausen
06b9881a05
Fix typos
...
Fix some typos regarding formality and noun-is-written-big-rules
3 years ago
translators
9b1651a267
Update: Translations from eints
...
swedish: 8 changes by Abbin44
norwegian (bokmal): 14 changes by Anolitt
chinese (traditional): 6 changes by SiderealArt
slovenian: 4 changes by Matej1245
vietnamese: 14 changes by KhoiCanDev
luxembourgish: 24 changes by phreeze83
hungarian: 1 change by baliball
serbian: 29 changes by nkrs
german: 1 change by SecretIdetity
russian: 2 changes by SecretIdetity, 1 change by Ln-Wolf
catalan: 1 change by J0anJosep
turkish: 1 change by ahmetlii
french: 1 change by glx22
3 years ago
Jonathan G Rennison
0b0d154788
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/ci-build.yml
# src/lang/german.txt
# src/lang/romanian.txt
# src/lang/slovak.txt
# src/lang/turkish.txt
# src/network/core/address.cpp
# src/network/core/tcp.h
# src/network/core/udp.cpp
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/newgrf_sl.cpp
# src/tree_cmd.cpp
# src/video/video_driver.hpp
# src/window.cpp
# src/window_gui.h
3 years ago
translators
b5e8b36b5b
Update: Translations from eints
...
chinese (traditional): 19 changes by benny30111
german: 3 changes by Wuzzy2
catalan: 3 changes by J0anJosep
3 years ago
translators
28d9181d5d
Update: Translations from eints
...
korean: 4 changes by telk5093
finnish: 4 changes by hpiirai
irish: 151 changes by temuchie
french: 11 changes by glx22
3 years ago
Jonathan G Rennison
2bd535e834
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/engine_base.h
# src/gfxinit.cpp
# src/graph_gui.cpp
# src/lang/brazilian_portuguese.txt
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/korean.txt
# src/lang/norwegian_bokmal.txt
# src/lang/portuguese.txt
# src/lang/russian.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/network/core/address.cpp
# src/network/core/game_info.h
# src/network/core/os_abstraction.h
# src/network/core/udp.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_internal.h
# src/newgrf_engine.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/string_func.h
# src/town_gui.cpp
# src/video/video_driver.cpp
# src/widget_type.h
3 years ago
translators
ff6c934916
Update: Translations from eints
...
english (us): 4 changes by 2TallTyler
greek: 10 changes by dionisis84
german: 4 changes by MagnumSociety
dutch: 4 changes by Afoklala
spanish: 66 changes by MontyMontana
polish: 10 changes by pAter-exe
3 years ago
translators
19a6513607
Update: Translations from eints
3 years ago
translators
c6035158ca
Update: Translations from eints
...
german: 5 changes by Wuzzy2
3 years ago
Jonathan G Rennison
282f5f22e3
Partially revert "Update: Translations from eints"
...
This partially reverts b721787c7f
Unremove string: STR_NETWORK_COMPANY_LIST_SPECTATE
3 years ago
translators
7107e63f8c
Update: Translations from eints
...
korean: 6 changes by telk5093
hungarian: 34 changes by pnpBrumi
indonesian: 16 changes by dimaspaf14
latvian: 94 changes by lexuslatvia
polish: 2 changes by pAter-exe
3 years ago
translators
80231975e5
Update: Translations from eints
...
greek: 121 changes by dionisis84
3 years ago
translators
aa83488fde
Update: Translations from eints
...
swedish: 2 changes by joeax910
spanish (mexican): 7 changes by absay
slovenian: 2 changes by Yeznick
greek: 60 changes by dionisis84
german: 7 changes by Wuzzy2
dutch: 2 changes by Afoklala
3 years ago
translators
52d57b17b0
Update: Translations from eints
...
swedish: 8 changes by joeax910
3 years ago
Jonathan G Rennison
5afa1b93eb
Show buy cost and running cost in template windows
...
See: #312
3 years ago
Jonathan G Rennison
d67f63a04e
Remove unused template replacement value strings
3 years ago
translators
335a2392e7
Update: Translations from eints
...
finnish: 2 changes by hpiirai
portuguese: 1 change by azulcosta
3 years ago
translators
cb9a2dec0d
Update: Translations from eints
...
portuguese: 1 change by azulcosta
3 years ago
translators
c3d43d7b1c
Update: Translations from eints
3 years ago
translators
580dd118cb
Update: Translations from eints
3 years ago