AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 15:01:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

update to master

Browse Source
This commit is contained in:
YueR 2019-09-09 08:34:28 +08:00
parent 252748d30c
commit 35ef7989bb
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/assets/jsons/Translations/Diplomacy,Trade,Nations.json
View File

@ -184,13 +184,6 @@
Simplified_Chinese:"我们遇到了城邦--[name]！" Simplified_Chinese:"我们遇到了城邦--[name]！"
Russian:"Мы обнаружили город-государство [name]!" Russian:"Мы обнаружили город-государство [name]!"
} }
<<<<<<< HEAD
"We have encountered [civName]!":{
Simplified_Chinese:"我们遇到了文明--[civName]！"
}
=======
>>>>>>> upstream/master
// Friendship declaration flavor texts // Friendship declaration flavor texts
"Declare Friendship ([numberOfTurns] turns)":{ "Declare Friendship ([numberOfTurns] turns)":{