From c06028b08224c53f4ffe3c21cbb99fd9bd71a963 Mon Sep 17 00:00:00 2001 From: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com> Date: Mon, 9 Sep 2019 00:25:49 +0800 Subject: [PATCH] update translation (#1041) * 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 --- .../Translations/Diplomacy,Trade,Nations.json | 16 ++---- .../NewGame,SaveGame,LoadGame,Options.json | 55 +++++++++---------- .../jsons/Translations/Notifications.json | 45 +++++++++++---- android/assets/jsons/Translations/Other.json | 45 +++++++++++---- .../assets/jsons/Translations/Policies.json | 2 +- .../jsons/Translations/Units,Promotions.json | 15 +++-- .../unciv/logic/civilization/TechManager.kt | 2 +- core/src/com/unciv/ui/saves/LoadGameScreen.kt | 2 +- .../unciv/ui/utils/CameraStageBaseScreen.kt | 1 + .../com/unciv/ui/worldscreen/AlertPopup.kt | 2 +- .../ui/worldscreen/bottombar/BattleTable.kt | 6 +- 11 files changed, 112 insertions(+), 79 deletions(-) diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index 678bb52900..61beaff81a 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -185,6 +185,10 @@ Russian:"Мы обнаружили город-государство [name]!" } + "We have encountered [civName]!":{ + Simplified_Chinese:"我们遇到了文明--[civName]！" + } + // Friendship declaration flavor texts "Declare Friendship ([numberOfTurns] turns)":{ Italian:"Dichiarazione di Amicizia ([numberOfTurns] turni)" @@ -755,6 +759,7 @@ "Introduction to [nation]":{ Italian:"Introduci a [nation]" + Simplified_Chinese:"介绍认识[nation]" } "Luxury resources":{ @@ -1341,17 +1346,6 @@ Russian:"Повышения" } - "units in rough terrain":{ - Italian:"unità su terreno accidentato" - Romanian:"unități în teren accidentat" - Spanish:"unidades en terreno accidentado" - Simplified_Chinese:"位于复杂地形的单位" - German:"Einheiten in unwegsamem Gelände" - French:"unités en terrain accidenté" - Portuguese:"unidades em terreno acidentado" - Russian:"юниты на пересеченной местности" - } - "Barbarians":{ Italian:"Barbari" Romanian:"Barbari" diff --git a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json index 52c4ffbe56..bb0c422060 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:"コピーしたデータを読み込む" } @@ -16,7 +16,7 @@ "Could not load game from clipboard!":{ Italian:"Impossibile caricare partita dagli appunti!" Romanian:"Jocul nu a putut fi încărcat din clipboard!" - Simplified_Chinese:"无法从剪贴板加载游戏!" + Simplified_Chinese:"无法从剪贴板读取游戏!" Portuguese:"Não foi possivel carregar o jogo da prancheta" German:"Das Spiel konnte nicht aus der Zwischenablage geladen werden!" French:"Impossible de charger la partie depuis le presse-papier" @@ -25,23 +25,6 @@ Dutch:"Kon game niet van klembord laden!" Spanish:"No se pudo cargar el juego desde el portapapeles!" } - -////// New game screen - -/* - "Civilization":{ //this word is not used in the game. - Italian:"Civiltà" - Russian:"Цивилизация" - French:"Civilisation" - Romanian:"Civilizaţie" - Spanish:"Civilización" - Simplified_Chinese:"文明" - Portuguese:"Civilização" - German:"Zivilisation" - } -*/ - - "Start game!":{ Italian:"Comincia la tua avventura!" @@ -78,7 +61,7 @@ "No barbarians":{//it can be showed correct as usual, so I'm not translate it. Italian:"Niente barbari" French:"Pas de barbare" - //Simplified_Chinese:"无蛮族" + Simplified_Chinese:"无蛮族" Russian:"Без варваров" } @@ -92,21 +75,21 @@ "Scientific": {//it can be showed correct as usual in chinese, so I'm not translate it. Italian:"Scientifica" French: "Scientifique" - //Simplified_Chinese:"科技" + Simplified_Chinese:"科技胜利" Russian:"Научная" } "Domination": {//it can be showed correct as usual in chinese, so I'm not translate it. Italian:"Per Dominazione" French: "Conquete" - //Simplified_Chinese:"征服" + Simplified_Chinese:"征服胜利" Russian:"Завоевание" }, "Cultural": {//it can be showed correct as usual in chinese, so I'm not translate it. Italian:"Culturale" French: "Culturelle" - //Simplified_Chinese:"文化" + Simplified_Chinese:"文化胜利" Russian:"Культурная" } @@ -302,7 +285,7 @@ "User Id":{ Italian:"ID Utente" - Simplified_Chinese:"用户ID" + Simplified_Chinese:"玩家Id" Russian:"ID игрока" } @@ -314,7 +297,7 @@ "Username":{ Italian:"Nome utente" - Simplified_Chinese:"用户名" + Simplified_Chinese:"玩家姓名" Russian:"Пользователь" } @@ -336,21 +319,25 @@ "Join Game":{ Italian:"Unisciti" + Simplified_Chinese:"加入游戏" Russian:"Подключиться" } "Invalid game ID!":{ Italian:"ID Partita non corretto" + Simplified_Chinese:"无效的游戏Id！" Russian:"Некорректный ID игры!" } "Copy User Id":{ Italian:"Copia ID Utente" + Simplified_Chinese:"复制玩家Id" Russian:"Скопировать ID игрока" } "Copy Game Id":{ Italian:"Copia ID Partita" + Simplified_Chinese:"复制游戏Id" Russian:"Скопировать ID игры" } @@ -432,6 +419,10 @@ Portuguese:"Partidas salvas" } + "Show autosaves":{ + Simplified_Chinese:"显示自动存档" + } + "Saved game name":{ Italian:"Nome del salvataggio" Russian:"Имя сохранённой игры" @@ -444,14 +435,18 @@ Portuguese:"Nome do jogo salvo" } - "Copy to clipboard":{ //shouldn't it be "copy saved game to clipboard" ? //Y: technichally yes, but that's longer so doesn't fit as well into the button-space + "Copy to clipboard":{ //this button exsits in "Save game" and "Map editor", it means that we can copy "current game status" to clipboard, "current game status" is not a existing file but some words. Italian:"Copia su appunti" French:"Copier dans le presse-papier" - Simplified_Chinese:"复制到剪贴板" + Simplified_Chinese:"复制当前游戏数据到剪贴板" Portuguese:"Copiar" //means copy but it is correct because you can actually paste it as text Russian:"Скопировать в буфер" } - + + "Copy saved game to clipboard":{//this button exsits in "Load game",it means that we have a "saved game" file, so we can copy its data to clipboard. + Simplified_Chinese:"复制游戏存档到剪贴板" + } + "Could not load game":{ Italian:"Impossibile caricare partita" Russian:"Не удалось загрузить игру" @@ -460,7 +455,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" } @@ -557,7 +552,7 @@ "Turns between autosaves":{ Italian:"Turni tra autosalvataggi" French:"Tours avant sauvegarde automatique" - Simplified_Chinese:"自动存档回合数" + Simplified_Chinese:"自动存档/回合" Portuguese:"Turnos entre autosaves" Russian:"Кол-во ходов между автосохранениями" } diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json index 0efd5d6c68..c91899f2e9 100644 --- a/android/assets/jsons/Translations/Notifications.json +++ b/android/assets/jsons/Translations/Notifications.json @@ -138,6 +138,7 @@ Italian:"La Meraviglia [wonder] è stata costruita in una terra lontana" French:"[wonder] a été construit(e) dans un lointain pays" Russian:"[wonder] был построен в далёких землях" + Simplified_Chinese:"[wonder]已在遥远的土地上建成" } "Work has started on [construction]":{ @@ -148,7 +149,7 @@ German:"Arbeit an [construction] hat begonnen" Dutch:"Werk is begonen aan [construction]" Spanish:"Se ha empezado a trabajar en [construction]" - Simplified_Chinese:"[construction]建造工作已经开始" + Simplified_Chinese:"开始建造/组建：[construction]" Portuguese:"Os trabalhos começaram no(a) [construction]" Japanese:"[construction]の作業が開始されました" } @@ -157,6 +158,7 @@ Italian:"[cityName] non può più costruire [construction]" French:"[cityName] ne peut plus travailler sur [construction]" Russian:"[cityName] не может продолжать работу над [construction]" + Simplified_Chinese:"[cityname]无法继续建造/组建[construction]" } @@ -168,7 +170,7 @@ German:"[cityname] hat seine Grenzen erweitert!" Dutch:"[cityname] heeft zijn grenzen uitgebreid!" Spanish:"¡[cityname] ha expandido sus fronteras!" - Simplified_Chinese:"[cityname]已经扩张它的边界" + Simplified_Chinese:"[cityname]的边界已经扩张！" Portuguese:"[cityname] expandiu seus territórios!" Japanese:"[cityname]は国境を拡大しました！" } @@ -209,7 +211,7 @@ German:"Ein(e) feindliche(r) [unit] hat [cityname] angegriffen" // Gender sensitive Dutch:"Een vijandelijke [unit] heeft [cityname] aangevallen" Spanish:"Un [unit] enemigo ha atacado [cityname]" - Simplified_Chinese:"1个敌方的[unit]攻击了[cityname]" + Simplified_Chinese:"敌方的[unit]攻击了[cityname]" Portuguese:"Um(a) [unit] inimaga(o) atacou [cityname]" Japanese:"敵[unit]が[cityname]を攻撃しました" } @@ -222,7 +224,7 @@ German:"Ein(e) feindliche(r) [unit] hat unsere(n) [ourUnit] angegriffen" // Gender sensitive Dutch:"Een vijandige [unit] heeft onze [ourUnit] aangevallen" Spanish:"Un [unit] enemigo ha atacado nuestro [ourUnit]" - Simplified_Chinese:"1个敌方的[unit]攻击了我们的[ourUnit]" + Simplified_Chinese:"敌方的[unit]攻击了我们的[ourUnit]" Portuguese:"Um(a) [unit] inimigo(a) atacout nossa [ourUnit]" Japanese:"敵[unit]が私たちの[ourUnit]を攻撃しました" } @@ -231,6 +233,7 @@ Italian:"La città nemica [cityName] ha attaccato [ourUnit]" French:"La cité ennemie [cityName] a attaqué notre [ourUnit]" Russian:"Наш [ourUnit] был атакован вражеским городом [cityName]" + Simplified_Chinese:"敌方城市[cityName]攻击了我们的[ourUnit]" } "An enemy [unit] has captured [cityname]":{ @@ -241,7 +244,7 @@ German:"Ein(e) feindliche(r) [unit] hat [cityname] eingenommen" // Gender sensitive Dutch:"Een vijandige [unit] heeft [cityname] ingenomen" Spanish:"Un [unit] enemigo ha capturado [cityname]" - Simplified_Chinese:"1个敌方的[unit]占领了[cityname]" + Simplified_Chinese:"敌方的[unit]占领了[cityname]" Portuguese:"Um(a) [unit] inimigo(a) capturou [cityname]" Japanese:"敵[unit]が[cityname]を占領しました" } @@ -254,7 +257,7 @@ German:"Ein(e) feindliche(r) [unit] hat unsere(n) [ourUnit] gefangen genommen" // Gender sensitive Dutch:"Een vijandige [unit] heeft [ourUnit] gevangen genomen" Spanish:"Un [unit] enemigo ha capturado nuestro [ourUnit]" - Simplified_Chinese:"1个敌方的[unit]俘虏了我们的[ourUnit]" + Simplified_Chinese:"敌方的[unit]俘虏了我们的[ourUnit]" Portuguese:"Um(a) [unit] inimigo(a) capturou nosso(a) [ourUnit]" Japanese:"敵[unit]が私たちの[ourUnit]を捕獲しました" } @@ -267,7 +270,7 @@ German:"Ein(e) feindliche(r) [unit] hat unsere(n) [ourUnit] zerstört" // Gender sensitive Dutch:"Een vijandige [unit] heeft onze [ourUnit] gedood" Spanish:"Un [unit] enemigo ha destruido nuestro [ourUnit]" - Simplified_Chinese:"1个敌方的[unit]杀死了我们的[ourUnit]" + Simplified_Chinese:"敌方的[unit]杀死了我们的[ourUnit]" Portuguese:"Um(a) [unit] inimigo(a) destruiu nosso(a) [ourUnit]" Japanese:"敵[unit]が私たちの[ourUnit]を破壊しました" } @@ -276,6 +279,7 @@ Italian:"La città nemica [cityName] ha distrutto [ourUnit]" French:"La cité ennemie [cityName] a détruit notre [ourUnit]" Russian:"Наш [ourUnit] был уничтожен вражеским городом [cityName]" + Simplified_Chinese:"敌方城市[cityName]杀死了我们的[ourUnit]" } "An enemy [unit] was destroyed while attacking [cityname]":{ @@ -286,7 +290,7 @@ German:"Ein(e) feindliche(r) [unit] wurde beim Angriff auf [cityname] zerstört" // Gender sensitive Dutch:"Een vijandige [unit] werd gedood tijdens zijn aanval op [cityname]" Spanish:"Un [unit] enemigo ha sido destruido mientras atacaba [cityname]" - Simplified_Chinese:"1个敌方的[unit]在攻击[cityname]时被消灭" + Simplified_Chinese:"敌方的[unit]在攻击[cityname]时被消灭" Portuguese:"Um(a) [unit] inimigo(a) foi destruido enquanto atacava [cityname]" Japanese:"[cityname]を攻撃している間に敵[unit]が破壊された" } @@ -299,7 +303,7 @@ German:"Ein(e) feindliche(r) [unit] wurde beim Angriff auf unsere(n) [ourUnit] zerstört" // Gender sensitive Dutch:"Een vijandige [unit] werd gedood tijdens zijn aanval op onze [unit]" Spanish:"Un [unit] enemigo ha sido destruido mientras atacaba nuestro [ourUnit]" - Simplified_Chinese:"1个敌方的[unit]在攻击我方[ourUnit]时被消灭" + Simplified_Chinese:"敌方的[unit]在攻击我方[ourUnit]时被消灭" Portuguese:"Um(a) [unit] inimigo(a) foi destruido(a) enquanto atacando nosso(a) [ourUit]" Japanese:"「私たちの[ourUnit]を攻撃している間に敵[unit]が破壊された" } @@ -308,24 +312,28 @@ Italian:"La nostra unità [attackerName] è stata distrutta dall'intercettante [interceptorName]" French:"Notre [attackerName] a été intercepté et détruit par un(e) [interceptorName] ennemie" Russian:"Наш [attackerName], был перехвачен и уничтожен вражеским [interceptorName]" + Simplified_Chinese:"我们的[attackerName]被敌方的[interceptorName]拦截并摧毁" } "Our [interceptorName] intercepted and destroyed an enemy [attackerName]":{ Italian:"La nostra unità [interceptorName] ha intercettato e distrutto l'unità nemica [attackerName]" French:"Notre [interceptorName] a intercepté et détruit un(e) [attackerName] ennemie" Russian:"Наш [interceptorName] перехватил и уничтожил вражеский [attackerName]" + Simplified_Chinese:"我们的[interceptorName]拦截并摧毁了敌方的[attackerName]" } "Our [$attackerName] was attacked by an intercepting [$interceptorName]":{ Italian:"La nostra unità [$attackerName] è stata attaccata dall'intercettante [$interceptorName]" French:"Notre [$attackerName] a été intercepté par un(e) [$interceptorName] ennemie" Russian:"Наш [$attackerName], был перехвачен и атакован вражеским [$interceptorName]" + Simplified_Chinese:"我们的[$attackerName]被敌方的[$interceptorName]拦截并攻击" } "Our [$interceptorName] intercepted and attacked an enemy [$attackerName]":{ Italian:"La nostra unità [$interceptorName] ha intercettato e attaccato l'unità nemica [$attackerName]" French:"Notre [$interceptorName] a intercepté un(e) [$attackerName] ennemie" Russian:"Наш [$interceptorName] перехватил и атаковал вражеский [$attackerName]" + Simplified_Chinese:"我们的[$interceptorName]拦截并攻击了敌方的[$attackerName]" } "An enemy [unit] was spotted near our territory":{ @@ -378,7 +386,7 @@ German:"Die Zivilisation [civName] wurde besiegt!" Dutch:"De [civName] beschaving is vernietigt!" //civname has to be an adjective Spanish:"¡La civilización de [civName] ha sido destruida!" - Simplified_Chinese:"[civName]文明已经毁灭" + Simplified_Chinese:"文明--[civName]已经灭亡！" Portuguese:"A civilização de [civName] foi destruida!" Japanese:"[civName]の文明は破壊されました！" } @@ -387,18 +395,21 @@ Italian:"La Città-Stato di [name] è stata distrutta!" French:"La Cité état [name] a été détruite" Russian:"Город-государство [name] был уничтожен!" + Simplified_Chinese:"城邦--[name]已经灭亡！" } "We have captured a barbarian encampment and recovered [goldAmount] gold!":{ //shouldn't it be "we have destroyed ..." ? Italian:"Abbiamo distrutto un accampamento barbaro e recuperato [goldAmount] Oro!" French:"Nous avons capturé un campement barbare et pillé [goldAmount] ors" Russian:"Мы разгромили лагерь варваров и нашли [goldAmount] золота!" + Simplified_Chinese:"我们摧毁蛮族营地获得了[goldAmount]金钱！" } "A barbarian [unitType] has joined us!":{ Italian:"L'unità barbarica [unitType] si è unita a noi!" French:"Un [unitType] barbare nous a rejoins!" Russian:"Варварский [unitType] присоединился к нам!" + Simplified_Chinese:"蛮族的[unitType]加入了我们！" } ///////////////// ruins @@ -412,7 +423,7 @@ Japanese:"遺跡で生存者が見つかりました - 人口は[cityName]に追加されました" Russian:"Мы нашли выживших в руинах - население добавлено в [cityName]" Dutch:"We hebben overlevenden gevonden in de ruïnes - populatie toegevoegd aan [cityName]" - Simplified_Chinese:"我们在废墟中找到了幸存者 - 人口被添加到[cityName]" + Simplified_Chinese:"我们在废墟中找到了幸存者 - [cityName]的人口增加了" Portuguese:"Encontramos sobreviventes nas ruínas - população adicionada a [cityName]" } "We have discovered the lost technology of [techName] in the ruins!":{ @@ -472,6 +483,7 @@ German: "[unit] hat die Erkundung abgeschlossen." French:"[unit] a fini d'explorer" Russian:"[unit] завершил исследование местности." + Simplified_Chinese:"[unit]已完成了探索。" }, "[unit] has no work to do.": { @@ -479,52 +491,61 @@ German:"[unit] hat keine Arbeit mehr." French:"[unit] n'a rien à faire" Russian:"[unit] завершил все доступные работы." + Simplified_Chinese:"[unit]处于空闲。" } "You're losing control of [name].":{ //When you're about to lose your friendship with a City-State Italian:"Stai perdendo il controllo di [name]." French:"Vous perdez le contrôle de [name]" Russian:"Вы теряете влияние на [name]." + Simplified_Chinese:"你已经失去了和[name]的脆弱友谊。" } "You and [name] are no longer friends!":{ // When you lose friendship with a City-State (Relationship fall less than 30) Italian:"Non sei più amico di [name]!" French:"Vous et [name] n'êtes plus amis!" Russian:"Вы и [name] больше не друзья!" + Simplified_Chinese:"你和[name]不再是朋友了！" } "Your alliance with [name] is faltering.":{ //When you're about to lose your alliance with a City-State Italian:"L'alleanza con [name] si sta sfaldando." French:"Votre alliance avec [name] est vacillante." Russian:"Ваш союз с [name] заканчивается." + Simplified_Chinese:"你和[name]的盟友关系正日薄西山。" } "You and [name] are no longer allies!":{ // When you lose alliance with a City-State (Relationship fall less than 60) Italian:"Non sei più alleato con [name]!" French:"Vous et [name] n'êtes plus alliés!" Russian:"Вы и [name] больше не союзники!" + Simplified_Chinese:"你和[name]不再是盟友了！" }, "[civName] gave us a [untiName] as gift near [cityName]!":{ // When a city state gives a unit as gift. Italian:"[civName] ci ha dato [untiName] come regalo vicino a [cityName]!" French:"[civName] nous offre un(e) [untiName] prêt de [cityName]!" Russian:"[civName] передал нам в дар [untiName] около города [cityName]!" + Simplified_Chinese:"[civName]将[untiName](出现在[cityName]附近)赠予我们！" } "[civName] has denounced us!":{ Italian:"[civName] ci ha denunciati pubblicamente!" Russian:"[civName] публично осудил нас!" + Simplified_Chinese:"真是不知死活！[civName]竟然敢谴责我们！" } // Trade "[civName] has accepted your trade request":{ Italian:"[civName] ha accettato la nostra offerta commerciale." Russian:"[civName] принимает ваше торговое предложение" + Simplified_Chinese:"[civName]接受了你的贸易请求" } "[civName] has denied your trade request":{ Italian:"[civName] ha rifiutato la nostra offerta commerciale." Russian:"[civName] отклонил ваше торговое предложение" + Simplified_Chinese:"[civName]否决了你的贸易请求" } @@ -541,12 +562,14 @@ Italian:"Un nostro accordo con [nation] è terminato." French:"Un de nos échanges avec [nation] a pris fin" Russian:"Торговая сделка с [nation] завершилась" + Simplified_Chinese:"我们与[nation]的贸易已经结束" }, "One of our trades with [nation] has been cut short": { Italian:"Un nostro accordo con [nation] è stato interrotto." French:"L'un de nos accord commercial avec [nation] s'est arrêté" Russian:"Торговая сделка с [nation] была завершена досрочно" + Simplified_Chinese:"我们与[nation]的贸易已被消减" }, "[nation] agreed to stop settling cities near us!": { diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index c9b0868d16..fdcb4ed294 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -33,6 +33,7 @@ "Waiting for other players...":{ // Displayed when next turn is being...turned Italian:"In attesa degli altri giocatori..." + Simplified_Chinese:"等待其他玩家..." Russian:"Ожидание других игроков..." } @@ -139,7 +140,7 @@ German:"Stärke" Dutch:"Kracht" Spanish:"Fuerza" - Simplified_Chinese:"近战攻击" + Simplified_Chinese:"战斗力" Portuguese:"Força" Japanese:"強さ" } @@ -152,7 +153,7 @@ German:"Fernkampf-Stärke" Dutch:"Kracht op afstand" Spanish:"Fuerza a distancia" - Simplified_Chinese:"远程攻击" + Simplified_Chinese:"远程战斗力" Portuguese:"Força a distancia" Japanese:"範囲の強さ" } @@ -266,7 +267,7 @@ German:"Befestigung" Dutch:"Versterking" Spanish:"Fortificación" - Simplified_Chinese:"驻守防御力+" + Simplified_Chinese:"驻守防御力加成" Portuguese:"Fortficação" Japanese:"要塞" } @@ -288,6 +289,7 @@ Italian: "In movimento" German: "Bewegen" French:"En mouvement" + Simplified_Chinese:"移动中" Russian:"В движении" } @@ -614,7 +616,7 @@ German:"Spiel laden" Dutch:"Spel laden" Spanish:"Cargar partida" - Simplified_Chinese:"载入游戏" + Simplified_Chinese:"读取游戏" Portuguese:"Carregar partida" Japanese:"ゲームをロード" } @@ -648,6 +650,7 @@ "Community":{ Italian:"Community" + Simplified_Chinese:"开发者社区" Russian:"Сообщество" } @@ -1132,6 +1135,12 @@ Russian:"Национальное чудо" } + "National Wonders":{ + Italian:"Meraviglie Nazionali" + Simplified_Chinese:"国家奇观" + Russian:"Национальные чудеса" + } + "Wonders enabled":{ Italian:"Meraviglie sbloccate" Russian:"Новые чудеса" @@ -1262,6 +1271,18 @@ Portuguese:"Ataque" } + "Bombard":{ + Simplified_Chinese:"轰击" + } + + "Captured!":{ + Simplified_Chinese:"可被俘虏！" + } + + "defence vs ranged":{ + Simplified_Chinese:"对方攻击类型为远程" + } + "[percentage] to unit defence":{ // e.g. +25% to unit defence Italian:"[percentage] di difesa dell'unità" Spanish:"[percentage] A la defensa" @@ -1331,14 +1352,14 @@ ////// Policy picker screen - "You have entered the [newEra] era!":{ + "You have entered the [newEra]!":{//e.g.:"You have entered the Ancient era!"， please re-translate it. Italian:"Sei entrato in una nuova era, l'Epoca [newEra]!" //[newEra] not translated in Italian Russian:"Вы вошли в эпоху [newEra]!" French:"Vous êtes entré dans l'ère [newEra]!" Romanian:"Ai intrat în epoca [newEra]!" Dutch:"Jij bent in het/de [newEra] aangekomen!" // depends on what era it is Spanish:"¡Has entrado en la [newEra]!" - Simplified_Chinese:"您已经进入了[newEra]" + Simplified_Chinese:"您已经进入了[newEra]！" Portuguese:"Voçê entrou na [newEra]!" German:"Zeitalter [newEra] ist eingeläutet!" } @@ -1350,7 +1371,7 @@ Romanian:"Ramura [policyBranch] deblocată!" Dutch:" Het/De [policyBranch] beleid is ontgrendeld!" // depends on what brach it is Spanish:"¡Rama política [policyBranch] desbloqueada!" - Simplified_Chinese:"[policyBranch]政策分支解锁!" + Simplified_Chinese:"[policyBranch]分支解锁!" Portuguese:"[policyBranch] foi desbloqueado(a)" German:"[policyBranch] Grundsatzzweig wurde freigeschaltet" } @@ -1436,11 +1457,6 @@ Russian:"Чудеса" } - "National Wonders":{ // already here at line 1099 - Italian:"Meraviglie Nazionali" - Russian:"Национальные чудеса" - } - "Specialist Buildings":{ Italian:"Edifici specialisti" Romanian:"Clădiri specializate" @@ -1688,18 +1704,22 @@ "You have achieved victory through the awesome power of your Culture. Your civilization's greatness - the magnificence of its monuments and the power of its artists - have astounded the world! Poets will honor you as long as beauty brings gladness to a weary heart.":{ Italian:"Hai ottenuto la vittoria attraverso il maestoso potere della tua cultura. La grandezza della tua civiltà, la magnificenza dei suoi monumenti e il talento dei suoi artisti ha sbalordito il mondo! I poeti ti ononeranno per sempre, finché la bellezza continuerà a portare sollievo ai cuori affaticati." + Simplified_Chinese:"你们依靠文化的强大力量取得了胜利。你们文明的伟大创作——富丽堂皇的建筑和鬼斧神工的艺术品震惊了世界！这些沁入心扉的美丽给疲乏的心带来温暖，给悲伤的人送去欢乐，诗人为你赞叹，乐者为你歌唱！" } "The world has been convulsed by war. May great and powerful civilizations have fallen, but you have survived - and emerged victorious! The world will long remember your glorious triumph!":{ Italian:"Il mondo è stato straziato dalla guerra. Molte grandi e potenti civiltà sono cadute, ma tu sei sopravvissuto e se emerso vittorioso. Il mondo ricorderà a lungo il tuo glorioso trionfo!" + Simplified_Chinese:"世界因战争而动荡不安。许多伟大而且强势的文明衰落了，但你们幸存了下来——并且取得了胜利！世界将永远记住你的光辉与荣耀！" } "You have achieved victory through mastery of Science! You have conquered the mysteries of nature and led your people on a voyage to a brave new world! Your triumph will be remembered as long as the stars burn in the night sky!":{ Italian:"Hai ottenuto la vittoria attraverso la padronanza della scienza! Hai penetrato i misteri più arcani della natura e condotto il tuo popolo in un viaggio verso un nuovo, favoloso mondo! Il tuo trionfo sarà ricordato finch* le stelle continueranno a brillare nel firmamento!" + Simplified_Chinese:"你们通过掌握先进的科技取得了胜利!你们已经征服了大自然的神秘，带领人民踏上了通往美丽新世界的航程！只要星星在夜空中燃烧，你的胜利就会被永远铭记！" } "You have been defeated. Your civilization has been overwhelmed by its many foes. But your people do not despair, for they know that one day you shall return - and lead them forward to victory!":{ Italian:"Sei stato sconfitto. La tua civiltà è stata spazzata via dai suoi nemici. Ma il tuo popolo non dispera, perché sa che un giorno tornerai... e lo condurrai alla vittoria!" + Simplified_Chinese:"你被打败了。虽然你们的文明曾经被许多敌人所征服，但是你的人民永不放弃，因为他们知道总有一天你会回来的！那时，你的文明将会成为天空中最耀眼的恒星！" } "One more turn...!":{ @@ -1955,6 +1975,7 @@ Italian:"Terreno accidentato" German: "Unwegsames Gelände" French:"Terrain abrupte" + Simplified_Chinese:"复杂地形" Russian:"Пересечённая местность" } diff --git a/android/assets/jsons/Translations/Policies.json b/android/assets/jsons/Translations/Policies.json index 6802ebcf32..fdca45d687 100644 --- a/android/assets/jsons/Translations/Policies.json +++ b/android/assets/jsons/Translations/Policies.json @@ -128,7 +128,7 @@ Russian:"Юниты в городах содержатся бесплатно, гарнизонный город + 50% силы атаки" Romanian:"Unitățile din orașe nu necesită costuri de întreținere, orașul înarmat + 50% atac" Spanish:"Unidades en las ciudades no cuestan mantenimiento, y +50% de fuerza de ataque" - Simplified_Chinese:"镇守城市的单位无需维护费，有单位镇守的城市+50%远程攻击力" + Simplified_Chinese:"镇守城市的单位无需维护费，有单位镇守的城市+50%远程战斗力" Portuguese:"Unidades em cidades não custam manutenção, +50% de força de ataque" German:"Einheiten in Städten Kosten keinen Unterhalt, +50% Angriffsstärke" French:"Les unités en garnison n'ont plus de coût d'entretien, +50% de la force d'attaque" diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index fd81d02ac5..32d7a9daaf 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -482,13 +482,6 @@ Portuguese:"Pode se mover após atacar" } - "Penalty vs City 33%":{ - Italian:"+33% Malus contro Città" - Simplified_Chinese:"攻击城市时-33%战斗力" - French:"Pénalité contre les villes -33%" - Russian:"Штраф против Города: 33%" - } - "Companion Cavalry":{ Italian:"Cavalleria dei Compagni" Russian:"Сопутствующая кавалерия" @@ -1467,7 +1460,13 @@ "units in rough terrain":{ Italian:"unità su terreno accidentato" - Russian:"юниты на пересечённой местности" + Romanian:"unități în teren accidentat" + Spanish:"unidades en terreno accidentado" + Simplified_Chinese:"位于复杂地形的单位" + German:"Einheiten in unwegsamem Gelände" + French:"unités en terrain accidenté" + Portuguese:"unidades em terreno acidentado" + Russian:"юниты на пересеченной местности" } "Barrage I":{ diff --git a/core/src/com/unciv/logic/civilization/TechManager.kt b/core/src/com/unciv/logic/civilization/TechManager.kt index 43c4935ea3..856db0324d 100644 --- a/core/src/com/unciv/logic/civilization/TechManager.kt +++ b/core/src/com/unciv/logic/civilization/TechManager.kt @@ -133,7 +133,7 @@ class TechManager { val currentEra = civInfo.getEra() if (previousEra < currentEra) { - civInfo.addNotification("You have entered the [$currentEra] era!".tr(), null, Color.GOLD) + civInfo.addNotification("You have entered the [$currentEra era]!".tr(), null, Color.GOLD) GameBasics.PolicyBranches.values.filter { it.era == currentEra } .forEach { civInfo.addNotification("[" + it.name + "] policy branch unlocked!".tr(), null, Color.PURPLE) } } diff --git a/core/src/com/unciv/ui/saves/LoadGameScreen.kt b/core/src/com/unciv/ui/saves/LoadGameScreen.kt index 346cc2b3ca..daf1d5f1c3 100644 --- a/core/src/com/unciv/ui/saves/LoadGameScreen.kt +++ b/core/src/com/unciv/ui/saves/LoadGameScreen.kt @@ -19,7 +19,7 @@ import java.util.* class LoadGameScreen : PickerScreen() { lateinit var selectedSave:String - val copySavedGameToClipboardButton = TextButton("Copy saved game to clipboard",skin) + val copySavedGameToClipboardButton = TextButton("Copy saved game to clipboard".tr(),skin) val saveTable = Table() val deleteSaveButton = TextButton("Delete save".tr(), skin) diff --git a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt index d8baf1be32..74546c0b00 100644 --- a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt +++ b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt @@ -64,6 +64,7 @@ open class CameraStageBaseScreen : Screen { fun resetFonts(){ skin.get(TextButton.TextButtonStyle::class.java).font = Fonts().getFont(20) + skin.get(CheckBox.CheckBoxStyle::class.java).font= Fonts().getFont(20) skin.get(Label.LabelStyle::class.java).apply { font = Fonts().getFont(18) fontColor= Color.WHITE diff --git a/core/src/com/unciv/ui/worldscreen/AlertPopup.kt b/core/src/com/unciv/ui/worldscreen/AlertPopup.kt index 0c24c049f6..f84623c336 100644 --- a/core/src/com/unciv/ui/worldscreen/AlertPopup.kt +++ b/core/src/com/unciv/ui/worldscreen/AlertPopup.kt @@ -62,7 +62,7 @@ class AlertPopup(val worldScreen: WorldScreen, val popupAlert: PopupAlert): Popu AlertType.CityConquered -> { addGoodSizedLabel("What would you like to do with the city?").row() add(getCloseButton("Annex")).row() - add(TextButton("Raze", skin).onClick { + add(TextButton("Raze".tr(), skin).onClick { worldScreen.viewingCiv.cities.first { it.name==popupAlert.value }.isBeingRazed=true worldScreen.shouldUpdate=true close() diff --git a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt index 99dae100aa..1818891155 100644 --- a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt +++ b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt @@ -80,7 +80,7 @@ class BattleTable(val worldScreen: WorldScreen): Table() { add(attackerNameWrapper) val defenderNameWrapper = Table() - val defenderLabel = Label(defender.getName(), skin) + val defenderLabel = Label(defender.getName().tr(), skin) if(defender is MapUnitCombatant) defenderNameWrapper.add(UnitGroup(defender.unit,25f)).padRight(5f) defenderNameWrapper.add(defenderLabel) @@ -91,9 +91,9 @@ class BattleTable(val worldScreen: WorldScreen): Table() { add("{Strength}: ".tr()+attacker.getAttackingStrength()) add("{Strength}: ".tr()+defender.getDefendingStrength()).row() - val attackerModifiers = BattleDamage().getAttackModifiers(attacker,defender) .map { it.key+": "+(if(it.value>0)"+" else "")+(it.value*100).toInt()+"%" } + val attackerModifiers = BattleDamage().getAttackModifiers(attacker,defender) .map { it.key.tr()+": "+(if(it.value>0)"+" else "")+(it.value*100).toInt()+"%" } val defenderModifiers = if (defender is MapUnitCombatant) - BattleDamage().getDefenceModifiers(attacker, defender).map { it.key+": "+(if(it.value>0)"+" else "")+(it.value*100).toInt()+"%" } + BattleDamage().getDefenceModifiers(attacker, defender).map { it.key.tr()+": "+(if(it.value>0)"+" else "")+(it.value*100).toInt()+"%" } else listOf() for(i in 0..max(attackerModifiers.size,defenderModifiers.size)){