Commit Graph

3966 Commits

Author SHA1 Message Date
patch-import
71be17729e Import vehicle lifetime profit patch v3
http://www.tt-forums.net/viewtopic.php?p=1161735#p1161735
2016-01-01 13:35:29 +00:00
Jonathan G Rennison
87df28f3a2 Merge branch 'master' into jgrpp 2016-01-01 13:11:26 +00:00
Jonathan G Rennison
b9091a0f6c Merge branch 'zoning' into jgrpp
Conflicts:
	src/station_gui.cpp
	src/zoning_cmd.cpp
2016-01-01 13:09:11 +00:00
Jonathan G Rennison
7f84a1c501 Zoning: Add mode to show station catchment only where station window open. 2016-01-01 12:17:11 +00:00
translators
137ecd5377 (svn r27485) -Update from Eints:
croatian: 114 changes by UnderwaterHesus
2015-12-31 18:45:36 +00:00
translators
7ab291af95 (svn r27484) -Update from Eints:
croatian: 4 changes by UnderwaterHesus
english (us): 1 change by Supercheese
serbian: 21 changes by stravagante
latin: 1 change by Supercheese
2015-12-30 18:45:36 +00:00
translators
864c6360eb (svn r27483) -Update from Eints:
norwegian (bokmal): 1 change by cuthbert
esperanto: 1 change by LaPingvino
2015-12-29 18:45:36 +00:00
Jonathan G Rennison
33ffa10fe5 Merge pull request #5 from auge8472/translate-de 2015-12-28 23:28:51 +00:00
translators
8e5487c347 (svn r27482) -Update from Eints:
irish: 23 changes by tem
2015-12-28 18:45:35 +00:00
Heiko August
5a93462de7 translate-de: fix: forgotten strings of improved breakdown patch 2015-12-28 18:20:38 +01:00
Heiko August
41b7fb80b5 translate-de: settings for building rivers in a running game 2015-12-28 15:52:04 +01:00
translators
12915a202f (svn r27480) -Update from Eints:
irish: 12 changes by tem
greek: 1 change by frosch
swedish: 1 change by Zuu
2015-12-27 19:45:37 +00:00
frosch
cc3fcf7d61 (svn r27479) -Fix: Remove genders from non-default cases. 2015-12-27 13:16:37 +00:00
translators
e9d4e9b896 (svn r27478) -Update from Eints:
german: 8 changes by translators, 2 changes by frosch
arabic (egypt): 36 changes by translators
afrikaans: 4 changes by translators
hungarian: 1 change by translators
english (us): 1 change by translators
frisian: 2 changes by translators
norwegian (bokmal): 5 changes by translators
norwegian (nynorsk): 1 change by translators
lithuanian: 5 changes by translators
slovenian: 4 changes by translators
russian: 1 change by translators
ukrainian: 2 changes by translators
welsh: 3 changes by translators
french: 5 changes by glx
english (au): 1 change by translators
irish: 1 change by translators
tamil: 1 change by translators
belarusian: 2 changes by translators
bulgarian: 1 change by translators
italian: 1 change by translators
scottish gaelic: 1 change by translators
romanian: 2 changes by translators
urdu: 5 changes by translators
turkish: 11 changes by translators
portuguese: 1 change by translators
latvian: 2 changes by translators
esperanto: 1 change by translators
dutch: 3 changes by translators
serbian: 1 change by translators
spanish: 1 change by translators
czech: 4 changes by translators
indonesian: 2 changes by translators
latin: 1 change by translators
catalan: 2 changes by translators
hebrew: 9 changes by translators
greek: 5 changes by translators
polish: 1 change by translators
chinese (traditional): 1 change by translators
slovak: 1 change by translators
icelandic: 2 changes by translators
portuguese (brazilian): 4 changes by translators
danish: 2 changes by translators
vietnamese: 6 changes by translators
malay: 2 changes by translators
galician: 4 changes by translators
croatian: 1 change by translators
korean: 4 changes by translators
finnish: 1 change by translators
chinese (simplified): 1 change by translators
estonian: 3 changes by translators
persian: 4 changes by translators
thai: 6 changes by translators
swedish: 1 change by translators
luxembourgish: 3 changes by translators
japanese: 5 changes by translators
basque: 2 changes by translators
2015-12-27 11:40:23 +00:00
translators
ff0f720e82 (svn r27477) -Update from WebTranslator v3.0:
greek - 76 changes by Ferrum
polish - 1 changes by ampersand
2015-12-24 18:45:14 +00:00
translators
82a412031b (svn r27476) -Update from WebTranslator v3.0:
german - 2 changes by mini1025
2015-12-23 18:45:08 +00:00
translators
7c7565e33c (svn r27475) -Update from WebTranslator v3.0:
slovak - 1 changes by Milsa
spanish - 3 changes by SilverSurferZzZ
2015-12-22 18:45:13 +00:00
translators
afe19055bb (svn r27474) -Update from WebTranslator v3.0:
irish - 21 changes by tem
2015-12-20 18:45:10 +00:00
translators
1ebc92faec (svn r27473) -Update from WebTranslator v3.0:
welsh - 1 changes by kazzie
2015-12-19 18:45:08 +00:00
Jonathan G Rennison
db2f08f86e Merge branch 'master' into jgrpp 2015-12-15 20:36:54 +00:00
Jonathan G Rennison
7673436d3a Trace restrict: add train ownership conditional.
Infra sharing whitespace fix.
2015-12-15 20:30:20 +00:00
translators
ed7e09833e (svn r27471) -Update from WebTranslator v3.0:
czech - 1 changes by djst
2015-12-15 18:45:10 +00:00
translators
7338ed075f (svn r27470) -Update from WebTranslator v3.0:
turkish - 69 changes by wakeup
2015-12-11 18:45:09 +00:00
translators
696626a8e9 (svn r27467) -Update from WebTranslator v3.0:
simplified_chinese - 1 changes by Gavin
turkish - 34 changes by wakeup
2015-12-09 18:45:14 +00:00
Jonathan G Rennison
69f3844d2e Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/settings_gui.cpp
	src/settings_type.h
	src/table/settings.ini
