Merge remote-tracking branch 'origin/master'

android/assets/jsons/translations/template.properties

@@ -342,6 +342,13 @@ Width =
 Radius = 
 Enable Religion = 
 
+Resource Setting = 
+Sparse = 
+Default = 
+Abundant = 
+Strategic Balance = 
+Legendary Start = 
+
 Advanced Settings = 
 RNG Seed = 
 Map Elevation = 
@@ -1193,6 +1200,8 @@ Natural Wonder =
 Hybrid = 
 Undesirable = 
 Desirable = 
+Featureless = 
+Fresh Water = 
 
 # improvementFilters