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
8f772352ce
Update: Translations from eints
...
italian: 1 change by Rivarossi
2 years ago
Jonathan G Rennison
752e46dfcb
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/station_cmd.cpp
2 years ago
translators
f72b9fa767
Update: Translations from eints
...
italian: 22 changes by Rivarossi
2 years ago
translators
ffd3c11ba7
Update: Translations from eints
...
italian: 8 changes by Rivarossi
spanish: 19 changes by MontyMontana
2 years ago
translators
f64cf8679d
Update: Translations from eints
...
chinese (traditional): 6 changes by wpi3
italian: 2 changes by Rivarossi
turkish: 1 change by jnmbk
2 years ago
translators
278c1d06cf
Update: Translations from eints
...
italian: 6 changes by Rivarossi
turkish: 37 changes by jnmbk
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
0a3d5f5ff8
Update: Translations from eints
...
italian: 1 change by Rivarossi
2 years ago
translators
a59c19c6c2
Update: Translations from eints
...
chinese (traditional): 24 changes by Tetrapod1206
italian: 6 changes by Rivarossi
2 years ago
translators
e3a4524133
Update: Translations from eints
...
chinese (traditional): 130 changes by Tetrapod1206, 10 changes by wpi3
italian: 6 changes by Rivarossi
2 years ago
translators
3a2c0531b6
Update: Translations from eints
...
italian: 1 change by Rivarossi
polish: 2 changes by pAter-exe
2 years ago
translators
b1e24a0ae3
Update: Translations from eints
...
italian: 22 changes by Rivarossi
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
24d7697acc
Update: Translations from eints
...
spanish: 1 change by frosch123
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
646d160c38
Update: Translations from eints
...
italian: 3 changes by Rivarossi
2 years ago
translators
8d51156150
Update: Translations from eints
...
spanish (mexican): 20 changes by absay
italian: 7 changes by Rivarossi
2 years ago
translators
5e5f864990
Update: Translations from eints
...
english (us): 1 change by 2TallTyler
italian: 1 change by Rivarossi
2 years ago
translators
c6e4fa7df1
Update: Translations from eints
...
italian: 11 changes by Rivarossi
dutch: 24 changes by Afoklala
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
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
ed0b0b80d3
Update: Translations from eints
...
spanish (mexican): 84 changes by absay
italian: 16 changes by Rivarossi
2 years ago
translators
4e09dbc86e
Update: Translations from eints
...
spanish (mexican): 137 changes by absay
italian: 10 changes by Rivarossi
2 years ago
translators
cc4186410b
Update: Translations from eints
...
spanish (mexican): 8 changes by absay
italian: 13 changes by Rivarossi
2 years ago
translators
869b645708
Update: Translations from eints
...
italian: 33 changes by Rivarossi
polish: 5 changes by pAter-exe
2 years ago
translators
6c161ad18a
Update: Translations from eints
...
italian: 2 changes by Rivarossi
2 years ago
translators
6cb668955e
Update: Translations from eints
...
italian: 7 changes by Rivarossi
2 years ago
translators
585e49a597
Update: Translations from eints
...
italian: 2 changes by Rivarossi
2 years ago
translators
98bdf01967
Update: Translations from eints
...
italian: 5 changes by Rivarossi
romanian: 7 changes by alexban011
2 years ago
translators
a24ba6c264
Update: Translations from eints
...
italian: 2 changes by Rivarossi
2 years ago
translators
3cf0e95f6e
Update: Translations from eints
...
italian: 1 change by Rivarossi
2 years ago
translators
49b8eac2dc
Update: Translations from eints
...
chinese (simplified): 3 changes by HansKaffee
italian: 30 changes by Rivarossi
polish: 14 changes by pAter-exe
2 years ago
translators
c36fc98137
Update: Translations from eints
2 years ago
Jonathan G Rennison
f5ef81f5ac
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/italian.txt
# src/lang/tamil.txt
2 years ago
translators
9e47df298f
Update: Translations from eints
...
italian: 61 changes by denialmac
2 years ago
Jonathan G Rennison
0513961b2a
Duplicate STR_SMALLMAP_LEGENDA_... veh type strings with format codes removed
2 years ago
Jonathan G Rennison
2f8e63e954
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfx.cpp
# src/lang/traditional_chinese.txt
# src/station_cmd.cpp
2 years ago
translators
21f85cac87
Update: Translations from eints
...
chinese (traditional): 25 changes by Tetrapod1206
italian: 12 changes by federico1564S
2 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