Jonathan G Rennison
2829a6fdf7
strgen: Split non-upstream translated strings into separate file
2 years ago
Jonathan G Rennison
ae9b416684
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ai/ai_core.cpp
# src/ai/ai_gui.cpp
# src/ai/ai_instance.cpp
# src/console_cmds.cpp
# src/engine_type.h
# src/game/game_gui.cpp
# src/game/game_instance.cpp
# src/goal.cpp
# src/goal_cmd.h
# src/lang/english.txt
# src/lang/estonian.txt
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_generic.h
# src/openttd.cpp
# src/saveload/saveload.h
# src/script/api/script_log.cpp
# src/script/api/script_town.cpp
# src/settings_table.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_map.h
# src/strings.cpp
# src/table/settings/difficulty_settings.ini
# src/table/settings/gui_settings.ini
# src/tbtr_template_gui_main.h
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/water_cmd.cpp
2 years ago
translators
b083584649
Update: Translations from eints
...
arabic (egypt): 30 changes by AviationGamerX
portuguese: 1 change by azulcosta
2 years ago
Jonathan G Rennison
17f1d92072
Template replacement: Allow naming templates
...
See: #481
2 years ago
translators
7c998d46bd
Update: Translations from eints
...
spanish (mexican): 22 changes by VMMF
chinese (simplified): 2 changes by XiaoJi-Game
turkish: 2 changes by EndChapter
2 years ago
translators
e41af1f2bb
Update: Translations from eints
...
portuguese (brazilian): 8 changes by ericandradex
2 years ago
Jonathan G Rennison
a9100e93cb
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/group_cmd.cpp
# src/lang/korean.txt
# src/lang/simplified_chinese.txt
# src/script/api/script_rail.cpp
# src/tunnelbridge_cmd.cpp
2 years ago
Jonathan G Rennison
1f364c6b21
Fix the viewport map default display mode setting
...
Routes value was missing
Adjust strings
See: #475
2 years ago
translators
5eb2e0fd3d
Update: Translations from eints
...
dutch: 4 changes by Afoklala
2 years ago
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
2 years ago
translators
b05c21203a
Update: Translations from eints
...
arabic (egypt): 20 changes by AviationGamerX
2 years ago
Jonathan G Rennison
0310fb0cdc
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/czech.txt
# src/lang/galician.txt
# src/lang/german.txt
# src/order_cmd.cpp
# src/saveload/afterload.cpp
# src/ship.h
# src/vehicle.cpp
2 years ago
translators
3af2c7fff6
Update: Translations from eints
...
swedish: 9 changes by joeax910
norwegian (bokmal): 7 changes by buzzCraft
chinese (traditional): 48 changes by wpi3
galician: 98 changes by pvillaverde
vietnamese: 13 changes by myquartz
czech: 42 changes by vladoschreiner, 40 changes by PatrikSamuelTauchim, 19 changes by adamek0202, 3 changes by LubosKolouch
chinese (simplified): 52 changes by HansKaffee
luxembourgish: 148 changes by phreeze83
hungarian: 50 changes by PstasDev, 23 changes by baliball
german: 69 changes by Wuzzy2, 4 changes by Luensche
romanian: 3 changes by kneekoo
ukrainian: 45 changes by StepanIvasyn
catalan: 12 changes by J0anJosep
turkish: 9 changes by Anceph
french: 1 change by Athozus
portuguese (brazilian): 9 changes by ericandradex
2 years ago
Jonathan G Rennison
64c210f770
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/build_vehicle_gui.cpp
# src/engine.cpp
# src/engine_func.h
# src/group_gui.cpp
# src/lang/english.txt
# src/newgrf.cpp
# src/saveload/oldloader_sl.cpp
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
2 years ago
Woelfi Von Wolfhausen
80444e7c55
Grammar in German lang-file ( #441 )
2 years ago
Jonathan G Rennison
14f4f6d104
Remove now unused vehicle.flip_direction_all_trains setting
2 years 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
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
d19771c36b
Merge PR #457 into jgrpp
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
Jonathan G Rennison
6cf62af092
Change vehicle route overlay settings
...
Add a mode setting: off, all locations, station stops only
Change show vehicle route setting to on/off
Move settings to their own section in the GUI
Add an unset hotkey to switch the mode setting
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
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
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
aa4501747f
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/base_station_base.h
# src/lang/german.txt
# src/saveload/station_sl.cpp
# src/station.cpp
# src/station_cmd.cpp
2 years ago
translators
7711907a6b
Update: Translations from eints
...
german: 16 changes by SecretIdetity
tamil: 3 changes by merni-ns
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
Jonathan G Rennison
1518c2fa1e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/depot_type.h
# src/lang/german.txt
# src/order_gui.cpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/script/api/script_window.hpp.in
# src/settings_table.cpp
# 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
translators
b0fd51a5ef
Update: Translations from eints
...
korean: 1 change by telk5093
german: 5 changes by MagnumSociety
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
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
Woelfi Von Wolfhausen
462d9414d6
Better word order
2 years ago
Woelfi Von Wolfhausen
c6cb89827d
Typos
...
I went through the settings and found some more typos :)
2 years ago
Woelfi Von Wolfhausen
8184ad6427
Make small corrections regarding the orthography
...
Tippfeler behobne
2 years ago
translators
e5203f3409
Update: Translations from eints
...
vietnamese: 7 changes by KhoiCanDev
german: 6 changes by Wuzzy2
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
1d08572cfa
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/english_AU.txt
# src/openttd.cpp
# src/viewport_sprite_sorter_sse4.cpp
2 years ago
Jonathan G Rennison
ad00f5032a
Add a setting to show the introduction year for train wagons
2 years ago