From 6e34f4743afe6dad8a6b26f29c08ae24a0d6f139 Mon Sep 17 00:00:00 2001
From: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Date: Thu, 12 Sep 2019 18:05:58 +0800
Subject: [PATCH] update translation (#1067)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程
---
 android/assets/jsons/Translations/Notifications.json            | 2 +-
 .../src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json
index 7f12c32637..bbd3f5e2cc 100644
--- a/android/assets/jsons/Translations/Notifications.json
+++ b/android/assets/jsons/Translations/Notifications.json
@@ -103,7 +103,7 @@
 		German:"[cityName] wurde gegründet!"
 		Dutch:"[cityName] is gesticht!"
 		Spanish:"¡[cityName] ha sido fundada!"
-		Simplified_Chinese:"[cityName]被发现!"
+		Simplified_Chinese:"已经建立了城市--[cityName]!"
 		Portuguese:"[cityName] foi fundada!"
 		Japanese:"[cityName]が設立されました！"
 	}
diff --git a/core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt b/core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt
index 961f27189a..6750707bea 100644
--- a/core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt
+++ b/core/src/com/unciv/logic/civilization/CivInfoTransientUpdater.kt
@@ -56,7 +56,7 @@ class CivInfoTransientUpdater(val civInfo: CivilizationInfo){
             for (otherCiv in viewedCivs.filterNot { it == civInfo || it.isBarbarian() })
                 if (!civInfo.diplomacy.containsKey(otherCiv.civName)) {
                     civInfo.meetCivilization(otherCiv)
-                    civInfo.addNotification("We have encountered [${otherCiv.civName}]!".tr(), null, Color.GOLD)
+                    civInfo.addNotification("We have encountered ["+otherCiv.civName+"]!", null, Color.GOLD)
                 }
         }
     }