Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-13 07:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,209 Commits 12 Branches 180 Tags 450 MiB
6611ed5a53
Commit Graph

1767 Commits

Author SHA1 Message Date
Xaroth Brook
86e08aa8ef Update: Apply name changes to all languages. 2020-12-21 23:12:58 +01:00
translators
8c42f3a8d4 Update: Translations from eints 
french: 1 change by glx22
 2020-12-14 23:45:41 +00:00
translators
819ce1bf49 Update: Translations from eints 
slovak: 30 changes by FuryPapaya
lithuanian: 37 changes by devastatorius
 2020-12-09 13:42:08 +00:00
Jonathan G Rennison
d85a529f87 Merge branch 'master' into jgrpp 2020-10-14 17:38:23 +01:00
translators
a36a1b5ff5 Update: Translations from eints 
slovak: 193 changes by FuryPapaya
spanish: 46 changes by MontyMontana
 2020-10-06 17:51:50 +00:00
translators
e01143edf8 Update: Translations from eints 
italian: 1 change by AlphaJack
romanian: 13 changes by ALEX11BR
finnish: 6 changes by VeeraKoo
slovak: 202 changes by FuryPapaya
spanish: 240 changes by MontyMontana
 2020-10-05 17:51:44 +00:00
Jonathan G Rennison
5b78090a61 Merge branch 'master' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	src/saveload/town_sl.cpp
#	src/screenshot.h
#	src/script/api/ai/ai_date.hpp.sq
#	src/script/api/ai/ai_marine.hpp.sq
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_date.hpp.sq
#	src/script/api/game/game_marine.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/game/game_window.hpp.sq
#	src/script/api/script_window.hpp
#	src/script/api/template/template_window.hpp.sq
#	src/signal.cpp
#	src/statusbar_gui.cpp
#	src/toolbar_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2020-08-27 18:31:09 +01:00
TechGeekNZ
a10013dd00 Codechange: Spell 'Viewport' consistently 
Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'.
This patch makes everything consistent.
 2020-07-27 17:31:29 +01:00
Jonathan G Rennison
7467051331 Merge branch 'master' into jgrpp 
# Conflicts:
#	.gitignore
#	src/network/network_server.cpp
#	src/vehicle_gui.cpp
 2020-07-12 12:29:28 +01:00
TrevorShelton
c39d62c245 Update: Disuse of STR_ERROR_INCOMPATIBLE_ROAD 2020-07-10 14:47:55 +01:00
Jonathan G Rennison
07c9621fcf Merge branch 'master' into jgrpp 2020-05-07 20:57:47 +01:00
glx
f0747c8c51 Update: Lang files 2020-05-06 09:54:36 +01:00
Jonathan G Rennison
4adfe0c9ae Merge branch 'master' into jgrpp 
# Conflicts:
#	src/industry_gui.cpp
#	src/lang/korean.txt
#	src/town.h
#	src/town_gui.cpp
 2020-01-08 18:40:34 +00:00
Niels Martin Hansen
7413d65c2a Cleanup: Unused music GUI strings 2020-01-07 18:13:58 +01:00
Jonathan G Rennison
7960db35f2 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
 2020-01-06 18:45:51 +00:00
translators
3a557b0336 Update: Translations from eints 
finnish: 11 changes by hpiirai
korean: 6 changes by telk5093
 2020-01-01 19:45:41 +01:00
pnda
e558aa8ff4 Feature: Screenshot window 2020-01-01 10:19:12 +00:00
translators
dbe44e80f1 Update: Translations from eints 2019-12-23 19:45:40 +01:00
Jonathan G Rennison
ab3a373c73 Merge branch 'master' into jgrpp 2019-11-16 19:54:31 +00:00
glx
9fc6329066 Cleanup: Remove unused strings 2019-11-13 08:11:37 +00:00
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
 2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
