f0747c8c51
Update: Lang files
4 years ago
b96e7f78fb
Merge branch 'master' into jgrpp
4 years ago
183c2a35bd
Update: Translations from eints
...
dutch: 2 changes by JanWillem
spanish (mexican): 2 changes by Absay
4 years ago
dd99fd646d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/base_station_base.h
# src/industry.h
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/station_cmd.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
4 years ago
b144258bf0
Update: Translations from eints
...
finnish: 19 changes by ln
dutch: 17 changes by JanWillem
danish: 109 changes by nielsmh
spanish (mexican): 1 change by Absay
korean: 1 change by telk5093
4 years ago
34b7cb6c03
Update: Translations from eints
...
finnish: 3 changes by ln
spanish (mexican): 7 changes by Absay
4 years ago
4adfe0c9ae
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/industry_gui.cpp
# src/lang/korean.txt
# src/town.h
# src/town_gui.cpp
4 years ago
7413d65c2a
Cleanup: Unused music GUI strings
4 years ago
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
4 years ago
e7922cd078
Update: Translations from eints
...
spanish (mexican): 18 changes by Absay
4 years ago
9e4533dc8f
Update: Translations from eints
...
luxembourgish: 131 changes by Phreeze
french: 6 changes by arikover
spanish (mexican): 20 changes by Absay
4 years ago
3a557b0336
Update: Translations from eints
...
finnish: 11 changes by hpiirai
korean: 6 changes by telk5093
4 years ago
e558aa8ff4
Feature: Screenshot window
4 years ago
e18f1703d2
Update: Translations from eints
...
spanish (mexican): 1 change by Absay
russian: 4 changes by Lone_Wolf
4 years ago
dbe44e80f1
Update: Translations from eints
4 years ago
ab3a373c73
Merge branch 'master' into jgrpp
5 years ago
b533c66f42
Update: Translations from eints
...
finnish: 5 changes by hpiirai
galician: 183 changes by Michi
polish: 5 changes by azabost
dutch: 6 changes by JanWillem
spanish (mexican): 5 changes by Absay
5 years ago
9fc6329066
Cleanup: Remove unused strings
5 years ago
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
5 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
ca3c72438e
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.bundle.in
# src/os/macosx/string_osx.cpp
# src/station_cmd.cpp
5 years ago
90682f8623
Update: Translations from eints
...
spanish (mexican): 2 changes by Absay
5 years ago
edfd378e93
Merge branch 'master' into jgrpp
...
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
5 years ago
2e30601b9c
Update: Translations from eints
...
czech: 91 changes by djst, 6 changes by belaseoci
spanish (mexican): 2 changes by Absay
5 years ago
b18a58d5e1
Update: Translations from eints
...
spanish (mexican): 9 changes by Absay
5 years ago
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
5 years ago
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
5 years ago
36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
5 years ago
ef74af6766
Update: Translations from eints
...
finnish: 32 changes by hpiirai
spanish (mexican): 16 changes by Absay
5 years ago
a1de834104
Cleanup: Remove unused string.
5 years ago
6b49205745
Update: Translations from eints
...
spanish (mexican): 16 changes by Absay
russian: 18 changes by Lone_Wolf
5 years ago
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
5 years ago
672c857e37
Cleanup: Update modified and removed strings in language files.
5 years ago
ead5b55119
Update: Translations from eints
...
spanish (mexican): 3 changes by Absay
russian: 3 changes by Lone_Wolf
5 years ago
f5747bf753
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
5 years ago
87d588f22f
Update: Translations from eints
...
luxembourgish: 17 changes by Phreeze
spanish (mexican): 2 changes by njn
5 years ago
a4a3a6a630
Merge branch 'master' into jgrpp
5 years ago
cb449049ff
Update: Translations from eints
...
english (us): 3 changes by Supercheese
spanish (mexican): 18 changes by Absay
hungarian: 2 changes by Brumi
latin: 33 changes by Supercheese
5 years ago
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
5 years ago
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
5 years ago
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
5 years ago
37b9fdc0c1
Update: Translations from eints
...
finnish: 13 changes by hpiirai
korean: 1 change by telk5093
5 years ago
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.
5 years ago
592f591a4b
Cleanup: Unused lang strings
5 years ago
35967effd3
Cleanup: Update changed string in language files.
5 years ago
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
5 years ago
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.
5 years ago
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 :(
5 years ago
db49efe29a
Update: Translations from eints
...
finnish: 40 changes by hpiirai
english (us): 19 changes by njn
spanish (mexican): 3 changes by njn
5 years ago
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
5 years ago
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
5 years ago
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
5 years ago
ef7e47a53a
Update: Translations from eints
...
danish: 5 changes by nielsmh
french: 3 changes by glx
spanish (mexican): 4 changes by Absay
russian: 4 changes by Lone_Wolf
5 years ago
ebe84b9d4c
Cleanup: update modified and removed strings in languages
5 years ago
2142452305
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/gamelog.cpp
# src/gamelog_internal.h
# src/lang/german.txt
# src/lang/korean.txt
# src/network/core/config.h
# src/network/network.cpp
# src/network/network_udp.cpp
# src/rev.h
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/gamelog_sl.cpp
# src/saveload/misc_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
# src/viewport.cpp
5 years ago
bdf0dc67e9
Update: Translations from eints
...
croatian: 4 changes by VoyagerOne
korean: 4 changes by telk5093
russian: 2 changes by Lone_Wolf
german: 4 changes by smwforever45, 4 changes by ShadowCop
spanish (mexican): 2 changes by Absay
portuguese: 52 changes by vesgo
finnish: 3 changes by hpiirai
dutch: 238 changes by JanWillem
estonian: 1 change by rm87
5 years ago
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
5 years ago
fa53abe864
Doc: Yearly increment.
5 years ago
5a5861f245
Update: Translations from eints
...
french: 2 changes by glx
german: 23 changes by planetmaker
danish: 139 changes by nielsmh
spanish (mexican): 3 changes by Absay
portuguese: 55 changes by vesgo
dutch: 214 changes by JanWillem
estonian: 30 changes by rm87
5 years ago
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
5 years ago
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
5 years ago
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
5 years ago
b60b193a6d
Cleanup: Remove out of date translations for changed string.
5 years ago
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
5 years ago
e71f7cf277
Update: Translations from eints
...
russian: 10 changes by Lone_Wolf
hungarian: 5 changes by Brumi
spanish (mexican): 6 changes by Absay
5 years ago
60da05cf2a
Update: Translations from eints
...
french: 3 changes by glx
5 years ago
f37304f9f5
Cleanup: Remove unused strings
5 years ago
07a40df9ab
Update: Translations from eints
...
spanish: 4 changes by SilverSurferZzZ
spanish (mexican): 1 change by Absay
5 years ago
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
5 years ago
c80608a83c
Update: Translations from eints
...
spanish: 3 changes by SilverSurferZzZ
spanish (mexican): 3 changes by Absay
5 years ago
e34a6c58ea
Update: Translations from eints
...
italian: 1 change by lorenzodv
french: 29 changes by glx
5 years ago
5e51d9ee82
Update: Translations from eints
...
hebrew: 22 changes by dnd_man
spanish (mexican): 1 change by Absay
5 years ago
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
5 years ago
391bc45c41
Update: Translations from eints
...
spanish (mexican): 10 changes by Absay
5 years ago
7da1f8b592
Merge branch 'master' into jgrpp
5 years ago
2978388153
Update: Translations from eints
...
spanish: 5 changes by SilverSurferZzZ
spanish (mexican): 23 changes by Absay
6 years ago
b1190b32b0
Merge branch 'master' into jgrpp
6 years ago
f35a59fd38
Update: Translations from eints
...
spanish (mexican): 2 changes by Absay
6 years ago
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
6 years ago
b3b89257f7
Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION"
6 years ago
3a640af71d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ground_vehicle.cpp
# src/viewport.cpp
6 years ago
060248a422
Update: Translations from eints
...
spanish (mexican): 2 changes by Absay
6 years ago
a37e30dfd0
Merge branch 'master' into jgrpp
6 years ago
703e7f8fc7
Update: Translations from eints
...
spanish (mexican): 1 change by Absay
6 years ago
9038ac5c00
Merge branch 'master' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
6 years ago
64dac65e20
Update: Translations from eints
...
spanish (mexican): 1 change by Absay
6 years ago
ae15c96c1a
Merge branch 'master' into jgrpp
...
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_gui.cpp
# src/bridge_map.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/rail_map.h
# src/rail_type.h
# src/road_map.h
# src/saveload/afterload.cpp
# src/saveload/map_sl.cpp
# src/saveload/saveload.cpp
# src/script/api/script_rail.cpp
# src/station_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
6 years ago
8090580f77
Update: Translations from eints
...
spanish (mexican): 25 changes by Absay
6 years ago
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
6 years ago
0bca1c53c9
Update: Translations from eints
...
spanish (mexican): 19 changes by Absay
6 years ago
6a6ffddc5f
Update: Translations from eints
...
greek: 46 changes by kyrm
italian: 44 changes by lorenzodv
6 years ago
85ef5acf29
Update: Translations from eints
...
malay: 10 changes by eidan_shafie
spanish (mexican): 9 changes by Absay
6 years ago
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
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.
6 years ago
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
6 years ago
61515c9abd
Update: Translations from eints
...
belarusian: 10 changes by KorneySan
russian: 6 changes by KorneySan
spanish (mexican): 10 changes by Absay
6 years ago
683b46a5b5
Cleanup: Remove unused strings from language files
6 years ago
cfe6a8ea4f
Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. ( #6756 )
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
a72117111e
Update: Translations from eints
...
spanish (mexican): 6 changes by Absay
6 years ago
080d57d97a
(svn r27991) -Update from Eints:
...
spanish (mexican): 1 change by Absay
6 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
6 years ago
91464af737
(svn r27980) -Doc: Yearly increment
6 years ago
b1592787eb
(svn r27980) -Doc: Yearly increment
6 years ago
d4301cd7b6
(svn r27971) -Update from Eints:
...
spanish (mexican): 2 changes by Absay
6 years ago
9ce3403e2d
(svn r27971) -Update from Eints:
...
spanish (mexican): 2 changes by Absay
6 years ago
911ba8cb8b
Merge branch 'master' into jgrpp
6 years ago
0c43d6903a
(svn r27966) -Update from Eints:
...
spanish (mexican): 32 changes by Absay
portuguese: 41 changes by Samu
6 years ago
5fe62ccb3e
(svn r27966) -Update from Eints:
...
spanish (mexican): 32 changes by Absay
portuguese: 41 changes by Samu
6 years ago
6886b156d2
(svn r27965) -Update from Eints:
...
spanish (mexican): 43 changes by Absay
6 years ago
25c9cc6b11
(svn r27965) -Update from Eints:
...
spanish (mexican): 43 changes by Absay
6 years ago
ef6adb0030
(svn r27964) -Update from Eints:
...
spanish (mexican): 10 changes by Absay
6 years ago
156d34b5e4
(svn r27964) -Update from Eints:
...
spanish (mexican): 10 changes by Absay
6 years ago
4a0d949d83
Merge branch 'master' into jgrpp
6 years ago
98c2fa87e6
(svn r27962) -Update from Eints:
...
spanish (mexican): 1 change by Absay
6 years ago
78d80a9968
(svn r27962) -Update from Eints:
...
spanish (mexican): 1 change by Absay
6 years ago
4882c1d617
(svn r27960) -Update from Eints:
...
spanish (mexican): 2 changes by Absay
6 years ago
96b3036d4c
(svn r27960) -Update from Eints:
...
spanish (mexican): 2 changes by Absay
6 years ago
6e3bb4dd90
(svn r27959) -Update from Eints:
...
spanish (mexican): 8 changes by Absay
6 years ago
ebd46cc303
(svn r27959) -Update from Eints:
...
spanish (mexican): 8 changes by Absay
6 years ago
60aa3074e3
(svn r27958) -Update from Eints:
...
spanish (mexican): 26 changes by Absay
6 years ago
ae5bbfb4b6
(svn r27958) -Update from Eints:
...
spanish (mexican): 26 changes by Absay
6 years ago
62d072b57c
(svn r27957) -Update from Eints:
...
spanish (mexican): 3 changes by Absay
6 years ago
66ccd9f71b
(svn r27957) -Update from Eints:
...
spanish (mexican): 3 changes by Absay
6 years ago
1298e3c94a
(svn r27956) -Update from Eints:
...
spanish (mexican): 16 changes by Absay
6 years ago
f9ae0c5045
(svn r27956) -Update from Eints:
...
spanish (mexican): 16 changes by Absay
6 years ago
1bc6fdef31
(svn r27953) -Cleanup: Adjust other languages for r27952
6 years ago
b394dd8468
(svn r27953) -Cleanup: Adjust other languages for r27952
6 years ago
ced7d2a4ec
(svn r27951) -Update from Eints:
...
spanish (mexican): 6 changes by Absay
6 years ago
2b23f11b47
(svn r27951) -Update from Eints:
...
spanish (mexican): 6 changes by Absay
6 years ago
43be9c80b1
(svn r27947) -Update from Eints:
...
spanish (mexican): 1 change by Absay
7 years ago
61c2f6ff9d
(svn r27947) -Update from Eints:
...
spanish (mexican): 1 change by Absay
7 years ago
873e3ed27f
(svn r27946) -Update from Eints:
...
spanish (mexican): 1 change by Absay
7 years ago
cd71c1af3a
(svn r27946) -Update from Eints:
...
spanish (mexican): 1 change by Absay
7 years ago
0fac4a751a
(svn r27945) -Update from Eints:
...
spanish (mexican): 3 changes by Absay
7 years ago
3db395700d
(svn r27945) -Update from Eints:
...
spanish (mexican): 3 changes by Absay
7 years ago
470d136358
(svn r27944) -Update from Eints:
...
spanish (mexican): 1 change by Absay
7 years ago
de4b1e80f6
(svn r27944) -Update from Eints:
...
spanish (mexican): 1 change by Absay
7 years ago
6df5cac0df
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/vehicle.cpp
7 years ago
f77a368268
Merge branch 'crashlog_improvements' into jgrpp
7 years ago
6b46133a2a
(svn r27910) -Update from Eints:
...
spanish (mexican): 10 changes by Absay
dutch: 145 changes by mrLeopold
7 years ago
f1e54b4375
(svn r27910) -Update from Eints:
...
spanish (mexican): 10 changes by Absay
dutch: 145 changes by mrLeopold
7 years ago
dc649f2738
(svn r27909) -Update from Eints:
...
spanish (mexican): 4 changes by Absay
7 years ago
eaf8d0ee07
(svn r27909) -Update from Eints:
...
spanish (mexican): 4 changes by Absay
7 years ago
a3f30a30df
(svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01)
7 years ago
2eae80bbfe
(svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01)
7 years ago
d1a287d73c
Merge branch 'save_ext' into jgrpp
7 years ago
830a4b63c9
(svn r27850) -Update from Eints:
...
korean: 3 changes by telk5093
spanish (mexican): 18 changes by Absay
7 years ago
144604a29e
(svn r27850) -Update from Eints:
...
korean: 3 changes by telk5093
spanish (mexican): 18 changes by Absay
7 years ago
8317eac918
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/window.cpp
7 years ago
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
7 years ago
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
7 years ago
b3fd11efd2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse4.cpp
7 years ago
17b46109ad
(svn r27803) -Change: Remove obsolete aircraft preview strings from other languages
7 years ago
49c0facf2e
(svn r27803) -Change: Remove obsolete aircraft preview strings from other languages
7 years ago
119965125d
(svn r27801) -Change: Also rename long aircraft preview window strings of other languages
7 years ago
2f1d808781
(svn r27801) -Change: Also rename long aircraft preview window strings of other languages
7 years ago
7c3004c785
(svn r27798) -Change: Also remove obsolete string from the other languages
7 years ago
85ed4975bf
(svn r27798) -Change: Also remove obsolete string from the other languages
7 years ago
ac69b746ab
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfxinit.cpp
# src/saveload/saveload.cpp
7 years ago
bc61ff380a
(svn r27777) -Doc: Yearly increment
7 years ago
15032bd765
(svn r27777) -Doc: Yearly increment
7 years ago
54494a0a7c
Merge branch 'send_money_company' into jgrpp
7 years ago
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
7 years ago
d5c6760c85
(svn r27753) -Update from Eints:
7 years ago
b264dd2a8d
(svn r27753) -Update from Eints:
7 years ago
fa81e20390
(svn r27752) -Cleanup: Remove obsolete strings from other languages as well.
7 years ago
07254a238d
(svn r27752) -Cleanup: Remove obsolete strings from other languages as well.
7 years ago
31d4b1e8d6
(svn r27742) -Update from Eints:
...
spanish (mexican): 1 change by Absay
7 years ago
505ba65922
(svn r27742) -Update from Eints:
...
spanish (mexican): 1 change by Absay
7 years ago
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.
7 years ago
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.
7 years ago
a8496153d6
(svn r27718) -Update from Eints:
...
spanish (mexican): 25 changes by Absay
7 years ago
1824df90bf
(svn r27718) -Update from Eints:
...
spanish (mexican): 25 changes by Absay
7 years ago
f294258b18
(svn r27685) -Change: Preemptively invalidate translation changes of next commit for eints.
8 years ago
acc817b3f5
(svn r27685) -Change: Preemptively invalidate translation changes of next commit for eints.
8 years ago
da76191afc
(svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default.
8 years ago
ad43465c31
(svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default.
8 years ago
9d5ed2c469
(svn r27624) -Update from Eints:
...
spanish (mexican): 24 changes by Absay
8 years ago
1c1ba859eb
(svn r27624) -Update from Eints:
...
spanish (mexican): 24 changes by Absay
8 years ago
3d54c33180
(svn r27601) -Update from Eints:
...
spanish (mexican): 4 changes by Absay
8 years ago
403c393ef0
(svn r27601) -Update from Eints:
...
spanish (mexican): 4 changes by Absay
8 years ago
39d588fa60
(svn r27582) -Update from Eints:
...
spanish (mexican): 18 changes by Absay
8 years ago
cfca6922e7
(svn r27582) -Update from Eints:
...
spanish (mexican): 18 changes by Absay
8 years ago
f5c5783fac
(svn r27569) -Update from Eints:
...
spanish (mexican): 3 changes by Absay
8 years ago
46b7ac7b48
(svn r27569) -Update from Eints:
...
spanish (mexican): 3 changes by Absay
8 years ago
101a63c3f5
(svn r27566) -Update from Eints:
...
spanish (mexican): 6 changes by Absay
8 years ago
ccd08c8c80
(svn r27566) -Update from Eints:
...
spanish (mexican): 6 changes by Absay
8 years ago
724dd44355
(svn r27565) -Update from Eints:
...
spanish (mexican): 13 changes by Absay
8 years ago
21646b7f48
(svn r27565) -Update from Eints:
...
spanish (mexican): 13 changes by Absay
8 years ago
bd71bcc616
(svn r27564) -Update: Ownname of es_MX.
8 years ago
36d91f8c02
(svn r27564) -Update: Ownname of es_MX.
8 years ago
edfe26f2ee
(svn r27563) -Update from Eints:
...
korean: 1 change by Gimel3830
spanish (mexican): 93 changes by Absay
8 years ago
7ccc54949e
(svn r27563) -Update from Eints:
...
korean: 1 change by Gimel3830
spanish (mexican): 93 changes by Absay
8 years ago
f0db8a16d5
(svn r27556) -Update from Eints:
...
spanish (mexican): 36 changes by Absay
8 years ago
463a16f1b0
(svn r27556) -Update from Eints:
...
spanish (mexican): 36 changes by Absay
8 years ago
a3ffac0025
(svn r27552) -Feature: Mexican Spanish (Absay)
8 years ago
9777f50fac
(svn r27552) -Feature: Mexican Spanish (Absay)
8 years ago
glx
Jonathan G Rennison
translators
Niels Martin Hansen
pnda
S. D. Cloudt
peter1138
Patric Stout
Charles Pigott
Oskari Leppäaho
PeterN
frosch
alberth
patch-import