This commit is contained in:
YueR 2019-09-07 22:31:53 +08:00
parent b4f06259da
commit 6db7858edc
5 changed files with 15 additions and 20 deletions

View File

@ -62,8 +62,10 @@
"Must not be on plains":{ "Must not be on plains":{
French:"Ne doit pas être sur une plaine" French:"Ne doit pas être sur une plaine"
Polish:"Nie może być na równinie" Italian:"Non deve trovarsi su Pianura"
Russian:"Не может быть построено на равнине" Polish:"Nie może być na równinach"
Russian:"Не может быть построено на равнинах"
Simplified_Chinese:"城市不能位于平原"
} }
"Stonehenge":{ "Stonehenge":{
@ -1108,6 +1110,7 @@
French:"Doit être sur une colline" French:"Doit être sur une colline"
Polish:"Nie może być na wzgórzu" Polish:"Nie może być na wzgórzu"
Russian:"Не может быть построено на холме" Russian:"Не может быть построено на холме"
Simplified_Chinese:"城市不能位于山脉"
} }
"Museum":{ "Museum":{
@ -1460,14 +1463,14 @@
German:"Muss an eine Wüste grenzen" German:"Muss an eine Wüste grenzen"
Dutch:"Moet aan een woestijn grenzen" Dutch:"Moet aan een woestijn grenzen"
Spanish:"Debe estar próximo a un desierto" Spanish:"Debe estar próximo a un desierto"
Simplified_Chinese:"必须紧邻沙漠" Simplified_Chinese:"城市必须紧邻沙漠"
Portuguese:"Nescessário que esteja proximo ao deserto" Portuguese:"Nescessário que esteja proximo ao deserto"
Polish:"Musi być obok pustyni" Polish:"Musi być obok pustyni"
} }
"Must be next to mountain":{ "Must be next to mountain":{
Italian:"Deve rasentare Montagna" Italian:"Deve rasentare Montagna"
Simplified_Chinese:"必须紧邻山脉" Simplified_Chinese:"城市必须紧邻山脉"
French:"Doit être à côté d'une montagne" French:"Doit être à côté d'une montagne"
Polish:"Musi być przy górze" Polish:"Musi być przy górze"
} }
@ -1764,18 +1767,4 @@
Russian:"Требуется технология: [requiredTech]" 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:"Не может быть построено на холмах"
}
} }

View File

@ -76,7 +76,7 @@
German:"[leaderName] von [nation]" German:"[leaderName] von [nation]"
Spanish:"[leaderName] de [nation]" Spanish:"[leaderName] de [nation]"
Portuguese:"[leaderName] do [nation]" Portuguese:"[leaderName] do [nation]"
Simplified_Chinese:"[leaderName]的[nation]" Simplified_Chinese:"[nation]的[leaderName]"
French:"[leaderName] de [nation]" French:"[leaderName] de [nation]"
Russian:"[leaderName] из [nation]" Russian:"[leaderName] из [nation]"
Romanian:"[leaderName] de [nation]" Romanian:"[leaderName] de [nation]"
@ -562,6 +562,7 @@
"Retract offer":{ "Retract offer":{
Italian:"Ritira offerta" Italian:"Ritira offerta"
Russian:"Отменить предложение" Russian:"Отменить предложение"
Simplified_Chinese:"撤回报价"
} }
"What do you have in mind?":{ "What do you have in mind?":{

View File

@ -1109,6 +1109,7 @@
"National Wonder":{ "National Wonder":{
Italian:"Meraviglia Nazionale" Italian:"Meraviglia Nazionale"
French:"Merveille Nationale" French:"Merveille Nationale"
Simplified_Chinese:"国家奇观"
Russian:"Национальное чудо" Russian:"Национальное чудо"
} }
@ -1455,6 +1456,7 @@
"City States":{ //I think that it's already elsewhere "City States":{ //I think that it's already elsewhere
Italian:"Città-Stato" Italian:"Città-Stato"
French:"Cité état" French:"Cité état"
Simplified_Chinese:"城邦"
} }
"Luxury resources":{ "Luxury resources":{

View File

@ -262,7 +262,7 @@ class CivilizationInfo {
fun isAtWar() = diplomacy.values.any { it.diplomaticStatus== DiplomaticStatus.War && !it.otherCiv().isDefeated() } fun isAtWar() = diplomacy.values.any { it.diplomaticStatus== DiplomaticStatus.War && !it.otherCiv().isDefeated() }
fun getLeaderDisplayName(): String { fun getLeaderDisplayName(): String {
var leaderName = getTranslatedNation().getLeaderDisplayName() var leaderName = getTranslatedNation().getLeaderDisplayName().tr()
if (playerType == PlayerType.AI) if (playerType == PlayerType.AI)
leaderName += " (" + "AI".tr() + ")" leaderName += " (" + "AI".tr() + ")"
else if (gameInfo.civilizations.count { it.playerType == PlayerType.Human } > 1) else if (gameInfo.civilizations.count { it.playerType == PlayerType.Human } > 1)

View File

@ -27,6 +27,9 @@ class TradePopup(worldScreen: WorldScreen): PopupTable(worldScreen){
val trade = tradeRequest.trade val trade = tradeRequest.trade
val tradeOffersTable = Table().apply { defaults().pad(10f) } 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)){ for(i in 0..max(trade.theirOffers.lastIndex, trade.ourOffers.lastIndex)){
if(trade.theirOffers.lastIndex>=i) tradeOffersTable.add(trade.theirOffers[i].getOfferText().toLabel()) if(trade.theirOffers.lastIndex>=i) tradeOffersTable.add(trade.theirOffers[i].getOfferText().toLabel())
else tradeOffersTable.add() else tradeOffersTable.add()