Generified more building uniques and merged functionality of global and city uniques when alculating tile stats

android/assets/jsons/Civ V - Vanilla/Buildings.json

@@ -139,7 +139,7 @@
 		"gold": 5,
 		"greatPersonPoints": {"gold": 1},
 		"isWonder": true,
-		"uniques": ["Can only be built in coastal cities", "+1 gold from worked water tiles in city"],
+		"uniques": ["Can only be built in coastal cities", "[+1 Gold] from [Water] tiles in this city"],
 		"requiredTech": "Iron Working",
 		"quote": "'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar"
 	},
@@ -427,7 +427,7 @@
 		"name": "Harbor",
 		"maintenance": 2,
 		"hurryCostModifier": 25,
-		"uniques": ["+1 production from all sea resources worked by the city",
+		"uniques": ["[+1 Production] from [Water resource] tiles in this city",
 			"Connects trade routes over water","Can only be built in coastal cities"],
 		"requiredTech": "Compass"
 	},
@@ -658,7 +658,7 @@
 		"hurryCostModifier": 25,
 		"maintenance": 2,
 		"requiredBuilding": "Harbor",
-		"uniques": ["+1 production and gold from all sea resources worked by the city",
+		"uniques": ["[+1 Production, +1 Gold] from [Water resource] tiles in this city",
 			"Can only be built in coastal cities", "+[15]% production when building [naval units] in this city"],
 		"requiredTech": "Navigation"
 	},

android/assets/jsons/translations/template.properties

@@ -195,7 +195,6 @@ Sun Never Sets =
 Ancien Régime = 
 
 Strategic Resources provide +1 Production, and Horses, Iron and Uranium Resources provide double quantity = 
-Strategic resources = 
 Siberian Riches = 
 
 +25% Production towards any buildings that already exist in the Capital = 
@@ -682,6 +681,7 @@ Policies =
 Base happiness = 
 Occupied City = 
 Buildings = 
+
 # For the "when constructing [military units]" translation
 military units = 
 melee units = 
@@ -689,6 +689,11 @@ mounted units =
 naval units = 
 # For the All "newly-trained [relevant] units in this city receive the [] promotion" translation. Relevant as in 'units that can receive'
 relevant = 
+# For '[stats] from [Water] tiles in this city'
+Water = 
+# For [stats] from [Water resource] tiles in this city
+Water resource = 
+
 Wonders = 
 Base values = 
 Bonuses =