Merge branch 'master' of https://github.com/yairm210/UnCiv

README.md

@@ -56,6 +56,18 @@ If not, then the feature won't be added until we've finished all the features fr
 
 THE most common request, hands down. Everyone wants their favorite Civ in the game, I get that. But there are so many other things to work on - automations, AI, UI, graphics, bugs, and of course other features from the original game that are currently missing. Eventually we'll have them all, but the key word is "eventually".
 
+## How can I translate to {language}?
+
+Awesome!
+
+Like most open-source projects, Unciv is developed at Github
+
+The​​​ translation​ files are at​​​ https://github.com/yairm210/UnCiv/tree/master/android/assets/jsons/Translations
+
+When you feel that you're ready to add your​​​ translation​​ to the game, you'll need to create a merge request, which takes your changes and puts them into the main version of the game - it's pretty straightforward once you do it
+
+Do as much as you're comfortable with - it's a big game with a lot of named objects, so don't feel pressured into doing everything =)
+
 ## How can I help?
 
 If you're a programmer, you can join us in any of the open issue, or work on improving anything you want - once you're finished, issue a pull request and it'll go into the next version!

android/assets/game.atlas

@@ -3126,7 +3126,7 @@ UnitIcons/Hwach'a
   orig: 100, 100
   offset: 0, 0
   index: -1
-UnitIcons/Immortal
+UnitIcons/Persian Immortal
   rotate: false
   xy: 896, 1010
   size: 100, 100
@@ -3602,7 +3602,7 @@ UnitPromotionIcons/Operational Range
   orig: 50, 50
   offset: 0, 0
   index: -1
-UnitPromotionIcons/Range
+UnitPromotionIcons/Extended Range
   rotate: false
   xy: 1266, 16
   size: 50, 50

android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json

@@ -464,7 +464,7 @@
 	
 	
 	
-	// Starting Era
+	// Starting Era, the Era names don't need to translate.
 	
 	"Starting Era":{
 		Italian:"Epoca iniziale"
@@ -472,46 +472,6 @@
                 Korean:"시작 시대"
 	}
  
-	"Ancient":{
-		Italian:"Antica"
-                Korean:"고대"
-	}
-	
-	"Classic":{
-		Italian:"Classica"
-                Korean:"고전"
-	}
-	
-	"Medieval":{
-		Italian:"Medievale"
-                Korean:"중세"
-	}
-	
-	"Renaissance":{
-		Italian:"Rinascimentale"
-                Korean:"르네상스"
-	}
-	
-	"Industrial":{
-		Italian:"Industriale"
-                Korean:"산업"
-	}
-	
-	"Modern":{
-		Italian:"Moderna"
-                Korean:"현대"
-	}
-	
-	"Information":{
-		Italian:"Informatica"
-                Korean:"정보"
-	}
-	
-	"Future":{
-		Italian:"Futura"
-                Korean:"미래"
-	}
- 
 ////
 	
 	"It looks like we can't make a map with the parameters you requested!":{

android/assets/jsons/Translations/Other.json

@@ -172,6 +172,9 @@
 		Japanese:"爆撃力"
 	}
 
+	"Range":{
+		Simplified_Chinese:"攻击范围"
+	}
 
 /////// Unit actions
 

android/assets/jsons/Translations/Units,Promotions.json

@@ -387,7 +387,7 @@
 		French:"Hoplite"
 	}
 	
-	"Immortal":{ // Persian unique
+	"Persian Immortal":{ // Persian unique
 		Italian:"Immortale"
 		Simplified_Chinese:"波斯长生军"
 	}
@@ -1683,12 +1683,12 @@
 		Simplified_Chinese:"警戒能力"
 	}
 
-	"Range":{
+	"Extended Range":{
 		Italian:"Raggio di tiro ampliato"
 		German:"Reichweite"
 		French:"Portée"
 		Russian:"Обзор"
-		Simplified_Chinese:"Range"// the unit attribute and the promotions ability have the same name,if we do not solve this problem,i will not translate it.
+		Simplified_Chinese:"射程拓展"
 	}
 
 	"+1 Range":{

android/assets/jsons/UnitPromotions.json

@@ -49,7 +49,7 @@
 		unitTypes:["Ranged","Siege"]
 	}
 	{
-		name:"Range",
+		name:"Extended Range",
 		prerequisites:["Accuracy III","Barrage III","Targeting II","Bombardment II", "Wolfpack II"],
 		effect:"+1 Range",
 		unitTypes:["Ranged","Siege","WaterRanged","WaterSubmarine"]

android/assets/jsons/Units.json

@@ -243,7 +243,7 @@
 		attackSound:"metalhit"
 	},
 	{
-		name:"Immortal",
+		name:"Persian Immortal",
 		replaces:"Spearman",
 		uniqueTo:"Persia",
 		unitType:"Melee",
@@ -423,7 +423,7 @@
 		requiredTech:"Machinery",
 		upgradesTo:"Gatling Gun",
 		obsoleteTech:"Industrialization",
-		promotions:["Range"],
+		promotions:["Extended Range"],
 		hurryCostModifier:20,
 		attackSound:"arrow"
 	},