1f535915d1 Merge branch 'master' into jgrpp-nrt 
# Conflicts:
#	config.lib
#	src/core/bitmath_func.hpp
#	src/lang/korean.txt
#	src/main_gui.cpp
#	src/order_gui.cpp
#	src/script/api/script_object.cpp
#	src/station_cmd.cpp
#	src/video/cocoa/wnd_quartz.mm
 2019-09-18 01:18:28 +01:00
translators
c7c1d1cb0c Update: Translations from eints 
spanish: 1 change by lpenap
 2019-08-24 19:45:40 +02:00
Jonathan G Rennison
6562937899 Merge branch 'master' into jgrpp-nrt 
# Conflicts:
#	src/console_cmds.cpp
#	src/script/api/script_order.cpp
#	src/station_cmd.cpp
#	src/statusbar_gui.cpp
#	src/town_gui.cpp
 2019-08-24 11:00:41 +01:00
translators
88950d8f23 Update: Translations from eints 
swedish: 49 changes by daishan
spanish: 80 changes by lpenap
 2019-07-15 19:45:44 +02:00
translators
24cec63a3d Update: Translations from eints 
welsh: 13 changes by kazzie
spanish: 35 changes by lpenap
 2019-07-14 19:45:46 +02:00
Jonathan G Rennison
dbc5f1baed Merge branch 'master' into jgrpp-nrt 
# Conflicts:
#	src/fontcache.cpp
#	src/game/game_text.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/station_cmd.cpp
#	src/viewport.cpp
 2019-07-11 20:03:23 +01:00
Jonathan G Rennison
ba8ed880c1 Merge branch 'master' into jgrpp-nrt 
Merge NRT feature

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_map.h
#	src/build_vehicle_gui.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/road_gui.cpp
#	src/road_map.h
#	src/road_type.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/script/api/script_bridge.cpp
#	src/table/newgrf_debug_data.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
 2019-07-11 19:45:56 +01:00
peter1138
a1de834104 Cleanup: Remove unused string. 2019-05-04 22:39:29 +01:00
translators
3469a2a445 Update: Translations from eints 
dutch: 27 changes by JanWillem
french: 29 changes by glx
hungarian: 3 changes by Brumi
korean: 71 changes by telk5093
 2019-05-02 19:45:47 +02:00
peter1138
672c857e37 Cleanup: Update modified and removed strings in language files. 2019-05-01 21:36:27 +02:00
Jonathan G Rennison
58433c7667 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/core/smallmap_type.hpp
#	src/lang/korean.txt
#	src/network/network_content.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
 2019-03-30 20:45:58 +00:00
translators
e817951bfd Update: Translations from eints 
finnish: 2 changes by hpiirai
english (us): 17 changes by Supercheese
luxembourgish: 10 changes by Phreeze
dutch: 20 changes by JanWillem
norwegian (bokmal): 2 changes by Leifbk
latin: 16 changes by Supercheese
portuguese: 3 changes by JayCity
 2019-03-27 19:45:44 +01:00
Jonathan G Rennison
ba34ec7ade Merge branch 'master' into jgrpp 
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
 2019-03-27 18:12:04 +00:00
translators
37b9fdc0c1 Update: Translations from eints 
finnish: 13 changes by hpiirai
korean: 1 change by telk5093
 2019-03-24 19:45:44 +01:00
Patric Stout
72c5f2b3ee Remove: DOS support 
In 10 years there was no active development on DOS. Although it
turned out to still work, the FPS was very bad. There is little
interest in the current community to look into this.

Further more, we like to switch to c++11 functions for threads,
which are not implemented by DJGPP, the only current compiler
for DOS.

Additionally, DOS is the only platform which does not support
networking. It is the reason we have tons of #ifdefs to support
disabling networking.

By removing DOS support, we can both use c++11 functions for threads,
and remove all the code related to disabling network. Sadly, this
means we have to see DOS go.

Of course, if you feel up for the task, simply revert this commit,
and implement stub c++11 functions for threads and stub functions
for networking. We are more than happy to accept such Pull Request.
 2019-03-19 23:22:51 +01:00
