Commit Graph

372 Commits (adf2210bc82041900f43ab319f84dfd5eb84b404)

Author SHA1 Message Date
Jonathan G Rennison adf2210bc8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/genworld_gui.cpp
#	src/lang/afrikaans.txt
#	src/lang/arabic_egypt.txt
#	src/lang/basque.txt
#	src/lang/belarusian.txt
#	src/lang/brazilian_portuguese.txt
#	src/lang/bulgarian.txt
#	src/lang/catalan.txt
#	src/lang/croatian.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/dutch.txt
#	src/lang/english.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/esperanto.txt
#	src/lang/estonian.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/frisian.txt
#	src/lang/gaelic.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/lang/greek.txt
#	src/lang/hebrew.txt
#	src/lang/hungarian.txt
#	src/lang/icelandic.txt
#	src/lang/indonesian.txt
#	src/lang/irish.txt
#	src/lang/italian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latin.txt
#	src/lang/latvian.txt
#	src/lang/lithuanian.txt
#	src/lang/luxembourgish.txt
#	src/lang/malay.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/norwegian_nynorsk.txt
#	src/lang/persian.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/slovenian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/thai.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/lang/welsh.txt
#	src/saveload/afterload.cpp
1 year ago
translators b05c21203a Update: Translations from eints
arabic (egypt): 20 changes by AviationGamerX
1 year ago
translators 9d13213c61 Update: Translations from eints
spanish (mexican): 3 changes by absay
1 year ago
Jonathan G Rennison 3435e74c0c Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	os/macosx/Info.plist.in
#	src/fileio.cpp
#	src/landscape.cpp
#	src/league_cmd.h
#	src/saveload/ai_sl.cpp
#	src/saveload/game_sl.cpp
#	src/saveload/league_sl.cpp
#	src/saveload/saveload.cpp
2 years ago
translators 888c9172e0 Update: Translations from eints
spanish (mexican): 3 changes by absay
korean: 1 change by telk5093
2 years ago
translators fd5de3b366 Update: Translations from eints
spanish (mexican): 7 changes by absay
romanian: 5 changes by bnegrut
finnish: 108 changes by hpiirai
2 years ago
Jonathan G Rennison ab95e8e5ed Add STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY entries
From STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY
2 years ago
Jonathan G Rennison 6d4474b84e Merge tag '13.0-beta2' into jgrpp
# Conflicts:
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/depot_gui.cpp
#	src/error_gui.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/misc_gui.cpp
#	src/network/network_content_gui.h
#	src/newgrf_debug_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/station_gui.cpp
#	src/subsidy_gui.cpp
#	src/table/settings/gui_settings.ini
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/water_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
2 years ago
Jonathan G Rennison 1f36c3f3e4 Merge branch 'master' into jgrpp
# Conflicts:
#	src/ai/ai_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/genworld_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/newgrf_sound.cpp
#	src/roadveh.h
#	src/sound.cpp
#	src/station_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_gui.cpp
2 years ago
translators 35c4af5cb7 Update: Translations from eints
english (au): 4 changes by krysclarke
spanish: 10 changes by MontyMontana
portuguese: 62 changes by azulcosta
2 years ago
translators 3040efdb10 Update: Translations from eints
spanish (mexican): 74 changes by absay
russian: 2 changes by Ln-Wolf
spanish: 6 changes by MontyMontana
polish: 1 change by pAter-exe
2 years ago
translators d30345edfb Update: Translations from eints
english (au): 3 changes by krysclarke
spanish (mexican): 3 changes by absay
english (us): 3 changes by 2TallTyler
russian: 2 changes by Ln-Wolf
french: 11 changes by ZarTek-Creole
portuguese: 3 changes by azulcosta
polish: 28 changes by pAter-exe
2 years ago
translators cbb2d5303d Update: Translations from eints
spanish (mexican): 14 changes by absay
english (us): 20 changes by 2TallTyler
russian: 5 changes by Ln-Wolf
portuguese: 44 changes by azulcosta
2 years ago
translators 553e5e6bbe Update: Translations from eints
english (au): 20 changes by krysclarke
spanish (mexican): 7 changes by absay
korean: 20 changes by telk5093
russian: 13 changes by Ln-Wolf
spanish: 74 changes by MontyMontana
2 years ago
translators ced4258969 Update: Translations from eints
english (au): 18 changes by krysclarke
spanish (mexican): 23 changes by absay
english (us): 18 changes by 2TallTyler
korean: 33 changes by telk5093
russian: 18 changes by Ln-Wolf
french: 31 changes by glx22
2 years ago
translators 3f579fa7dc Update: Translations from eints
dutch: 12 changes by Afoklala
2 years ago
Jonathan G Rennison 3b7352132b Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/screenshot.cpp
#	src/settings_gui.cp
2 years ago
translators 27e1d057c5 Update: Translations from eints
english (au): 12 changes by krysclarke
spanish (mexican): 24 changes by absay
english (us): 12 changes by 2TallTyler
russian: 12 changes by Ln-Wolf
french: 1 change by glx22
portuguese: 16 changes by azulcosta
2 years ago
translators e2f661b281 Update: Translations from eints
spanish: 24 changes by MontyMontana
2 years ago
Tyler Trahan 31d08421ab Update: Rename mapgen Sea Level string in other language files 2 years ago
Jonathan G Rennison b14e213bd9 Add average travel time to the link graph overlay tooltip 2 years ago
Jonathan G Rennison 6459e62fff Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/map_type.h
#	src/network/network_command.cpp
#	src/object_cmd.cpp
#	src/rail_cmd.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/settings_gui.cpp
#	src/string.cpp
#	src/table/road_land.h
#	src/table/settings/game_settings.ini
#	src/table/settings/world_settings.ini
#	src/tbtr_template_gui_main.h
#	src/train_cmd.cpp
2 years ago
translators 71663bbaee Update: Translations from eints
hungarian: 11 changes by PstasDev
2 years ago
Rubidium 648cd1076b Update: other language files after string renames 2 years ago
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 30ff89cac0 Update: Translations from eints
frisian: 33 changes by Bouke
spanish (mexican): 10 changes by absay
english (us): 4 changes by 2TallTyler
korean: 7 changes by telk5093
dutch: 3 changes by Afoklala
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 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 70d33dc71f Update: Translations from eints
spanish (mexican): 1 change by absay
chinese (simplified): 1 change by XiaoJi-Game
korean: 1 change by telk5093
2 years ago
Jonathan G Rennison 08bb440b47 Merge branch 'master' into jgrpp 2 years ago
translators 984e0b1263 Update: Translations from eints
spanish (mexican): 5 changes by absay
catalan: 6 changes by J0anJosep
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 97d79c8e52 Update: Translations from eints
spanish (mexican): 1 change by absay
catalan: 1 change by J0anJosep
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 9fca8af586 Update: Translations from eints
spanish (mexican): 7 changes by absay
2 years ago
translators 9d979a6d23 Update: Translations from eints
spanish (mexican): 1 change by absay
german: 25 changes by SecretIdetity
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
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 8d51156150 Update: Translations from eints
spanish (mexican): 20 changes by absay
italian: 7 changes by Rivarossi
2 years ago
translators 867f6a5964 Update: Translations from eints
spanish (mexican): 9 changes by absay
polish: 3 changes by pAter-exe
2 years ago
translators 9c58ea7a37 Update: Translations from eints
swedish: 2 changes by joeax910
spanish (mexican): 62 changes by absay
korean: 25 changes by telk5093
polish: 72 changes by pAter-exe
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