Jonathan G Rennison
38571cf0da
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/landscape.cpp
# src/lang/frisian.txt
# src/lang/korean.txt
# src/lang/russian.txt
2 years ago
translators
520520c11c
Update: Translations from eints
...
frisian: 82 changes by Bouke
russian: 10 changes by Ln-Wolf
portuguese: 3 changes by azulcosta
2 years ago
Jonathan G Rennison
4c01fe2e7f
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/russian.txt
# src/linkgraph/linkgraph_gui.cpp
# src/news_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
2 years ago
translators
252111512f
Update: Translations from eints
...
frisian: 17 changes by Bouke
english (au): 1 change by krysclarke
russian: 1 change by Ln-Wolf
dutch: 4 changes by Bouke
portuguese: 4 changes by azulcosta
2 years ago
Jonathan G Rennison
1341666807
Merge branch 'master' into jgrpp
2 years ago
translators
35c1aeb6d1
Update: Translations from eints
...
english (au): 3 changes by krysclarke
english (us): 3 changes by 2TallTyler
russian: 3 changes by Ln-Wolf
2 years ago
Jonathan G Rennison
23b974fb39
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fontcache.cpp
# src/openttd.cpp
# src/os/macosx/font_osx.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/font_win32.cpp
# src/strings.cpp
2 years ago
translators
761105aaa4
Update: Translations from eints
...
russian: 1 change by Ln-Wolf
catalan: 1 change by J0anJosep
2 years ago
Jonathan G Rennison
ece0a43146
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/newgrf_station.cpp
2 years ago
translators
d29289addb
Update: Translations from eints
...
english (us): 6 changes by 2TallTyler
russian: 2 changes by Ln-Wolf
portuguese: 6 changes by azulcosta
2 years ago
Jonathan G Rennison
ad00f5032a
Add a setting to show the introduction year for train wagons
2 years ago
Jonathan G Rennison
71b6d7a502
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/arabic_egypt.txt
# src/station_cmd.cpp
# src/station_cmd.h
# src/timetable_cmd.cpp
# src/train_cmd.cpp
2 years ago
translators
d1d7e47896
Update: Translations from eints
...
russian: 1 change by Ln-Wolf
portuguese: 1 change by azulcosta
2 years ago
Jonathan G Rennison
3ea1e27fdd
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/spanish_MX.txt
# src/lang/traditional_chinese.txt
# src/script/api/script_airport.cpp
# src/script/api/script_rail.cpp
2 years ago
translators
59f16b1a38
Update: Translations from eints
...
korean: 5 changes by telk5093
russian: 12 changes by Ln-Wolf
2 years ago
translators
8d8f45f0dd
Update: Translations from eints
...
russian: 25 changes by Ln-Wolf
2 years ago
translators
9842e8b762
Update: Translations from eints
...
spanish (mexican): 8 changes by absay
czech: 18 changes by adamek0202
russian: 1 change by Ln-Wolf
catalan: 5 changes by J0anJosep
2 years ago
translators
f8c6034b93
Update: Translations from eints
...
spanish (mexican): 21 changes by absay
italian: 1 change by Rivarossi
russian: 12 changes by Ln-Wolf
2 years ago
translators
fd1aa154f4
Update: Translations from eints
...
italian: 1 change by Rivarossi
russian: 16 changes by Ln-Wolf
2 years ago
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
84aec4fcb8
Update: Translations from eints
...
english (us): 2 changes by 2TallTyler
italian: 2 changes by Rivarossi
russian: 5 changes by Ln-Wolf
dutch: 2 changes by Afoklala
french: 25 changes by glx22
portuguese: 2 changes by azulcosta
2 years ago
translators
142321da79
Update: Translations from eints
...
spanish (mexican): 1 change by absay
russian: 4 changes by Ln-Wolf
catalan: 20 changes by J0anJosep
french: 1 change by glx22
portuguese: 1 change by azulcosta
2 years ago
translators
1ed212775c
Update: Translations from eints
...
galician: 27 changes by pvillaverde
2 years ago
translators
be72f1e54b
Update: Translations from eints
...
spanish (mexican): 18 changes by absay
italian: 30 changes by Rivarossi
russian: 17 changes by Ln-Wolf
portuguese: 25 changes by azulcosta
2 years ago
translators
b8565d8cac
Update: Translations from eints
...
spanish (mexican): 10 changes by absay
english (us): 23 changes by 2TallTyler
russian: 22 changes by Ln-Wolf
french: 24 changes by glx22
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
ee105257ff
Update: Translations from eints
...
russian: 4 changes by Ln-Wolf
french: 4 changes by glx22
2 years ago
translators
c36fc98137
Update: Translations from eints
2 years ago
Jonathan G Rennison
0513961b2a
Duplicate STR_SMALLMAP_LEGENDA_... veh type strings with format codes removed
2 years ago
Jonathan G Rennison
dca7e7bc58
Merge branch 'master' into jgrpp
3 years ago
translators
62795a2e6d
Update: Translations from eints
...
russian: 2 changes by Ln-Wolf
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
62afd94b47
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/company_cmd.cpp
# src/economy.cpp
# src/lang/swedish.txt
# src/network/network_command.cpp
# src/news_gui.cpp
# src/saveload/saveload.h
# src/script/api/script_list.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/sdl2_v.cpp
3 years ago
translators
ae340f415e
Update: Translations from eints
...
russian: 2 changes by Ln-Wolf
3 years ago
translators
6289b4dd81
Update: Translations from eints
...
greek: 2 changes by dionisis84
russian: 1 change by Ln-Wolf
finnish: 2 changes by hpiirai
tamil: 88 changes by Aswn
3 years ago
translators
eaeab34e7a
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
(cherry picked from commit 8dd846bad4
)
3 years ago
translators
33a55c5fd4
Update: Translations from eints
...
hindi: 67 changes by ritwikraghav14
(cherry picked from commit c562b4c527
)
3 years ago
translators
f65ec3b797
Update: Translations from eints
...
korean: 2 changes by telk5093
russian: 1 change by Ln-Wolf
finnish: 1 change by hpiirai
portuguese: 1 change by azulcosta
portuguese (brazilian): 1 change by Vimerum
(cherry picked from commit 043a544248
)
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
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
translators
7c6b39e189
Update: Translations from eints
...
korean: 4 changes by telk5093
greek: 1 change by dionisis84
russian: 2 changes by Ln-Wolf
finnish: 1 change by hpiirai
portuguese: 1 change by azulcosta
3 years ago