Charles Pigott
592f591a4b Cleanup: Unused lang strings 2019-03-16 22:30:11 +00:00
Jonathan G Rennison
5e6d283463 Merge branch 'master' into jgrpp 
Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
 2019-03-13 03:38:26 +00:00
Patric Stout
f58db44ff2 Remove: BeOS support (deprecated by Haiku) 
In 10 years there is no commit to change how BeOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).

With the arrival of SDL2 (and removal of SDL), BeOS is no longer
support. SDL2 suggests to use Haiku instead of BeOS.
 2019-03-05 22:03:00 +01:00
Patric Stout
7784d77713 Remove: MorphOS / AmigaOS support 
In 10 years there is no commit to change how MorphOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).

With the arrival of SDL2 (and removal of SDL), MorphOS is no longer
support. There is an SDL2 port for MorphOS, but it is not maintained
by upstream SDL2, and nobody can currently test it out.

If anyone wants to re-add MorphOS, please do (revert this patch,
fix the problems, and create a Pull Request). If you need any help
doing so, let us know! It is not that we don't like MorphOS, it is
that we don't have anyone fixing the problems :(
 2019-03-05 22:03:00 +01:00
Jonathan G Rennison
7ff252c58d Merge branch 'master' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h
 2019-03-04 01:18:25 +00:00
translators
f240f61fb2 Update: Translations from eints 
danish: 11 changes by nielsmh
spanish (mexican): 11 changes by Absay
hungarian: 100 changes by Brumi
russian: 6 changes by Lone_Wolf
croatian: 9 changes by VoyagerOne
 2019-02-23 19:45:45 +01:00
Jonathan G Rennison
36ac643749 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/afrikaans.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/estonian.txt
#	src/lang/finnish.txt
#	src/lang/french.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/norwegian_bokmal.txt
#	src/lang/norwegian_nynorsk.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/unfinished/persian.txt
#	src/lang/vietnamese.txt
#	src/lang/welsh.txt
#	src/rail_cmd.cpp
#	src/station_cmd.cpp
 2019-02-19 19:36:30 +00:00
glx
ebe84b9d4c Cleanup: update modified and removed strings in languages 2019-02-16 22:19:16 +01:00
Jonathan G Rennison
9d3b77c5a2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
 2019-02-02 01:27:56 +00:00
Peter Nelson
fa53abe864 Doc: Yearly increment. 2019-02-01 22:12:07 +00:00
translators
8e02b7952b Update: Translations from eints 
swedish: 36 changes by Joel_A
spanish: 3 changes by SilverSurferZzZ
russian: 2 changes by Lone_Wolf
romanian: 18 changes by kneekoo
portuguese: 37 changes by vesgo
 2019-01-31 19:45:43 +01:00
Jonathan G Rennison
281d346fe2 Merge branch 'master' into jgrpp 
# Conflicts:
#	bin/baseset/no_sound.obs
#	bin/baseset/orig_dos.obg
#	bin/baseset/orig_dos.obs
#	bin/baseset/orig_dos_de.obg
#	bin/baseset/orig_win.obg
#	bin/baseset/orig_win.obm
#	bin/baseset/orig_win.obs
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.cpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/common.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/saveload/saveload.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2019-01-29 02:28:14 +00:00
translators
9f458ecb10 Update: Translations from eints 
korean: 15 changes by telk5093
spanish: 2 changes by SilverSurferZzZ
russian: 21 changes by Lone_Wolf
spanish (mexican): 13 changes by Absay
 2019-01-28 19:45:43 +01:00