2015-12-09 01:03:37 +00:00
Jonathan G Rennison
a93714a720 Add setting to show restricted electric signals using the default sprites.
This is to improve visual distinctiveness of restricted signals when
using signal GRFs.
This defaults to off.
2015-12-09 01:01:37 +00:00
Jonathan G Rennison
14bf956cec Merge branch 'master' into jgrpp 2015-12-06 17:13:37 +00:00
translators
ae767d30a4 (svn r27466) -Update from WebTranslator v3.0:
hungarian - 1 changes by IPG
spanish - 2 changes by SilverSurferZzZ
2015-12-04 18:45:14 +00:00
translators
ae1bb896e6 (svn r27465) -Update from WebTranslator v3.0:
spanish - 5 changes by SilverSurferZzZ
2015-12-03 18:45:08 +00:00
translators
1bf75b1abb (svn r27464) -Update from WebTranslator v3.0:
spanish - 8 changes by SilverSurferZzZ
2015-12-02 18:45:09 +00:00
translators
244144f0f6 (svn r27460) -Update from WebTranslator v3.0:
spanish - 8 changes by SilverSurferZzZ
2015-12-01 18:45:07 +00:00
Jonathan G Rennison
cd23d17745 Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/vehicle.cpp
2015-11-30 22:32:29 +00:00
Jonathan G Rennison
9eb07b4a77 Merge branch 'auto_timetables' into auto_timetables-sx 2015-11-30 22:31:08 +00:00
Jonathan G Rennison
d2b87485fb When clearing auto timetables, mark times as undefined rather than 0.
Fix unautomate timetable having reversed ctrl key behaviour,
update tooltip string with ctrl behaviour.
Minor comment/whitespace fixes.
2015-11-30 22:28:38 +00:00
Jonathan G Rennison
d05f67cf5a Merge branch 'master' into auto_timetables 2015-11-30 22:26:29 +00:00
translators
9808cfdf5e (svn r27459) -Update from WebTranslator v3.0:
basque - 43 changes by Thadah
spanish - 3 changes by SilverSurferZzZ
2015-11-30 18:45:13 +00:00
Jonathan G Rennison
af93385f41 Merge pull request #3 from auge8472/translate-de
Translate de; improved breakdowns, adjacent level crossings
2015-11-29 15:38:54 +00:00
Heiko August
d485f548f0 translate-de: add translation for improved breakdowns 2015-11-29 16:02:01 +01:00
Heiko August
e59a789fff translate-de: fix wrong template string 2015-11-29 14:27:46 +01:00
translators
bf61d7a797 (svn r27458) -Update from WebTranslator v3.0:
basque - 20 changes by Thadah
2015-11-26 18:45:10 +00:00
translators
786838d277 (svn r27457) -Update from WebTranslator v3.0:
croatian - 1 changes by VoyagerOne
spanish - 2 changes by SilverSurferZzZ
2015-11-25 18:45:12 +00:00
translators
e94c79227b (svn r27456) -Update from WebTranslator v3.0:
korean - 7 changes by telk5093
spanish - 4 changes by SilverSurferZzZ
2015-11-24 18:45:15 +00:00
Jonathan G Rennison
9ee5aecbaf Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-11-24 01:06:51 +00:00
Jonathan G Rennison
1c3c413cfb Merge branch 'save_ext' into enhanced_viewport_overlay-sx 2015-11-24 01:06:35 +00:00
translators
06fc9283f7 (svn r27455) -Update from WebTranslator v3.0:
spanish - 4 changes by SilverSurferZzZ
2015-11-23 18:45:08 +00:00
translators
ca93b0ef79 (svn r27454) -Update from WebTranslator v3.0:
korean - 4 changes by telk5093
2015-11-22 18:45:10 +00:00
translators
d8b8f033d5 (svn r27453) -Update from WebTranslator v3.0:
italian - 1 changes by lorenzodv
2015-11-21 18:45:08 +00:00
Jonathan G Rennison
6075dd22e2 Show small square if vehicle owner does not match list owner.
No longer check the infrastructure sharing setting.
Add a separate setting to control company colour squares (default on).
2015-11-20 23:55:02 +00:00
translators
17e6f42f03 (svn r27452) -Update from WebTranslator v3.0:
russian - 1 changes by Lone_Wolf
2015-11-20 18:45:10 +00:00
alberth
e1a00bc244 (svn r27451) -Feature[FS#6241]: Move sprite 8 positions in sprite aligner with ctrl+click. (based on work by juzza1) 2015-11-20 10:04:28 +00:00