Commit Graph

1881 Commits (38571cf0daea6f9e4ec56f489df0c9a282ef94f4)

Author SHA1 Message Date
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 7167175aa5 Simplify strings for tracerestrict change counter action 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
TELK e9de3e9c4d Update: Korean translation for some route restrict 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
translators 1f04cc62d9 Update: Translations from eints
welsh: 8 changes by Osian
korean: 6 changes by telk5093
2 years ago
Jonathan G Rennison 681b9e08f0 Fix fc5e2071: Incorrect translation string codes 2 years ago
Jonathan G Rennison fc5e20719d Fix #423: Max TE/weight should not be shown for maglevs 2 years ago
Jonathan G Rennison dc5e073379 Merge branch 'master' into jgrpp 2 years ago
translators db378e746b Update: Translations from eints
korean: 2 changes by telk5093
2 years ago
Jonathan G Rennison 1d08572cfa Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/english_AU.txt
#	src/openttd.cpp
#	src/viewport_sprite_sorter_sse4.cpp
2 years ago
translators 88a046a76e Update: Translations from eints
korean: 7 changes by telk5093
2 years ago
Jonathan G Rennison ad00f5032a Add a setting to show the introduction year for train wagons 2 years ago
Jonathan G Rennison 0f8dc86120 Remove setting string now unused since 309f1b47 2 years ago
translators 5a404a17ee Update: Translations from eints
korean: 1 change by telk5093
polish: 1 change by pAter-exe
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 b199779ad4 Update: Translations from eints
chinese (simplified): 26 changes by ZZY2357
korean: 1 change by telk5093
2 years ago
TELK f2838768ca Update: Korean translation up to 0.48.0 2 years ago
TELK 3cace09207 Update: Match the lines of Korean lang. file with english's one 2 years ago
Jonathan G Rennison 6a69a5495f Add tracerestrict action to set combined normal/shunt signal mode
Add associated conditional to get reservation end tile
2 years ago
TELK 9c81951cef Update: Korean translation up to 10b415b 2 years ago
TELK 08726de24c Update: Korean translation up to v0.47.3 2 years ago
Jonathan G Rennison 9a40b9fbb9 Merge PR #390 into jgrpp 2 years ago
Jonathan G Rennison 6f7f80c6cf Merge branch 'master' into jgrpp 2 years ago
translators 0d3756818f Update: Translations from eints
korean: 1 change by telk5093
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
TELK 7ec5d7b8de Update: Korean translation up to 6107aa9 2 years ago
Jonathan G Rennison ad47275d53 Disabling timetable automation without ctrl no longer clears timetable 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 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 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
TELK 483e2f6a74 Update: Korean translation up to 2bfa53f 2 years ago
translators c36fc98137 Update: Translations from eints 2 years ago
Jonathan G Rennison 4fde8d13a7 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/lang/belarusian.txt
2 years ago
translators 83b6defbfb Update: Translations from eints
korean: 1 change by telk5093
turkish: 5 changes by AlphenLLC
2 years ago
TELK 1c7263a736 Update: Korean translation up to a7bcb7e 2 years ago
Jonathan G Rennison 5a6a2400a5 Merge branch 'pr-364' into jgrpp 2 years ago
TELK 680344719b Fix: Korean translation 2 years ago
translators 61abfc9050 Update: Translations from eints
korean: 2 changes by telk5093
slovak: 14 changes by FuryPapaya
thai: 107 changes by phetoffux
2 years ago
TELK 6d9921ef72 Update: Korean translation up to 0.46-rc1 2 years ago
TELK f0da66961a Update: Korean translation for conditional orders 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