translators
80c7965c65 Update: Translations from eints 
belarusian: 1 change by translators
norwegian (nynorsk): 1 change by translators
chinese (simplified): 1 change by translators
serbian: 1 change by translators
czech: 1 change by translators
esperanto: 1 change by translators
chinese (traditional): 1 change by translators
portuguese (brazilian): 1 change by translators
norwegian (bokmal): 1 change by translators
swedish: 1 change by translators
lithuanian: 1 change by translators
hebrew: 1 change by translators
croatian: 1 change by translators
bulgarian: 1 change by translators
catalan: 1 change by translators
afrikaans: 1 change by translators
vietnamese: 1 change by translators
slovenian: 1 change by translators
faroese: 1 change by translators
thai: 1 change by translators
frisian: 1 change by translators
scottish gaelic: 1 change by translators
persian: 1 change by translators
korean: 1 change by translators
greek: 1 change by translators
latin: 1 change by translators
welsh: 1 change by translators
galician: 1 change by translators
japanese: 1 change by translators
english (au): 1 change by translators
italian: 6 changes by lorenzodv, 1 change by translators
urdu: 1 change by translators
french: 7 changes by glx
malay: 1 change by translators
tamil: 1 change by translators
spanish: 4 changes by SilverSurferZzZ, 1 change by translators
slovak: 1 change by translators
basque: 1 change by translators
polish: 1 change by translators
indonesian: 1 change by translators
arabic (egypt): 1 change by translators
russian: 2 changes by Lone_Wolf, 1 change by translators
hungarian: 1 change by translators
luxembourgish: 1 change by translators
romanian: 1 change by translators
irish: 1 change by translators
latvian: 1 change by translators
german: 1 change by translators
danish: 1 change by translators
spanish (mexican): 7 changes by Absay
icelandic: 1 change by translators
english (us): 1 change by translators
turkish: 1 change by translators
portuguese: 1 change by translators
ukrainian: 1 change by translators
finnish: 1 change by translators
dutch: 1 change by translators
estonian: 1 change by translators
 2019-01-27 19:45:42 +01:00
Peter Nelson
b60b193a6d Cleanup: Remove out of date translations for changed string. 2019-01-27 12:34:49 +01:00
translators
ed325ada88 Update: Translations from eints 
spanish: 3 changes by SilverSurferZzZ
 2019-01-23 19:45:44 +01:00
Jonathan G Rennison
191afd93c1 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/vehicle_base.h
#	src/widgets/dropdown.cpp
 2019-01-21 19:28:29 +00:00
translators
60da05cf2a Update: Translations from eints 
french: 3 changes by glx
 2019-01-19 19:45:43 +01:00
Niels Martin Hansen
f37304f9f5 Cleanup: Remove unused strings 2019-01-19 13:33:17 +01:00
translators
07a40df9ab Update: Translations from eints 
spanish: 4 changes by SilverSurferZzZ
spanish (mexican): 1 change by Absay
 2019-01-18 19:45:44 +01:00
translators
91315a7a39 Update: Translations from eints 
spanish: 3 changes by SilverSurferZzZ
 2019-01-15 19:45:41 +01:00
Jonathan G Rennison
e3d167f9f0 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	config.lib
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
 2019-01-14 00:01:44 +00:00
translators
c80608a83c Update: Translations from eints 
spanish: 3 changes by SilverSurferZzZ
spanish (mexican): 3 changes by Absay
 2019-01-11 19:45:46 +01:00
translators
e34a6c58ea Update: Translations from eints 
italian: 1 change by lorenzodv
french: 29 changes by glx
 2019-01-10 19:45:44 +01:00
Jonathan G Rennison
0e7519f33e Merge branch 'more_cond_orders-sx' into jgrpp 
# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
 2019-01-06 22:35:57 +00:00
translators
49ab02c084 Update: Translations from eints 
spanish: 4 changes by SilverSurferZzZ
 2019-01-04 19:45:45 +01:00
Jonathan G Rennison
7da1f8b592 Merge branch 'master' into jgrpp 2018-12-19 00:18:49 +00:00
translators
2ab4b5dd03 Update: Translations from eints 
spanish: 3 changes by SilverSurferZzZ
 2018-12-14 19:45:43 +01:00
translators
2978388153 Update: Translations from eints 
spanish: 5 changes by SilverSurferZzZ
spanish (mexican): 23 changes by Absay
 2018-12-13 19:45:44 +01:00
translators
863b80e880 Update: Translations from eints 
spanish: 6 changes by SilverSurferZzZ
 2018-12-10 19:45:44 +01:00
