diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json index 6fc8968382..8b48d718a4 100644 --- a/android/assets/jsons/Translations/Buildings.json +++ b/android/assets/jsons/Translations/Buildings.json @@ -62,8 +62,10 @@ "Must not be on plains":{ French:"Ne doit pas être sur une plaine" - Polish:"Nie może być na równinie" - Russian:"Не может быть построено на равнине" + Italian:"Non deve trovarsi su Pianura" + Polish:"Nie może być na równinach" + Russian:"Не может быть построено на равнинах" + Simplified_Chinese:"城市不能位于平原" } "Stonehenge":{ @@ -1108,6 +1110,7 @@ French:"Doit être sur une colline" Polish:"Nie może być na wzgórzu" Russian:"Не может быть построено на холме" + Simplified_Chinese:"城市不能位于山脉" } "Museum":{ @@ -1460,14 +1463,14 @@ German:"Muss an eine Wüste grenzen" Dutch:"Moet aan een woestijn grenzen" Spanish:"Debe estar próximo a un desierto" - Simplified_Chinese:"必须紧邻沙漠" + Simplified_Chinese:"城市必须紧邻沙漠" Portuguese:"Nescessário que esteja proximo ao deserto" Polish:"Musi być obok pustyni" } "Must be next to mountain":{ Italian:"Deve rasentare Montagna" - Simplified_Chinese:"必须紧邻山脉" + Simplified_Chinese:"城市必须紧邻山脉" French:"Doit être à côté d'une montagne" Polish:"Musi być przy górze" } @@ -1764,18 +1767,4 @@ Russian:"Требуется технология: [requiredTech]" } - "Must not be on plains":{ - Italian:"Non deve trovarsi su Pianura" - Polish:"Nie może być na równinach" - Russian:"Не может быть построено на равнинах" - } - - "Must not be on hill":{//Line correction - Italian:"Non deve trovarsi su Collina" - Polish:"Nie może być na wzgórzach" - Russian:"Не может быть построено на холмах" - } - - - } diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index df5b9c759a..ba0288bb5b 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -76,7 +76,7 @@ German:"[leaderName] von [nation]" Spanish:"[leaderName] de [nation]" Portuguese:"[leaderName] do [nation]" - Simplified_Chinese:"[leaderName]的[nation]" + Simplified_Chinese:"[nation]的[leaderName]" French:"[leaderName] de [nation]" Russian:"[leaderName] из [nation]" Romanian:"[leaderName] de [nation]" @@ -562,6 +562,7 @@ "Retract offer":{ Italian:"Ritira offerta" Russian:"Отменить предложение" + Simplified_Chinese:"撤回报价" } "What do you have in mind?":{ diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 60825a85f9..a878c88c08 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -1109,6 +1109,7 @@ "National Wonder":{ Italian:"Meraviglia Nazionale" French:"Merveille Nationale" + Simplified_Chinese:"国家奇观" Russian:"Национальное чудо" } @@ -1455,6 +1456,7 @@ "City States":{ //I think that it's already elsewhere Italian:"Città-Stato" French:"Cité état" + Simplified_Chinese:"城邦" } "Luxury resources":{ diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index 2df6171add..62d00815a6 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -262,7 +262,7 @@ class CivilizationInfo { fun isAtWar() = diplomacy.values.any { it.diplomaticStatus== DiplomaticStatus.War && !it.otherCiv().isDefeated() } fun getLeaderDisplayName(): String { - var leaderName = getTranslatedNation().getLeaderDisplayName() + var leaderName = getTranslatedNation().getLeaderDisplayName().tr() if (playerType == PlayerType.AI) leaderName += " (" + "AI".tr() + ")" else if (gameInfo.civilizations.count { it.playerType == PlayerType.Human } > 1) diff --git a/core/src/com/unciv/ui/worldscreen/TradePopup.kt b/core/src/com/unciv/ui/worldscreen/TradePopup.kt index 9380323f9e..1d37a0e5a2 100644 --- a/core/src/com/unciv/ui/worldscreen/TradePopup.kt +++ b/core/src/com/unciv/ui/worldscreen/TradePopup.kt @@ -27,6 +27,9 @@ class TradePopup(worldScreen: WorldScreen): PopupTable(worldScreen){ val trade = tradeRequest.trade val tradeOffersTable = Table().apply { defaults().pad(10f) } + tradeOffersTable.add("[${translatedNation.getNameTranslation()}]'s trade offer".tr().toLabel()) + tradeOffersTable.add("Our trade offer".tr().toLabel()) + tradeOffersTable.row() for(i in 0..max(trade.theirOffers.lastIndex, trade.ourOffers.lastIndex)){ if(trade.theirOffers.lastIndex>=i) tradeOffersTable.add(trade.theirOffers[i].getOfferText().toLabel()) else tradeOffersTable.add()