dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'zoning' into jgrpp

Browse Source 
Conflicts:
	src/station_gui.cpp
	src/zoning_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2016-01-01 13:09:11 +00:00
parent efa27abde5 7f84a1c501
commit b9091a0f6c
5 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lang/english.txt
View File

@@ -5542,6 +5542,7 @@ STR_ZONING_NO_ZONING :Nothing
STR_ZONING_AUTHORITY :Authority
STR_ZONING_CAN_BUILD :Where I can't build
STR_ZONING_STA_CATCH :Station catchment
STR_ZONING_STA_CATCH_OPEN :Station catchment (window open)
STR_ZONING_BUL_UNSER :Unserved buildings
STR_ZONING_IND_UNSER :Unserved industries
STR_ZONING_TRACERESTRICT :Restricted signals