Jonathan G Rennison
2003a86932 Merge remote-tracking branch 'origin/master' into jgrpp 
# Conflicts:
#	src/string.cpp
 2018-12-10 18:40:05 +00:00
translators
68b5b11b7c Update: Translations from eints 
spanish: 4 changes by SilverSurferZzZ
 2018-12-09 19:45:44 +01:00
translators
c63f0b3005 Update: Translations from eints 
chinese (simplified): 28 changes by ww9980
spanish: 12 changes by SilverSurferZzZ
 2018-12-08 19:45:43 +01:00
translators
cd44e33f4e Update: Translations from eints 
spanish: 4 changes by SilverSurferZzZ
portuguese: 2 changes by Samu
 2018-12-07 19:45:44 +01:00
translators
587c2149b6 Update: Translations from eints 
croatian: 23 changes by VoyagerOne
spanish: 8 changes by SilverSurferZzZ
 2018-12-03 19:45:44 +01:00
translators
88894166e8 Update: Translations from eints 
italian: 23 changes by lorenzodv
spanish: 2 changes by SilverSurferZzZ
 2018-11-29 19:45:43 +01:00
translators
eab3aa16aa Update: Translations from eints 
spanish: 3 changes by SilverSurferZzZ
 2018-11-27 19:45:42 +01:00
Jonathan G Rennison
b1190b32b0 Merge branch 'master' into jgrpp 2018-11-26 18:49:15 +00:00
translators
af4a21bd82 Update: Translations from eints 
korean: 4 changes by telk5093
spanish: 3 changes by SilverSurferZzZ
russian: 8 changes by Lone_Wolf
 2018-11-25 19:45:41 +01:00
Jonathan G Rennison
f3c52f1b6c Merge branch 'master' into jgrpp 2018-11-22 19:04:59 +00:00
translators
16a36dffa0 Update: Translations from eints 
spanish: 2 changes by SilverSurferZzZ
 2018-11-21 19:45:42 +01:00
Jonathan G Rennison
c1df63a2eb Merge branch 'master' into jgrpp 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/viewport.cpp
 2018-11-19 20:51:16 +00:00
translators
71cda6ca1d Update: Translations from eints 
spanish: 10 changes by SilverSurferZzZ
 2018-11-13 19:45:42 +01:00
Jonathan G Rennison
e735c1a51a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
 2018-11-05 12:53:36 +00:00
Oskari Leppäaho
b3b89257f7 Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION" 2018-10-31 19:24:21 +01:00
Jonathan G Rennison
035f5622b9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h
 2018-07-24 18:30:42 +01:00
translators
6a6ffddc5f Update: Translations from eints 
greek: 46 changes by kyrm
italian: 44 changes by lorenzodv
 2018-07-20 19:45:40 +02:00
Jonathan G Rennison
8e9d68048a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/string.cpp
 2018-06-07 06:49:18 +01:00
