Commit Graph

168 Commits

Author SHA1 Message Date
Jonathan G Rennison
3a640af71d Merge branch 'master' into jgrpp
# Conflicts:
#	src/ground_vehicle.cpp
#	src/viewport.cpp
2018-10-29 18:33:15 +00:00
translators
060248a422 Update: Translations from eints
spanish (mexican): 2 changes by Absay
2018-09-24 19:45:43 +02:00
Jonathan G Rennison
a37e30dfd0 Merge branch 'master' into jgrpp 2018-08-29 02:26:16 +01:00
translators
703e7f8fc7 Update: Translations from eints
spanish (mexican): 1 change by Absay
2018-08-17 19:45:42 +02:00
Jonathan G Rennison
9038ac5c00 Merge branch 'master' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
2018-08-06 02:33:13 +01:00
translators
64dac65e20 Update: Translations from eints
spanish (mexican): 1 change by Absay
2018-07-28 19:45:41 +02:00
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
2018-07-26 20:54:13 +01:00
translators
8090580f77 Update: Translations from eints
spanish (mexican): 25 changes by Absay
2018-07-25 19:45:41 +02: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
0bca1c53c9 Update: Translations from eints
spanish (mexican): 19 changes by Absay
2018-07-23 19:45:41 +02: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
translators
85ef5acf29 Update: Translations from eints
malay: 10 changes by eidan_shafie
spanish (mexican): 9 changes by Absay
2018-07-10 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
translators
61515c9abd Update: Translations from eints
belarusian: 10 changes by KorneySan
russian: 6 changes by KorneySan
spanish (mexican): 10 changes by Absay
2018-05-02 19:45:41 +02: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
1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 2018-04-27 02:42:20 +01:00
translators
a72117111e Update: Translations from eints
spanish (mexican): 6 changes by Absay
2018-04-16 23:25:46 +02:00
translators
080d57d97a (svn r27991) -Update from Eints:
spanish (mexican): 1 change by Absay
2018-03-14 18:45:37 +00: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
translators
d4301cd7b6 (svn r27971) -Update from Eints:
spanish (mexican): 2 changes by Absay
2018-03-01 18:45:36 +00:00
translators
9ce3403e2d (svn r27971) -Update from Eints:
spanish (mexican): 2 changes by Absay
2018-03-01 18:45:36 +00:00
Jonathan G Rennison
911ba8cb8b Merge branch 'master' into jgrpp 2018-02-09 18:10:57 +00:00
translators
0c43d6903a (svn r27966) -Update from Eints:
spanish (mexican): 32 changes by Absay
portuguese: 41 changes by Samu
2018-01-22 18:45:38 +00:00
translators
5fe62ccb3e (svn r27966) -Update from Eints:
spanish (mexican): 32 changes by Absay
portuguese: 41 changes by Samu
2018-01-22 18:45:38 +00:00
translators
6886b156d2 (svn r27965) -Update from Eints:
spanish (mexican): 43 changes by Absay
2018-01-21 18:45:39 +00:00
translators
25c9cc6b11 (svn r27965) -Update from Eints:
spanish (mexican): 43 changes by Absay
2018-01-21 18:45:39 +00:00
translators
ef6adb0030 (svn r27964) -Update from Eints:
spanish (mexican): 10 changes by Absay
2018-01-16 18:45:39 +00:00
translators
156d34b5e4 (svn r27964) -Update from Eints:
spanish (mexican): 10 changes by Absay
2018-01-16 18:45:39 +00:00
Jonathan G Rennison
4a0d949d83 Merge branch 'master' into jgrpp 2018-01-14 23:22:47 +00:00
translators
98c2fa87e6 (svn r27962) -Update from Eints:
spanish (mexican): 1 change by Absay
2018-01-09 18:45:38 +00:00
translators
78d80a9968 (svn r27962) -Update from Eints:
spanish (mexican): 1 change by Absay
2018-01-09 18:45:38 +00:00
translators
4882c1d617 (svn r27960) -Update from Eints:
spanish (mexican): 2 changes by Absay
2018-01-06 18:45:38 +00:00
translators
96b3036d4c (svn r27960) -Update from Eints:
spanish (mexican): 2 changes by Absay
2018-01-06 18:45:38 +00:00
translators
6e3bb4dd90 (svn r27959) -Update from Eints:
spanish (mexican): 8 changes by Absay
2018-01-05 18:45:40 +00:00
translators
ebd46cc303 (svn r27959) -Update from Eints:
spanish (mexican): 8 changes by Absay
2018-01-05 18:45:40 +00:00
translators
60aa3074e3 (svn r27958) -Update from Eints:
spanish (mexican): 26 changes by Absay
2018-01-04 18:45:39 +00:00
translators
ae5bbfb4b6 (svn r27958) -Update from Eints:
spanish (mexican): 26 changes by Absay
2018-01-04 18:45:39 +00:00
translators
62d072b57c (svn r27957) -Update from Eints:
spanish (mexican): 3 changes by Absay
2018-01-03 18:45:37 +00:00
translators
66ccd9f71b (svn r27957) -Update from Eints:
spanish (mexican): 3 changes by Absay
2018-01-03 18:45:37 +00:00
translators
1298e3c94a (svn r27956) -Update from Eints:
spanish (mexican): 16 changes by Absay
2017-12-31 18:45:41 +00:00
translators
f9ae0c5045 (svn r27956) -Update from Eints:
spanish (mexican): 16 changes by Absay
2017-12-31 18:45:41 +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
translators
ced7d2a4ec (svn r27951) -Update from Eints:
spanish (mexican): 6 changes by Absay
2017-12-26 18:45:39 +00:00
translators
2b23f11b47 (svn r27951) -Update from Eints:
spanish (mexican): 6 changes by Absay
2017-12-26 18:45:39 +00:00
translators
43be9c80b1 (svn r27947) -Update from Eints:
spanish (mexican): 1 change by Absay
2017-12-22 18:45:39 +00:00
translators
61c2f6ff9d (svn r27947) -Update from Eints:
spanish (mexican): 1 change by Absay
2017-12-22 18:45:39 +00:00
translators
873e3ed27f (svn r27946) -Update from Eints:
spanish (mexican): 1 change by Absay
2017-12-21 18:45:38 +00:00
translators
cd71c1af3a (svn r27946) -Update from Eints:
spanish (mexican): 1 change by Absay
2017-12-21 18:45:38 +00:00
translators
0fac4a751a (svn r27945) -Update from Eints:
spanish (mexican): 3 changes by Absay
2017-12-20 18:45:39 +00:00
translators
3db395700d (svn r27945) -Update from Eints:
spanish (mexican): 3 changes by Absay
2017-12-20 18:45:39 +00:00
translators
470d136358 (svn r27944) -Update from Eints:
spanish (mexican): 1 change by Absay
2017-12-14 18:45:41 +00:00
translators
de4b1e80f6 (svn r27944) -Update from Eints:
spanish (mexican): 1 change by Absay
2017-12-14 18:45:41 +00:00
Jonathan G Rennison
6df5cac0df Merge branch 'enhanced_viewport_overlay' into jgrpp
# Conflicts:
#	src/vehicle.cpp
2017-09-04 01:24:10 +01:00
Jonathan G Rennison
f77a368268 Merge branch 'crashlog_improvements' into jgrpp 2017-09-04 01:23:08 +01:00
translators
6b46133a2a (svn r27910) -Update from Eints:
spanish (mexican): 10 changes by Absay
dutch: 145 changes by mrLeopold
2017-09-01 17:45:42 +00:00
translators
f1e54b4375 (svn r27910) -Update from Eints:
spanish (mexican): 10 changes by Absay
dutch: 145 changes by mrLeopold
2017-09-01 17:45:42 +00:00
translators
dc649f2738 (svn r27909) -Update from Eints:
spanish (mexican): 4 changes by Absay
2017-08-31 17:45:38 +00:00
translators
eaf8d0ee07 (svn r27909) -Update from Eints:
spanish (mexican): 4 changes by Absay
2017-08-31 17:45:38 +00: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
d1a287d73c Merge branch 'save_ext' into jgrpp 2017-04-11 18:42:11 +01:00
translators
830a4b63c9 (svn r27850) -Update from Eints:
korean: 3 changes by telk5093
spanish (mexican): 18 changes by Absay
2017-04-09 17:45:38 +00:00
translators
144604a29e (svn r27850) -Update from Eints:
korean: 3 changes by telk5093
spanish (mexican): 18 changes by Absay
2017-04-09 17:45:38 +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
translators
31d4b1e8d6 (svn r27742) -Update from Eints:
spanish (mexican): 1 change by Absay
2017-02-03 18:45:39 +00:00
translators
505ba65922 (svn r27742) -Update from Eints:
spanish (mexican): 1 change by Absay
2017-02-03 18:45:39 +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
a8496153d6 (svn r27718) -Update from Eints:
spanish (mexican): 25 changes by Absay
2016-12-30 18:45:38 +00:00
translators
1824df90bf (svn r27718) -Update from Eints:
spanish (mexican): 25 changes by Absay
2016-12-30 18:45:38 +00:00
frosch
f294258b18 (svn r27685) -Change: Preemptively invalidate translation changes of next commit for eints. 2016-12-09 21:26:37 +00:00
frosch
acc817b3f5 (svn r27685) -Change: Preemptively invalidate translation changes of next commit for eints. 2016-12-09 21:26:37 +00:00
frosch
da76191afc (svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default. 2016-12-08 20:21:39 +00:00
frosch
ad43465c31 (svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default. 2016-12-08 20:21:39 +00:00
translators
9d5ed2c469 (svn r27624) -Update from Eints:
spanish (mexican): 24 changes by Absay
2016-08-07 17:45:36 +00:00
translators
1c1ba859eb (svn r27624) -Update from Eints:
spanish (mexican): 24 changes by Absay
2016-08-07 17:45:36 +00:00