Commit Graph

9189 Commits

Author SHA1 Message Date
translators
4487ad1a5e Update: Translations from eints
korean: 1 change by telk5093
polish: 2 changes by pAter-exe
2021-10-25 18:49:13 +00:00
Jonathan G Rennison
ffef1c9e44 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/table/settings/settings.ini
#	src/town_cmd.cpp
#	src/vehicle.cpp
2021-10-25 18:10:15 +01:00
Jonathan G Rennison
944f090b46 Add settings for minimum contiguous landmass size for town/city placement 2021-10-25 00:30:25 +01:00
translators
a0831cec39 Update: Translations from eints
swedish: 1 change by joeax910
2021-10-24 18:46:47 +00:00
translators
279fe11b03 Update: Translations from eints
indonesian: 2 changes by hadyatmo
2021-10-23 18:47:57 +00:00
translators
bf0210229c Update: Translations from eints
english (us): 2 changes by 2TallTyler
vietnamese: 2 changes by KhoiCanDev
catalan: 2 changes by J0anJosep
portuguese (brazilian): 2 changes by Vimerum
2021-10-22 18:53:01 +00:00
translators
ae340f415e Update: Translations from eints
russian: 2 changes by Ln-Wolf
2021-10-21 18:47:48 +00:00
translators
b043d58b92 Update: Translations from eints
swedish: 4 changes by joeax910
spanish: 1 change by MontyMontana
2021-10-20 18:49:34 +00:00
translators
e68a51eced Update: Translations from eints
korean: 3 changes by telk5093
french: 2 changes by glx22
portuguese: 2 changes by azulcosta
2021-10-19 18:47:37 +00:00
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
2021-10-18 18:48:12 +00:00
Jonathan G Rennison
544da99102 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/cargopacket.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraph.h
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.h
#	src/network/network_admin.h
#	src/network/network_func.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/order_base.h
#	src/rail_cmd.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/signs_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/subsidy_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_object.cpp
#	src/settings.cpp
#	src/string.cpp
#	src/string_func.h
#	src/table/CMakeLists.txt
#	src/table/settings/settings.ini
#	src/viewport_sprite_sorter_sse4.cpp
2021-10-18 18:01:27 +01:00
Charles Pigott
53e17d07d2 Fix #9595: Always use plural forms of cargo for subsidy strings (#9619) 2021-10-18 09:43:14 +01:00
Jonathan G Rennison
406b81abb1 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/economy.cpp
#	src/lang/traditional_chinese.txt
#	src/order_gui.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini
2021-10-18 00:43:50 +01:00
Charles Pigott
0853c1979b Feature: Button to toggle showing advanced signal types (#9617) 2021-10-17 19:24:50 +01:00
Charles Pigott
3b7daca832 Change: Don't use 'server address' string in server list when displaying an invite code (#9615) 2021-10-17 18:14:25 +01:00
translators
d66dea5d83 Update: Translations from eints
indonesian: 9 changes by bsuseno
2021-10-15 18:47:17 +00:00
translators
4b96244b4d Update: Translations from eints
romanian: 6 changes by kneekoo
2021-10-12 18:47:28 +00:00
translators
d0092925c9 Update: Translations from eints
romanian: 9 changes by kneekoo
2021-10-11 18:48:06 +00:00
translators
7d831be3ab Update: Translations from eints
indonesian: 6 changes by bsuseno
2021-10-10 18:46:33 +00:00
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)
2021-10-08 18:19:31 +01:00
translators
33a55c5fd4 Update: Translations from eints
hindi: 67 changes by ritwikraghav14

(cherry picked from commit c562b4c527)
2021-10-08 18:19:25 +01:00
translators
9831644112 Update: Translations from eints
spanish (mexican): 2 changes by absay

(cherry picked from commit 37b285ad83)
2021-10-08 18:18:51 +01:00
translators
7119903c94 Update: Translations from eints
german: 1 change by Wuzzy2
spanish: 1 change by ilyabakhlin

(cherry picked from commit 12de256b72)
2021-10-08 18:18:44 +01:00
translators
de83640d77 Update: Translations from eints
english (us): 1 change by 2TallTyler
catalan: 5 changes by J0anJosep

(cherry picked from commit d835a42c05)
2021-10-08 18:18:35 +01:00
translators
f7ca8bd6ae Update: Translations from eints
spanish (mexican): 1 change by absay
latvian: 2 changes by osprinkis

(cherry picked from commit 3559e55b91)
2021-10-08 18:18:28 +01:00
translators
b6e29de951 Update: Translations from eints
korean: 1 change by telk5093
dutch: 1 change by Afoklala
french: 1 change by MalaGaM