PeterN
eaa32f5ad5
Change: Use name of cargo instead of Passengers/Mail in town statistics. (#6801) 
* Change: Use name of cargo instead of Passengers/Mail in town statistics.
* Cleanup: Remove strings from all language files.
 2018-06-04 13:14:11 +01:00
Jonathan G Rennison
ad1c402ad8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
 2018-05-03 23:54:51 +01:00
Niels Martin Hansen
683b46a5b5 Cleanup: Remove unused strings from language files 2018-04-29 19:26:05 +02:00
PeterN
cfe6a8ea4f
Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. (#6756) 2018-04-28 22:27:14 +01:00
Jonathan G Rennison
385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 2018-03-11 22:21:39 +00:00
frosch
91464af737 (svn r27980) -Doc: Yearly increment 2018-03-11 12:24:32 +00:00
frosch
b1592787eb (svn r27980) -Doc: Yearly increment 2018-03-11 12:24:32 +00:00
Jonathan G Rennison
4a0d949d83 Merge branch 'master' into jgrpp 2018-01-14 23:22:47 +00:00
frosch
1bc6fdef31 (svn r27953) -Cleanup: Adjust other languages for r27952 2017-12-27 21:55:30 +00:00
frosch
b394dd8468 (svn r27953) -Cleanup: Adjust other languages for r27952 2017-12-27 21:55:30 +00:00
Jonathan G Rennison
f77a368268 Merge branch 'crashlog_improvements' into jgrpp 2017-09-04 01:23:08 +01:00
alberth
a3f30a30df (svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01) 2017-08-20 07:11:08 +00:00
alberth
2eae80bbfe (svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01) 2017-08-20 07:11:08 +00:00
Jonathan G Rennison
52dadc9252 Merge branch 'master' into jgrpp 2017-07-27 18:41:43 +01:00
translators
bf3fd277c1 (svn r27891) -Update from Eints: 
spanish: 29 changes by SilverSurferZzZ
 2017-07-25 17:45:37 +00:00
translators
ccf7580eb8 (svn r27891) -Update from Eints: 
spanish: 29 changes by SilverSurferZzZ
 2017-07-25 17:45:37 +00:00
translators
de2ef2b543 (svn r27890) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-07-13 17:45:38 +00:00
translators
8220a8a971 (svn r27890) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-07-13 17:45:38 +00:00
Jonathan G Rennison
21696cc126 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/lang/german.txt
 2017-06-06 21:06:47 +01:00
translators
8b1bf56b29 (svn r27873) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-05-15 17:45:36 +00:00
translators
7174f04322 (svn r27873) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-05-15 17:45:36 +00:00
translators
092ede70fd (svn r27871) -Update from Eints: 
korean: 2 changes by telk5093
spanish: 2 changes by SilverSurferZzZ
german: 6 changes by mini1025
 2017-05-11 17:45:37 +00:00
translators
43a917420b (svn r27871) -Update from Eints: 
korean: 2 changes by telk5093
spanish: 2 changes by SilverSurferZzZ
german: 6 changes by mini1025
 2017-05-11 17:45:37 +00:00
Jonathan G Rennison
40b89902a5 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/galician.txt
 2017-05-10 19:40:39 +01:00
translators
5d80417591 (svn r27869) -Update from Eints: 
spanish: 2 changes by SilverSurferZzZ
hungarian: 6 changes by Brumi
 2017-05-08 17:45:36 +00:00
translators
8dfa9bddd7 (svn r27869) -Update from Eints: 
spanish: 2 changes by SilverSurferZzZ
hungarian: 6 changes by Brumi
 2017-05-08 17:45:36 +00:00
translators
497aca8175 (svn r27868) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-05-05 17:45:38 +00:00
translators
661ad02c95 (svn r27868) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-05-05 17:45:38 +00:00
translators
0f89d95459 (svn r27855) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-04-16 17:45:36 +00:00
translators
62eb2f1739 (svn r27855) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
 2017-04-16 17:45:36 +00:00
translators
747a950920 (svn r27854) -Update from Eints: 
spanish: 30 changes by SilverSurferZzZ
czech: 18 changes by djst
 2017-04-12 17:45:37 +00:00
translators
8b031f6c89 (svn r27854) -Update from Eints: 
spanish: 30 changes by SilverSurferZzZ
czech: 18 changes by djst
 2017-04-12 17:45:37 +00:00
translators
3e772b0732 (svn r27853) -Update from Eints: 
spanish: 1 change by juanjo
 2017-04-11 17:45:36 +00:00
translators
aa241d073a (svn r27853) -Update from Eints: 
spanish: 1 change by juanjo
 2017-04-11 17:45:36 +00:00
Jonathan G Rennison
d1a287d73c Merge branch 'save_ext' into jgrpp 2017-04-11 18:42:11 +01:00
translators
6192780721 (svn r27852) -Update from Eints: 
catalan: 31 changes by juanjo
spanish: 5 changes by SilverSurferZzZ
 2017-04-10 17:45:37 +00:00
translators
60ec55b483 (svn r27852) -Update from Eints: 
catalan: 31 changes by juanjo
spanish: 5 changes by SilverSurferZzZ
 2017-04-10 17:45:37 +00:00
Jonathan G Rennison
ca93c90b56 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
 2017-04-07 18:31:06 +01:00
translators
3b6fa4e33f (svn r27848) -Update from Eints: 
korean: 43 changes by telk5093
spanish: 6 changes by SilverSurferZzZ
 2017-04-06 17:45:37 +00:00
translators
1644ef5f2d (svn r27848) -Update from Eints: 
korean: 43 changes by telk5093
spanish: 6 changes by SilverSurferZzZ
 2017-04-06 17:45:37 +00:00
Jonathan G Rennison
80d56307c7 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/group_gui.cpp
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/vehicle_sl.cpp
#	src/window.cpp
 2017-04-04 19:22:56 +01:00
translators
e37d54fb08 (svn r27842) -Update from Eints: 
spanish: 9 changes by SilverSurferZzZ
 2017-04-03 17:45:36 +00:00
translators
9a7fa689a1 (svn r27842) -Update from Eints: 
spanish: 9 changes by SilverSurferZzZ
 2017-04-03 17:45:36 +00:00
Jonathan G Rennison
8317eac918 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
 2017-04-01 01:14:28 +01:00
translators
6ceb8a0d28 (svn r27824) -Update from Eints: 
catalan: 7 changes by juanjo
croatian: 4 changes by VoyagerOne
korean: 15 changes by telk5093
scottish gaelic: 54 changes by GunChleoc
 2017-03-24 18:45:45 +00:00
translators
2385f4adbc (svn r27824) -Update from Eints: 
catalan: 7 changes by juanjo
croatian: 4 changes by VoyagerOne
korean: 15 changes by telk5093
scottish gaelic: 54 changes by GunChleoc
 2017-03-24 18:45:45 +00:00
Jonathan G Rennison
b3fd11efd2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse4.cpp
 2017-03-19 12:27:24 +00:00
alberth
17b46109ad (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 2017-03-18 20:49:24 +00:00
alberth
49c0facf2e (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 2017-03-18 20:49:24 +00:00
alberth
119965125d (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 2017-03-18 20:48:27 +00:00
alberth
2f1d808781 (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 2017-03-18 20:48:27 +00:00
alberth
7c3004c785 (svn r27798) -Change: Also remove obsolete string from the other languages 2017-03-18 20:45:18 +00:00
alberth
85ed4975bf (svn r27798) -Change: Also remove obsolete string from the other languages 2017-03-18 20:45:18 +00:00
Jonathan G Rennison
ac69b746ab Merge branch 'master' into jgrpp 
# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp
 2017-03-12 20:37:26 +00:00
frosch
bc61ff380a (svn r27777) -Doc: Yearly increment 2017-03-11 16:49:51 +00:00
frosch
15032bd765 (svn r27777) -Doc: Yearly increment 2017-03-11 16:49:51 +00:00
Jonathan G Rennison
54494a0a7c Merge branch 'send_money_company' into jgrpp 2017-03-03 22:42:07 +00:00
patch-import
f820543391 Import give money to company patch 
From: https://www.tt-forums.net/viewtopic.php?p=1183311#p1183311

Fix language files and minor formatting issues
 2017-03-02 00:09:23 +00:00
translators
d5c6760c85 (svn r27753) -Update from Eints: 2017-02-26 18:45:43 +00:00
translators
b264dd2a8d (svn r27753) -Update from Eints: 2017-02-26 18:45:43 +00:00
alberth
fa81e20390 (svn r27752) -Cleanup: Remove obsolete strings from other languages as well. 2017-02-26 15:34:57 +00:00
alberth
07254a238d (svn r27752) -Cleanup: Remove obsolete strings from other languages as well. 2017-02-26 15:34:57 +00:00
frosch
050271ed2d (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 2017-01-14 18:30:26 +00:00
frosch
7b553d255e (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 2017-01-14 18:30:26 +00:00
translators
151956d471 (svn r27717) -Update from Eints: 
spanish: 2 changes by SilverSurferZzZ
 2016-12-29 18:45:38 +00:00