From 373fefd2e38688bfe162bb1ff11a2ea9ac27ead9 Mon Sep 17 00:00:00 2001 From: YueR Date: Sat, 7 Sep 2019 14:28:21 +0800 Subject: [PATCH] update --- .../BasicHelp_Simplified_Chinese.json | 2 +- .../assets/jsons/Translations/Buildings.json | 4 ++ .../Translations/Diplomacy,Trade,Nations.json | 40 +++++++++++++--- .../NewGame,SaveGame,LoadGame,Options.json | 16 +++++-- android/assets/jsons/Translations/Other.json | 12 +++-- .../jsons/Translations/Units,Promotions.json | 9 +--- .../Tutorials_Simplified_Chinese.json | 46 +++++++++---------- .../com/unciv/ui/newgamescreen/NationTable.kt | 2 +- .../pickerscreens/GreatPersonPickerScreen.kt | 9 ++-- .../src/com/unciv/ui/trade/DiplomacyScreen.kt | 14 +++--- 10 files changed, 99 insertions(+), 55 deletions(-) diff --git a/android/assets/jsons/BasicHelp/BasicHelp_Simplified_Chinese.json b/android/assets/jsons/BasicHelp/BasicHelp_Simplified_Chinese.json index 330253822b..62c4c18ae4 100644 --- a/android/assets/jsons/BasicHelp/BasicHelp_Simplified_Chinese.json +++ b/android/assets/jsons/BasicHelp/BasicHelp_Simplified_Chinese.json @@ -13,7 +13,7 @@ }, { name:"基本资源", - description: "文明游戏中有6种基本资源：食物、产能、金钱、科研、快乐和文化。\n产能和食物的产出每个城市独立计算，而其他资源的计算是所有城市产出的总和。\n基本资源的产出由城市的工作地块和城市里的建筑或奇观决定。" + description: "文明游戏中有6种基本资源：食物、产能、金钱、科研、快乐和文化。\n产能和食物的产出每个城市独立计算，其他资源的产出则是所有城市该种资源产出总和计算。\n基本资源的产出由城市的工作地块和城市里的建筑或奇观决定。" }, { name:"食物", diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json index 8157747238..0818014693 100644 --- a/android/assets/jsons/Translations/Buildings.json +++ b/android/assets/jsons/Translations/Buildings.json @@ -1046,6 +1046,10 @@ Russian:"Выбор великого человека" } + "Get ":{ + Simplified_Chinese:"获得" + } + "Himeji Castle":{ Italian:"Castello di Himeji" Simplified_Chinese:"姬路城" diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index 85570cfe35..bcd559d4a3 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -126,6 +126,7 @@ "Sounds good!":{ Italian:"Sta bene!" French:"Très bien!" + Simplified_Chinese:"听起来还不错。" Polish:"Bardzo dobrze!" Russian:"Звучит неплохо!" } @@ -141,7 +142,7 @@ "Excellent!":{ // AI statement after we accept a trade they proposed, and when we meet a city state, and our response when they agree to our diplomatic demand Italian:"Eccellente!" - Simplified_Chinese:"好极了！和和气气才是生财之道。" + Simplified_Chinese:"幸会幸会！互相尊重是建立友好关系的第一步。" French:"Excellent!" Portuguese:"Excelente!" Polish:"Wyśmienicie!" @@ -179,7 +180,8 @@ Italian:"Abbiamo incontrato la Citta-Stato di [name]!" Portuguese:"Nós encontramos a cidade-estado de [name]" French:"Nous avons rencontré la cité-état de [name]!" - Polish:"Napotkaliśmy państwo-miasto o nazwie [name]!" + Polish:"Napotkaliśmy państwo-miasto o nazwie [name]!" + Simplified_Chinese:"我们遇到了城邦--[name]！" Russian:"Мы обнаружили город-государство [name]!" } @@ -215,6 +217,7 @@ "Denounce ([numberOfTurns] turns)":{ Italian:"Denuncia ([numberOfTurns] turni)" French:"Dénoncer ([numberOfTurns] tours)" + Simplified_Chinese:"谴责([numberOfTurns]回合)" Polish:"Potęp cywilizację na [numberOfTurns] tur" Russian:"Осуждение на [numberOfTurns] ходов" } @@ -222,6 +225,7 @@ "We will remember this.":{ Italian:"Non credere che ce lo scorderemo!" French:"Nous nous en souviendrons." + Simplified_Chinese:"这种侮辱我们绝不会忘记。请好自为之！" Russian:"Мы это запомним" } @@ -289,36 +293,39 @@ "Provides [amountOfCulture] culture at 30 Influence":{ Italian:"Dona [amountOfCulture] punti Cultura a minimo 30 Punti Influenza" French:"Fournit [amountOfCulture] de Culture à 30 d'influence" + Simplified_Chinese:"当影响力不低于30时提供[amountOfCulture]文化" Russian:"Даёт [amountOfCulture] культуры при 30 Влияния" } "Provides 3 food in capital and 1 food in other cities at 30 Influence":{ Italian:"Dona 3 Cibo alla Capitale e 1 Cibo alle altre Città a minimo 30 Punti Influenza" French:"Fournit 3 Nourriture à la capitale et 1 nourriture pour les autres villes à 30 d'influence" + Simplified_Chinese:"当影响力不低于30时为首都提供3食物，为其他城市提供1食物" Russian:"Даёт 3 Еды в столице и 1 Еда в остальных городах при 30 Влияния" } "Provides 3 happiness at 30 Influence":{ Italian:"Dona 3 Punti Felicità a minimo 30 Punti Influenza" French:"Fournit 3 de Bonheur à 30 d'influence" + Simplified_Chinese:"当影响力不低于30时提供3快乐" Russian:"Даёт 3 Счастья при 30 Влияния" }, "Provides land units every 20 turns at 30 Influence":{ Italian:"Concede un'unità terrestre ogni 20 turni a minimo 30 Punti Influenza" French:"Fournit des unités terrestres tous les 20 tours à 30 d'influence" + Simplified_Chinese:"当影响力不低于30时每20回合提供陆军单位" Russian:"Даёт сухопутные юниты каждые 20 ходов при 30 Влияния" }, - "Gift [goldAmount] gold":{ - Italian:"Dona [goldAmount] Oro" - French:"Donner [goldAmount] ors" - Russian:"Дарит [goldAmount] золота" + "Gift [giftAmount] gold (+[influenceAmount] influence)":{ + Simplified_Chinese:"赠予[giftAmount]金钱(+[influenceAmount]影响力)" } "Relationship changes in another [turnsToRelationshipChange] turns":{ Italian:"I rapporti cambieranno tra [turnsToRelationshipChange] turni" French:"Les relations changent dans [turnsToRelationshipChange] tours" + Simplified_Chinese:"将在[turnsToRelationshipChange]回合后失去对该城邦的影响" Russian:"Отношения изменятся в следующие [turnsToRelationshipChange] ходов" } @@ -402,24 +409,28 @@ Italian:"La tua cosiddetta 'amicizia' non vale nulla!" Portuguese:"Sua chamada 'amizade' não vale nada." French:"Votre soi-disant 'amitié' ne vaut rien." + Simplified_Chinese:"你所谓的“友谊”一文不值。" Russian:"Ваше так называемое дружелюбие ничего не значит." } "You have publicly denounced us!":{ Italian:"Ci hai denunciato pubblicamente di fronte al mondo!" French:"Vous nous avez dénoncé publiquement!" + Simplified_Chinese:"批判的武器不能代替武器的批判，谴责是无力的懦夫行为。" Russian:"Вы публично осудили нас!" } "You have denounced our allies":{ Italian:"Hai denunciato i nostri alleati!" French:"Vous avez dénoncé nos alliées" + Simplified_Chinese:"对我们盟友的侮辱也是对我们的冒犯，请好自为之！" Russian:"Вы осудили наших союзников!" } "You have denounced our enemies":{ Italian:"Hai denunciato i nostri nemici!" French:"Vous avez dénoncé nos ennemies" + Simplified_Chinese:"敌人的敌人就是朋友，你的谴责是维护公正的仗义执言，我们期待听到更多。" Russian:"Вы осудили наших врагов" } @@ -427,51 +438,60 @@ "Demands":{ Italian:"Richieste" French:"Demandes" + Simplified_Chinese:"要求" Russian:"Требования" } "Please don't settle new cities near us.":{ Italian:"Smetti di fondare città vicino a noi." French:"Veuillez ne pas construire de villes proches de nous." + Simplified_Chinese:"请不要在我们附近建立新的城市。" Russian:"Пожалуйста, не закладывайте новых городов рядом с нами." } "Very well, we shall look for new lands to settle.":{ Italian:"Ti porgiamo le nostre scuse." French:"Très bien, nous chercherons d'autres terres à coloniser" + Simplified_Chinese:"好的，我们将会寻找新的建城位置。" Russian:"Хорошо, мы найдем другие земли для поселений" } "We shall do as we please.":{ Italian:"Colonizzeremo la terra che ci pare e piace." French:"Nous faisons ce que nous voulons." + Simplified_Chinese:"我们只是自己的奴隶，这里不需要弱者叽叽喳喳。" Russian:"Мы поступим, как сочтем нужным" } "You betrayed your promise to not settle cities near us":{ Italian:"Hai tradito la tua promessa di non fondare città nelle nostre vicinanze." French:"Vous avez trahis votre promesse de ne pas fonder de ville proche de nous" + Simplified_Chinese:"你背叛了不在我们附近建城的承诺，请好自为之。" Russian:"Вы нарушили ваше обещание не закладывать города рядом с нами" } "You fulfilled your promise to stop settling cities near us!":{ Italian:"Hai mantenuto la tua promessa di non fondare città nelle nostre vicinanze." French:"Vous avez tenu votre promesse de ne pas fonder de ville proche de nous!" + Simplified_Chinese:"感谢你履行了不在我们附近建城的承诺。" Russian:"Вы выполнили ваше обещание не закладывать города рядом с нами" } "You refused to stop settling cities near us":{ Italian:"Hai continuato a fondare città nelle nostre vicinanze." French:"Vous avez refusez de ne pas fonder de villes proches de nous" + Simplified_Chinese:"你拒绝停止在我们附近建城的决定是愚蠢的，好自为之！" Russian:"Вы отказались не закладывать города рядом с нами" } "We noticed your new city near our borders, despite your promise. This will have....implications.":{ Italian:"Abbiamo notato la la tua nuova città vicino ai nostri confini. E questo avrà... ripercussioni sui nostri rapporti." French:"Nous avons remarquez votre nouvelle ville à notre frontière, malgré votre promesse. Cela aura des... conséquences." + Simplified_Chinese:"尽管你答应了，我们还是注意到你在我们边境附近的新城市。如果有不好的影响...这将是你自找的！" Russian:"Мы заметили ваш новый город около наших границ. Это может повлечь... последствия." } "Your arrogant demands are in bad taste":{ Italian:"Hai fatto una richiesta arrogante." French:"Vos arrogantes demandes sont de mauvais goût" + Simplified_Chinese:"你的傲慢要求不合情理。" Russian:"Ваши высокомерные требования раздражают" } @@ -507,6 +527,14 @@ Russian:"Воинственный" } + "Type: ":{ + Simplified_Chinese:"城邦类型：" + } + + "Influence: ":{ + Simplified_Chinese:"影响力：" + } + ////// Trade "Trade":{ diff --git a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json index 27f11f8654..2f358c4362 100644 --- a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json +++ b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json @@ -8,7 +8,7 @@ German:"Aus Zwischenablage laden" Dutch:"Gekopieerde data laden" Spanish:"Cargar datos copiados" - Simplified_Chinese:"加载复制过的数据" + Simplified_Chinese:"加载复制的数据" Portuguese:"Carregar dados copiados" Japanese:"コピーしたデータを読み込む" } @@ -278,10 +278,12 @@ "AI":{ Italian:"IA" + Simplified_Chinese:"电脑" } "Human":{ Italian:"Umano" + Simplified_Chinese:"人类玩家" } "Hotseat":{ @@ -290,17 +292,21 @@ "User Id":{ Italian:"ID Utente" + Simplified_Chinese:"用户ID" } "Click to copy":{ Italian:"Clicca per copiare" + Simplified_Chinese:"点击复制" } "Username":{ Italian:"Nome utente" + Simplified_Chinese:"用户名" } "Multiplayer":{ + Simplified_Chinese:"多人游戏" } "Could not download game!":{ @@ -418,7 +424,7 @@ German:"Spiel konnte nicht geladen werden" Dutch:"Spel kon niet geladen worden" Spanish:"Imposible cargar partida" - Simplified_Chinese:"无法读档" + Simplified_Chinese:"无法载入游戏" Portuguese:"Não foi possivel carregar a partida salva" } @@ -454,22 +460,26 @@ German:"Gespeichert um" Dutch:"Opgeslagen in" Spanish:"Guardado en" - Simplified_Chinese:"保存在" + Simplified_Chinese:"存储时间" Portuguese:"Salvo em" } ////////////// Load map "Load map":{ + Simplified_Chinese:"载入地图" } "Are you sure you want to delete this map?":{ + Simplified_Chinese:"你真想删除这张地图吗？" } "Upload":{ + Simplified_Chinese:"上传" } "Could not upload map!":{ + Simplified_Chinese:"无法上传地图！" } ////////////// Options diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 5843aabb38..9bac96f3a3 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -226,7 +226,7 @@ German:"Automatisieren anhalten" French:"Arrêtez automatisation" Portuguese:"Pare a automação" - Simplified_Chinese:"停止自动化" + Simplified_Chinese:"停止自动工作" Romanian:"Opriți automatizarea" Russian:"Остановить автоматизацию" Japanese:"自動化を停止" @@ -422,11 +422,13 @@ "Create [improvement]":{ // for great units, fishing boats, etc. Italian:"Costruisci [improvement]" French:"Construire [improvement]" + Simplified_Chinese:"建造[improvement]" } "Start Golden Age":{ Italian:"Inizia Età dell'Oro" French:"Commencer un Age d'Or" + Simplified_Chinese:"开启黄金时代" Russian:"Войти в золотой век" } @@ -770,6 +772,7 @@ Italian: "Scegli ora!" German: "Jetzt wählen!" French:"Choisir maintenant !" + Simplified_Chinese:"选择此项！" Russian:"Выбрать сейчас!" } @@ -1606,7 +1609,7 @@ German:"Um zu gewinnen vervollständigen\nSie alle Raumschiffteile!" French:"Construisez toutes les parties du \n vaisseau spatial pour gagner!" Russian:"Для победы\n завершите все части космического коробля" - Simplified_Chinese:"完成建造太空飞船\n胜利 " + Simplified_Chinese:"完成建造太空飞船\n胜利！" Portuguese:"Complete todas as partes da nave para ganhar" } @@ -1742,17 +1745,20 @@ "Remove your troops in our border immediately!":{ Italian:"Esigiamo che rimuoviate i vostri soldati dai nostri confini!" French:"Enlevez vos troupes de nos terres immédiatement!" + Simplified_Chinese:"请停止这种无理而且野蛮的行径！马上让你的单位滚出我的领土！" } "Sorry.":{ Italian:"Ti porgiamo le nostre scuse." French:"Désolé." + Simplified_Chinese:"请您原谅我的鲁莽。" } "Never!":{ Italian:"Non sia mai!" French:"Jamais!" - Russian:"Никогда!" + Russian:"Никогда!" + Simplified_Chinese:"愤怒是无能的表现。" } ////// Civilopedia texts diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index b720f256ca..804ca8a4aa 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -1350,16 +1350,9 @@ "Bonus for units in 2 tile radius 15%" :{ Italian:"15% Bonus per le unità nel raggio di 2 caselle" French:"Bonus de combat +15% pour les unités dans un rayon de 2 cases" + Simplified_Chinese:"周围两格地块内的我方所有陆军单位+15%战斗力" Russian:"Бонус к атаке юнитам в радиусе 2-х клеток" } - - /* Not in use now, but will be when we eventually add Great Admiral and split the job - "Bonus for land units in 2 tile radius 15%" :{ - Italian:"15% Bonus per le unità terrestri nel raggio di 2 caselle" - Simplified_Chinese:"周围两格地块内的我方所有陆军单位+15%战斗力" - French:"Bonus de combat +15% pour les unités terrestres dans un rayon de 2 cases" - } - */ ////// Unit Promotions diff --git a/android/assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json b/android/assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json index 6e05d9f91e..5b4de92644 100644 --- a/android/assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json +++ b/android/assets/jsons/Tutorials/Tutorials_Simplified_Chinese.json @@ -62,17 +62,17 @@ [ "一旦你建立了第一座城市，便可以执行组建单位、建造建筑等操作，", "同时还可以着手研发科技。", - "科技研究是非常复杂的，这里不作说明，稍后我们会详细介绍。下面继续我们的教程---", - "让我们先来谈谈组建单位。" + "科技研究是非常复杂的，这里不作说明，稍后我们会详细介绍。下面继续我们的教程--", + "先来谈谈组建单位吧。" ], [ - "你的城市第一个组建的单位应该是斥候或勇士，" + "你的城市第一个要组建的单位应该是斥候或勇士，" "我非常喜欢勇士因为他可以用于防守，同时也是可升级的，", - "当您解锁“铁器”科技后只需花费一定数量的金钱就可以把他升级为剑士。", + "当您研发完“铁器”科技后只需花费一定数量的金钱就可以把他升级为剑士。", "斥候是探查地图的专家，尤其是当所在区域有大片的山脉和森林时。", "斥候在这些复杂地形移动无移动力惩罚。" "如果您是经验丰富的4X游戏玩家，紧随勇士和斥候后组建的单位应该是移民，", - "在这一类型的游戏中快速的扩张是获取胜利的有效手段。", + "在这一类型的游戏中快速扩张是获取胜利的有效手段。", ], ], @@ -86,16 +86,16 @@ ], [ "如何选择一个合适的首都建立位置?这不是一个容易回答的问题。", - "通常情况下，选择紧邻奢侈资源的的位置是选择建立点的不二法则。", - "奢侈资源主要包括宝石、棉花、丝绸等（这些资源在地图上用一个笑脸标示），", + "通常情况下，选择紧邻奢侈资源的位置是选择建立点的不二法则。", + "奢侈资源主要包括宝石、棉花、丝绸等（这些资源在地图上用一个“笑脸”标示），", "开发这些资源可以增加您的文明的快乐。当然，你也应该留意那些组建单位时所需要的战略资源，比如铁。" ], [ "但是，城市的边界不是固定的，它会随着文化的积累慢慢扩张。" "这意味着你并不一定要把城市建在太过靠近资源的位置。", "举例来说，比如, 你需要获得战略资源铁--但悲剧的是该资源紧邻沙漠。" - "您无需把城市建立在紧邻沙漠的位置，相反的，可以选择离该资源稍远而且更加富饶的地块。", - "随着城市的不断繁荣发展和边界的扩张，你的城市将慢慢靠近该资源直至获得它。", + "您无需把城市建立在紧邻沙漠的位置。相反的，可以选择离该资源稍远而且更加富饶的地块。", + "随着城市的不断繁荣发展和边界的扩张，城市将慢慢靠近该资源直至获得它。", "如果需要马上获得所需的战略资源你可以选择建城在靠近资源的位置--", "有时候这样做可能对游戏的胜利更有利，但通常情况下您都有充裕的时间选择更加合理的建立点。" ], @@ -104,22 +104,22 @@ HappinessGettingLow:[ [ - "As cities grow in size and influence they also are able to work more territory.", - "You also have to deal with a happiness mechanic that is no longer tied to each individual city.", - "Instead, your entire empire shares the same level of satisfaction.", - "As your cities grow in population you’ll find that it is more and more difficult to keep your empire happy." + "随着城市规模扩大，城市的可工作地块也会变得越来越多。", + "这时，你将不得不面对游戏中关于“快乐”的机制。在游戏中，快乐的产出是所有城市总和计算，", + "快乐的消耗则由城市数量和人口数量决定。", + "随着城市数量的增加和城市人口的增长您将会很快发现：保持你的文明始终处于快乐是一件越来越难的事。" ], [ - "In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.", - "If your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.", - "If your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)", - " your armies will have a big penalty slapped on to their overall combat effectiveness." + "此外，在未研发相关科技前您将无法建造任何能增加快乐的建筑、奇观和开发可以增加快乐的奢侈资源。", + "如果您的文明处于不满，将会极大地减慢城市发展速度。", + "如果文明的不满状态非常严重（顶部信息栏用一个“哭脸”标示），", + "您的部队战斗力将会有极大的减成。" ], [ - "This means that it is very difficult to expand quickly in Unciv." - "It isn’t impossible, but as a new player you probably shouldn’t do it." - "So what should you do? Chill out, scout, and improve the land that you do have by building Workers.", - "Only build new cities once you have found a spot that you believe is appropriate." + "这意味着在Unciv游戏中快速扩张是一件非常困难的事，新手们一定要十分慎重。" + "那么究竟应该如何做呢？把目光聚焦在发展自己已有的城市上吧。" + "通过组建工人建造设施、开发资源，同时不要放松对其他文明的侦查工作，", + "只有当您在寻找到一个合适的位置后再来建立新的城市吧。" ], ] @@ -361,8 +361,8 @@ Idle_Units:[ [ "如果当前回合不想对某个单位执行任何操作，可以点击右上方“下个未行动单位”按钮来跳过该单位。", - "如果一段时间内不想对其执行任何操作，可以对该单位执行“驻防”或“休眠”指令，", - "系统执行“回合结束前查看未行动单位”指令时将自动跳过处于“驻防”或“休眠”状态的未行动单位。", + "如果一段时间内不想对其执行任何操作，可以对该单位执行“驻守”或“休眠”指令，", + "系统执行“回合结束前查看未行动单位”指令时将自动跳过处于“驻守”或“休眠”状态的未行动单位。", "如果想完全禁用“下个未行动单位”按钮，请进入“设置”菜单并将“回合结束前查看未行动单位”设置为“否”。", ] ] diff --git a/core/src/com/unciv/ui/newgamescreen/NationTable.kt b/core/src/com/unciv/ui/newgamescreen/NationTable.kt index 5df9634ada..4cd40e5920 100644 --- a/core/src/com/unciv/ui/newgamescreen/NationTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/NationTable.kt @@ -84,7 +84,7 @@ class NationTable(val nation: Nation, width:Float, onClick:()->Unit) for (unique in unit.uniques.filterNot { it in originalUnit.uniques }) textList += " " + Translations.translateBonusOrPenalty(unique) for(unique in originalUnit.uniques.filterNot { it in unit.uniques }) - textList += " "+"Lost ability".tr()+"(vs "+originalUnit.name.tr()+"):"+Translations.translateBonusOrPenalty(unique) + textList += " "+"Lost ability".tr()+"(vs "+originalUnit.name.tr()+"): "+Translations.translateBonusOrPenalty(unique) for (promotion in unit.promotions.filter { it !in originalUnit.promotions }) textList += " " + promotion.tr() + " (" + Translations.translateBonusOrPenalty(GameBasics.UnitPromotions[promotion]!!.effect) + ")" diff --git a/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt index 783846d88e..2f2d5f07d1 100644 --- a/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt @@ -5,6 +5,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Button import com.unciv.UnCivGame import com.unciv.logic.civilization.GreatPersonManager import com.unciv.models.gamebasics.GameBasics +import com.unciv.models.gamebasics.tr import com.unciv.models.gamebasics.unit.BaseUnit import com.unciv.ui.utils.ImageGetter import com.unciv.ui.utils.onClick @@ -16,7 +17,7 @@ class GreatPersonPickerScreen : PickerScreen() { init { closeButton.isVisible=false - rightSideButton.setText("Choose a free great person") + rightSideButton.setText("Choose a free great person".tr()) for (unit in GameBasics.Units.values .filter { it.name in GreatPersonManager().statToGreatPersonMapping.values || it.name == "Great General"}) { @@ -27,8 +28,10 @@ class GreatPersonPickerScreen : PickerScreen() { button.pack() button.onClick { theChosenOne = unit - pick("Get " +unit.name) - descriptionLabel.setText(unit.uniques.joinToString()) + var unitDescription=HashSet() + unit.uniques.forEach { unitDescription.add(it.tr()) } + pick("Get ".tr() +unit.name.tr()) + descriptionLabel.setText(unitDescription.joinToString()) } topTable.add(button).pad(10f).row() } diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index 1b012bafc6..c2ab3bba99 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -94,16 +94,16 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { val diplomacyTable = Table() diplomacyTable.defaults().pad(10f) diplomacyTable.add(otherCiv.getLeaderDisplayName().toLabel().setFontSize(24)).row() - diplomacyTable.add(("Type: " + otherCiv.getCityStateType().toString()).toLabel()).row() - diplomacyTable.add(("Influence: " + otherCivDiplomacyManager.influence.toInt() + "/30").toLabel()).row() + diplomacyTable.add(("Type: ".tr() + otherCiv.getCityStateType().toString().tr()).toLabel()).row() + diplomacyTable.add(("Influence: ".tr() + otherCivDiplomacyManager.influence.toInt() + "/30").toLabel()).row() diplomacyTable.add(getRelationshipTable(otherCivDiplomacyManager)).row() val friendBonusText = when (otherCiv.getCityStateType()) { - CityStateType.Cultured -> "Provides [" + (3 * (viewingCiv.getEra().ordinal + 1)).toString() + "] culture at [30] Influence" - CityStateType.Maritime -> "Provides 3 food in capital and 1 food in other cities at [30] Influence" - CityStateType.Mercantile -> "Provides 3 happiness at [30] Influence" - CityStateType.Militaristic -> "Provides land units every 20 turns at [30] Influence" + CityStateType.Cultured -> "Provides [" + (3 * (viewingCiv.getEra().ordinal + 1)).toString() + "] culture at [30] Influence".tr() + CityStateType.Maritime -> "Provides 3 food in capital and 1 food in other cities at [30] Influence".tr() + CityStateType.Mercantile -> "Provides 3 happiness at [30] Influence".tr() + CityStateType.Militaristic -> "Provides land units every 20 turns at [30] Influence".tr() } val friendBonusLabel = friendBonusText.toLabel() @@ -111,7 +111,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { if (otherCivDiplomacyManager.relationshipLevel() >= RelationshipLevel.Friend) { friendBonusLabel.setFontColor(Color.GREEN) val turnsToRelationshipChange = otherCivDiplomacyManager.influence.toInt() - 30 + 1 - diplomacyTable.add("Relationship changes in another [$turnsToRelationshipChange] turns".toLabel()).row() + diplomacyTable.add("Relationship changes in another [$turnsToRelationshipChange] turns".tr().toLabel()).row() } else friendBonusLabel.setFontColor(Color.GRAY)