(cherry picked from commit ea23a9cdb6)
2021-10-08 18:18:21 +01:00
translators
cda901ff04 Update: Translations from eints
korean: 1 change by telk5093

(cherry picked from commit d816ff0361)
2021-10-08 18:18:13 +01:00
translators
7ec6db1808 Update: Translations from eints
swedish: 1 change by joeax910

(cherry picked from commit 48ecc481ee)
2021-10-08 18:18:04 +01:00
translators
c26682de02 Update: Translations from eints
japanese: 1 change by scabtert

(cherry picked from commit 956d761e3e)
2021-10-08 18:17:57 +01:00
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)
2021-10-08 18:17:48 +01:00
translators
b24fba8a94 Update: Translations from eints
norwegian (bokmal): 3 changes by Anolitt
dutch: 3 changes by Afoklala
portuguese (brazilian): 3 changes by Vimerum

(cherry picked from commit ce1c60699a)
2021-10-08 18:17:31 +01:00
translators
a702de64c3 Update: Translations from eints
chinese (traditional): 9 changes by benny30111
english (us): 3 changes by 2TallTyler

(cherry picked from commit 7b5c0b4236)
2021-10-08 18:17:21 +01:00
Tyler Trahan
fb0549ea59 Feature: Configurable subsidy duration
(cherry picked from commit d09210e1c6)
2021-10-08 18:13:02 +01:00
Jonathan G Rennison
4042480806 Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini
2021-10-08 18:12:04 +01:00
translators
8b157c9bdf Update: Translations from eints
romanian: 1 change by kneekoo
2021-10-06 18:47:23 +00:00
translators
d2bc32e94a Update: Translations from eints
korean: 1 change by telk5093
romanian: 15 changes by kneekoo
2021-10-04 18:48:34 +00:00
translators
340a36bf1f Update: Translations from eints
romanian: 8 changes by kneekoo
irish: 55 changes by temuchie
2021-10-03 18:46:14 +00:00
Loïc Guilloux
2144cd98a3 Fix: Incorrect Romanian own name (#9598) 2021-10-03 09:49:03 +01:00
translators
a2cf81e722 Update: Translations from eints
romanian: 38 changes by kneekoo
2021-10-02 18:46:31 +00:00
translators
78d66b7732 Update: Translations from eints
romanian: 145 changes by kneekoo
2021-10-01 18:45:29 +00:00
translators
41094b6a4a Update: Translations from eints
spanish: 14 changes by MontyMontana
2021-09-30 18:48:12 +00:00
translators
e89be8d97a Update: Translations from eints
indonesian: 28 changes by bsuseno
romanian: 49 changes by kneekoo
2021-09-29 18:47:12 +00:00
Jonathan G Rennison
db11c1d927 Add setting description help text for extra asymmetric linkgraph modes
See also: #321
2021-09-29 19:41:59 +01:00
translators
b4bacff4fe Update: Translations from eints
hungarian: 4 changes by pnpBrumi
indonesian: 41 changes by bsuseno
italian: 28 changes by CoderLel
romanian: 46 changes by kneekoo
slovak: 18 changes by ApplePie420
danish: 279 changes by nielsmh
2021-09-28 18:47:22 +00:00
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
2021-09-27 22:47:23 +01:00
translators
7a48b5597d Update: Translations from eints
czech: 40 changes by LubosKolouch, 27 changes by CzechRepublic98
hungarian: 1 change by pnpBrumi
turkish: 13 changes by ahmetlii
2021-09-27 18:49:51 +00:00
translators
7aacb2ed8e Update: Translations from eints
japanese: 18 changes by akaregi, 10 changes by clzls
slovenian: 17 changes by Matej1245
czech: 33 changes by CzechRepublic98
chinese (simplified): 27 changes by clzls
arabic (egypt): 17 changes by AviationGamerX
luxembourgish: 99 changes by phreeze83
hungarian: 24 changes by pnpBrumi, 6 changes by baliball
serbian: 107 changes by nkrs
romanian: 16 changes by kneekoo, 2 changes by ALEX11BR
irish: 229 changes by temuchie
ukrainian: 113 changes by StepanIvasyn
latvian: 8 changes by lexuslatvia
lithuanian: 41 changes by devbotas
polish: 1 change by yazalo
2021-09-26 18:47:33 +00:00
Woelfi Von Wolfhausen
f047690dc9 Fix typo, ii
Typo, a t was missing (Frach-art to Fracht-art)
2021-09-26 18:17:04 +02:00
Woelfi Von Wolfhausen
06b9881a05 Fix typos
Fix some typos regarding formality and noun-is-written-big-rules
2021-09-26 17:57:37 +02:00
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
2021-09-25 18:46:38 +00:00