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
|
6 years ago |
translators
|
c80608a83c
|
Update: Translations from eints
spanish: 3 changes by SilverSurferZzZ
spanish (mexican): 3 changes by Absay
|
6 years ago |
|
translators
|
e34a6c58ea
|
Update: Translations from eints
italian: 1 change by lorenzodv
french: 29 changes by glx
|
6 years ago |
|
translators
|
5e51d9ee82
|
Update: Translations from eints
hebrew: 22 changes by dnd_man
spanish (mexican): 1 change by Absay
|
6 years ago |
|
Jonathan G Rennison
|
4f1d54564e
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/debug.cpp
|
6 years ago |
|
translators
|
391bc45c41
|
Update: Translations from eints
spanish (mexican): 10 changes by Absay
|
6 years ago |
|
Jonathan G Rennison
|
7da1f8b592
|
Merge branch 'master' into jgrpp
|
6 years ago |
|
translators
|
2978388153
|
Update: Translations from eints
spanish: 5 changes by SilverSurferZzZ
spanish (mexican): 23 changes by Absay
|
6 years ago |
|
Jonathan G Rennison
|
b1190b32b0
|
Merge branch 'master' into jgrpp
|
6 years ago |
|
translators
|
f35a59fd38
|
Update: Translations from eints
spanish (mexican): 2 changes by Absay
|
6 years ago |
|
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
|
6 years ago |
Oskari Leppäaho
|
b3b89257f7
|
Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION"
|
6 years ago |
|
Jonathan G Rennison
|
3a640af71d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/ground_vehicle.cpp
# src/viewport.cpp
|
6 years ago |
|
translators
|
060248a422
|
Update: Translations from eints
spanish (mexican): 2 changes by Absay
|
6 years ago |
|
Jonathan G Rennison
|
a37e30dfd0
|
Merge branch 'master' into jgrpp
|
6 years ago |
|
translators
|
703e7f8fc7
|
Update: Translations from eints
spanish (mexican): 1 change by Absay
|
6 years ago |
|
Jonathan G Rennison
|
9038ac5c00
|
Merge branch 'master' into jgrpp
# Conflicts:
# docs/landscape_grid.html
|
6 years ago |
|
translators
|
64dac65e20
|
Update: Translations from eints
spanish (mexican): 1 change by Absay
|
6 years ago |
|
Jonathan G Rennison
|
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 |
|
translators
|
8090580f77
|
Update: Translations from eints
spanish (mexican): 25 changes by Absay
|
6 years ago |
|
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
|
6 years ago |
|
translators
|
0bca1c53c9
|
Update: Translations from eints
spanish (mexican): 19 changes by Absay
|
6 years ago |
|
translators
|
6a6ffddc5f
|
Update: Translations from eints
greek: 46 changes by kyrm
italian: 44 changes by lorenzodv
|
6 years ago |
|
translators
|
85ef5acf29
|
Update: Translations from eints
malay: 10 changes by eidan_shafie
spanish (mexican): 9 changes by Absay
|
6 years ago |
|
Jonathan G Rennison
|
8e9d68048a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/string.cpp
|
6 years ago |
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.
|
6 years ago |
|
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
|
6 years ago |
|
translators
|
61515c9abd
|
Update: Translations from eints
belarusian: 10 changes by KorneySan
russian: 6 changes by KorneySan
spanish (mexican): 10 changes by Absay
|
6 years ago |
Niels Martin Hansen
|
683b46a5b5
|
Cleanup: Remove unused strings from language files
|
6 years ago |
|
PeterN
|
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 |
|
Jonathan G Rennison
|
1fe0bb76b9
|
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
|
6 years ago |
|
translators
|
a72117111e
|
Update: Translations from eints
spanish (mexican): 6 changes by Absay
|
6 years ago |
|
translators
|
080d57d97a
|
(svn r27991) -Update from Eints:
spanish (mexican): 1 change by Absay
|
6 years ago |
|
Jonathan G Rennison
|
385a2552e9
|
Merge branch 'enhanced_viewport_overlay' into jgrpp
|
6 years ago |
frosch
|
91464af737
|
(svn r27980) -Doc: Yearly increment
|
6 years ago |
|
frosch
|
b1592787eb
|
(svn r27980) -Doc: Yearly increment
|
6 years ago |
|
translators
|
d4301cd7b6
|
(svn r27971) -Update from Eints:
spanish (mexican): 2 changes by Absay
|
6 years ago |
|
translators
|
9ce3403e2d
|
(svn r27971) -Update from Eints:
spanish (mexican): 2 changes by Absay
|
6 years ago |
|
Jonathan G Rennison
|
911ba8cb8b
|
Merge branch 'master' into jgrpp
|
6 years ago |
|
translators
|
0c43d6903a
|
(svn r27966) -Update from Eints:
spanish (mexican): 32 changes by Absay
portuguese: 41 changes by Samu
|
7 years ago |
|
translators
|
5fe62ccb3e
|
(svn r27966) -Update from Eints:
spanish (mexican): 32 changes by Absay
portuguese: 41 changes by Samu
|
7 years ago |
|
translators
|
6886b156d2
|
(svn r27965) -Update from Eints:
spanish (mexican): 43 changes by Absay
|
7 years ago |
|
translators
|
25c9cc6b11
|
(svn r27965) -Update from Eints:
spanish (mexican): 43 changes by Absay
|
7 years ago |
|
translators
|
ef6adb0030
|
(svn r27964) -Update from Eints:
spanish (mexican): 10 changes by Absay
|
7 years ago |
|
translators
|
156d34b5e4
|
(svn r27964) -Update from Eints:
spanish (mexican): 10 changes by Absay
|
7 years ago |
|
Jonathan G Rennison
|
4a0d949d83
|
Merge branch 'master' into jgrpp
|
7 years ago |
|
translators
|
98c2fa87e6
|
(svn r27962) -Update from Eints:
spanish (mexican): 1 change by Absay
|
7 years ago |
|
translators
|
78d80a9968
|
(svn r27962) -Update from Eints:
spanish (mexican): 1 change by Absay
|
7 years ago |
|
translators
|
4882c1d617
|
(svn r27960) -Update from Eints:
spanish (mexican): 2 changes by Absay
|
7 years ago |
|
translators
|
96b3036d4c
|
(svn r27960) -Update from Eints:
spanish (mexican): 2 changes by Absay
|
7 years ago |