From cae3d4973853298777d3b98f1e6b8a824659e026 Mon Sep 17 00:00:00 2001
From: Duan Tao <duantao@live.cn>
Date: Wed, 10 Jul 2019 10:30:26 +0800
Subject: [PATCH] Add notification translation.

---
 .../jsons/Translations/Diplomacy,Trade,Nations.json      | 9 +++++----
 android/assets/jsons/Translations/Notifications.json     | 5 ++++-
 .../src/com/unciv/logic/civilization/CivilizationInfo.kt | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json
index 06f95019be..f4e0e24cd8 100644
--- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json
+++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json
@@ -260,7 +260,10 @@
 	"Provides 3 happiness at 30 Influence":{
 		Italian:"Dona 3 Punti Felicità quando l'Influenza supera 30 punti"
 		French:"Fournit 3 de Bonheur à 30 d'influence"
-	}
+	},
+
+	"Provides land units every 20 turns at 30 Influence":{
+	},
 
 	"Gift [goldAmount] gold":{
 		Italian:"Dona [goldAmount] Oro"
@@ -409,12 +412,10 @@
 	"Mercantile":{
 		Italian:"Mercantile"
 	}
-	
-	/*
+
 	"Militaristic":{
 		Italian:"Militaristica"
 	}
-	*/
 
 ////// Trade	
 
diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json
index 02abeb3247..c36a472973 100644
--- a/android/assets/jsons/Translations/Notifications.json
+++ b/android/assets/jsons/Translations/Notifications.json
@@ -474,5 +474,8 @@
 
 		"You and [name] are no longer allies!":{ // When you lose alliance with a City-State (Relationship fall less than 60)
 			Italian:"Non sei più alleato con [name]!"
-		}
+		},
+
+        "[civName] gave us a [untiName] as gift near [cityName]!":{ // When a city state gives a unit as gift.
+        }
 }
diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index 855478e51f..271de66d0f 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -407,7 +407,7 @@ class CivilizationInfo {
                     .getConstructableUnits().filter { !it.unitType.isCivilian() && it.unitType.isLandUnit()}
                     .random()
             placeUnitNearTile(city.location, militaryUnit.name)
-            addNotification("[${otherCiv.civName}] gave us a [${militaryUnit.name}] as gift near [${city.name}]!".tr(), null, Color.RED)
+            addNotification("[${otherCiv.civName}] gave us a [${militaryUnit.name}] as gift near [${city.name}]!".tr(), null, Color.GREEN)
         }
     }