Merge branch 'house_placing' into jgrpp
# Conflicts: # src/settings_gui.cpp # src/settings_type.h # src/town_gui.cpp
This commit is contained in:
Jonathan G Rennison
@@ -362,7 +362,6 @@ STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION :{BLACK}Road con
|
||||
STR_SCENEDIT_TOOLBAR_PLANT_TREES :{BLACK}Plant trees. Shift toggles building/showing cost estimate
|
||||
STR_SCENEDIT_TOOLBAR_PLACE_SIGN :{BLACK}Place sign
|
||||
STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Place object. Shift toggles building/showing cost estimate
|
||||
STR_SCENEDIT_TOOLBAR_PLACE_HOUSE :{BLACK}Place house
|
||||
|
||||
############ range for SE file menu starts
|
||||
STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO :Save scenario
|
||||
@@ -410,6 +409,7 @@ STR_MAP_MENU_PLAN_LIST :Plan list
|
||||
############ range for town menu starts
|
||||
STR_TOWN_MENU_TOWN_DIRECTORY :Town directory
|
||||
STR_TOWN_MENU_FOUND_TOWN :Found town
|
||||
STR_TOWN_MENU_FUND_HOUSE :Fund new house
|
||||
############ range ends here
|
||||
|
||||
############ range for subsidies menu starts
|
||||
@@ -1243,6 +1243,8 @@ STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS :Allow funding b
|
||||
STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS_HELPTEXT :Allow companies to give money to towns for funding new houses
|
||||
STR_CONFIG_SETTING_ALLOW_FUND_ROAD :Allow funding local road reconstruction: {STRING2}
|
||||
STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT :Allow companies to give money to towns for road re-construction to sabotage road-based services in the town
|
||||
STR_CONFIG_SETTING_ALLOW_PLACING_HOUSES :Allow placing houses in-game: {STRING2}
|
||||
STR_CONFIG_SETTING_ALLOW_PLACING_HOUSES_HELPTEXT :Allow placing houses manually also during gameplay, not just in scenario editor
|
||||
STR_CONFIG_SETTING_ALLOW_GIVE_MONEY :Allow sending money to other companies: {STRING2}
|
||||
STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT :Allow transfer of money between companies in multiplayer mode
|
||||
STR_CONFIG_SETTING_FREIGHT_TRAINS :Weight multiplier for freight to simulate heavy trains: {STRING2}
|
||||
@@ -2795,24 +2797,33 @@ STR_OBJECT_BUILD_SIZE :{BLACK}Size: {G
|
||||
STR_OBJECT_CLASS_LTHS :Lighthouses
|
||||
STR_OBJECT_CLASS_TRNS :Transmitters
|
||||
|
||||
#House construction window (for SE only)
|
||||
STR_HOUSE_BUILD_CAPTION :{WHITE}House Selection
|
||||
STR_HOUSE_BUILD_CUSTOM_CAPTION :{WHITE}{RAW_STRING}
|
||||
#Town select window
|
||||
STR_SELECT_TOWN_CAPTION :{WHITE}Select town
|
||||
STR_SELECT_TOWN_LIST_TOWN_ZONE :{WHITE}{TOWN}{BLACK} (zone {NUM})
|
||||
STR_SELECT_TOWN_LIST_TOWN_OUTSIDE :{WHITE}{TOWN}{BLACK} (outside)
|
||||
|
||||
# House construction window
|
||||
STR_HOUSE_BUILD_CAPTION :{WHITE}{STRING1}
|
||||
STR_HOUSE_BUILD_CAPTION_DEFAULT_TEXT :House Selection
|
||||
STR_HOUSE_BUILD_HOUSESET_LIST_TOOLTIP :{BLACK}Select set of houses
|
||||
STR_HOUSE_BUILD_SELECT_HOUSE_TOOLTIP :{BLACK}Select house to build
|
||||
STR_HOUSE_BUILD_HOUSE_NAME :{GOLD}{STRING1}
|
||||
STR_HOUSE_BUILD_HISTORICAL_BUILDING :{GOLD}(historical building)
|
||||
STR_HOUSE_BUILD_HOUSE_POPULATION :{BLACK}Population: {GOLD}{NUM}
|
||||
STR_HOUSE_BUILD_HOUSE_ZONES :{BLACK}House zones: {STRING1} {STRING1} {STRING1} {STRING1} {STRING1}
|
||||
STR_HOUSE_BUILD_HOUSE_ZONE_DISABLED :{GRAY}{NUM}
|
||||
STR_HOUSE_BUILD_HOUSE_ZONE_ENABLED :{GOLD}{NUM}
|
||||
STR_HOUSE_BUILD_HOUSE_ZONE_GOOD :{GOLD}{NUM}
|
||||
STR_HOUSE_BUILD_HOUSE_ZONE_BAD :{GRAY}{NUM}
|
||||
STR_HOUSE_BUILD_HOUSE_ZONE_GOOD_HIGHLIGHTED :{WHITE}{NUM}
|
||||
STR_HOUSE_BUILD_HOUSE_ZONE_BAD_HIGHLIGHTED :{RED}{NUM}
|
||||
STR_HOUSE_BUILD_LANDSCAPE :{BLACK}Landscape: {STRING}
|
||||
STR_HOUSE_BUILD_LANDSCAPE_ABOVE_OR_BELOW_SNOWLINE :{GOLD}above or below snowline
|
||||
STR_HOUSE_BUILD_LANDSCAPE_ONLY_ABOVE_SNOWLINE :{GOLD}only above snowline
|
||||
STR_HOUSE_BUILD_LANDSCAPE_ONLY_BELOW_SNOWLINE :{GOLD}only below snowline
|
||||
STR_HOUSE_BUILD_LANDSCAPE_ONLY_ABOVE_SNOWLINE_GOOD :{GOLD}only above snowline
|
||||
STR_HOUSE_BUILD_LANDSCAPE_ONLY_ABOVE_SNOWLINE_BAD :{RED}only above snowline
|
||||
STR_HOUSE_BUILD_LANDSCAPE_ONLY_BELOW_SNOWLINE_GOOD :{GOLD}only below snowline
|
||||
STR_HOUSE_BUILD_LANDSCAPE_ONLY_BELOW_SNOWLINE_BAD :{RED}only below snowline
|
||||
STR_HOUSE_BUILD_YEARS :{BLACK}Years: {STRING1}{GOLD} - {STRING1}
|
||||
STR_HOUSE_BUILD_YEARS_BAD_YEAR :{RED}{NUM}
|
||||
STR_HOUSE_BUILD_YEARS_GOOD_YEAR :{GOLD}{NUM}
|
||||
STR_HOUSE_BUILD_YEAR_GOOD :{GOLD}{NUM}
|
||||
STR_HOUSE_BUILD_YEAR_BAD :{RED}{NUM}
|
||||
STR_HOUSE_BUILD_SUPPLIED_CARGO :{BLACK}Supplies: {GOLD}{CARGO_LIST}
|
||||
STR_HOUSE_BUILD_ACCEPTED_CARGO :{BLACK}Accepts: {GOLD}{RAW_STRING}
|
||||
STR_HOUSE_BUILD_CARGO_FIRST :{STRING2}
|
||||
@@ -2821,10 +2832,6 @@ STR_HOUSE_BUILD_CARGO_VALUE_JUST_NAME :{1:STRING}
|
||||
STR_HOUSE_BUILD_CARGO_VALUE_EIGHTS :({COMMA}/8 {STRING})
|
||||
STR_BASIC_HOUSE_SET_NAME :Basic houses
|
||||
|
||||
#Town select window (for SE only)
|
||||
STR_SELECT_TOWN_CAPTION :{WHITE}Select town
|
||||
STR_SELECT_TOWN_LIST_ITEM :{BLACK}{TOWN}
|
||||
|
||||
# Tree planting window (last two for SE only)
|
||||
STR_PLANT_TREE_CAPTION :{WHITE}Trees
|
||||
STR_PLANT_TREE_TOOLTIP :{BLACK}Select tree type to plant. If the tile already has a tree, this will add more trees of mixed types independent of the selected type
|
||||
@@ -4737,14 +4744,9 @@ STR_ERROR_ROAD_WORKS_IN_PROGRESS :{WHITE}Road wor
|
||||
STR_ERROR_TOWN_CAN_T_DELETE :{WHITE}Can't delete this town...{}A station or depot is referring to the town or a town owned tile can't be removed
|
||||
STR_ERROR_STATUE_NO_SUITABLE_PLACE :{WHITE}... there is no suitable place for a statue in the centre of this town
|
||||
STR_ERROR_BUILDING_NOT_ALLOWED_IN_THIS_TOWN_ZONE :{WHITE}... not allowed in this town zone.
|
||||
STR_ERROR_BUILDING_NOT_ALLOWED_ABOVE_SNOW_LINE :{WHITE}... not allowed above the snow line.
|
||||
STR_ERROR_BUILDING_NOT_ALLOWED_BELOW_SNOW_LINE :{WHITE}... not allowed below the snow line.
|
||||
STR_ERROR_TOO_MANY_HOUSE_SETS :{WHITE}... too many house sets in the town
|
||||
STR_ERROR_TOO_MANY_HOUSE_TYPES :{WHITE}... too many house types in the town
|
||||
STR_ERROR_BUILDING_IS_TOO_OLD :{WHITE}... building is too old.
|
||||
STR_ERROR_BUILDING_IS_TOO_MODERN :{WHITE}... building is too modern.
|
||||
STR_ERROR_ONLY_ONE_BUILDING_ALLOWED_PER_TOWN :{WHITE}... only one building of this type is allowed in a town.
|
||||
STR_ERROR_BUILDING_NOT_ALLOWED :{WHITE}... the building is not allowed.
|
||||
STR_ERROR_ONLY_ONE_CHURCH_PER_TOWN :{WHITE}... only one church per town is allowed.
|
||||
STR_ERROR_ONLY_ONE_STADIUM_PER_TOWN :{WHITE}... only one stadium per town is allowed.
|
||||
STR_ERROR_TOO_FAR_FROM_TOWN :{WHITE}... too far from town.
|
||||
|
||||
# Industry related errors
|
||||
STR_ERROR_TOO_MANY_INDUSTRIES :{WHITE}... too many industries
|
||||
|
||||
@@ -241,6 +241,7 @@ STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC :{BLACK}Musnahka
|
||||
|
||||
# Show engines button
|
||||
|
||||
STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP_TOOLTIP :{BLACK}Dengan membenarkan pilihan ini, kapal tersembunyi turut ditunjukkan
|
||||
|
||||
# Query window
|
||||
STR_BUTTON_DEFAULT :{BLACK}Asal
|
||||
@@ -4078,6 +4079,7 @@ STR_DESKTOP_SHORTCUT_COMMENT :Sebuah permaina
|
||||
|
||||
# Translatable descriptions in media/baseset/*.ob* files
|
||||
STR_BASEGRAPHICS_DOS_DESCRIPTION :Grafik asal Transport Tycoon Deluxe DOS edition.
|
||||
STR_BASEGRAPHICS_WIN_DESCRIPTION :Grafik asal Transport Tycoon Deluxe edisi Windows.
|
||||
|
||||
##id 0x2000
|
||||
# Town building names
|
||||
|
||||
@@ -1200,9 +1200,11 @@ STR_CONFIG_SETTING_POPULATION_IN_LABEL :நகரத்
|
||||
STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT :நகரத்தின் மக்கள்தொகையினை வரைபடத்தில் காட்டவும்
|
||||
STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :வரைபடத்தில் கோடுகளின் எண்ணிக்கை: {STRING}
|
||||
|
||||
STR_CONFIG_SETTING_LANDSCAPE : நிலவெளி: {STRING}
|
||||
STR_CONFIG_SETTING_LAND_GENERATOR :நில உருவாக்கி: {STRING}
|
||||
STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL :உண்மையான
|
||||
STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS :TerraGenesis
|
||||
STR_CONFIG_SETTING_INDUSTRY_DENSITY :தொழிற்சாலை அடர்த்தி: {STRING}
|
||||
STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE :வரைபட எல்லையிலிருந்து எண்ணெய் சுத்திகரிப்பு நிலையங்கள் இருக்கக்கூடிய தூரம்: {STRING}
|
||||
STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT :எண்ணெய் சுத்திகரிப்பு நிலையங்கள் வரைபடத்தின் எல்லைகளில் மட்டுமே கட்ட இயலும், அதாவது தீவு வரைபடங்களில் கடற்கரைகளில் கட்ட இயலும்
|
||||
STR_CONFIG_SETTING_SNOWLINE_HEIGHT :பனி-கோடின் உயரம்: {STRING}
|
||||
@@ -1215,6 +1217,7 @@ STR_CONFIG_SETTING_TREE_PLACER :மரங்க
|
||||
STR_CONFIG_SETTING_TREE_PLACER_NONE :ஒன்றுமில்லை
|
||||
STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL :உண்மையான
|
||||
STR_CONFIG_SETTING_TREE_PLACER_IMPROVED :சீரமைக்கப்பட்ட
|
||||
STR_CONFIG_SETTING_ROAD_SIDE :சாலை வாகனங்கள்: {STRING}
|
||||
STR_CONFIG_SETTING_HEIGHTMAP_ROTATION :உயர்பட சுழற்ச்சி: {STRING}
|
||||
STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE :வலமிருந்து இடமாக செல்
|
||||
STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE :இடமிலிருந்து வலஞ்செல்
|
||||
@@ -1250,6 +1253,7 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL :Ctrl+Click
|
||||
STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :அணை
|
||||
|
||||
|
||||
STR_CONFIG_SETTING_AUTOSAVE :தானியங்கிபதிவு: {STRING}
|
||||
|
||||
STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :{STRING} தேதி வகையினை பதிவுஆட்டங்கள் பெயர்களுக்கு பயன்படுத்தவும்
|
||||
STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT :பதிவு ஆட்டங்கள் கோப்புப் பெயர்களில் உள்ள தேதி வகையினை அமை
|
||||
@@ -1306,6 +1310,7 @@ STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT_HELPTEXT :கணினி
|
||||
STR_CONFIG_SETTING_AI_BUILDS_SHIPS :கணினியிற்கு கப்பல்களை அனுமதிக்காதே: {STRING}
|
||||
STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT :கணினியால் கப்பல்களை பயன்படுத்த இயலாது
|
||||
|
||||
STR_CONFIG_SETTING_AI_PROFILE :முதன்மை அமைப்புகள் profile: {STRING}
|
||||
STR_CONFIG_SETTING_AI_PROFILE_EASY :எளிதான
|
||||
STR_CONFIG_SETTING_AI_PROFILE_MEDIUM :நடுத்தரமான
|
||||
STR_CONFIG_SETTING_AI_PROFILE_HARD :கடுமையான
|
||||
@@ -1414,6 +1419,7 @@ STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED :ஒன்று
|
||||
STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER :தொடக்க நகர அளவு பெருக்கம்: {STRING}
|
||||
STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT :ஆட்டத்தின் தொடக்கத்தில் மாநகரங்களின் அளவு நகரங்களை ஒப்பிடுகையில்
|
||||
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_MANUAL :கைமுறை
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_PAX :பயணிகள் பரிமாற்றம் வகை: {STRING}
|
||||
STR_CONFIG_SETTING_DISTRIBUTION_MAIL :அஞ்சல் பரிமாற்றம் வகை: {STRING}
|
||||
|
||||
@@ -1446,11 +1452,17 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :இம்பீ
|
||||
STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :மெட்ரிக் (மீ)
|
||||
STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (மீ)
|
||||
|
||||
STR_CONFIG_SETTING_GRAPHICS :{ORANGE}அசைவூட்டம்
|
||||
STR_CONFIG_SETTING_SOUND :{ORANGE}ஒலிகள்
|
||||
STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interface
|
||||
STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}கட்டுமானம்
|
||||
STR_CONFIG_SETTING_COMPANY :{ORANGE}நிறுவனம்
|
||||
STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}கணக்கியல்
|
||||
STR_CONFIG_SETTING_VEHICLES :{ORANGE}வாகனங்கள்
|
||||
STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}வழி மாற்றல்
|
||||
STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}எல்லைகள்
|
||||
STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}பேரழிவுகள் / விபத்துகள்
|
||||
STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}சுற்றுச்சூழல்
|
||||
STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}நகரங்கள்
|
||||
STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}தொழிற்சாலைகள்
|
||||
STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}சரக்கு பரிமாற்றம்
|
||||
@@ -2146,6 +2158,7 @@ STR_AIRPORT_CITY :மாநகர
|
||||
STR_AIRPORT_METRO :மாநகர
|
||||
STR_AIRPORT_INTERNATIONAL :சர்வதேச
|
||||
STR_AIRPORT_COMMUTER :பயணிகள்
|
||||
STR_AIRPORT_INTERCONTINENTAL :கண்டமிடை
|
||||
STR_AIRPORT_HELIPORT :ஹெலிபோர்ட்
|
||||
STR_AIRPORT_HELIDEPOT :வானூர்தி பணிமனை
|
||||
STR_AIRPORT_HELISTATION :வானூர்தி நிலையம்
|
||||
|
||||
Reference in New Issue
Block a user